Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: tdesdk/kompare
Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/tdesdk/kompare/
(cherry picked from commit 364e0ab2be9e2a9808bf801fec4ac41896d851cd)

1 files changed, 512 insertions, 486 deletions

diff --git a/tde-i18n-hr/messages/tdesdk/kompare.po b/tde-i18n-hr/messages/tdesdk/kompare.po
index b16cf4b6d92..42db0c25017 100644
--- a/tde-i18n-hr/messages/tdesdk/kompare.po
+++ b/tde-i18n-hr/messages/tdesdk/kompare.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kompare 0\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-31 18:49+0100\n"
 "PO-Revision-Date: 2004-04-20 13:26+CEST\n"
 "Last-Translator: auto\n"
 "Language-Team: Croatian <[email protected]>\n"
@@ -12,348 +12,17 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 :  n%10>"
-"=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 :  n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;;\n"
 "X-Generator: TransDict server\n"
 
-#: libdiff2/komparemodellist.cpp:61
-#, fuzzy
-msgid "&Apply Difference"
-msgstr "&Priizbornik razliku"
-
-#: libdiff2/komparemodellist.cpp:64
-#, fuzzy
-msgid "Un&apply Difference"
-msgstr "&Poništi primenjenu razliku"
-
-#: libdiff2/komparemodellist.cpp:67
-#, fuzzy
-msgid "App&ly All"
-msgstr "Prime&ni sve"
-
-#: libdiff2/komparemodellist.cpp:70
-#, fuzzy
-msgid "&Unapply All"
-msgstr "&Poništi sve primenjeno"
-
-#: libdiff2/komparemodellist.cpp:73
-#, fuzzy
-msgid "P&revious File"
-msgstr "P&rethodni datoteka"
-
-#: libdiff2/komparemodellist.cpp:76
-#, fuzzy
-msgid "N&ext File"
-msgstr "S&ledeći datoteka"
-
-#: libdiff2/komparemodellist.cpp:79
-#, fuzzy
-msgid "&Previous Difference"
-msgstr "&Prethodna razlika"
-
-#: libdiff2/komparemodellist.cpp:82
-#, fuzzy
-msgid "&Next Difference"
-msgstr "&Sljedeća razlika"
-
-#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262
-msgid ""
-"<qt>No models or no differences, this file: <b>%1</b>"
-", is not a valid diff file.</qt>"
-msgstr ""
-
-#: libdiff2/komparemodellist.cpp:246
-msgid ""
-"<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</qt>"
-msgstr ""
-
-#: libdiff2/komparemodellist.cpp:271
-msgid ""
-"<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>"
-".</qt>"
-msgstr ""
-
-#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582
-#, fuzzy
-msgid "Could not open a temporary file."
-msgstr "Nisam mogao otvoriti privreizbornik datoteka."
-
-#: libdiff2/komparemodellist.cpp:350
-#, fuzzy
-msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>"
-msgstr "Nisam mogao da pišem u privreizbornik datoteka."
-
-#: libdiff2/komparemodellist.cpp:368
-#, fuzzy
-msgid ""
-"<qt>Could not create destination directory <b>%1</b>.\n"
-"The file has not been saved.</qt>"
-msgstr "Nisam mogao da pišem u privreizbornik datoteka."
-
-#: libdiff2/komparemodellist.cpp:383
-msgid ""
-"<qt>Could not upload the temporary file to the destination location <b>%1</b>"
-". The temporary file is still available under: <b>%2</b>"
-". You can manually copy it to the right place.</qt>"
-msgstr ""
-
-#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548
-#, fuzzy
-msgid "Could not parse diff output."
-msgstr "Nisam mogao da analiziram diff izlaz."
-
-#: libdiff2/komparemodellist.cpp:451
-#, fuzzy
-msgid "The files are identical."
-msgstr "Datoteke su identični."
-
-#: libdiff2/komparemodellist.cpp:613
-#, fuzzy
-msgid "Could not write to the temporary file."
-msgstr "Nisam mogao da pišem u privreizbornik datoteka."
-
-#. i18n: file komparepart/komparepartui.rc line 13
-#: rc.cpp:15
-#, no-c-format
-msgid "&Difference"
-msgstr "&Razlika"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 41
-#: rc.cpp:21
-#, fuzzy, no-c-format
-msgid "Run Diff In"
-msgstr "Pokreni diff u"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 84
-#: rc.cpp:24
-#, no-c-format
-msgid "Command Line"
-msgstr "Ime domene"
-
-#. 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 -- izvor odredište"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 135
-#: rc.cpp:33
-#, fuzzy, no-c-format
-msgid "Look for smaller changes"
-msgstr "Izgled za manje izmjene"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 146
-#: rc.cpp:36
-#, fuzzy, no-c-format
-msgid "Optimize for large files"
-msgstr "Optimizuj za velike datotekaove"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 157
-#: rc.cpp:39
-#, fuzzy, no-c-format
-msgid "Ignore changes in case"
-msgstr "Ignoriši izmjene koje se odnose na veličinu slova"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 165
-#: rc.cpp:42
-#, fuzzy, no-c-format
-msgid "Expand tabs to spaces"
-msgstr "Proširi tabulatore u razmake"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 173
-#: rc.cpp:45
-#, fuzzy, no-c-format
-msgid "Ignore added or removed empty lines"
-msgstr "Ignoriši dodate ili uklonjene prazne linije"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 181
-#: rc.cpp:48
-#, fuzzy, no-c-format
-msgid "Ignore changes in whitespace"
-msgstr "Ignoriši izmjene u praznom prostoru"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 189
-#: rc.cpp:51
-#, fuzzy, no-c-format
-msgid "Show function names"
-msgstr "Pokaži imena funkcija"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 200
-#: rc.cpp:54
-#, fuzzy, no-c-format
-msgid "Compare folders recursively"
-msgstr "Uporedi direktorije rekurzivno"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 211
-#: rc.cpp:57
-#, fuzzy, no-c-format
-msgid "Treat new files as empty"
-msgstr "Tretiraj nove datotekaove kao prazne"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 227
-#: rc.cpp:60
-#, no-c-format
-msgid "Format"
-msgstr "Oblikovanje"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 244
-#: komparepart/kompare_part.cpp:638 libdialogpages/diffpage.cpp:238 rc.cpp:63
-#, no-c-format
-msgid "Context"
-msgstr "Kontekst"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 252
-#: komparepart/kompare_part.cpp:644 libdialogpages/diffpage.cpp:239 rc.cpp:66
-#, fuzzy, no-c-format
-msgid "Ed"
-msgstr "Ed"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 260
-#: komparepart/kompare_part.cpp:647 libdialogpages/diffpage.cpp:241 rc.cpp:69
-#, no-c-format
-msgid "Normal"
-msgstr "Obično"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 268
-#: komparepart/kompare_part.cpp:641 libdialogpages/diffpage.cpp:242 rc.cpp:72
-#, fuzzy, 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
-#, fuzzy, no-c-format
-msgid "Unified"
-msgstr "Ujedinjeno"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 287
-#: rc.cpp:78
-#, no-c-format
-msgid "Side-by-side"
-msgstr "Jedno uz drugo"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 312
-#: libdialogpages/diffpage.cpp:251 rc.cpp:81
-#, fuzzy, no-c-format
-msgid "Number of context lines:"
-msgstr "Broj linija konteksta:"
-
-#: main.cpp:33
-#, fuzzy
-msgid ""
-"A program to view the differences between files and optionally generate a diff"
-msgstr ""
-"Program za pregledanje razlika među datotekema i opciono pravljenje diff-a."
-
-#: main.cpp:39
-#, fuzzy
-msgid "This will compare URL1 with URL2"
-msgstr "Ovo će uporediti URL1 sa URL2."
-
-#: 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 ""
-"Ovo će otvoriti URL1 u očekivanju da je to diff izlaz. URL1 također može biti "
-"„-“ i u tom slučaju će čitati iz standardnog ulaza. Može se na primjer "
-"koristiti za cvs diff | kompare -o -. Kompare će izvršiti provjeru da vidi da "
-"li može da nađe originalne datotekaove i onda će stopiti originalne datotekaove "
-"u diff izlaz i to prikazati u dijelu za pregled. -n isključuje provjeru."
-
-#: main.cpp:41
-#, fuzzy
-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 ""
-"Ovo će stopiti URL2 u URL1, gdje se očekuje da je URL2 diff izlaz, a URL1 "
-"datoteka ili direktorij u koji treba stopiti diff izlaz."
-
-#: main.cpp:42
-#, fuzzy
-msgid ""
-"Disables the check for automatically finding the original file(s) when using "
-"'-' as URL with the -o option."
-msgstr ""
-"Isključuje provjeru za automatsko pronalaženje originalnih datotekaova kada se "
-"sa opcijom -o koristi „-“ kao URL."
-
-#: 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
-msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman"
-msgstr ""
-
-#: main.cpp:55 main.cpp:56
-msgid "Author"
-msgstr "Autor"
-
-#: main.cpp:57
-msgid "Kompare icon artist"
-msgstr ""
-
-#: main.cpp:58
-msgid "A lot of good advice"
-msgstr "Mnoštvo dobrih savjeta"
-
-#: main.cpp:59
-#, fuzzy
-msgid "Cervisia diff viewer"
-msgstr "Cervisia-in dio za pregeled diff-ova"
-
-#: kompare_shell.cpp:398 main.cpp:185
-#, fuzzy
-msgid "Compare Files or Folders"
-msgstr "Uporedi datotekaove ili direktorije"
-
-#: kompare_shell.cpp:399 main.cpp:186
-msgid "Source"
-msgstr "Izvor"
-
-#: kompare_shell.cpp:400 main.cpp:187
-msgid "Destination"
-msgstr "Odredište"
-
-#: kompare_shell.cpp:402 main.cpp:189
-msgid "Compare"
-msgstr "Usporedba"
-
-#: main.cpp:189
-#, fuzzy
-msgid "Compare these files or folder"
-msgstr "Uporedi ove datotekaove ili direktorije"
-
-#: kompare_shell.cpp:402 main.cpp:189
-#, fuzzy
-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 ""
-"Ako ste unijeli 2 imena datotekaa ili 2 direktorija u poljima u ovom prozoru, "
-"ovo gumb će biti uključeno i njegovim pritiskanjem će započeti upoređivanje "
-"unijetih datotekaova ili direktorija. "
-
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Diana Ćorluka, Robert Pezer"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -474,23 +143,51 @@ msgstr "Stopi ovaj datoteka ili direktorij sa diff izlazom"
 #: 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 ""
