summaryrefslogtreecommitdiffstats
path: root/po/[email protected]
diff options
context:
space:
mode:
Diffstat (limited to 'po/[email protected]')
-rw-r--r--po/[email protected]81
1 files changed, 16 insertions, 65 deletions
diff --git a/po/[email protected] b/po/[email protected]
index 7bf2e54..de4e32e 100644
--- a/po/[email protected]
+++ b/po/[email protected]
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: kdiff3\n"
-"POT-Creation-Date: 2018-12-27 20:04+0100\n"
+"POT-Creation-Date: 2019-01-13 19:08+0100\n"
"PO-Revision-Date: 2005-02-26 19:41+0100\n"
"Last-Translator: Chusslove Illich <[email protected]>\n"
"Language-Team: Serbian\n"
@@ -154,11 +154,6 @@ msgstr ""
"Trenutno stapate direktorijume. Želite li zaista da prekinete stapanje i "
"ponovo skenirate direktorijum?"
-#: directorymergewindow.cpp:335 kdiff3.cpp:602 kdiff3.cpp:610 kdiff3.cpp:622
-#: mergeresultwindow.cpp:287 pdiff.cpp:981 pdiff.cpp:1724 pdiff.cpp:1732
-msgid "Warning"
-msgstr ""
-
#: directorymergewindow.cpp:335 directorymergewindow.cpp:2930
msgid "Rescan"
msgstr "Ponovo skeniraj"
@@ -263,11 +258,6 @@ msgstr "Menjam sve operacije stapanja"
msgid "C&ontinue"
msgstr "&Nastavi"
-#: directorymergewindow.cpp:868 fileaccess.cpp:1476 mergeresultwindow.cpp:287
-#: smalldialogs.cpp:169 smalldialogs.cpp:381
-msgid "&Cancel"
-msgstr ""
-
#: directorymergewindow.cpp:1236
msgid "Processing "
msgstr "Obrađujem "
@@ -359,13 +349,6 @@ msgstr "Programska greška"
msgid "An error occurred while copying.\n"
msgstr "Došlo je do greške u toku kopiranja.\n"
-#: directorymergewindow.cpp:1965 directorymergewindow.cpp:2034
-#: directorymergewindow.cpp:2066 directorymergewindow.cpp:2112
-#: directorymergewindow.cpp:2121 directorymergewindow.cpp:2371
-#, fuzzy
-msgid "Error"
-msgstr "Greška."
-
#: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372
msgid "Merge Error"
msgstr "Greška stapanja"
@@ -610,11 +593,6 @@ msgstr "Poslednja izmena"
msgid "Link-Destination"
msgstr "Veza-odredište"
-#: directorymergewindow.cpp:2712
-#, fuzzy
-msgid "File"
-msgstr "Fajl..."
-
#: directorymergewindow.cpp:2729
msgid "not available"
msgstr "nije dostupno"
@@ -879,10 +857,6 @@ msgstr "Greška pri otvaranju fajla"
msgid "Opens documents for comparison..."
msgstr "Otvara dokumente za poređenje..."
-#: kdiff3.cpp:436
-msgid "Reload"
-msgstr ""
-
#: kdiff3.cpp:439
msgid "Saves the merge result. All conflicts must be solved!"
msgstr "Snima rezultat stapanja. Svi sukobi moraju biti razrešeni!"
@@ -1156,10 +1130,6 @@ msgid ""
"You are currently doing a directory merge. Are you sure, you want to abort?"
msgstr "Trenutno stapate direktorijume. Želite li zaista da prekinete?"
-#: kdiff3.cpp:622
-msgid "Quit"
-msgstr ""
-
#: kdiff3.cpp:644
msgid "Saving file..."
msgstr "Snimam fajl..."
@@ -1168,10 +1138,6 @@ msgstr "Snimam fajl..."
msgid "Saving file with a new filename..."
msgstr "Snimam fajl pod novim imenom..."
-#: kdiff3.cpp:663
-msgid "Save As..."
-msgstr ""
-
#: kdiff3.cpp:751
#, fuzzy
msgid "Printing..."
@@ -1439,15 +1405,6 @@ msgstr "Latin1"
msgid "Change this if non-ASCII characters are not displayed correctly."
msgstr "Izmenite ovo ake se znakovi koji nisu ASCII ne prikazuju ispravno."
-#: optiondialog.cpp:455
-#, fuzzy
-msgid "Configure"
-msgstr "Podesi..."
-
-#: optiondialog.cpp:510
-msgid "Font"
-msgstr ""
-
#: optiondialog.cpp:510
msgid "Editor & Diff Output Font"
msgstr "Font uređivača i raz. izlaza"
@@ -2417,10 +2374,6 @@ msgstr "Izlaz (opciono):"
msgid "Configure..."
msgstr "Podesi..."
-#: smalldialogs.cpp:164
-msgid "&OK"
-msgstr ""
-
#: smalldialogs.cpp:347
msgid "Search text:"
msgstr "Tekst za pretragu:"
@@ -2493,14 +2446,6 @@ msgstr ""
msgid "Sort key result:"
msgstr ""
-#: smalldialogs.cpp:493
-msgid "OK"
-msgstr ""
-
-#: smalldialogs.cpp:497
-msgid "Cancel"
-msgstr ""
-
#: smalldialogs.cpp:537 smalldialogs.cpp:547 smalldialogs.cpp:568
msgid "Match success."
msgstr ""
@@ -2524,11 +2469,6 @@ msgstr "&KDiff3"
msgid "Configure KDiff3"
msgstr "Podesi KDiff3"
-#: kdiff3_shell.rc:4
-#, fuzzy, no-c-format
-msgid "&File"
-msgstr "Fajl..."
-
#: kdiff3_shell.rc:7
#, no-c-format
msgid "&Directory"
@@ -2564,10 +2504,21 @@ msgstr "&Stopi"
msgid "&Window"
msgstr "P&rozor"
-#: kdiff3_shell.rc:106
-#, no-c-format
-msgid "Main Toolbar"
-msgstr ""
+#, fuzzy
+#~ msgid "Error"
+#~ msgstr "Greška."
+
+#, fuzzy
+#~ msgid "File"
+#~ msgstr "Fajl..."
+
+#, fuzzy
+#~ msgid "Configure"
+#~ msgstr "Podesi..."
+
+#, fuzzy
+#~ msgid "&File"
+#~ msgstr "Fajl..."
#~ msgid "Files A and B are binary equal.\n"
#~ msgstr "Fajlovi A i B su binarno jednaki.\n"