From ff4fa4a4bcbcb8f46cd9231b0a5f3b3d19f5989c Mon Sep 17 00:00:00 2001
From: Automated System <kb9vqf@pearsoncomputing.net>
Date: Mon, 29 Sep 2014 12:26:02 -0500
Subject: Automated l10n update (.po files)

---
 tde-i18n-is/messages/tdesdk/kompare.po | 1328 ++++++++++++++++----------------
 1 file changed, 664 insertions(+), 664 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 741e221dedf..5394e4bceac 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 00:48-0500\n"
+"POT-Creation-Date: 2014-09-29 12:05-0500\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,109 +13,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11\n"
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Björgvin Ragnarsson"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "nifgraup@hotmail.com"
-
-#: komparenavtreepart/komparenavtreepart.cpp:61
-#, fuzzy
-msgid "Source Folder"
-msgstr "Upprunaleg mappa"
-
-#: komparenavtreepart/komparenavtreepart.cpp:66
-#, fuzzy
-msgid "Destination Folder"
-msgstr "Áfangastaður Mappa"
-
-#: komparenavtreepart/komparenavtreepart.cpp:71
-#, fuzzy
-msgid "Source File"
-msgstr "Frumskrá"
-
-#: komparenavtreepart/komparenavtreepart.cpp:72
-#, fuzzy
-msgid "Destination File"
-msgstr "Áfangastaður Skrá"
-
-#: komparenavtreepart/komparenavtreepart.cpp:78
-#, fuzzy
-msgid "Source Line"
-msgstr "Uppruni Lína"
-
-#: komparenavtreepart/komparenavtreepart.cpp:79
-#, fuzzy
-msgid "Destination Line"
-msgstr "Áfangastaður Lína"
-
-#: komparenavtreepart/komparenavtreepart.cpp:80
-msgid "Difference"
-msgstr "Mismunur"
-
-#: komparenavtreepart/komparenavtreepart.cpp:426
-#, c-format
-msgid ""
-"_n: Applied: Changes made to %n line undone\n"
-"Applied: Changes made to  %n lines undone"
-msgstr ""
-
-#: komparenavtreepart/komparenavtreepart.cpp:429
-#, c-format
-msgid ""
-"_n: Changed %n line\n"
-"Changed %n lines"
-msgstr ""
-"Breytti %n línu\n"
-"Breytti %n línum"
-
-#: komparenavtreepart/komparenavtreepart.cpp:434
-#, c-format
-msgid ""
-"_n: Applied: Insertion of %n line undone\n"
-"Applied: Insertion of %n lines undone"
-msgstr ""
-
-#: komparenavtreepart/komparenavtreepart.cpp:437
-#, 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"
-
-#: komparenavtreepart/komparenavtreepart.cpp:442
-#, c-format
-msgid ""
-"_n: Applied: Deletion of %n line undone\n"
-"Applied: Deletion of %n lines undone"
-msgstr ""
-
-#: komparenavtreepart/komparenavtreepart.cpp:445
-#, c-format
-msgid ""
-"_n: Deleted %n line\n"
-"Deleted %n lines"
-msgstr ""
-"Eyddi %n línu\n"
-"Eyddi %n línum"
-
-#: komparenavtreepart/komparenavtreepart.cpp:531
-#: komparepart/kompare_part.cpp:651
-msgid "Unknown"
-msgstr "Óþekkt"
-
-#: komparenavtreepart/komparenavtreepart.cpp:694
-msgid "KompareNavTreePart"
-msgstr "KompareNavTreePart"
-
 #: libdiff2/komparemodellist.cpp:61
 msgid "&Apply Difference"
 msgstr "&Virkja mismun"
@@ -205,127 +102,197 @@ msgstr "Skrárnar eru eins."
 msgid "Could not write to the temporary file."
 msgstr "Gat ekki skrifað í vinnuskrána."
 
-#: kompare_shell.cpp:77
-#, fuzzy
-msgid "Could not find our KompareViewPart."
-msgstr "Gat ekki funduð okkar KompareViewPart!"
-
-#: kompare_shell.cpp:106
-#, fuzzy
-msgid "Could not load our KompareViewPart."
-msgstr "Gat ekki hlaðið okkar KompareViewPart!"
+#. i18n: file komparepart/komparepartui.rc line 13
+#: rc.cpp:15
+#, no-c-format
+msgid "&Difference"
+msgstr "&Mismunur"
 
