diff options
Diffstat (limited to 'tde-i18n-is/messages/tdesdk/kompare.po')
| -rw-r--r-- | tde-i18n-is/messages/tdesdk/kompare.po | 970 |
1 files changed, 499 insertions, 471 deletions
diff --git a/tde-i18n-is/messages/tdesdk/kompare.po b/tde-i18n-is/messages/tdesdk/kompare.po index 5394e4bceac..09145bde822 100644 --- a/tde-i18n-is/messages/tdesdk/kompare.po +++ b/tde-i18n-is/messages/tdesdk/kompare.po @@ -3,7 +3,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: 2005-12-05 23:52+0100\n" "Last-Translator: Arnar Leosson <leosson@frisurf.no>\n" "Language-Team: Icelandic <kde-isl@molar.is>\n" @@ -13,326 +13,13 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11\n" -#: libdiff2/komparemodellist.cpp:61 -msgid "&Apply Difference" -msgstr "&Virkja mismun" - -#: libdiff2/komparemodellist.cpp:64 -msgid "Un&apply Difference" -msgstr "&Afvirkja mismun" - -#: libdiff2/komparemodellist.cpp:67 -msgid "App&ly All" -msgstr "Virkja a&llt" - -#: libdiff2/komparemodellist.cpp:70 -msgid "&Unapply All" -msgstr "A&fvirkja allt" - -#: libdiff2/komparemodellist.cpp:73 -msgid "P&revious File" -msgstr "Fy&rri skrá" - -#: libdiff2/komparemodellist.cpp:76 -msgid "N&ext File" -msgstr "&Næsta skrá" - -#: libdiff2/komparemodellist.cpp:79 -msgid "&Previous Difference" -msgstr "Fyrra &mismunur" - -#: libdiff2/komparemodellist.cpp:82 -msgid "&Next Difference" -msgstr "Næsti m&ismunur" - -#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 -#, fuzzy -msgid "" -"<qt>No models or no differences, this file: <b>%1</b>" -", is not a valid diff file.</qt>" -msgstr "Enginn mismunur, Þessi skrá: %1, er ekki gild diff skrá." - -#: libdiff2/komparemodellist.cpp:246 -#, fuzzy -msgid "" -"<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</qt>" -msgstr "Það komu upp vandamál við að virkja diff (%1) í skrána (%2)." - -#: libdiff2/komparemodellist.cpp:271 -#, fuzzy -msgid "" -"<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>" -".</qt>" -msgstr "Það komu upp vandamál við að virkja diff (%1) í möppuna (%2)." - -#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 -msgid "Could not open a temporary file." -msgstr "Gat ekki opnað vinnuskrá." - -#: libdiff2/komparemodellist.cpp:350 -#, fuzzy -msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>" -msgstr "Gat ekki skrifað í vinnuskrána." - -#: libdiff2/komparemodellist.cpp:368 -msgid "" -"<qt>Could not create destination directory <b>%1</b>.\n" -"The file has not been saved.</qt>" -msgstr "" - -#: libdiff2/komparemodellist.cpp:383 -#, fuzzy -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 "" -"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." - -#: libdiff2/komparemodellist.cpp:451 -msgid "The files are identical." -msgstr "Skrárnar eru eins." - -#: libdiff2/komparemodellist.cpp:613 -msgid "Could not write to the temporary file." -msgstr "Gat ekki skrifað í vinnuskrána." - -#. i18n: file komparepart/komparepartui.rc line 13 -#: rc.cpp:15 -#, no-c-format -msgid "&Difference" -msgstr "&Mismunur" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 41 -#: rc.cpp:21 -#, fuzzy, no-c-format -msgid "Run Diff In" -msgstr "Keyra Diff í" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 84 -#: rc.cpp:24 -#, no-c-format -msgid "Command Line" -msgstr "Skipanalína" - -#. 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" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 135 -#: rc.cpp:33 -#, no-c-format -msgid "Look for smaller changes" -msgstr "Leita að smærri breytingum" - -#. 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" - -#. 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" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 165 -#: rc.cpp:42 -#, fuzzy, no-c-format -msgid "Expand tabs to spaces" -msgstr "Breyta dálkalykli í bil" - -#. 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" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 181 -#: rc.cpp:48 -#, no-c-format -msgid "Ignore changes in whitespace" -msgstr "Hunsa breytingar í bilum" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 189 -#: rc.cpp:51 -#, no-c-format -msgid "Show function names" -msgstr "Sýna nöfn falla" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 200 -#: rc.cpp:54 -#, no-c-format -msgid "Compare folders recursively" -msgstr "Bera saman möppur arfgengt" - -#. 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" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 227 -#: rc.cpp:60 -#, no-c-format -msgid "Format" -msgstr "Snið" - -#. 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 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" - -#. 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 "Sameinað" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 287 -#: rc.cpp:78 -#, no-c-format -msgid "Side-by-side" -msgstr "Hlið við hlið" - -#. 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: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." - -#: main.cpp:39 -#, fuzzy -msgid "This will compare URL1 with URL2" -msgstr "Þetta mun bera slóð 1 við slóð 2." - -#: 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é" - -#: 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 "" - -#: main.cpp:42 -msgid "" -"Disables the check for automatically finding the original file(s) when using " -"'-' as URL with the -o option." -msgstr "" - -#: 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 "" - -#: main.cpp:52 -msgid "Kompare" -msgstr "Kompare" - -#: 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" - -#: kompare_shell.cpp:398 main.cpp:185 -msgid "Compare Files or Folders" -msgstr "Bera saman skrár eða möppur" - -#: kompare_shell.cpp:399 main.cpp:186 -#, fuzzy -msgid "Source" -msgstr "Uppruni" - -#: kompare_shell.cpp:400 main.cpp:187 -#, fuzzy -msgid "Destination" -msgstr "Áfangastaður" - -#: kompare_shell.cpp:402 main.cpp:189 -msgid "Compare" -msgstr "Bera saman" - -#: main.cpp:189 -msgid "Compare these files or folder" -msgstr "Bera saman þessar skrár eða möppu" - -#: 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 "" -"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." - -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "Björgvin Ragnarsson" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" @@ -448,22 +135,50 @@ msgstr "Blanda þessari skrá eða möppu við diff úttakið" #: kompare_shell.cpp:373 #, fuzzy msgid "" -"If you have entered a file or folder name and a file that contains diff output " -"in the fields in this dialog then this button will be enabled and pressing it " -"will open kompare's main view where the output of the entered file or files " -"from the folder are mixed with the diff output so you can then apply the " -"difference(s) to a file or to the files. " +"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. " +"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:398 main.cpp:185 +msgid "Compare Files or Folders" +msgstr "Bera saman skrár eða möppur" + +#: kompare_shell.cpp:399 main.cpp:186 +#, fuzzy +msgid "Source" +msgstr "Uppruni" + +#: kompare_shell.cpp:400 main.cpp:187 +#, fuzzy +msgid "Destination" +msgstr "Áfangastaður" + +#: 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 "" +"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." + #: kompare_shell.cpp:439 msgid "Text View" msgstr "Textasýn" @@ -559,19 +274,230 @@ msgstr "Óþekkt" msgid "KompareNavTreePart" msgstr "KompareNavTreePart" -#: kompareurldialog.cpp:41 -msgid "Here you can enter the files you want to compare." +#: komparepart/kompare_part.cpp:165 +msgid "Save &All" +msgstr "Vist&a Allt" + +#: komparepart/kompare_part.cpp:168 +msgid "Save .&diff..." +msgstr "Vista .&diff..." + +#: komparepart/kompare_part.cpp:171 +msgid "Swap Source with Destination" +msgstr "Víxla á uppruna og áfangastað" + +#: komparepart/kompare_part.cpp:174 +msgid "Show Statistics" +msgstr "Sýna tölfræði" + +#: komparepart/kompare_part.cpp:269 +msgid "<qt>The URL <b>%1</b> cannot be downloaded.</qt>" +msgstr "<qt>Tókst ekki að ná í slóðina <b>%1</b>.</qt>" + +#: komparepart/kompare_part.cpp:281 +msgid "<qt>The URL <b>%1</b> does not exist on your system.</qt>" +msgstr "<qt>Slóðin <b>%1</b> er ekki til á kerfinu þínu.</qt>" + +#: komparepart/kompare_part.cpp:425 +msgid "Diff Options" +msgstr "Diff valkostir" + +#: komparepart/kompare_part.cpp:443 +msgid "*.diff *.dif *.patch|Patch Files" +msgstr "*.diff *.dif *.patch|Patch skrár" + +#: komparepart/kompare_part.cpp:443 +msgid "Save .diff" +msgstr "Vista .diff" + +#: 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?" + +#: komparepart/kompare_part.cpp:446 +msgid "File Exists" +msgstr "Skrá þegar til" + +#: komparepart/kompare_part.cpp:446 +msgid "Overwrite" +msgstr "Skrifa yfir" + +#: komparepart/kompare_part.cpp:446 +msgid "Do Not Overwrite" +msgstr "Ekki skrifa yfir" + +#: komparepart/kompare_part.cpp:481 +msgid "KomparePart" +msgstr "KomparePart" + +#: komparepart/kompare_part.cpp:493 +msgid "Running diff..." +msgstr "Keyri diff..." + +#: komparepart/kompare_part.cpp:496 +msgid "Parsing diff output..." +msgstr "Þátta diff útták..." + +#: komparepart/kompare_part.cpp:545 +msgid "Comparing file %1 with file %2" +msgstr "Ber skrána %1 saman við skrána %2" + +#: komparepart/kompare_part.cpp:550 +msgid "Comparing files in %1 with files in %2" +msgstr "Ber saman skrár í %1 við skrár í %2" + +#: komparepart/kompare_part.cpp:555 +#, c-format +msgid "Viewing diff output from %1" +msgstr "Sýni diff úttak frá %1" + +#: komparepart/kompare_part.cpp:558 +msgid "Blending diff output from %1 into file %2" +msgstr "Blanda diff úttaki frá %1 í skrá %2" + +#: komparepart/kompare_part.cpp:563 +msgid "Blending diff output from %1 into folder %2" +msgstr "Blanda diff úttaki frá %1 í möppu %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 "" +"Þú hefur gert breytingar á áfangastað.\n" +"Viltu vista þær?" + +#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 +msgid "Save Changes?" +msgstr "Vista breytingar?" + +#: komparepart/kompare_part.cpp:635 komparepart/komparesaveoptionsbase.ui:276 +#: libdialogpages/diffpage.cpp:244 +#, no-c-format +msgid "Unified" +msgstr "Sameinað" + +#: komparepart/kompare_part.cpp:638 komparepart/komparesaveoptionsbase.ui:244 +#: libdialogpages/diffpage.cpp:238 +#, no-c-format +msgid "Context" +msgstr "Samhengi" + +#: 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 "Venjulegt" + +#: komparepart/kompare_part.cpp:667 +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." + +#: 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 "" +"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" + +#: 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 "" +"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" + +#: komparepart/kompareprefdlg.cpp:33 +msgid "Preferences" +msgstr "Stillingar" + +#: komparepart/kompareprefdlg.cpp:39 +#, fuzzy +msgid "View" +msgstr "Textasýn" + +#: komparepart/kompareprefdlg.cpp:39 +msgid "View Settings" +msgstr "Stillingar sýnar" #: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 msgid "Diff" msgstr "Diff" +#: komparepart/kompareprefdlg.cpp:43 +msgid "Diff Settings" +msgstr "Stillingar diff" + +#: kompareurldialog.cpp:41 +#, fuzzy +msgid "Files" +msgstr "&Næsta skrá" + +#: kompareurldialog.cpp:41 +msgid "Here you can enter the files you want to compare." +msgstr "" + #: kompareurldialog.cpp:47 msgid "Here you can change the options for comparing the files." msgstr "" #: kompareurldialog.cpp:53 +#, fuzzy +msgid "Appearance" +msgstr "Út&lit" + +#: kompareurldialog.cpp:53 msgid "Here you can change the options for the view." msgstr "" @@ -597,15 +523,20 @@ msgstr "Úttakssnið" #: 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 "" #: libdialogpages/diffpage.cpp:247 msgid "Lines of Context" msgstr "Línur af samhengi" +#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251 +#, no-c-format +msgid "Number of context lines:" +msgstr "Fjöldi samhengislína:" + #: libdialogpages/diffpage.cpp:253 msgid "" "The number of context lines is normally 2 or 3. This makes the diff readable " @@ -729,14 +660,14 @@ msgstr "" #: 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 "" #: 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 "" #: libdialogpages/diffpage.cpp:338 @@ -750,14 +681,14 @@ 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 "" #: 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 "" #: libdialogpages/diffpage.cpp:352 @@ -825,170 +756,267 @@ msgstr "Letur:" msgid "Size:" msgstr "Stærð:" -#: komparepart/kompareprefdlg.cpp:33 -msgid "Preferences" -msgstr "Stillingar" - -#: komparepart/kompareprefdlg.cpp:39 -msgid "View Settings" -msgstr "Stillingar sýnar" - -#: komparepart/kompareprefdlg.cpp:43 -msgid "Diff Settings" -msgstr "Stillingar diff" +#: libdialogpages/viewpage.cpp:119 +#, fuzzy +msgid "&Fonts" +msgstr "Letur:" -#: komparepart/kompare_part.cpp:165 -msgid "Save &All" -msgstr "Vist&a Allt" +#: libdiff2/komparemodellist.cpp:61 +msgid "&Apply Difference" +msgstr "&Virkja mismun" -#: komparepart/kompare_part.cpp:168 -msgid "Save .&diff..." -msgstr "Vista .&diff..." +#: libdiff2/komparemodellist.cpp:64 +msgid "Un&apply Difference" +msgstr "&Afvirkja mismun" -#: komparepart/kompare_part.cpp:171 -msgid "Swap Source with Destination" -msgstr "Víxla á uppruna og áfangastað" +#: libdiff2/komparemodellist.cpp:67 +msgid "App&ly All" +msgstr "Virkja a&llt" -#: komparepart/kompare_part.cpp:174 -msgid "Show Statistics" -msgstr "Sýna tölfræði" +#: libdiff2/komparemodellist.cpp:70 +msgid "&Unapply All" +msgstr "A&fvirkja allt" -#: komparepart/kompare_part.cpp:269 -msgid "<qt>The URL <b>%1</b> cannot be downloaded.</qt>" -msgstr "<qt>Tókst ekki að ná í slóðina <b>%1</b>.</qt>" +#: libdiff2/komparemodellist.cpp:73 +msgid "P&revious File" +msgstr "Fy&rri skrá" -#: komparepart/kompare_part.cpp:281 -msgid "<qt>The URL <b>%1</b> does not exist on your system.</qt>" -msgstr "<qt>Slóðin <b>%1</b> er ekki til á kerfinu þínu.</qt>" +#: libdiff2/komparemodellist.cpp:76 +msgid "N&ext File" +msgstr "&Næsta skrá" -#: komparepart/kompare_part.cpp:425 -msgid "Diff Options" -msgstr "Diff valkostir" +#: libdiff2/komparemodellist.cpp:79 +msgid "&Previous Difference" +msgstr "Fyrra &mismunur" -#: komparepart/kompare_part.cpp:443 -msgid "*.diff *.dif *.patch|Patch Files" -msgstr "*.diff *.dif *.patch|Patch skrár" +#: libdiff2/komparemodellist.cpp:82 +msgid "&Next Difference" +msgstr "Næsti m&ismunur" -#: komparepart/kompare_part.cpp:443 -msgid "Save .diff" -msgstr "Vista .diff" +#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 +#, fuzzy +msgid "" +"<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff " +"file.</qt>" +msgstr "Enginn mismunur, Þessi skrá: %1, er ekki gild diff skrá." -#: 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?" +#: libdiff2/komparemodellist.cpp:246 +#, fuzzy +msgid "" +"<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</" +"qt>" +msgstr "Það komu upp vandamál við að virkja diff (%1) í skrána (%2)." -#: komparepart/kompare_part.cpp:446 -msgid "File Exists" -msgstr "Skrá þegar til" +#: libdiff2/komparemodellist.cpp:271 +#, fuzzy +msgid "" +"<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>." +"</qt>" +msgstr "Það komu upp vandamál við að virkja diff (%1) í möppuna (%2)." -#: komparepart/kompare_part.cpp:446 -msgid "Overwrite" -msgstr "Skrifa yfir" +#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 +msgid "Could not open a temporary file." +msgstr "Gat ekki opnað vinnuskrá." -#: komparepart/kompare_part.cpp:446 -msgid "Do Not Overwrite" -msgstr "Ekki skrifa yfir" +#: libdiff2/komparemodellist.cpp:350 +#, fuzzy +msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>" +msgstr "Gat ekki skrifað í vinnuskrána." -#: komparepart/kompare_part.cpp:481 -msgid "KomparePart" -msgstr "KomparePart" +#: libdiff2/komparemodellist.cpp:368 +msgid "" +"<qt>Could not create destination directory <b>%1</b>.\n" +"The file has not been saved.</qt>" +msgstr "" -#: komparepart/kompare_part.cpp:493 -msgid "Running diff..." -msgstr "Keyri diff..." +#: libdiff2/komparemodellist.cpp:383 +#, fuzzy +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 "" +"Gat ekki sent vinnuskrána á áfangastaðinn %2. Vinnuskráin er enn tiltæk í: " +"%1. Þú getur afritað hana handvirkt á rétta staðinn." -#: komparepart/kompare_part.cpp:496 -msgid "Parsing diff output..." -msgstr "Þátta diff útták..." +#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 +msgid "Could not parse diff output." +msgstr "Gat ekki þáttað diff úttak." -#: 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:451 +msgid "The files are identical." +msgstr "Skrárnar eru eins." -#: 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:613 +msgid "Could not write to the temporary file." +msgstr "Gat ekki skrifað í vinnuskrána." -#: komparepart/kompare_part.cpp:555 -#, c-format -msgid "Viewing diff output from %1" -msgstr "Sýni diff úttak frá %1" +#: 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." -#: komparepart/kompare_part.cpp:558 -msgid "Blending diff output from %1 into file %2" -msgstr "Blanda diff úttaki frá %1 í skrá %2" +#: main.cpp:39 +#, fuzzy +msgid "This will compare URL1 with URL2" +msgstr "Þetta mun bera slóð 1 við slóð 2." -#: komparepart/kompare_part.cpp:563 -msgid "Blending diff output from %1 into folder %2" -msgstr "Blanda diff úttaki frá %1 í möppu %2" +#: 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é" -#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 +#: main.cpp:41 msgid "" -"You have made changes to the destination file(s).\n" -"Would you like to save them?" +"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 "" -"Þú hefur gert breytingar á áfangastað.\n" -"Viltu vista þær?" - -#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 -msgid "Save Changes?" -msgstr "Vista breytingar?" -#: komparepart/kompare_part.cpp:667 +#: main.cpp:42 msgid "" -"No diff file, or no 2 files have been diffed. Therefore no stats are available." +"Disables the check for automatically finding the original file(s) when using " +"'-' as URL with the -o option." 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." -#: 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 +#: main.cpp:43 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" +"Use this to specify the encoding when calling it from the command line. It " +"will default to the local encoding if not specified." 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 -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" +#: main.cpp:52 +msgid "Kompare" +msgstr "Kompare" + +#: 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" + +#: komparepart/komparepartui.rc:4 kompareui.rc:4 +#, fuzzy, no-c-format +msgid "&File" +msgstr "&Næsta skrá" + +#: komparepart/komparepartui.rc:13 +#, no-c-format +msgid "&Difference" +msgstr "&Mismunur" + +#: komparepart/komparepartui.rc:25 kompareui.rc:14 +#, fuzzy, no-c-format +msgid "&Settings" +msgstr "Stillingar sýnar" + +#: komparepart/komparesaveoptionsbase.ui:41 +#, fuzzy, no-c-format +msgid "Run Diff In" +msgstr "Keyra Diff í" + +#: komparepart/komparesaveoptionsbase.ui:84 +#, no-c-format +msgid "Command Line" +msgstr "Skipanalína" + +#: komparepart/komparesaveoptionsbase.ui:108 +#, fuzzy, no-c-format +msgid "cd dir && diff -udHprNa -- source destination" +msgstr "cd dir && diff -udHprNa -- source destination" + +#: komparepart/komparesaveoptionsbase.ui:118 +#, fuzzy, no-c-format +msgid "Options" +msgstr "Valk&ostir" + +#: komparepart/komparesaveoptionsbase.ui:135 +#, no-c-format +msgid "Look for smaller changes" +msgstr "Leita að smærri breytingum" + +#: komparepart/komparesaveoptionsbase.ui:146 +#, no-c-format +msgid "Optimize for large files" +msgstr "Besta fyrir stórar skrár" + +#: komparepart/komparesaveoptionsbase.ui:157 +#, no-c-format +msgid "Ignore changes in case" +msgstr "Hunsa breytingar á há-/lágstöfum" + +#: komparepart/komparesaveoptionsbase.ui:165 +#, fuzzy, no-c-format +msgid "Expand tabs to spaces" +msgstr "Breyta dálkalykli í bil" + +#: komparepart/komparesaveoptionsbase.ui:173 +#, no-c-format +msgid "Ignore added or removed empty lines" +msgstr "Hunsa viðbættar eða fjarlægðar tómar línur" + +#: komparepart/komparesaveoptionsbase.ui:181 +#, no-c-format +msgid "Ignore changes in whitespace" +msgstr "Hunsa breytingar í bilum" + +#: komparepart/komparesaveoptionsbase.ui:189 +#, no-c-format +msgid "Show function names" +msgstr "Sýna nöfn falla" + +#: komparepart/komparesaveoptionsbase.ui:200 +#, no-c-format +msgid "Compare folders recursively" +msgstr "Bera saman möppur arfgengt" + +#: komparepart/komparesaveoptionsbase.ui:211 +#, no-c-format +msgid "Treat new files as empty" +msgstr "Fara með nýjar skrár sem tómar" + +#: komparepart/komparesaveoptionsbase.ui:227 +#, no-c-format +msgid "Format" +msgstr "Snið" + +#: komparepart/komparesaveoptionsbase.ui:287 +#, no-c-format +msgid "Side-by-side" +msgstr "Hlið við hlið" + +#: kompareui.rc:27 +#, no-c-format +msgid "Main Toolbar" 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" #~ msgid "%1" #~ msgstr "%1" |