-"Ako ste unijeli ime datotekaa ili direktorija i datoteka koji sadrži diff izlaz "
-"u poljima u ovom prozoru onda će ovo gumb biti omogućeno i njegovim "
+"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 ""
+"Ako ste unijeli ime datotekaa ili direktorija i datoteka koji sadrži diff "
+"izlaz u poljima u ovom prozoru onda će ovo gumb biti omogućeno i njegovim "
 "pritiskanjem će se otvoriti glavni pogled kompare-a gdje su izlazi unetog "
 "datotekaa ili datotekaova iz direktorija pomešani sa diff izlazom tako da "
 "možete priizbornikti razlike na datoteka ili datotekaove."
 
+#: kompare_shell.cpp:398 main.cpp:185
+#, fuzzy
+msgid "Compare Files or Folders"
+msgstr "Uporedi datotekaove ili direktorije"
+
+#: kompare_shell.cpp:399 main.cpp:186
+msgid "Source"
+msgstr "Izvor"
+
+#: kompare_shell.cpp:400 main.cpp:187
+msgid "Destination"
+msgstr "Odredište"
+
+#: kompare_shell.cpp:402 main.cpp:189
+msgid "Compare"
+msgstr "Usporedba"
+
 #: kompare_shell.cpp:402
 #, fuzzy
 msgid "Compare these files or folders"
 msgstr "Uporedi ove datotekaove ili direktorije"
 