-#: kompare_shell.cpp:114
-#, fuzzy
-msgid "Could not find our KompareNavigationPart."
-msgstr "Gat ekki fundið okkar KompareNavigationPart!"
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 41
+#: rc.cpp:21
+#, fuzzy, no-c-format
+msgid "Run Diff In"
+msgstr "Keyra Diff í"
 
-#: kompare_shell.cpp:138
-#, fuzzy
-msgid "Could not load our KompareNavigationPart."
-msgstr "Gat ekki hlaðið okkar KompareNavigationPart!"
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 84
+#: rc.cpp:24
+#, no-c-format
+msgid "Command Line"
+msgstr "Skipanalína"
 
-#: kompare_shell.cpp:233
-msgid "&Open Diff..."
-msgstr "&Opna Diff..."
+#. 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"
 
-#: kompare_shell.cpp:234
-msgid "&Compare Files..."
-msgstr "&Bera saman skrár..."
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 135
+#: rc.cpp:33
+#, no-c-format
+msgid "Look for smaller changes"
+msgstr "Leita að smærri breytingum"
 
-#: kompare_shell.cpp:237
-#, fuzzy
-msgid "&Blend URL with Diff..."
-msgstr "Slóð með."
+#. 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"
 
-#: kompare_shell.cpp:246
-#, fuzzy
-msgid "Show T&ext View"
-msgstr "Sýna T&exti Skoða"
+#. 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"
 
-#: kompare_shell.cpp:248
-#, fuzzy
-msgid "Hide T&ext View"
-msgstr "Textasýn"
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 165
+#: rc.cpp:42
+#, fuzzy, no-c-format
+msgid "Expand tabs to spaces"
+msgstr "Breyta dálkalykli í bil"
 
-#: kompare_shell.cpp:257
-msgid " 0 of 0 differences "
-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"
 
-#: kompare_shell.cpp:258
-msgid " 0 of 0 files "
-msgstr " 0 af 0 skrár "
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 181
+#: rc.cpp:48
+#, no-c-format
+msgid "Ignore changes in whitespace"
+msgstr "Hunsa breytingar í bilum"
 
-#: kompare_shell.cpp:273
-msgid ""
-"_n:  %1 of %n file \n"
-" %1 of %n files "
-msgstr ""
-"%1 af %n skrá \n"
-" %1 af %n skrár "
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 189
+#: rc.cpp:51
+#, no-c-format
+msgid "Show function names"
+msgstr "Sýna nöfn falla"
 
-#: kompare_shell.cpp:275
-#, c-format
-msgid ""
-"_n:  %n file \n"
-" %n files "
-msgstr ""
-"%n skrá \n"
-"%n skrár "
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 200
+#: rc.cpp:54
+#, no-c-format
+msgid "Compare folders recursively"
+msgstr "Bera saman möppur arfgengt"
 
-#: kompare_shell.cpp:278
-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ð "
+#. 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"
 
-#: kompare_shell.cpp:281
-#, fuzzy, c-format
-msgid ""
-"_n:  %n difference \n"
-" %n differences "
-msgstr ""
-" %n mismunur \n"
-" %n differences "
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 227
+#: rc.cpp:60
+#, no-c-format
+msgid "Format"
+msgstr "Snið"
 
-#: kompare_shell.cpp:369
-#, fuzzy
-msgid "Blend File/Folder with diff Output"
-msgstr "Blanda skrá/möppu við diff úttak"
+#. 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"
 
-#: kompare_shell.cpp:370
-msgid "File/Folder"
-msgstr "Skrá/mappa"
+#. 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"
 
-#: kompare_shell.cpp:371
-msgid "Diff Output"
-msgstr "Diff úttak"
+#. 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"
 
-#: kompare_shell.cpp:373
+#. 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 "Blend"
-msgstr "Blanda"
+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."
 
-#: 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ð"
+#: main.cpp:39
+#, fuzzy
+msgid "This will compare URL1 with URL2"
+msgstr "Þetta mun bera slóð 1 við slóð 2."
 
-#: kompare_shell.cpp:373
+#: main.cpp:40
 #, 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. "
+"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 ""
-"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. "
+
+#: 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"
@@ -345,9 +312,9 @@ msgstr "Áfangastaður"
 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"
