From 242434109c14a494dee7738b9c343f5947d20506 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 29 Sep 2014 03:08:03 -0500 Subject: Automated l10n update (.po files) --- tde-i18n-is/messages/tdesdk/kompare.po | 1517 ++++++++++++++++---------------- 1 file changed, 759 insertions(+), 758 deletions(-) (limited to 'tde-i18n-is/messages/tdesdk/kompare.po') diff --git a/tde-i18n-is/messages/tdesdk/kompare.po b/tde-i18n-is/messages/tdesdk/kompare.po index 120162c36ff..741e221dedf 100644 --- a/tde-i18n-is/messages/tdesdk/kompare.po +++ b/tde-i18n-is/messages/tdesdk/kompare.po @@ -3,991 +3,992 @@ msgid "" msgstr "" "Project-Id-Version: kompare\n" -"POT-Creation-Date: 2007-12-20 01:16+0100\n" +"POT-Creation-Date: 2014-09-29 00:48-0500\n" "PO-Revision-Date: 2005-12-05 23:52+0100\n" "Last-Translator: Arnar Leosson \n" "Language-Team: Icelandic \n" +"Language: is\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11\n" -#: komparepart/kompareprefdlg.cpp:33 -msgid "Preferences" -msgstr "Stillingar" +#: _translatorinfo.cpp:1 +msgid "" +"_: NAME OF TRANSLATORS\n" +"Your names" +msgstr "Björgvin Ragnarsson" -#: komparepart/kompareprefdlg.cpp:39 -msgid "View Settings" -msgstr "Stillingar sýnar" +#: _translatorinfo.cpp:3 +msgid "" +"_: EMAIL OF TRANSLATORS\n" +"Your emails" +msgstr "nifgraup@hotmail.com" -#: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 -msgid "Diff" -msgstr "Diff" +#: komparenavtreepart/komparenavtreepart.cpp:61 +#, fuzzy +msgid "Source Folder" +msgstr "Upprunaleg mappa" -#: komparepart/kompareprefdlg.cpp:43 -msgid "Diff Settings" -msgstr "Stillingar diff" +#: komparenavtreepart/komparenavtreepart.cpp:66 +#, fuzzy +msgid "Destination Folder" +msgstr "Áfangastaður Mappa" -#: komparepart/kompare_part.cpp:165 -msgid "Save &All" -msgstr "Vist&a Allt" +#: komparenavtreepart/komparenavtreepart.cpp:71 +#, fuzzy +msgid "Source File" +msgstr "Frumskrá" -#: komparepart/kompare_part.cpp:168 -msgid "Save .&diff..." -msgstr "Vista .&diff..." +#: komparenavtreepart/komparenavtreepart.cpp:72 +#, fuzzy +msgid "Destination File" +msgstr "Áfangastaður Skrá" -#: komparepart/kompare_part.cpp:171 -msgid "Swap Source with Destination" -msgstr "Víxla á uppruna og áfangastað" +#: komparenavtreepart/komparenavtreepart.cpp:78 +#, fuzzy +msgid "Source Line" +msgstr "Uppruni Lína" -#: komparepart/kompare_part.cpp:174 -msgid "Show Statistics" -msgstr "Sýna tölfræði" +#: komparenavtreepart/komparenavtreepart.cpp:79 +#, fuzzy +msgid "Destination Line" +msgstr "Áfangastaður Lína" -#: komparepart/kompare_part.cpp:269 -msgid "The URL %1 cannot be downloaded." -msgstr "Tókst ekki að ná í slóðina %1." +#: komparenavtreepart/komparenavtreepart.cpp:80 +msgid "Difference" +msgstr "Mismunur" -#: komparepart/kompare_part.cpp:281 -msgid "The URL %1 does not exist on your system." -msgstr "Slóðin %1 er ekki til á kerfinu þínu." +#: komparenavtreepart/komparenavtreepart.cpp:426 +#, c-format +msgid "" +"_n: Applied: Changes made to %n line undone\n" +"Applied: Changes made to %n lines undone" +msgstr "" -#: komparepart/kompare_part.cpp:425 -msgid "Diff Options" -msgstr "Diff valkostir" +#: komparenavtreepart/komparenavtreepart.cpp:429 +#, c-format +msgid "" +"_n: Changed %n line\n" +"Changed %n lines" +msgstr "" +"Breytti %n línu\n" +"Breytti %n línum" -#: komparepart/kompare_part.cpp:443 -msgid "*.diff *.dif *.patch|Patch Files" -msgstr "*.diff *.dif *.patch|Patch skrár" +#: komparenavtreepart/komparenavtreepart.cpp:434 +#, c-format +msgid "" +"_n: Applied: Insertion of %n line undone\n" +"Applied: Insertion of %n lines undone" +msgstr "" -#: komparepart/kompare_part.cpp:443 -msgid "Save .diff" -msgstr "Vista .diff" +#: komparenavtreepart/komparenavtreepart.cpp:437 +#, c-format +msgid "" +"_n: Inserted %n line\n" +"Inserted %n lines" +msgstr "" +"Bætti við %n línu\n" +"Bætti við %n línum" -#: komparepart/kompare_part.cpp:446 -msgid "The file exists or is write-protected; do you want to overwrite it?" -msgstr "Skráin er þegar til eða er ritvarin; viltu skrifa yfir hana?" +#: komparenavtreepart/komparenavtreepart.cpp:442 +#, c-format +msgid "" +"_n: Applied: Deletion of %n line undone\n" +"Applied: Deletion of %n lines undone" +msgstr "" -#: komparepart/kompare_part.cpp:446 -msgid "File Exists" -msgstr "Skrá þegar til" +#: komparenavtreepart/komparenavtreepart.cpp:445 +#, c-format +msgid "" +"_n: Deleted %n line\n" +"Deleted %n lines" +msgstr "" +"Eyddi %n línu\n" +"Eyddi %n línum" -#: komparepart/kompare_part.cpp:446 -msgid "Overwrite" -msgstr "Skrifa yfir" +#: komparenavtreepart/komparenavtreepart.cpp:531 +#: komparepart/kompare_part.cpp:651 +msgid "Unknown" +msgstr "Óþekkt" -#: komparepart/kompare_part.cpp:446 -msgid "Do Not Overwrite" -msgstr "Ekki skrifa yfir" +#: komparenavtreepart/komparenavtreepart.cpp:694 +msgid "KompareNavTreePart" +msgstr "KompareNavTreePart" -#: komparepart/kompare_part.cpp:481 -msgid "KomparePart" -msgstr "KomparePart" +#: libdiff2/komparemodellist.cpp:61 +msgid "&Apply Difference" +msgstr "&Virkja mismun" -#: komparepart/kompare_part.cpp:493 -msgid "Running diff..." -msgstr "Keyri diff..." +#: libdiff2/komparemodellist.cpp:64 +msgid "Un&apply Difference" +msgstr "&Afvirkja mismun" -#: komparepart/kompare_part.cpp:496 -msgid "Parsing diff output..." -msgstr "Þátta diff útták..." +#: libdiff2/komparemodellist.cpp:67 +msgid "App&ly All" +msgstr "Virkja a&llt" -#: komparepart/kompare_part.cpp:545 -msgid "Comparing file %1 with file %2" -msgstr "Ber skrána %1 saman við skrána %2" +#: libdiff2/komparemodellist.cpp:70 +msgid "&Unapply All" +msgstr "A&fvirkja allt" -#: komparepart/kompare_part.cpp:550 -msgid "Comparing files in %1 with files in %2" -msgstr "Ber saman skrár í %1 við skrár í %2" +#: libdiff2/komparemodellist.cpp:73 +msgid "P&revious File" +msgstr "Fy&rri skrá" -#: komparepart/kompare_part.cpp:555 -#, c-format -msgid "Viewing diff output from %1" -msgstr "Sýni diff úttak frá %1" +#: libdiff2/komparemodellist.cpp:76 +msgid "N&ext File" +msgstr "&Næsta skrá" -#: komparepart/kompare_part.cpp:558 -msgid "Blending diff output from %1 into file %2" -msgstr "Blanda diff úttaki frá %1 í skrá %2" +#: libdiff2/komparemodellist.cpp:79 +msgid "&Previous Difference" +msgstr "Fyrra &mismunur" -#: komparepart/kompare_part.cpp:563 -msgid "Blending diff output from %1 into folder %2" -msgstr "Blanda diff úttaki frá %1 í möppu %2" +#: libdiff2/komparemodellist.cpp:82 +msgid "&Next Difference" +msgstr "Næsti m&ismunur" -#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 +#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 +#, fuzzy msgid "" -"You have made changes to the destination file(s).\n" -"Would you like to save them?" -msgstr "" -"Þú hefur gert breytingar á áfangastað.\n" -"Viltu vista þær?" - -#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 -msgid "Save Changes?" -msgstr "Vista breytingar?" - -#. 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 "Sameinað" - -#. 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 "Samhengi" - -#. 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 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 "Venjulegt" +"No models or no differences, this file: %1" +", is not a valid diff file." +msgstr "Enginn mismunur, Þessi skrá: %1, er ekki gild diff skrá." -#: komparenavtreepart/komparenavtreepart.cpp:531 -#: komparepart/kompare_part.cpp:651 -msgid "Unknown" -msgstr "Óþekkt" +#: libdiff2/komparemodellist.cpp:246 +#, fuzzy +msgid "" +"There were problems applying the diff %1 to the file %2." +msgstr "Það komu upp vandamál við að virkja diff (%1) í skrána (%2)." -#: komparepart/kompare_part.cpp:667 +#: libdiff2/komparemodellist.cpp:271 +#, fuzzy msgid "" -"No diff file, or no 2 files have been diffed. Therefore no stats are available." -msgstr "" -"Engin diff skrá, eða engar tvær skrár hafa verið athugaðar. Þess vegna eru " -"engar tölfræðiupplýsingar tiltækar." +"There were problems applying the diff %1 to the folder %2" +"." +msgstr "Það komu upp vandamál við að virkja diff (%1) í möppuna (%2)." -#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 -#: komparepart/kompare_part.cpp:698 -msgid "Diff Statistics" -msgstr "Diff tölfræði" +#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 +msgid "Could not open a temporary file." +msgstr "Gat ekki opnað vinnuskrá." -#: komparepart/kompare_part.cpp:673 +#: libdiff2/komparemodellist.cpp:350 +#, fuzzy +msgid "Could not write to the temporary file %1, deleting it." +msgstr "Gat ekki skrifað í vinnuskrána." + +#: libdiff2/komparemodellist.cpp:368 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" +"Could not create destination directory %1.\n" +"The file has not been saved." msgstr "" -"Tölfræði:\n" -"\n" -"Gamla skráin: %1\n" -"Nýja skráin: %2\n" -"\n" -"Snið: %3\n" -"Fjöldi blokka: %4\n" -"Fjöldi mismuna: %5" -#: komparepart/kompare_part.cpp:686 +#: libdiff2/komparemodellist.cpp:383 +#, 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" +"Could not upload the temporary file to the destination location %1" +". The temporary file is still available under: %2" +". You can manually copy it to the right place." msgstr "" -"Tölfræði:\n" -"\n" -"Fjöldi skráa í diff skrá: %1\n" -"Snið: %2\n" -"\n" -"Núverandi gamla skrá: %3\n" -"Núverandi nýja skrá: %4\n" -"\n" -"Fjöldi blokka: %5\n" -"Fjöldi mismuna: %6" - -#: libdialogpages/viewpage.cpp:51 -msgid "Colors" -msgstr "Litir" - -#: libdialogpages/viewpage.cpp:56 -msgid "Removed color:" -msgstr "Fjarlægt litur:" - -#: libdialogpages/viewpage.cpp:61 -msgid "Changed color:" -msgstr "Breytt lítur" +"Gat ekki sent vinnuskrána á áfangastaðinn %2. Vinnuskráin er enn tiltæk í: %1. " +"Þú getur afritað hana handvirkt á rétta staðinn." -#: libdialogpages/viewpage.cpp:66 -msgid "Added color:" -msgstr "Bætt við litur:" +#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 +msgid "Could not parse diff output." +msgstr "Gat ekki þáttað diff úttak." -#: libdialogpages/viewpage.cpp:71 -msgid "Applied color:" -msgstr "Virkjað litur:" +#: libdiff2/komparemodellist.cpp:451 +msgid "The files are identical." +msgstr "Skrárnar eru eins." -#: libdialogpages/viewpage.cpp:76 -msgid "Mouse Wheel" -msgstr "Músarhjól" +#: libdiff2/komparemodellist.cpp:613 +msgid "Could not write to the temporary file." +msgstr "Gat ekki skrifað í vinnuskrána." -#: libdialogpages/viewpage.cpp:80 -msgid "Number of lines:" -msgstr "Fjöldi lína:" +#: kompare_shell.cpp:77 +#, fuzzy +msgid "Could not find our KompareViewPart." +msgstr "Gat ekki funduð okkar KompareViewPart!" -#: libdialogpages/viewpage.cpp:86 -msgid "Tabs to Spaces" -msgstr "Tab í bil" +#: kompare_shell.cpp:106 +#, fuzzy +msgid "Could not load our KompareViewPart." +msgstr "Gat ekki hlaðið okkar KompareViewPart!" -#: libdialogpages/viewpage.cpp:90 -msgid "Number of spaces to convert a tab character to:" -msgstr "Fjöldi bila til að breyta tab-stafi í:" +#: kompare_shell.cpp:114 +#, fuzzy +msgid "Could not find our KompareNavigationPart." +msgstr "Gat ekki fundið okkar KompareNavigationPart!" -#: libdialogpages/viewpage.cpp:97 -msgid "A&ppearance" -msgstr "Út&lit" +#: kompare_shell.cpp:138 +#, fuzzy +msgid "Could not load our KompareNavigationPart." +msgstr "Gat ekki hlaðið okkar KompareNavigationPart!" -#: libdialogpages/viewpage.cpp:104 -msgid "Text Font" -msgstr "Textaletur" +#: kompare_shell.cpp:233 +msgid "&Open Diff..." +msgstr "&Opna Diff..." -#: libdialogpages/viewpage.cpp:108 -msgid "Font:" -msgstr "Letur:" +#: kompare_shell.cpp:234 +msgid "&Compare Files..." +msgstr "&Bera saman skrár..." -#: libdialogpages/viewpage.cpp:112 -msgid "Size:" -msgstr "Stærð:" +#: kompare_shell.cpp:237 +#, fuzzy +msgid "&Blend URL with Diff..." +msgstr "Slóð með." -#: libdialogpages/diffpage.cpp:211 -msgid "Diff Program" -msgstr "Diff forrit" +#: kompare_shell.cpp:246 +#, fuzzy +msgid "Show T&ext View" +msgstr "Sýna T&exti Skoða" -#: libdialogpages/diffpage.cpp:216 +#: kompare_shell.cpp:248 #, fuzzy -msgid "" -"You can select a different diff program here. On Solaris the standard diff " -"program does not support all the options that the GNU version does. This way " -"you can select that version." -msgstr "Hér getur þú valið annað diff forrit. Á Solaris " +msgid "Hide T&ext View" +msgstr "Textasýn" -#: libdialogpages/diffpage.cpp:221 -msgid "&Diff" -msgstr "&Diff" +#: kompare_shell.cpp:257 +msgid " 0 of 0 differences " +msgstr "" -#: libdialogpages/diffpage.cpp:232 -msgid "Output Format" -msgstr "Úttakssnið" +#: kompare_shell.cpp:258 +msgid " 0 of 0 files " +msgstr " 0 af 0 skrár " -#: libdialogpages/diffpage.cpp:233 +#: kompare_shell.cpp:273 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." +"_n: %1 of %n file \n" +" %1 of %n files " msgstr "" +"%1 af %n skrá \n" +" %1 af %n skrár " -#: libdialogpages/diffpage.cpp:247 -msgid "Lines of Context" -msgstr "Línur af samhengi" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 312 -#: libdialogpages/diffpage.cpp:251 rc.cpp:81 -#, no-c-format -msgid "Number of context lines:" -msgstr "Fjöldi samhengislína:" +#: kompare_shell.cpp:275 +#, c-format +msgid "" +"_n: %n file \n" +" %n files " +msgstr "" +"%n skrá \n" +"%n skrár " -#: libdialogpages/diffpage.cpp:253 +#: kompare_shell.cpp:278 msgid "" -"The number of context lines is normally 2 or 3. This makes the diff readable " -"and applicable in most cases. More than 3 lines will only bloat the diff " -"unnecessarily." +"_n: %1 of %n difference, %2 applied \n" +" %1 of %n differences, %2 applied " msgstr "" +" %1 af %n mismun, %2 virkjað \n" +" %1 of %n differences, %2 virkjað " -#: libdialogpages/diffpage.cpp:259 -msgid "&Format" -msgstr "&Snið" +#: kompare_shell.cpp:281 +#, fuzzy, c-format +msgid "" +"_n: %n difference \n" +" %n differences " +msgstr "" +" %n mismunur \n" +" %n differences " -#: libdialogpages/diffpage.cpp:270 -msgid "General" -msgstr "Almennt" +#: kompare_shell.cpp:369 +#, fuzzy +msgid "Blend File/Folder with diff Output" +msgstr "Blanda skrá/möppu við diff úttak" -#: libdialogpages/diffpage.cpp:274 -msgid "&Look for smaller changes" -msgstr "&Skoða eftir minniháttar breytingum" +#: kompare_shell.cpp:370 +msgid "File/Folder" +msgstr "Skrá/mappa" -#: libdialogpages/diffpage.cpp:275 -msgid "This corresponds to the -d diff option." -msgstr "Þetta samsvarar -d diff valkostinum." +#: kompare_shell.cpp:371 +msgid "Diff Output" +msgstr "Diff úttak" -#: libdialogpages/diffpage.cpp:276 +#: kompare_shell.cpp:373 #, fuzzy -msgid "O&ptimize for large files" -msgstr "fyrir" +msgid "Blend" +msgstr "Blanda" -#: libdialogpages/diffpage.cpp:277 -msgid "This corresponds to the -H diff option." -msgstr "" +#: kompare_shell.cpp:373 +msgid "Blend this file or folder with the diff output" +msgstr "Blanda þessari skrá eða möppu við diff úttakið" -#: libdialogpages/diffpage.cpp:278 +#: kompare_shell.cpp:373 #, fuzzy -msgid "&Ignore changes in case" -msgstr "Hunsa \"" - -#: libdialogpages/diffpage.cpp:279 -msgid "This corresponds to the -i diff option." +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 "" +"Ef þú hefur skrifað skráar- eða möppunafn og skrá sem inniheldur diff úttak í " +"svæðin á þessum glugga, mun þessi hnappur vera virkjaður og með því að smella á " +"hann opnast aðalgluggi kompare þar sem úttakið af valdri skrá eða skrám úr " +"möppu eru blandaðar saman við diff úttakið svo þú getur síðan virkjað " +"mismuninní skrá eða skrárnar. " -#: libdialogpages/diffpage.cpp:284 -msgid "Ignore regexp:" -msgstr "Hunsa regexp:" - -#: libdialogpages/diffpage.cpp:285 -msgid "This option corresponds to the -I diff option." -msgstr "" +#: kompare_shell.cpp:398 main.cpp:185 +msgid "Compare Files or Folders" +msgstr "Bera saman skrár eða möppur" -#: libdialogpages/diffpage.cpp:288 -msgid "" -"Add the regular expression here that you want to use\n" -"to ignore lines that match it." -msgstr "" +#: kompare_shell.cpp:399 main.cpp:186 +#, fuzzy +msgid "Source" +msgstr "Uppruni" -#: libdialogpages/diffpage.cpp:294 +#: kompare_shell.cpp:400 main.cpp:187 #, fuzzy -msgid "&Edit..." -msgstr "Sýs&l..." +msgid "Destination" +msgstr "Áfangastaður" -#: libdialogpages/diffpage.cpp:295 +#: kompare_shell.cpp:402 main.cpp:189 +msgid "Compare" +msgstr "Bera saman" + +#: kompare_shell.cpp:402 +msgid "Compare these files or folders" +msgstr "Bera saman þessar skrár eða möppur" + +#: kompare_shell.cpp:402 main.cpp:189 msgid "" -"Clicking this will open a regular expression dialog where\n" -"you can graphically create regular expressions." +"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 "" +"Ef þú slærð inn 2 skráarnöfn eða 2 möppur í svæðin í þessum glugga verður þessi " +"hnappur virkur og með því að smella á hann hefst samanburður á völdum skrám eða " +"möppum." -#: libdialogpages/diffpage.cpp:300 -msgid "Whitespace" -msgstr "Bil" - -#: libdialogpages/diffpage.cpp:304 -#, fuzzy -msgid "E&xpand tabs to spaces in output" -msgstr "Breyta dálkalykli í bil" +#: kompare_shell.cpp:439 +msgid "Text View" +msgstr "Textasýn" -#: libdialogpages/diffpage.cpp:305 -msgid "This option corresponds to the -t diff option." +#: kompareurldialog.cpp:41 +msgid "Here you can enter the files you want to compare." msgstr "" -#: libdialogpages/diffpage.cpp:306 -msgid "I&gnore added or removed empty lines" -msgstr "&Hunsa viðbættar eða fjarlægðar tómar línur" +#: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 +msgid "Diff" +msgstr "Diff" -#: libdialogpages/diffpage.cpp:307 -msgid "This option corresponds to the -B diff option." +#: kompareurldialog.cpp:47 +msgid "Here you can change the options for comparing the files." msgstr "" -#: libdialogpages/diffpage.cpp:308 -msgid "Ig&nore changes in the amount of whitespace" -msgstr "H&unsa breytingar í fjölda bila" - -#: libdialogpages/diffpage.cpp:309 -msgid "This option corresponds to the -b diff option." +#: kompareurldialog.cpp:53 +msgid "Here you can change the options for the view." msgstr "" -#: libdialogpages/diffpage.cpp:310 -#, fuzzy -msgid "Ign&ore all whitespace" -msgstr "Hunsa breytingar í bilum" +#. i18n: file komparepart/komparepartui.rc line 13 +#: rc.cpp:15 +#, no-c-format +msgid "&Difference" +msgstr "&Mismunur" -#: libdialogpages/diffpage.cpp:311 -msgid "This option corresponds to the -w diff option." -msgstr "" +#. i18n: file komparepart/komparesaveoptionsbase.ui line 41 +#: rc.cpp:21 +#, fuzzy, no-c-format +msgid "Run Diff In" +msgstr "Keyra Diff í" -#: libdialogpages/diffpage.cpp:312 -#, fuzzy -msgid "Igno&re changes due to tab expansion" -msgstr "Hunsa breytingar í bilum" +#. i18n: file komparepart/komparesaveoptionsbase.ui line 84 +#: rc.cpp:24 +#, no-c-format +msgid "Command Line" +msgstr "Skipanalína" -#: libdialogpages/diffpage.cpp:313 -msgid "This option corresponds to the -E diff option." -msgstr "" +#. i18n: file komparepart/komparesaveoptionsbase.ui line 108 +#: rc.cpp:27 +#, fuzzy, no-c-format +msgid "cd dir && diff -udHprNa -- source destination" +msgstr "cd dir && diff -udHprNa -- source destination" -#: libdialogpages/diffpage.cpp:318 -msgid "O&ptions" -msgstr "Valk&ostir" +#. i18n: file komparepart/komparesaveoptionsbase.ui line 135 +#: rc.cpp:33 +#, no-c-format +msgid "Look for smaller changes" +msgstr "Leita að smærri breytingum" -#: libdialogpages/diffpage.cpp:328 -msgid "File Pattern to Exclude" -msgstr "" +#. i18n: file komparepart/komparesaveoptionsbase.ui line 146 +#: rc.cpp:36 +#, no-c-format +msgid "Optimize for large files" +msgstr "Besta fyrir stórar skrár" -#: 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." -msgstr "" +#. i18n: file komparepart/komparesaveoptionsbase.ui line 157 +#: rc.cpp:39 +#, no-c-format +msgid "Ignore changes in case" +msgstr "Hunsa breytingar á há-/lágstöfum" -#: libdialogpages/diffpage.cpp:332 -msgid "" -"Here you can enter or remove a shell pattern or select one or more entries from " -"the list." -msgstr "" +#. i18n: file komparepart/komparesaveoptionsbase.ui line 165 +#: rc.cpp:42 +#, fuzzy, no-c-format +msgid "Expand tabs to spaces" +msgstr "Breyta dálkalykli í bil" -#: libdialogpages/diffpage.cpp:338 -msgid "File with Filenames to Exclude" -msgstr "" +#. i18n: file komparepart/komparesaveoptionsbase.ui line 173 +#: rc.cpp:45 +#, no-c-format +msgid "Ignore added or removed empty lines" +msgstr "Hunsa viðbættar eða fjarlægðar tómar línur" -#: libdialogpages/diffpage.cpp:340 -msgid "" -"If this is checked you can enter a filename in the combo box on the right." -msgstr "" +#. i18n: file komparepart/komparesaveoptionsbase.ui line 181 +#: rc.cpp:48 +#, no-c-format +msgid "Ignore changes in whitespace" +msgstr "Hunsa breytingar í bilum" -#: 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." -msgstr "" +#. i18n: file komparepart/komparesaveoptionsbase.ui line 189 +#: rc.cpp:51 +#, no-c-format +msgid "Show function names" +msgstr "Sýna nöfn falla" -#: 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." -msgstr "" +#. i18n: file komparepart/komparesaveoptionsbase.ui line 200 +#: rc.cpp:54 +#, no-c-format +msgid "Compare folders recursively" +msgstr "Bera saman möppur arfgengt" -#: libdialogpages/diffpage.cpp:352 -msgid "&Exclude" -msgstr "" +#. i18n: file komparepart/komparesaveoptionsbase.ui line 211 +#: rc.cpp:57 +#, no-c-format +msgid "Treat new files as empty" +msgstr "Fara með nýjar skrár sem tómar" -#: libdialogpages/filespage.cpp:53 -msgid "Encoding" -msgstr "" +#. i18n: file komparepart/komparesaveoptionsbase.ui line 227 +#: rc.cpp:60 +#, no-c-format +msgid "Format" +msgstr "Snið" -#: libdialogpages/filespage.cpp:64 -#, fuzzy -msgid "&Files" -msgstr "&Næsta skrá" +#. 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 "Samhengi" -#: _translatorinfo.cpp:1 -msgid "" -"_: NAME OF TRANSLATORS\n" -"Your names" -msgstr "Björgvin Ragnarsson" +#. 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" -#: _translatorinfo.cpp:3 -msgid "" -"_: EMAIL OF TRANSLATORS\n" -"Your emails" -msgstr "nifgraup@hotmail.com" +#. 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 "Venjulegt" -#: main.cpp:33 -#, fuzzy -msgid "" -"A program to view the differences between files and optionally generate a diff" -msgstr "" -"Forrit til að skoða mismun á milli skráa auk þess sem hægt er að búa til diff." +#. 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" -#: main.cpp:39 -#, fuzzy -msgid "This will compare URL1 with URL2" -msgstr "Þetta mun bera slóð 1 við slóð 2." +#. 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 "Sameinað" -#: 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 "Þetta mun opna slóð 1 og búast því það að hún sé" +#. i18n: file komparepart/komparesaveoptionsbase.ui line 287 +#: rc.cpp:78 +#, no-c-format +msgid "Side-by-side" +msgstr "Hlið við hlið" -#: 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 "" +#. i18n: file komparepart/komparesaveoptionsbase.ui line 312 +#: libdialogpages/diffpage.cpp:251 rc.cpp:81 +#, no-c-format +msgid "Number of context lines:" +msgstr "Fjöldi samhengislína:" -#: main.cpp:42 -msgid "" -"Disables the check for automatically finding the original file(s) when using " -"'-' as URL with the -o option." -msgstr "" +#: komparepart/kompareprefdlg.cpp:33 +msgid "Preferences" +msgstr "Stillingar" -#: 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/kompareprefdlg.cpp:39 +msgid "View Settings" +msgstr "Stillingar sýnar" -#: main.cpp:52 -msgid "Kompare" -msgstr "Kompare" +#: komparepart/kompareprefdlg.cpp:43 +msgid "Diff Settings" +msgstr "Stillingar diff" -#: main.cpp:54 -#, fuzzy -msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman" -msgstr "(c) 2001-2003, John Firebaugh og Otto Bruggeman" +#: komparepart/kompare_part.cpp:165 +msgid "Save &All" +msgstr "Vist&a Allt" -#: main.cpp:55 main.cpp:56 -msgid "Author" -msgstr "Höfundur" +#: komparepart/kompare_part.cpp:168 +msgid "Save .&diff..." +msgstr "Vista .&diff..." -#: main.cpp:57 -#, fuzzy -msgid "Kompare icon artist" -msgstr "KomparePart" +#: komparepart/kompare_part.cpp:171 +msgid "Swap Source with Destination" +msgstr "Víxla á uppruna og áfangastað" -#: main.cpp:58 -msgid "A lot of good advice" -msgstr "Fullt af góðum ráðum" +#: komparepart/kompare_part.cpp:174 +msgid "Show Statistics" +msgstr "Sýna tölfræði" -#: main.cpp:59 -msgid "Cervisia diff viewer" -msgstr "Cervisia diff skoðari" +#: komparepart/kompare_part.cpp:269 +msgid "The URL %1 cannot be downloaded." +msgstr "Tókst ekki að ná í slóðina %1." -#: kompare_shell.cpp:397 main.cpp:185 -msgid "Compare Files or Folders" -msgstr "Bera saman skrár eða möppur" +#: komparepart/kompare_part.cpp:281 +msgid "The URL %1 does not exist on your system." +msgstr "Slóðin %1 er ekki til á kerfinu þínu." -#: kompare_shell.cpp:398 main.cpp:186 -#, fuzzy -msgid "Source" -msgstr "Uppruni" +#: komparepart/kompare_part.cpp:425 +msgid "Diff Options" +msgstr "Diff valkostir" -#: kompare_shell.cpp:399 main.cpp:187 -#, fuzzy -msgid "Destination" -msgstr "Áfangastaður" +#: komparepart/kompare_part.cpp:443 +msgid "*.diff *.dif *.patch|Patch Files" +msgstr "*.diff *.dif *.patch|Patch skrár" -#: kompare_shell.cpp:401 main.cpp:189 -msgid "Compare" -msgstr "Bera saman" +#: komparepart/kompare_part.cpp:443 +msgid "Save .diff" +msgstr "Vista .diff" -#: main.cpp:189 -msgid "Compare these files or folder" -msgstr "Bera saman þessar skrár eða möppu" +#: komparepart/kompare_part.cpp:446 +msgid "The file exists or is write-protected; do you want to overwrite it?" +msgstr "Skráin er þegar til eða er ritvarin; viltu skrifa yfir hana?" -#: kompare_shell.cpp:401 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 "" -"Ef þú slærð inn 2 skráarnöfn eða 2 möppur í svæðin í þessum glugga verður þessi " -"hnappur virkur og með því að smella á hann hefst samanburður á völdum skrám eða " -"möppum." +#: komparepart/kompare_part.cpp:446 +msgid "File Exists" +msgstr "Skrá þegar til" -#: kompareurldialog.cpp:41 -msgid "Here you can enter the files you want to compare." -msgstr "" +#: komparepart/kompare_part.cpp:446 +msgid "Overwrite" +msgstr "Skrifa yfir" -#: kompareurldialog.cpp:47 -msgid "Here you can change the options for comparing the files." -msgstr "" +#: komparepart/kompare_part.cpp:446 +msgid "Do Not Overwrite" +msgstr "Ekki skrifa yfir" -#: kompareurldialog.cpp:53 -msgid "Here you can change the options for the view." -msgstr "" +#: komparepart/kompare_part.cpp:481 +msgid "KomparePart" +msgstr "KomparePart" -#: komparenavtreepart/komparenavtreepart.cpp:61 -#, fuzzy -msgid "Source Folder" -msgstr "Upprunaleg mappa" +#: komparepart/kompare_part.cpp:493 +msgid "Running diff..." +msgstr "Keyri diff..." -#: komparenavtreepart/komparenavtreepart.cpp:66 -#, fuzzy -msgid "Destination Folder" -msgstr "Áfangastaður Mappa" +#: komparepart/kompare_part.cpp:496 +msgid "Parsing diff output..." +msgstr "Þátta diff útták..." -#: komparenavtreepart/komparenavtreepart.cpp:71 -#, fuzzy -msgid "Source File" -msgstr "Frumskrá" +#: komparepart/kompare_part.cpp:545 +msgid "Comparing file %1 with file %2" +msgstr "Ber skrána %1 saman við skrána %2" -#: komparenavtreepart/komparenavtreepart.cpp:72 -#, fuzzy -msgid "Destination File" -msgstr "Áfangastaður Skrá" +#: komparepart/kompare_part.cpp:550 +msgid "Comparing files in %1 with files in %2" +msgstr "Ber saman skrár í %1 við skrár í %2" -#: komparenavtreepart/komparenavtreepart.cpp:78 -#, fuzzy -msgid "Source Line" -msgstr "Uppruni Lína" +#: komparepart/kompare_part.cpp:555 +#, c-format +msgid "Viewing diff output from %1" +msgstr "Sýni diff úttak frá %1" -#: komparenavtreepart/komparenavtreepart.cpp:79 -#, fuzzy -msgid "Destination Line" -msgstr "Áfangastaður Lína" +#: komparepart/kompare_part.cpp:558 +msgid "Blending diff output from %1 into file %2" +msgstr "Blanda diff úttaki frá %1 í skrá %2" -#: komparenavtreepart/komparenavtreepart.cpp:80 -msgid "Difference" -msgstr "Mismunur" +#: komparepart/kompare_part.cpp:563 +msgid "Blending diff output from %1 into folder %2" +msgstr "Blanda diff úttaki frá %1 í möppu %2" -#: komparenavtreepart/komparenavtreepart.cpp:426 -#, c-format +#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 msgid "" -"_n: Applied: Changes made to %n line undone\n" -"Applied: Changes made to %n lines undone" +"You have made changes to the destination file(s).\n" +"Would you like to save them?" msgstr "" +"Þú hefur gert breytingar á áfangastað.\n" +"Viltu vista þær?" -#: komparenavtreepart/komparenavtreepart.cpp:429 -#, c-format +#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 +msgid "Save Changes?" +msgstr "Vista breytingar?" + +#: komparepart/kompare_part.cpp:667 msgid "" -"_n: Changed %n line\n" -"Changed %n lines" +"No diff file, or no 2 files have been diffed. Therefore no stats are available." msgstr "" -"Breytti %n línu\n" -"Breytti %n línum" +"Engin diff skrá, eða engar tvær skrár hafa verið athugaðar. Þess vegna eru " +"engar tölfræðiupplýsingar tiltækar." -#: komparenavtreepart/komparenavtreepart.cpp:434 -#, c-format +#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 +#: komparepart/kompare_part.cpp:698 +msgid "Diff Statistics" +msgstr "Diff tölfræði" + +#: komparepart/kompare_part.cpp:673 msgid "" -"_n: Applied: Insertion of %n line undone\n" -"Applied: Insertion of %n lines undone" +"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 "" +"Tölfræði:\n" +"\n" +"Gamla skráin: %1\n" +"Nýja skráin: %2\n" +"\n" +"Snið: %3\n" +"Fjöldi blokka: %4\n" +"Fjöldi mismuna: %5" -#: komparenavtreepart/komparenavtreepart.cpp:437 -#, c-format +#: komparepart/kompare_part.cpp:686 msgid "" -"_n: Inserted %n line\n" -"Inserted %n lines" +"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 "" -"Bætti við %n línu\n" -"Bætti við %n línum" +"Tölfræði:\n" +"\n" +"Fjöldi skráa í diff skrá: %1\n" +"Snið: %2\n" +"\n" +"Núverandi gamla skrá: %3\n" +"Núverandi nýja skrá: %4\n" +"\n" +"Fjöldi blokka: %5\n" +"Fjöldi mismuna: %6" -#: komparenavtreepart/komparenavtreepart.cpp:442 -#, c-format -msgid "" -"_n: Applied: Deletion of %n line undone\n" -"Applied: Deletion of %n lines undone" +#: libdialogpages/filespage.cpp:53 +msgid "Encoding" msgstr "" -#: komparenavtreepart/komparenavtreepart.cpp:445 -#, c-format -msgid "" -"_n: Deleted %n line\n" -"Deleted %n lines" -msgstr "" -"Eyddi %n línu\n" -"Eyddi %n línum" +#: libdialogpages/filespage.cpp:64 +#, fuzzy +msgid "&Files" +msgstr "&Næsta skrá" -#: komparenavtreepart/komparenavtreepart.cpp:694 -msgid "KompareNavTreePart" -msgstr "KompareNavTreePart" +#: libdialogpages/viewpage.cpp:51 +msgid "Colors" +msgstr "Litir" -#. i18n: file komparepart/komparepartui.rc line 13 -#: rc.cpp:15 -#, no-c-format -msgid "&Difference" -msgstr "&Mismunur" +#: libdialogpages/viewpage.cpp:56 +msgid "Removed color:" +msgstr "Fjarlægt litur:" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 41 -#: rc.cpp:21 -#, fuzzy, no-c-format -msgid "Run Diff In" -msgstr "Keyra Diff í" +#: libdialogpages/viewpage.cpp:61 +msgid "Changed color:" +msgstr "Breytt lítur" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 84 -#: rc.cpp:24 -#, no-c-format -msgid "Command Line" -msgstr "Skipanalína" +#: libdialogpages/viewpage.cpp:66 +msgid "Added color:" +msgstr "Bætt við litur:" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 108 -#: rc.cpp:27 -#, fuzzy, no-c-format -msgid "cd dir && diff -udHprNa -- source destination" -msgstr "cd dir && diff -udHprNa -- source destination" +#: libdialogpages/viewpage.cpp:71 +msgid "Applied color:" +msgstr "Virkjað litur:" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 135 -#: rc.cpp:33 -#, no-c-format -msgid "Look for smaller changes" -msgstr "Leita að smærri breytingum" +#: libdialogpages/viewpage.cpp:76 +msgid "Mouse Wheel" +msgstr "Músarhjól" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 146 -#: rc.cpp:36 -#, no-c-format -msgid "Optimize for large files" -msgstr "Besta fyrir stórar skrár" +#: libdialogpages/viewpage.cpp:80 +msgid "Number of lines:" +msgstr "Fjöldi lína:" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 157 -#: rc.cpp:39 -#, no-c-format -msgid "Ignore changes in case" -msgstr "Hunsa breytingar á há-/lágstöfum" +#: libdialogpages/viewpage.cpp:86 +msgid "Tabs to Spaces" +msgstr "Tab í bil" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 165 -#: rc.cpp:42 -#, fuzzy, no-c-format -msgid "Expand tabs to spaces" -msgstr "Breyta dálkalykli í bil" +#: libdialogpages/viewpage.cpp:90 +msgid "Number of spaces to convert a tab character to:" +msgstr "Fjöldi bila til að breyta tab-stafi í:" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 173 -#: rc.cpp:45 -#, no-c-format -msgid "Ignore added or removed empty lines" -msgstr "Hunsa viðbættar eða fjarlægðar tómar línur" +#: libdialogpages/viewpage.cpp:97 +msgid "A&ppearance" +msgstr "Út&lit" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 181 -#: rc.cpp:48 -#, no-c-format -msgid "Ignore changes in whitespace" -msgstr "Hunsa breytingar í bilum" +#: libdialogpages/viewpage.cpp:104 +msgid "Text Font" +msgstr "Textaletur" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 189 -#: rc.cpp:51 -#, no-c-format -msgid "Show function names" -msgstr "Sýna nöfn falla" +#: libdialogpages/viewpage.cpp:108 +msgid "Font:" +msgstr "Letur:" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 200 -#: rc.cpp:54 -#, no-c-format -msgid "Compare folders recursively" -msgstr "Bera saman möppur arfgengt" +#: libdialogpages/viewpage.cpp:112 +msgid "Size:" +msgstr "Stærð:" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 211 -#: rc.cpp:57 -#, no-c-format -msgid "Treat new files as empty" -msgstr "Fara með nýjar skrár sem tómar" +#: libdialogpages/diffpage.cpp:211 +msgid "Diff Program" +msgstr "Diff forrit" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 227 -#: rc.cpp:60 -#, no-c-format -msgid "Format" -msgstr "Snið" +#: libdialogpages/diffpage.cpp:216 +#, fuzzy +msgid "" +"You can select a different diff program here. On Solaris the standard diff " +"program does not support all the options that the GNU version does. This way " +"you can select that version." +msgstr "Hér getur þú valið annað diff forrit. Á Solaris " -#. i18n: file komparepart/komparesaveoptionsbase.ui line 287 -#: rc.cpp:78 -#, no-c-format -msgid "Side-by-side" -msgstr "Hlið við hlið" +#: libdialogpages/diffpage.cpp:221 +msgid "&Diff" +msgstr "&Diff" -#: kompare_shell.cpp:77 -#, fuzzy -msgid "Could not find our KompareViewPart." -msgstr "Gat ekki funduð okkar KompareViewPart!" +#: libdialogpages/diffpage.cpp:232 +msgid "Output Format" +msgstr "Úttakssnið" -#: kompare_shell.cpp:106 -#, fuzzy -msgid "Could not load our KompareViewPart." -msgstr "Gat ekki hlaðið okkar KompareViewPart!" +#: 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." +msgstr "" -#: kompare_shell.cpp:114 -#, fuzzy -msgid "Could not find our KompareNavigationPart." -msgstr "Gat ekki fundið okkar KompareNavigationPart!" +#: libdialogpages/diffpage.cpp:247 +msgid "Lines of Context" +msgstr "Línur af samhengi" -#: kompare_shell.cpp:138 -#, fuzzy -msgid "Could not load our KompareNavigationPart." -msgstr "Gat ekki hlaðið okkar KompareNavigationPart!" +#: libdialogpages/diffpage.cpp:253 +msgid "" +"The number of context lines is normally 2 or 3. This makes the diff readable " +"and applicable in most cases. More than 3 lines will only bloat the diff " +"unnecessarily." +msgstr "" -#: kompare_shell.cpp:232 -msgid "&Open Diff..." -msgstr "&Opna Diff..." +#: libdialogpages/diffpage.cpp:259 +msgid "&Format" +msgstr "&Snið" -#: kompare_shell.cpp:233 -msgid "&Compare Files..." -msgstr "&Bera saman skrár..." +#: libdialogpages/diffpage.cpp:270 +msgid "General" +msgstr "Almennt" -#: kompare_shell.cpp:236 -#, fuzzy -msgid "&Blend URL with Diff..." -msgstr "Slóð með." +#: libdialogpages/diffpage.cpp:274 +msgid "&Look for smaller changes" +msgstr "&Skoða eftir minniháttar breytingum" + +#: libdialogpages/diffpage.cpp:275 +msgid "This corresponds to the -d diff option." +msgstr "Þetta samsvarar -d diff valkostinum." -#: kompare_shell.cpp:245 +#: libdialogpages/diffpage.cpp:276 #, fuzzy -msgid "Show T&ext View" -msgstr "Sýna T&exti Skoða" +msgid "O&ptimize for large files" +msgstr "fyrir" + +#: libdialogpages/diffpage.cpp:277 +msgid "This corresponds to the -H diff option." +msgstr "" -#: kompare_shell.cpp:247 +#: libdialogpages/diffpage.cpp:278 #, fuzzy -msgid "Hide T&ext View" -msgstr "Textasýn" +msgid "&Ignore changes in case" +msgstr "Hunsa \"" -#: kompare_shell.cpp:256 -msgid " 0 of 0 differences " +#: libdialogpages/diffpage.cpp:279 +msgid "This corresponds to the -i diff option." msgstr "" -#: kompare_shell.cpp:257 -msgid " 0 of 0 files " -msgstr " 0 af 0 skrár " +#: libdialogpages/diffpage.cpp:284 +msgid "Ignore regexp:" +msgstr "Hunsa regexp:" -#: kompare_shell.cpp:272 -msgid "" -"_n: %1 of %n file \n" -" %1 of %n files " +#: libdialogpages/diffpage.cpp:285 +msgid "This option corresponds to the -I diff option." msgstr "" -"%1 af %n skrá \n" -" %1 af %n skrár " -#: kompare_shell.cpp:274 -#, c-format +#: libdialogpages/diffpage.cpp:288 msgid "" -"_n: %n file \n" -" %n files " +"Add the regular expression here that you want to use\n" +"to ignore lines that match it." msgstr "" -"%n skrá \n" -"%n skrár " -#: kompare_shell.cpp:277 -msgid "" -"_n: %1 of %n difference, %2 applied \n" -" %1 of %n differences, %2 applied " -msgstr "" -" %1 af %n mismun, %2 virkjað \n" -" %1 of %n differences, %2 virkjað " +#: libdialogpages/diffpage.cpp:294 +#, fuzzy +msgid "&Edit..." +msgstr "Sýs&l..." -#: kompare_shell.cpp:280 -#, fuzzy, c-format +#: libdialogpages/diffpage.cpp:295 msgid "" -"_n: %n difference \n" -" %n differences " +"Clicking this will open a regular expression dialog where\n" +"you can graphically create regular expressions." msgstr "" -" %n mismunur \n" -" %n differences " -#: kompare_shell.cpp:368 +#: libdialogpages/diffpage.cpp:300 +msgid "Whitespace" +msgstr "Bil" + +#: libdialogpages/diffpage.cpp:304 #, fuzzy -msgid "Blend File/Folder with diff Output" -msgstr "Blanda skrá/möppu við diff úttak" +msgid "E&xpand tabs to spaces in output" +msgstr "Breyta dálkalykli í bil" -#: kompare_shell.cpp:369 -msgid "File/Folder" -msgstr "Skrá/mappa" +#: libdialogpages/diffpage.cpp:305 +msgid "This option corresponds to the -t diff option." +msgstr "" -#: kompare_shell.cpp:370 -msgid "Diff Output" -msgstr "Diff úttak" +#: libdialogpages/diffpage.cpp:306 +msgid "I&gnore added or removed empty lines" +msgstr "&Hunsa viðbættar eða fjarlægðar tómar línur" -#: kompare_shell.cpp:372 -#, fuzzy -msgid "Blend" -msgstr "Blanda" +#: libdialogpages/diffpage.cpp:307 +msgid "This option corresponds to the -B diff option." +msgstr "" -#: kompare_shell.cpp:372 -msgid "Blend this file or folder with the diff output" -msgstr "Blanda þessari skrá eða möppu við diff úttakið" +#: libdialogpages/diffpage.cpp:308 +msgid "Ig&nore changes in the amount of whitespace" +msgstr "H&unsa breytingar í fjölda bila" -#: kompare_shell.cpp:372 -#, 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. " +#: libdialogpages/diffpage.cpp:309 +msgid "This option corresponds to the -b diff option." msgstr "" -"Ef þú hefur skrifað skráar- eða möppunafn og skrá sem inniheldur diff úttak í " -"svæðin á þessum glugga, mun þessi hnappur vera virkjaður og með því að smella á " -"hann opnast aðalgluggi kompare þar sem úttakið af valdri skrá eða skrám úr " -"möppu eru blandaðar saman við diff úttakið svo þú getur síðan virkjað " -"mismuninní skrá eða skrárnar. " -#: kompare_shell.cpp:401 -msgid "Compare these files or folders" -msgstr "Bera saman þessar skrár eða möppur" +#: libdialogpages/diffpage.cpp:310 +#, fuzzy +msgid "Ign&ore all whitespace" +msgstr "Hunsa breytingar í bilum" -#: kompare_shell.cpp:439 -msgid "Text View" -msgstr "Textasýn" +#: libdialogpages/diffpage.cpp:311 +msgid "This option corresponds to the -w diff option." +msgstr "" -#: libdiff2/komparemodellist.cpp:61 -msgid "&Apply Difference" -msgstr "&Virkja mismun" +#: libdialogpages/diffpage.cpp:312 +#, fuzzy +msgid "Igno&re changes due to tab expansion" +msgstr "Hunsa breytingar í bilum" -#: libdiff2/komparemodellist.cpp:64 -msgid "Un&apply Difference" -msgstr "&Afvirkja mismun" +#: libdialogpages/diffpage.cpp:313 +msgid "This option corresponds to the -E diff option." +msgstr "" -#: libdiff2/komparemodellist.cpp:67 -msgid "App&ly All" -msgstr "Virkja a&llt" +#: libdialogpages/diffpage.cpp:318 +msgid "O&ptions" +msgstr "Valk&ostir" -#: libdiff2/komparemodellist.cpp:70 -msgid "&Unapply All" -msgstr "A&fvirkja allt" +#: libdialogpages/diffpage.cpp:328 +msgid "File Pattern to Exclude" +msgstr "" -#: libdiff2/komparemodellist.cpp:73 -msgid "P&revious File" -msgstr "Fy&rri skrá" +#: 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." +msgstr "" -#: libdiff2/komparemodellist.cpp:76 -msgid "N&ext File" -msgstr "&Næsta skrá" +#: libdialogpages/diffpage.cpp:332 +msgid "" +"Here you can enter or remove a shell pattern or select one or more entries from " +"the list." +msgstr "" -#: libdiff2/komparemodellist.cpp:79 -msgid "&Previous Difference" -msgstr "Fyrra &mismunur" +#: libdialogpages/diffpage.cpp:338 +msgid "File with Filenames to Exclude" +msgstr "" -#: libdiff2/komparemodellist.cpp:82 -msgid "&Next Difference" -msgstr "Næsti m&ismunur" +#: libdialogpages/diffpage.cpp:340 +msgid "" +"If this is checked you can enter a filename in the combo box on the right." +msgstr "" -#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 -#, fuzzy +#: libdialogpages/diffpage.cpp:342 msgid "" -"No models or no differences, this file: %1" -", is not a valid diff file." -msgstr "Enginn mismunur, Þessi skrá: %1, er ekki gild diff skrá." +"Here you can enter the URL of a file with shell patterns to ignore during the " +"comparison of the folders." +msgstr "" -#: libdiff2/komparemodellist.cpp:246 -#, fuzzy +#: libdialogpages/diffpage.cpp:344 msgid "" -"There were problems applying the diff %1 to the file %2." -msgstr "Það komu upp vandamál við að virkja diff (%1) í skrána (%2)." +"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 "" -#: libdiff2/komparemodellist.cpp:271 +#: libdialogpages/diffpage.cpp:352 +msgid "&Exclude" +msgstr "" + +#: main.cpp:33 #, fuzzy msgid "" -"There were problems applying the diff %1 to the folder %2" -"." -msgstr "Það komu upp vandamál við að virkja diff (%1) í möppuna (%2)." +"A program to view the differences between files and optionally generate a diff" +msgstr "" +"Forrit til að skoða mismun á milli skráa auk þess sem hægt er að búa til diff." -#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 -msgid "Could not open a temporary file." -msgstr "Gat ekki opnað vinnuskrá." +#: main.cpp:39 +#, fuzzy +msgid "This will compare URL1 with URL2" +msgstr "Þetta mun bera slóð 1 við slóð 2." -#: libdiff2/komparemodellist.cpp:350 +#: main.cpp:40 #, fuzzy -msgid "Could not write to the temporary file %1, deleting it." -msgstr "Gat ekki skrifað í vinnuskrána." +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 "Þetta mun opna slóð 1 og búast því það að hún sé" -#: libdiff2/komparemodellist.cpp:368 +#: main.cpp:41 msgid "" -"Could not create destination directory %1.\n" -"The file has not been saved." +"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 "" -#: libdiff2/komparemodellist.cpp:383 -#, fuzzy +#: main.cpp:42 msgid "" -"Could not upload the temporary file to the destination location %1" -". The temporary file is still available under: %2" -". You can manually copy it to the right place." +"Disables the check for automatically finding the original file(s) when using " +"'-' as URL with the -o option." msgstr "" -"Gat ekki sent vinnuskrána á áfangastaðinn %2. Vinnuskráin er enn tiltæk í: %1. " -"Þú getur afritað hana handvirkt á rétta staðinn." -#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 -msgid "Could not parse diff output." -msgstr "Gat ekki þáttað diff úttak." +#: 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 "" -#: libdiff2/komparemodellist.cpp:451 -msgid "The files are identical." -msgstr "Skrárnar eru eins." +#: main.cpp:52 +msgid "Kompare" +msgstr "Kompare" -#: libdiff2/komparemodellist.cpp:613 -msgid "Could not write to the temporary file." -msgstr "Gat ekki skrifað í vinnuskrána." +#: main.cpp:54 +#, fuzzy +msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman" +msgstr "(c) 2001-2003, John Firebaugh og Otto Bruggeman" + +#: main.cpp:55 main.cpp:56 +msgid "Author" +msgstr "Höfundur" + +#: main.cpp:57 +#, fuzzy +msgid "Kompare icon artist" +msgstr "KomparePart" + +#: main.cpp:58 +msgid "A lot of good advice" +msgstr "Fullt af góðum ráðum" + +#: main.cpp:59 +msgid "Cervisia diff viewer" +msgstr "Cervisia diff skoðari" + +#: main.cpp:189 +msgid "Compare these files or folder" +msgstr "Bera saman þessar skrár eða möppu" #~ msgid "%1" #~ msgstr "%1" -- cgit v1.2.1