+#: kompare_shell.cpp:402 main.cpp:189
+#, fuzzy
+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 ""
+"Ako ste unijeli 2 imena datotekaa ili 2 direktorija u poljima u ovom "
+"prozoru, ovo gumb će biti uključeno i njegovim pritiskanjem će započeti "
+"upoređivanje unijetih datotekaova ili direktorija. "
+
 #: kompare_shell.cpp:439
 msgid "Text View"
 msgstr "Pogled teksta"
@@ -589,19 +286,242 @@ msgstr "Napoznato"
 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 "&Spremi sve"
+
+#: komparepart/kompare_part.cpp:168
+msgid "Save .&diff..."
+msgstr ""
+
+#: komparepart/kompare_part.cpp:171
+#, fuzzy
+msgid "Swap Source with Destination"
+msgstr "Zaizbornik izvor odredištem"
+
+#: komparepart/kompare_part.cpp:174
+#, fuzzy
+msgid "Show Statistics"
+msgstr "Pokaži statistiku"
+
+#: komparepart/kompare_part.cpp:269
+msgid "<qt>The URL <b>%1</b> cannot be downloaded.</qt>"
+msgstr ""
+
+#: komparepart/kompare_part.cpp:281
+msgid "<qt>The URL <b>%1</b> does not exist on your system.</qt>"
+msgstr ""
+
+#: komparepart/kompare_part.cpp:425
+#, fuzzy
+msgid "Diff Options"
+msgstr "Diff opcije"
+
+#: komparepart/kompare_part.cpp:443
+#, fuzzy
+msgid "*.diff *.dif *.patch|Patch Files"
+msgstr "*.diff *.dif *.patch|Datoteke zakrpe"
+
+#: komparepart/kompare_part.cpp:443
+#, fuzzy
+msgid "Save .diff"
+msgstr "Snimi .diff"
+
+#: komparepart/kompare_part.cpp:446
+msgid "The file exists or is write-protected; do you want to overwrite it?"
+msgstr ""
+
+#: komparepart/kompare_part.cpp:446
+msgid "File Exists"
+msgstr ""
+
+#: komparepart/kompare_part.cpp:446
+msgid "Overwrite"
+msgstr ""
+
+#: komparepart/kompare_part.cpp:446
+msgid "Do Not Overwrite"
+msgstr ""
+
+#: komparepart/kompare_part.cpp:481
+#, fuzzy
+msgid "KomparePart"
+msgstr "KomparePart"
+
+#: komparepart/kompare_part.cpp:493
+#, fuzzy
+msgid "Running diff..."
+msgstr "Pokrećem diff..."
+
+#: komparepart/kompare_part.cpp:496
+#, fuzzy
+msgid "Parsing diff output..."
+msgstr "Raščlanjujem diff izlaz..."
+
+#: komparepart/kompare_part.cpp:545
+msgid "Comparing file %1 with file %2"
+msgstr "Upoređujem datoteka %1 sa datotekaom %2"
+
+#: komparepart/kompare_part.cpp:550
+msgid "Comparing files in %1 with files in %2"
+msgstr "Upoređujem datotekaove u %1 sa datotekema u %2"
+
+#: komparepart/kompare_part.cpp:555
+#, fuzzy, c-format
+msgid "Viewing diff output from %1"
+msgstr "Prikazujem diff izlaz iz %1"
+
+#: komparepart/kompare_part.cpp:558
+msgid "Blending diff output from %1 into file %2"
+msgstr "Stapam diff izlaz iz %1 u datoteka %2"
+
+#: komparepart/kompare_part.cpp:563
+#, fuzzy
+msgid "Blending diff output from %1 into folder %2"
+msgstr "Stapam diff izlaz iz %1 u direktorij %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 ""
 