+#: 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 ""
@@ -359,377 +326,254 @@ msgstr ""
 "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"
-
-#: kompareurldialog.cpp:41
-msgid "Here you can enter the files you want to compare."
-msgstr ""
+#: _translatorinfo.cpp:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Björgvin Ragnarsson"
 
-#: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47
-msgid "Diff"
-msgstr "Diff"
+#: _translatorinfo.cpp:3
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "nifgraup@hotmail.com"
 
-#: kompareurldialog.cpp:47
-msgid "Here you can change the options for comparing the files."
-msgstr ""
+#: kompare_shell.cpp:77
+#, fuzzy
+msgid "Could not find our KompareViewPart."
+msgstr "Gat ekki funduð okkar KompareViewPart!"
 
-#: kompareurldialog.cpp:53
-msgid "Here you can change the options for the view."
-msgstr ""
+#: kompare_shell.cpp:106
+#, fuzzy
+msgid "Could not load our KompareViewPart."
+msgstr "Gat ekki hlaðið okkar KompareViewPart!"
 
-#. i18n: file komparepart/komparepartui.rc line 13
-#: rc.cpp:15
-#, no-c-format
-msgid "&Difference"
-msgstr "&Mismunur"
+#: kompare_shell.cpp:114
+#, fuzzy
+msgid "Could not find our KompareNavigationPart."
+msgstr "Gat ekki fundið okkar KompareNavigationPart!"
 
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 41
-#: rc.cpp:21
-#, fuzzy, no-c-format
-msgid "Run Diff In"
-msgstr "Keyra Diff í"
+#: kompare_shell.cpp:138
+#, fuzzy
+msgid "Could not load our KompareNavigationPart."
+msgstr "Gat ekki hlaðið okkar KompareNavigationPart!"
 
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 84
-#: rc.cpp:24
-#, no-c-format
-msgid "Command Line"
-msgstr "Skipanalína"
+#: kompare_shell.cpp:233
+msgid "&Open Diff..."
+msgstr "&Opna Diff..."
 
-#. 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"
+#: kompare_shell.cpp:234
+msgid "&Compare Files..."
+msgstr "&Bera saman skrár..."
 
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 135
-#: rc.cpp:33
-#, no-c-format
-msgid "Look for smaller changes"
-msgstr "Leita að smærri breytingum"
+#: kompare_shell.cpp:237
+#, fuzzy
+msgid "&Blend URL with Diff..."
+msgstr "Slóð með."
 
-#. 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"
+#: kompare_shell.cpp:246
+#, fuzzy
+msgid "Show T&ext View"
+msgstr "Sýna T&exti Skoða"
 
-#. 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"
+#: kompare_shell.cpp:248
+#, fuzzy
+msgid "Hide T&ext View"
+msgstr "Textasýn"
 
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 165
-#: rc.cpp:42
-#, fuzzy, no-c-format
-msgid "Expand tabs to spaces"
-msgstr "Breyta dálkalykli í bil"
+#: kompare_shell.cpp:257
+msgid " 0 of 0 differences "
+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"
+#: kompare_shell.cpp:258
+msgid " 0 of 0 files "
+msgstr " 0 af 0 skrár "
 
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 181
-#: rc.cpp:48
-#, no-c-format
-msgid "Ignore changes in whitespace"
-msgstr "Hunsa breytingar í bilum"
+#: kompare_shell.cpp:273
+msgid ""
+"_n:  %1 of %n file \n"
+" %1 of %n files "
+msgstr ""
+"%1 af %n skrá \n"
+" %1 af %n skrár "
 
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 189
-#: rc.cpp:51
-#, no-c-format
-msgid "Show function names"
-msgstr "Sýna nöfn falla"
+#: kompare_shell.cpp:275
+#, c-format
+msgid ""
+"_n:  %n file \n"
+" %n files "
+msgstr ""
+"%n skrá \n"
+"%n skrár "
 
-#. 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:"
-
-#: 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"
-
-#: komparepart/kompare_part.cpp:165
-msgid "Save &All"
-msgstr "Vist&a Allt"
-
-#: komparepart/kompare_part.cpp:168
-msgid "Save .&diff..."
-msgstr "Vista .&diff..."
+#: kompare_shell.cpp:278
+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ð "
 