+#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711
+#, fuzzy
+msgid "Save Changes?"
+msgstr "Da li da snimim izmjene?"
+
+#: komparepart/kompare_part.cpp:635 komparepart/komparesaveoptionsbase.ui:276
+#: libdialogpages/diffpage.cpp:244
+#, fuzzy, no-c-format
+msgid "Unified"
+msgstr "Ujedinjeno"
+
+#: komparepart/kompare_part.cpp:638 komparepart/komparesaveoptionsbase.ui:244
+#: libdialogpages/diffpage.cpp:238
+#, no-c-format
+msgid "Context"
+msgstr "Kontekst"
+
+#: komparepart/kompare_part.cpp:641 komparepart/komparesaveoptionsbase.ui:268
+#: libdialogpages/diffpage.cpp:242
+#, fuzzy, no-c-format
+msgid "RCS"
+msgstr "RCS"
+
+#: komparepart/kompare_part.cpp:644 komparepart/komparesaveoptionsbase.ui:252
+#: libdialogpages/diffpage.cpp:239
+#, fuzzy, no-c-format
+msgid "Ed"
+msgstr "Ed"
+
+#: komparepart/kompare_part.cpp:647 komparepart/komparesaveoptionsbase.ui:260
+#: libdialogpages/diffpage.cpp:241
+#, no-c-format
+msgid "Normal"
+msgstr "Obično"
+
+#: komparepart/kompare_part.cpp:667
+#, fuzzy
+msgid ""
+"No diff file, or no 2 files have been diffed. Therefore no stats are "
+"available."
+msgstr ""
+"Nema diff datotekaa, ili nikoja dva datotekaa nisu diff-ovana. Stoga, nije "
+"dostupna statistika."
+
+#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683
+#: komparepart/kompare_part.cpp:698
+#, fuzzy
+msgid "Diff Statistics"
+msgstr "Diff statistika"
+
+#: komparepart/kompare_part.cpp:673
+#, fuzzy
+msgid ""
+"Statistics:\n"
+"\n"
+"Old file: %1\n"
+"New file: %2\n"
+"\n"
+"Format: %3\n"
+"Number of hunks: %4\n"
+"Number of differences: %5"
+msgstr ""
+"Statistika:\n"
+"\n"
+"Stari datoteka: %1\n"
+"Novi datoteka: %2\n"
+"\n"
+"Format: %3\n"
+"Broj komada: %4\n"
+"Broj razlika: %5"
+
+#: komparepart/kompare_part.cpp:686
+#, 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"
+msgstr ""
+"Statistika:\n"
+"\n"
+"Broj datotekaova u diff datoteku: %1\n"
+"Format: %2\n"
+"\n"
+"Trenutni stari datoteka: %3\n"
+"Trenutni novi datoteka: %4\n"
+"\n"
+"Broj komada: %5\n"
+"Broj razlika: %6"
+
+#: komparepart/kompareprefdlg.cpp:33
+msgid "Preferences"
+msgstr "Podešenja"
+
+#: komparepart/kompareprefdlg.cpp:39
+#, fuzzy
+msgid "View"
+msgstr "Pogled teksta"
+
+#: komparepart/kompareprefdlg.cpp:39
+msgid "View Settings"
+msgstr "Postavke pogleda"
+
 #: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47
 msgid "Diff"
 msgstr "Razlika"
 
+#: komparepart/kompareprefdlg.cpp:43
+#, fuzzy
+msgid "Diff Settings"
+msgstr "Diff podešavanja"
+
+#: kompareurldialog.cpp:41
+msgid "Files"
+msgstr ""
+
+#: 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 "&Izgled"
+
+#: kompareurldialog.cpp:53
 msgid "Here you can change the options for the view."
 msgstr ""
 
@@ -628,9 +548,9 @@ msgstr "Format prosleđivanja"
 
 #: 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
@@ -638,6 +558,11 @@ msgstr ""
 msgid "Lines of Context"
 msgstr "Linije konteksta"
 
+#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251
+#, fuzzy, no-c-format
+msgid "Number of context lines:"
+msgstr "Broj linija konteksta:"
+
 #: libdialogpages/diffpage.cpp:253
 msgid ""
 "The number of context lines is normally 2 or 3. This makes the diff readable "
@@ -761,14 +686,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
@@ -782,14 +707,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
@@ -861,180 +786,281 @@ msgstr ""
 msgid "Size:"
 msgstr ""
 
-#: komparepart/kompareprefdlg.cpp:33
-msgid "Preferences"
-msgstr "Podešenja"
-
-#: komparepart/kompareprefdlg.cpp:39
-msgid "View Settings"
-msgstr "Postavke pogleda"
-
-#: komparepart/kompareprefdlg.cpp:43
-#, fuzzy
-msgid "Diff Settings"
-msgstr "Diff podešavanja"
-
-#: komparepart/kompare_part.cpp:165
-msgid "Save &All"
-msgstr "&Spremi sve"
-
-#: komparepart/kompare_part.cpp:168
-msgid "Save .&diff..."
+#: libdialogpages/viewpage.cpp:119
+msgid "&Fonts"
 msgstr ""
 
-#: komparepart/kompare_part.cpp:171
+#: libdiff2/komparemodellist.cpp:61
 #, fuzzy
-msgid "Swap Source with Destination"
-msgstr "Zaizbornik izvor odredištem"
+msgid "&Apply Difference"
+msgstr "&Priizbornik razliku"
 
-#: komparepart/kompare_part.cpp:174
+#: libdiff2/komparemodellist.cpp:64
 #, fuzzy
-msgid "Show Statistics"
-msgstr "Pokaži statistiku"
+msgid "Un&apply Difference"
+msgstr "&Poništi primenjenu razliku"
 