-#: komparepart/kompare_part.cpp:171
-msgid "Swap Source with Destination"
-msgstr "Víxla á uppruna og áfangastað"
+#: kompare_shell.cpp:281
+#, fuzzy, c-format
+msgid ""
+"_n:  %n difference \n"
+" %n differences "
+msgstr ""
+" %n mismunur \n"
+" %n differences "
 
-#: komparepart/kompare_part.cpp:174
-msgid "Show Statistics"
-msgstr "Sýna tölfræði"
+#: kompare_shell.cpp:369
+#, fuzzy
+msgid "Blend File/Folder with diff Output"
+msgstr "Blanda skrá/möppu við diff úttak"
 
-#: 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>"
+#: kompare_shell.cpp:370
+msgid "File/Folder"
+msgstr "Skrá/mappa"
 
-#: 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>"
+#: kompare_shell.cpp:371
+msgid "Diff Output"
+msgstr "Diff úttak"
 
-#: komparepart/kompare_part.cpp:425
-msgid "Diff Options"
-msgstr "Diff valkostir"
+#: kompare_shell.cpp:373
+#, fuzzy
+msgid "Blend"
+msgstr "Blanda"
 
-#: komparepart/kompare_part.cpp:443
-msgid "*.diff *.dif *.patch|Patch Files"
-msgstr "*.diff *.dif *.patch|Patch skrár"
+#: 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ð"
 
-#: komparepart/kompare_part.cpp:443
-msgid "Save .diff"
-msgstr "Vista .diff"
+#: kompare_shell.cpp:373
+#, fuzzy
+msgid ""
+"If you have entered a file or folder name and a file that contains diff output "
+"in the fields in this dialog then this button will be enabled and pressing it "
+"will open kompare's main view where the output of the entered file or files "
+"from the folder are mixed with the diff output so you can then apply the "
+"difference(s) to a file or to the files. "
+msgstr ""
+"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. "
 
-#: 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:402
+msgid "Compare these files or folders"
+msgstr "Bera saman þessar skrár eða möppur"
 
-#: komparepart/kompare_part.cpp:446
-msgid "File Exists"
-msgstr "Skrá þegar til"
+#: kompare_shell.cpp:439
+msgid "Text View"
+msgstr "Textasýn"
 
-#: komparepart/kompare_part.cpp:446
-msgid "Overwrite"
-msgstr "Skrifa yfir"
+#: komparenavtreepart/komparenavtreepart.cpp:61
+#, fuzzy
+msgid "Source Folder"
+msgstr "Upprunaleg mappa"
 
-#: komparepart/kompare_part.cpp:446
-msgid "Do Not Overwrite"
-msgstr "Ekki skrifa yfir"
+#: komparenavtreepart/komparenavtreepart.cpp:66
+#, fuzzy
+msgid "Destination Folder"
+msgstr "Áfangastaður Mappa"
 
-#: komparepart/kompare_part.cpp:481
-msgid "KomparePart"
-msgstr "KomparePart"
+#: komparenavtreepart/komparenavtreepart.cpp:71
+#, fuzzy
+msgid "Source File"
+msgstr "Frumskrá"
 
-#: komparepart/kompare_part.cpp:493
-msgid "Running diff..."
-msgstr "Keyri diff..."
+#: komparenavtreepart/komparenavtreepart.cpp:72
+#, fuzzy
+msgid "Destination File"
+msgstr "Áfangastaður Skrá"
 
-#: komparepart/kompare_part.cpp:496
-msgid "Parsing diff output..."
-msgstr "Þátta diff útták..."
+#: komparenavtreepart/komparenavtreepart.cpp:78
+#, fuzzy
+msgid "Source Line"
+msgstr "Uppruni Lína"
 
-#: 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:79
+#, fuzzy
+msgid "Destination Line"
+msgstr "Áfangastaður Lína"
 
-#: 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:80
+msgid "Difference"
+msgstr "Mismunur"
 
-#: komparepart/kompare_part.cpp:555
+#: komparenavtreepart/komparenavtreepart.cpp:426
 #, 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: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"
-
-#: libdialogpages/filespage.cpp:53
-msgid "Encoding"
+"_n: Applied: Changes made to %n line undone\n"
+"Applied: Changes made to  %n lines undone"
 msgstr ""
 
-#: libdialogpages/filespage.cpp:64
-#, fuzzy
-msgid "&Files"
-msgstr "&Næsta skrá"
-
-#: 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"
+#: 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"
 