-#: komparepart/kompare_part.cpp:269
-msgid "<qt>The URL <b>%1</b> cannot be downloaded.</qt>"
-msgstr ""
+#: libdiff2/komparemodellist.cpp:67
+#, fuzzy
+msgid "App&ly All"
+msgstr "Prime&ni sve"
 
-#: komparepart/kompare_part.cpp:281
-msgid "<qt>The URL <b>%1</b> does not exist on your system.</qt>"
-msgstr ""
+#: libdiff2/komparemodellist.cpp:70
+#, fuzzy
+msgid "&Unapply All"
+msgstr "&Poništi sve primenjeno"
 
-#: komparepart/kompare_part.cpp:425
+#: libdiff2/komparemodellist.cpp:73
 #, fuzzy
-msgid "Diff Options"
-msgstr "Diff opcije"
+msgid "P&revious File"
+msgstr "P&rethodni datoteka"
 
-#: komparepart/kompare_part.cpp:443
+#: libdiff2/komparemodellist.cpp:76
 #, fuzzy
-msgid "*.diff *.dif *.patch|Patch Files"
-msgstr "*.diff *.dif *.patch|Datoteke zakrpe"
+msgid "N&ext File"
+msgstr "S&ledeći datoteka"
 
-#: komparepart/kompare_part.cpp:443
+#: libdiff2/komparemodellist.cpp:79
 #, fuzzy
-msgid "Save .diff"
-msgstr "Snimi .diff"
+msgid "&Previous Difference"
+msgstr "&Prethodna razlika"
 
-#: komparepart/kompare_part.cpp:446
-msgid "The file exists or is write-protected; do you want to overwrite it?"
-msgstr ""
+#: libdiff2/komparemodellist.cpp:82
+#, fuzzy
+msgid "&Next Difference"
+msgstr "&Sljedeća razlika"
 
-#: komparepart/kompare_part.cpp:446
-msgid "File Exists"
+#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262
+msgid ""
+"<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff "
+"file.</qt>"
 msgstr ""
 
-#: komparepart/kompare_part.cpp:446
-msgid "Overwrite"
+#: libdiff2/komparemodellist.cpp:246
+msgid ""
+"<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</"
+"qt>"
 msgstr ""
 
-#: komparepart/kompare_part.cpp:446
-msgid "Do Not Overwrite"
+#: libdiff2/komparemodellist.cpp:271
+msgid ""
+"<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>."
+"</qt>"
 msgstr ""
 
-#: komparepart/kompare_part.cpp:481
+#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582
 #, fuzzy
-msgid "KomparePart"
-msgstr "KomparePart"
+msgid "Could not open a temporary file."
+msgstr "Nisam mogao otvoriti privreizbornik datoteka."
 
-#: komparepart/kompare_part.cpp:493
+#: libdiff2/komparemodellist.cpp:350
 #, fuzzy
-msgid "Running diff..."
-msgstr "Pokrećem diff..."
+msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>"
+msgstr "Nisam mogao da pišem u privreizbornik datoteka."
 
-#: komparepart/kompare_part.cpp:496
+#: libdiff2/komparemodellist.cpp:368
 #, fuzzy
-msgid "Parsing diff output..."
-msgstr "Raščlanjujem diff izlaz..."
-
-#: komparepart/kompare_part.cpp:545
-msgid "Comparing file %1 with file %2"
-msgstr "Upoređujem datoteka %1 sa datotekaom %2"
+msgid ""
+"<qt>Could not create destination directory <b>%1</b>.\n"
+"The file has not been saved.</qt>"
+msgstr "Nisam mogao da pišem u privreizbornik datoteka."
 
-#: komparepart/kompare_part.cpp:550
-msgid "Comparing files in %1 with files in %2"
-msgstr "Upoređujem datotekaove u %1 sa datotekema u %2"
+#: libdiff2/komparemodellist.cpp:383
+msgid ""
+"<qt>Could not upload the temporary file to the destination location <b>%1</"
+"b>. The temporary file is still available under: <b>%2</b>. You can manually "
+"copy it to the right place.</qt>"
+msgstr ""
 
-#: komparepart/kompare_part.cpp:555
-#, fuzzy, c-format
-msgid "Viewing diff output from %1"
-msgstr "Prikazujem diff izlaz iz %1"
+#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548
+#, fuzzy
+msgid "Could not parse diff output."
+msgstr "Nisam mogao da analiziram diff izlaz."
 
-#: komparepart/kompare_part.cpp:558
-msgid "Blending diff output from %1 into file %2"
-msgstr "Stapam diff izlaz iz %1 u datoteka %2"
+#: libdiff2/komparemodellist.cpp:451
+#, fuzzy
+msgid "The files are identical."
+msgstr "Datoteke su identični."
 
-#: komparepart/kompare_part.cpp:563
+#: libdiff2/komparemodellist.cpp:613
 #, fuzzy
-msgid "Blending diff output from %1 into folder %2"
-msgstr "Stapam diff izlaz iz %1 u direktorij %2"
+msgid "Could not write to the temporary file."
+msgstr "Nisam mogao da pišem u privreizbornik datoteka."
 
-#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709
+#: main.cpp:33
+#, fuzzy
 msgid ""
-"You have made changes to the destination file(s).\n"
-"Would you like to save them?"
+"A program to view the differences between files and optionally generate a "
+"diff"
 msgstr ""
+"Program za pregledanje razlika među datotekema i opciono pravljenje diff-a."
 
-#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711
+#: main.cpp:39
 #, fuzzy
-msgid "Save Changes?"
-msgstr "Da li da snimim izmjene?"
+msgid "This will compare URL1 with URL2"
+msgstr "Ovo će uporediti URL1 sa URL2."
 
-#: komparepart/kompare_part.cpp:667
+#: main.cpp:40
 #, fuzzy
 msgid ""
-"No diff file, or no 2 files have been diffed. Therefore no stats are available."
-msgstr ""
-"Nema diff datotekaa, ili nikoja dva datotekaa nisu diff-ovana. Stoga, nije "
-"dostupna statistika."
+"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 ""
+"Ovo će otvoriti URL1 u očekivanju da je to diff izlaz. URL1 također može "
+"biti „-“ i u tom slučaju će čitati iz standardnog ulaza. Može se na primjer "
+"koristiti za cvs diff | kompare -o -. Kompare će izvršiti provjeru da vidi "
+"da li može da nađe originalne datotekaove i onda će stopiti originalne "
+"datotekaove u diff izlaz i to prikazati u dijelu za pregled. -n isključuje "
+"provjeru."
 
-#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683
-#: komparepart/kompare_part.cpp:698
+#: main.cpp:41
 #, fuzzy
-msgid "Diff Statistics"
-msgstr "Diff statistika"
+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 ""
+"Ovo će stopiti URL2 u URL1, gdje se očekuje da je URL2 diff izlaz, a URL1 "
+"datoteka ili direktorij u koji treba stopiti diff izlaz."
 
-#: komparepart/kompare_part.cpp:673
+#: main.cpp:42
 #, fuzzy
 msgid ""
-"Statistics:\n"
-"\n"
-"Old file: %1\n"
-"New file: %2\n"
-"\n"
-"Format: %3\n"
-"Number of hunks: %4\n"
-"Number of differences: %5"
+"Disables the check for automatically finding the original file(s) when using "
+"'-' as URL with the -o option."
 msgstr ""
-"Statistika:\n"
-"\n"
-"Stari datoteka: %1\n"
-"Novi datoteka: %2\n"
-"\n"
-"Format: %3\n"
-"Broj komada: %4\n"
-"Broj razlika: %5"
+"Isključuje provjeru za automatsko pronalaženje originalnih datotekaova kada "
+"se sa opcijom -o koristi „-“ kao URL."
 
-#: komparepart/kompare_part.cpp:686
-#, fuzzy
+#: main.cpp:43
 msgid ""