-#: libdialogpages/viewpage.cpp:66
-msgid "Added color:"
-msgstr "Bætt við litur:"
+#: komparenavtreepart/komparenavtreepart.cpp:434
+#, c-format
+msgid ""
+"_n: Applied: Insertion of %n line undone\n"
+"Applied: Insertion of %n lines undone"
+msgstr ""
 
-#: libdialogpages/viewpage.cpp:71
-msgid "Applied color:"
-msgstr "Virkjað litur:"
+#: 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"
 
-#: libdialogpages/viewpage.cpp:76
-msgid "Mouse Wheel"
-msgstr "Músarhjól"
+#: komparenavtreepart/komparenavtreepart.cpp:442
+#, c-format
+msgid ""
+"_n: Applied: Deletion of %n line undone\n"
+"Applied: Deletion of %n lines undone"
+msgstr ""
 
-#: libdialogpages/viewpage.cpp:80
-msgid "Number of lines:"
-msgstr "Fjöldi lína:"
+#: 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/viewpage.cpp:86
-msgid "Tabs to Spaces"
-msgstr "Tab í bil"
+#: komparenavtreepart/komparenavtreepart.cpp:531
+#: komparepart/kompare_part.cpp:651
+msgid "Unknown"
+msgstr "Óþekkt"
 
-#: libdialogpages/viewpage.cpp:90
-msgid "Number of spaces to convert a tab character to:"
-msgstr "Fjöldi bila til að breyta tab-stafi í:"
+#: komparenavtreepart/komparenavtreepart.cpp:694
+msgid "KompareNavTreePart"
+msgstr "KompareNavTreePart"
 
-#: libdialogpages/viewpage.cpp:97
-msgid "A&ppearance"
-msgstr "Út&lit"
+#: kompareurldialog.cpp:41
+msgid "Here you can enter the files you want to compare."
+msgstr ""
 
-#: libdialogpages/viewpage.cpp:104
-msgid "Text Font"
-msgstr "Textaletur"
+#: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47
+msgid "Diff"
+msgstr "Diff"
 
-#: libdialogpages/viewpage.cpp:108
-msgid "Font:"
-msgstr "Letur:"
+#: kompareurldialog.cpp:47
+msgid "Here you can change the options for comparing the files."
+msgstr ""
 
-#: libdialogpages/viewpage.cpp:112
-msgid "Size:"
-msgstr "Stærð:"
+#: kompareurldialog.cpp:53
+msgid "Here you can change the options for the view."
+msgstr ""
 
 #: libdialogpages/diffpage.cpp:211
 msgid "Diff Program"
@@ -822,173 +666,329 @@ msgstr ""
 msgid "&Edit..."
 msgstr "Sýs&l..."
 