-"Statistics:\n"
-"\n"
-"Number of files in diff file: %1\n"
-"Format: %2\n"
-"\n"
-"Current old file: %3\n"
-"Current new file: %4\n"
-"\n"
-"Number of hunks: %5\n"
-"Number of differences: %6"
+"Use this to specify the encoding when calling it from the command line. It "
+"will default to the local encoding if not specified."
+msgstr ""
+
+#: main.cpp:52
+msgid "Kompare"
+msgstr "Kompare"
+
+#: main.cpp:54
+msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman"
+msgstr ""
+
+#: main.cpp:55 main.cpp:56
+msgid "Author"
+msgstr "Autor"
+
+#: main.cpp:57
+msgid "Kompare icon artist"
+msgstr ""
+
+#: main.cpp:58
+msgid "A lot of good advice"
+msgstr "Mnoštvo dobrih savjeta"
+
+#: main.cpp:59
+#, fuzzy
+msgid "Cervisia diff viewer"
+msgstr "Cervisia-in dio za pregeled diff-ova"
+
+#: main.cpp:189
+#, fuzzy
+msgid "Compare these files or folder"
+msgstr "Uporedi ove datotekaove ili direktorije"
+
+#: komparepart/komparepartui.rc:4 kompareui.rc:4
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "S&ledeći datoteka"
+
+#: komparepart/komparepartui.rc:13
+#, no-c-format
+msgid "&Difference"
+msgstr "&Razlika"
+
+#: komparepart/komparepartui.rc:25 kompareui.rc:14
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Postavke pogleda"
+
+#: komparepart/komparesaveoptionsbase.ui:41
+#, fuzzy, no-c-format
+msgid "Run Diff In"
+msgstr "Pokreni diff u"
+
+#: komparepart/komparesaveoptionsbase.ui:84
+#, no-c-format
+msgid "Command Line"
+msgstr "Ime domene"
+
+#: komparepart/komparesaveoptionsbase.ui:108
+#, fuzzy, no-c-format
+msgid "cd dir && diff -udHprNa -- source destination"
+msgstr "cd dir && diff -udHprNa -- izvor odredište"
+
+#: komparepart/komparesaveoptionsbase.ui:118
+#, fuzzy, no-c-format
+msgid "Options"
+msgstr "Podešavanje FTP-a"
+
+#: komparepart/komparesaveoptionsbase.ui:135
+#, fuzzy, no-c-format
+msgid "Look for smaller changes"
+msgstr "Izgled za manje izmjene"
+
+#: komparepart/komparesaveoptionsbase.ui:146
+#, fuzzy, no-c-format
+msgid "Optimize for large files"
+msgstr "Optimizuj za velike datotekaove"
+
+#: komparepart/komparesaveoptionsbase.ui:157
+#, fuzzy, no-c-format
+msgid "Ignore changes in case"
+msgstr "Ignoriši izmjene koje se odnose na veličinu slova"
+
+#: komparepart/komparesaveoptionsbase.ui:165
+#, fuzzy, no-c-format
+msgid "Expand tabs to spaces"
+msgstr "Proširi tabulatore u razmake"
+
+#: komparepart/komparesaveoptionsbase.ui:173
+#, fuzzy, no-c-format
+msgid "Ignore added or removed empty lines"
+msgstr "Ignoriši dodate ili uklonjene prazne linije"
+
+#: komparepart/komparesaveoptionsbase.ui:181
+#, fuzzy, no-c-format
+msgid "Ignore changes in whitespace"
+msgstr "Ignoriši izmjene u praznom prostoru"
+
+#: komparepart/komparesaveoptionsbase.ui:189
+#, fuzzy, no-c-format
+msgid "Show function names"
+msgstr "Pokaži imena funkcija"
+
+#: komparepart/komparesaveoptionsbase.ui:200
+#, fuzzy, no-c-format
+msgid "Compare folders recursively"
+msgstr "Uporedi direktorije rekurzivno"
+
+#: komparepart/komparesaveoptionsbase.ui:211
+#, fuzzy, no-c-format
+msgid "Treat new files as empty"
+msgstr "Tretiraj nove datotekaove kao prazne"
+
+#: komparepart/komparesaveoptionsbase.ui:227
+#, no-c-format
+msgid "Format"
+msgstr "Oblikovanje"
+
+#: komparepart/komparesaveoptionsbase.ui:287
+#, no-c-format
+msgid "Side-by-side"
+msgstr "Jedno uz drugo"
+
+#: kompareui.rc:27
+#, no-c-format
+msgid "Main Toolbar"
 msgstr ""
-"Statistika:\n"
-"\n"
-"Broj datotekaova u diff datoteku: %1\n"
-"Format: %2\n"
-"\n"
-"Trenutni stari datoteka: %3\n"
-"Trenutni novi datoteka: %4\n"
-"\n"
-"Broj komada: %5\n"
-"Broj razlika: %6"