-#: libdialogpages/diffpage.cpp:295
-msgid ""
-"Clicking this will open a regular expression dialog where\n"
-"you can graphically create regular expressions."
-msgstr ""
+#: libdialogpages/diffpage.cpp:295
+msgid ""
+"Clicking this will open a regular expression dialog where\n"
+"you can graphically create regular expressions."
+msgstr ""
+
+#: 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"
+
+#: libdialogpages/diffpage.cpp:305
+msgid "This option corresponds to the -t diff option."
+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"
+
+#: libdialogpages/diffpage.cpp:307
+msgid "This option corresponds to the -B diff option."
+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."
+msgstr ""
+
+#: libdialogpages/diffpage.cpp:310
+#, fuzzy
+msgid "Ign&ore all whitespace"
+msgstr "Hunsa breytingar í bilum"
+
+#: libdialogpages/diffpage.cpp:311
+msgid "This option corresponds to the -w diff option."
+msgstr ""
+
+#: libdialogpages/diffpage.cpp:312
+#, fuzzy
+msgid "Igno&re changes due to tab expansion"
+msgstr "Hunsa breytingar í bilum"
+
+#: libdialogpages/diffpage.cpp:313
+msgid "This option corresponds to the -E diff option."
+msgstr ""
+
+#: libdialogpages/diffpage.cpp:318
+msgid "O&ptions"
+msgstr "Valk&ostir"
+
+#: libdialogpages/diffpage.cpp:328
+msgid "File Pattern to Exclude"
+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."
+msgstr ""
+
+#: libdialogpages/diffpage.cpp:332
+msgid ""
+"Here you can enter or remove a shell pattern or select one or more entries from "
+"the list."
+msgstr ""
+
+#: libdialogpages/diffpage.cpp:338
+msgid "File with Filenames to Exclude"
+msgstr ""
+
+#: libdialogpages/diffpage.cpp:340
+msgid ""
+"If this is checked you can enter a filename in the combo box on the right."
+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."
+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."
+msgstr ""
+
+#: libdialogpages/diffpage.cpp:352
+msgid "&Exclude"
+msgstr ""
+
+#: libdialogpages/filespage.cpp:53
+msgid "Encoding"
+msgstr ""
+
+#: libdialogpages/filespage.cpp:64
+#, fuzzy
+msgid "&Files"
+msgstr "&Næsta skrá"
+
+#: 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"
+
+#: libdialogpages/viewpage.cpp:66
+msgid "Added color:"
+msgstr "Bætt við litur:"
+
+#: libdialogpages/viewpage.cpp:71
+msgid "Applied color:"
+msgstr "Virkjað litur:"
+
+#: libdialogpages/viewpage.cpp:76
+msgid "Mouse Wheel"
+msgstr "Músarhjól"
+
+#: libdialogpages/viewpage.cpp:80
+msgid "Number of lines:"
+msgstr "Fjöldi lína:"
+
+#: libdialogpages/viewpage.cpp:86
+msgid "Tabs to Spaces"
+msgstr "Tab í bil"
+
+#: libdialogpages/viewpage.cpp:90
+msgid "Number of spaces to convert a tab character to:"
+msgstr "Fjöldi bila til að breyta tab-stafi í:"
+
+#: libdialogpages/viewpage.cpp:97
+msgid "A&ppearance"
+msgstr "Út&lit"
+
+#: libdialogpages/viewpage.cpp:104
+msgid "Text Font"
+msgstr "Textaletur"
+
+#: libdialogpages/viewpage.cpp:108
+msgid "Font:"
+msgstr "Letur:"
+
+#: libdialogpages/viewpage.cpp:112
+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"
+
+#: komparepart/kompare_part.cpp:165
+msgid "Save &All"
+msgstr "Vist&a Allt"
 
-#: libdialogpages/diffpage.cpp:300
-msgid "Whitespace"
-msgstr "Bil"
+#: komparepart/kompare_part.cpp:168
+msgid "Save .&diff..."
+msgstr "Vista .&diff..."
 
-#: libdialogpages/diffpage.cpp:304
-#, fuzzy
-msgid "E&xpand tabs to spaces in output"
-msgstr "Breyta dálkalykli í bil"
+#: komparepart/kompare_part.cpp:171
+msgid "Swap Source with Destination"
+msgstr "Víxla á uppruna og áfangastað"
 
-#: libdialogpages/diffpage.cpp:305
-msgid "This option corresponds to the -t diff option."
-msgstr ""
+#: komparepart/kompare_part.cpp:174
+msgid "Show Statistics"
+msgstr "Sýna tölfræði"
 
-#: 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/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>"
 
-#: libdialogpages/diffpage.cpp:307
-msgid "This option corresponds to the -B diff option."
-msgstr ""
+#: 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>"
 
-#: libdialogpages/diffpage.cpp:308
-msgid "Ig&nore changes in the amount of whitespace"
-msgstr "H&unsa breytingar í fjölda bila"
+#: komparepart/kompare_part.cpp:425
+msgid "Diff Options"
+msgstr "Diff valkostir"
 
-#: libdialogpages/diffpage.cpp:309
-msgid "This option corresponds to the -b diff option."
-msgstr ""
+#: komparepart/kompare_part.cpp:443
+msgid "*.diff *.dif *.patch|Patch Files"
+msgstr "*.diff *.dif *.patch|Patch skrár"
 
-#: libdialogpages/diffpage.cpp:310
-#, fuzzy
-msgid "Ign&ore all whitespace"
-msgstr "Hunsa breytingar í bilum"
+#: komparepart/kompare_part.cpp:443
+msgid "Save .diff"
+msgstr "Vista .diff"
 
-#: libdialogpages/diffpage.cpp:311
-msgid "This option corresponds to the -w diff option."
-msgstr ""
+#: 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?"
 
-#: libdialogpages/diffpage.cpp:312
-#, fuzzy
-msgid "Igno&re changes due to tab expansion"
-msgstr "Hunsa breytingar í bilum"
+#: komparepart/kompare_part.cpp:446
+msgid "File Exists"
+msgstr "Skrá þegar til"
 
-#: libdialogpages/diffpage.cpp:313
-msgid "This option corresponds to the -E diff option."
-msgstr ""
+#: komparepart/kompare_part.cpp:446
+msgid "Overwrite"
+msgstr "Skrifa yfir"
 
-#: libdialogpages/diffpage.cpp:318
-msgid "O&ptions"
-msgstr "Valk&ostir"
+#: komparepart/kompare_part.cpp:446
+msgid "Do Not Overwrite"
+msgstr "Ekki skrifa yfir"
 
-#: libdialogpages/diffpage.cpp:328
-msgid "File Pattern to Exclude"
-msgstr ""
+#: komparepart/kompare_part.cpp:481
+msgid "KomparePart"
+msgstr "KomparePart"
 
-#: 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 ""
+#: komparepart/kompare_part.cpp:493
+msgid "Running diff..."
+msgstr "Keyri diff..."
 
-#: libdialogpages/diffpage.cpp:332
-msgid ""
-"Here you can enter or remove a shell pattern or select one or more entries from "
-"the list."
-msgstr ""
+#: komparepart/kompare_part.cpp:496
+msgid "Parsing diff output..."
+msgstr "Þátta diff útták..."
 
-#: libdialogpages/diffpage.cpp:338
-msgid "File with Filenames to Exclude"
-msgstr ""
+#: komparepart/kompare_part.cpp:545
+msgid "Comparing file %1 with file %2"
+msgstr "Ber skrána %1 saman við skrána %2"
 
-#: libdialogpages/diffpage.cpp:340
-msgid ""
-"If this is checked you can enter a filename in the combo box on the right."
-msgstr ""
+#: komparepart/kompare_part.cpp:550
+msgid "Comparing files in %1 with files in %2"
+msgstr "Ber saman skrár í %1 við skrár í %2"
 
-#: 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 ""
+#: komparepart/kompare_part.cpp:555
+#, c-format
+msgid "Viewing diff output from %1"
+msgstr "Sýni diff úttak frá %1"
 
-#: 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 ""
+#: komparepart/kompare_part.cpp:558
+msgid "Blending diff output from %1 into file %2"
+msgstr "Blanda diff úttaki frá %1 í skrá %2"
 
-#: libdialogpages/diffpage.cpp:352
-msgid "&Exclude"
-msgstr ""
+#: 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:33
-#, fuzzy
+#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709
 msgid ""
-"A program to view the differences between files and optionally generate a diff"
+"You have made changes to the destination file(s).\n"
+"Would you like to save them?"
 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."
+"Þú hefur gert breytingar á áfangastað.\n"
+"Viltu vista þær?"
 
-#: 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:588 komparepart/kompare_part.cpp:711
+msgid "Save Changes?"
+msgstr "Vista breytingar?"
 
-#: main.cpp:41
+#: komparepart/kompare_part.cpp:667
 msgid ""
-"This will blend URL2 into URL1, URL2 is expected to be diff output and URL1 the "
-"file or folder that the diffoutput needs to be blended into. "
+"No diff file, or no 2 files have been diffed. Therefore no stats are available."
 msgstr ""
+"Engin diff skrá, eða engar tvær skrár hafa verið athugaðar. Þess vegna eru "
+"engar tölfræðiupplýsingar tiltækar."
 
-#: main.cpp:42
+#: 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 ""
-"Disables the check for automatically finding the original file(s) when using "
-"'-' as URL with the -o option."
+"Statistics:\n"
+"\n"
+"Old file: %1\n"
+"New file: %2\n"
+"\n"
+"Format: %3\n"
+"Number of hunks: %4\n"
+"Number of differences: %5"
 msgstr ""
+"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"
 
-#: main.cpp:43
+#: komparepart/kompare_part.cpp:686
 msgid ""
-"Use this to specify the encoding when calling it from the command line. It will "
-"default to the local encoding if not specified."
+"Statistics:\n"
+"\n"
+"Number of files in diff file: %1\n"
+"Format: %2\n"
+"\n"
+"Current old file: %3\n"
+"Current new file: %4\n"
+"\n"
+"Number of hunks: %5\n"
+"Number of differences: %6"
 msgstr ""
-
-#: 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"
+"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"
-- 
cgit v1.2.1