[meld] Updated Serbian translation
- From: ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ <mirosnik src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld] Updated Serbian translation
- Date: Fri, 9 Nov 2012 10:38:29 +0000 (UTC)
commit 63f060babf27a036457fc804c9ff4bf4c25ffe72
Author: ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ <miroslavnikolic rocketmail com>
Date: Fri Nov 9 11:39:19 2012 +0100
Updated Serbian translation
po/sr.po | 512 ++++++++++++++++++++++++++++++--------------------------
po/sr latin po | 512 ++++++++++++++++++++++++++++++--------------------------
2 files changed, 548 insertions(+), 476 deletions(-)
---
diff --git a/po/sr.po b/po/sr.po
index 667b761..5e064ea 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -8,8 +8,8 @@ msgstr ""
"Project-Id-Version: meld\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=meld&k";
"eywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-09-25 20:44+0000\n"
-"PO-Revision-Date: 2012-09-29 09:34+0200\n"
+"POT-Creation-Date: 2012-11-05 19:37+0000\n"
+"PO-Revision-Date: 2012-11-09 11:37+0200\n"
"Last-Translator: ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ <miroslavnikolic rocketmail com>\n"
"Language-Team: Serbian <gnom prevod org>\n"
"Language: sr\n"
@@ -53,7 +53,7 @@ msgstr "ÐÐÐÑÐÐ ÐÐ ÑÑÐÑÐÐÐÑÐ"
msgid "Active"
msgstr "ÐÐÑÐÐÐÐ"
-#: ../data/ui/EditableList.ui.h:3 ../meld/vcview.py:166
+#: ../data/ui/EditableList.ui.h:3 ../meld/vcview.py:164
msgid "Name"
msgstr "ÐÐÐÐÐ"
@@ -65,7 +65,7 @@ msgstr "ÐÐÑÐÐÐÑ"
msgid "Add new filter"
msgstr "ÐÐÐÐÑÑÐ ÐÐÐÐ ÑÐÐÑÐÑ"
-#: ../data/ui/EditableList.ui.h:6 ../meld/vcview.py:129
+#: ../data/ui/EditableList.ui.h:6 ../meld/vcview.py:128
msgid "_Add"
msgstr "_ÐÐÐÐÑ"
@@ -73,7 +73,7 @@ msgstr "_ÐÐÐÐÑ"
msgid "Remove selected filter"
msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÐÑÐÐÐ ÑÐÐÑÐÑ"
-#: ../data/ui/EditableList.ui.h:8 ../meld/vcview.py:131
+#: ../data/ui/EditableList.ui.h:8 ../meld/vcview.py:129
msgid "_Remove"
msgstr "_ÐÐÐÐÐÐ"
@@ -113,7 +113,7 @@ msgstr "_ÐÐÐÐÑÐ ÐÐÐÐÐÐ"
msgid "_Save Selected"
msgstr "_ÐÐÑÑÐÐÑ ÐÐÐÐÑÐÐÐ"
-#: ../data/ui/findbar.ui.h:1 ../meld/meldwindow.py:148
+#: ../data/ui/findbar.ui.h:1 ../meld/meldwindow.py:126
msgid "_Replace"
msgstr "_ÐÐÐÐÐÐ"
@@ -149,6 +149,10 @@ msgstr "ÐÐ_ÐÑ ÑÐÑ"
msgid "Regular E_xpression"
msgstr "_ÐÐÐÑÐÐÑÐÐ ÐÐÑÐÐ"
+#: ../data/ui/findbar.ui.h:10
+msgid "Wrapped"
+msgstr "ÐÑÐÐÐÐÑÐÐÐ"
+
#: ../data/ui/meldapp.ui.h:2
msgid ""
"Copyright © 2002-2009 Stephen Kennedy\n"
@@ -396,11 +400,11 @@ msgstr "ÐÑÐÑÑÐÐÐÐ ÐÐÐÐÐÐÑÐ"
msgid "Log Message"
msgstr "ÐÐÑÑÐÐ ÐÐÐÐÐÐÐÐ"
-#: ../meld/dirdiff.py:229 ../meld/vcview.py:126
+#: ../meld/dirdiff.py:229 ../meld/vcview.py:125
msgid "_Compare"
msgstr "_ÐÐÐÑÐÐÐ"
-#: ../meld/dirdiff.py:229 ../meld/vcview.py:126
+#: ../meld/dirdiff.py:229 ../meld/vcview.py:125
msgid "Compare selected"
msgstr "ÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐÐ"
@@ -424,7 +428,7 @@ msgstr "ÐÐÐÐÐÐÑÐ ÐÐÑÐÐ"
msgid "Delete selected"
msgstr "ÐÐÑÐÑÐ ÐÐÐÐÑÐÐÐ"
-#: ../meld/dirdiff.py:233 ../meld/filediff.py:1103
+#: ../meld/dirdiff.py:233 ../meld/filediff.py:1216
msgid "Hide"
msgstr "ÐÐÐÑÐÑ"
@@ -464,7 +468,7 @@ msgstr "ÐÑÐÐÐÐÐ ÐÐÐÐ"
msgid "Modified"
msgstr "ÐÐÐÐÑÐÐÐ"
-#: ../meld/dirdiff.py:240 ../meld/vcview.py:139
+#: ../meld/dirdiff.py:240 ../meld/vcview.py:137
msgid "Show modified"
msgstr "ÐÑÐÐÐÐÐ ÐÐÐÐÑÐÐÐ"
@@ -476,41 +480,41 @@ msgstr "ÐÐÐÑÐÑÐ"
msgid "Set active filters"
msgstr "ÐÐÐÐÑÐÑÐ ÐÐÑÐÐÐÐ ÑÐÐÑÐÑÐ"
-#: ../meld/dirdiff.py:398
+#: ../meld/dirdiff.py:406
#, python-format
msgid "Hide %s"
msgstr "ÐÐÐÑÐÑ â%sâ"
-#: ../meld/dirdiff.py:502 ../meld/dirdiff.py:521 ../meld/vcview.py:329
-#: ../meld/vcview.py:353
+#: ../meld/dirdiff.py:510 ../meld/dirdiff.py:529 ../meld/vcview.py:326
+#: ../meld/vcview.py:350
#, python-format
msgid "[%s] Scanning %s"
msgstr "[%s] ÐÑÐÐÐÐÐÐÐ â%sâ"
-#: ../meld/dirdiff.py:620
+#: ../meld/dirdiff.py:628
#, python-format
msgid "[%s] Done"
msgstr "[%s] ÐÐÑÐÐÐ"
-#: ../meld/dirdiff.py:624
+#: ../meld/dirdiff.py:632
msgid "Multiple errors occurred while scanning this folder"
msgstr "ÐÐÑÐÐ ÑÐ ÐÐ ÐÐÑÐ ÐÑÐÑÐÐÐ ÐÐ ÐÑÐÐÐ ÐÑÐÑÑÐÐÐÐÐÑÐ ÐÐÐ ÑÐÑÑÐÐÐÐ"
-#: ../meld/dirdiff.py:625
+#: ../meld/dirdiff.py:633
msgid "Files with invalid encodings found"
msgstr "ÐÑÐÐÐÑÐÐÐ ÑÑ ÐÐÑÐÑÐÐÐ ÑÐ ÐÐÐÑÐÑÐÐÐÐÐ ÐÐÐÐÑÐÑÐÐ"
#. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:627
+#: ../meld/dirdiff.py:635
msgid "Some files were in an incorrect encoding. The names are something like:"
msgstr "ÐÐÐÐ ÐÐÑÐÑÐÐÐ ÐÐÑÐÑÑ Ñ ÐÐÐÑÐÑÐÐÐÐÐ ÐÐÐÐÑÐÑÑ. ÐÐÐÐÐÐ ÑÑ ÐÐÑÑÐ ÐÐÐ:"
-#: ../meld/dirdiff.py:629
+#: ../meld/dirdiff.py:637
msgid "Files hidden by case insensitive comparison"
msgstr "ÐÐÑÐÑÐÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑÐÑÐÑÐÐ ÐÐÐÑÐÑÑÐÐÐÐ ÐÐ ÐÐÐÐÑÐÐÑ ÑÐÐÐÐ"
#. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:631
+#: ../meld/dirdiff.py:639
msgid ""
"You are running a case insensitive comparison on a case sensitive "
"filesystem. The following files in this folder are hidden:"
@@ -518,16 +522,17 @@ msgstr ""
"ÐÐÐÑÐÐÑÐÐ ÑÑÐ ÐÐÑÐÑÐÑÐ ÐÐÐÐÐÐÑÐÐ ÐÐ ÐÐÐÐÑÐÐÐ ÑÐÐÐÐ ÐÐ ÑÐÑÑÐÐÑ ÐÐÑÐÑÐÐÐ ÐÐÐ "
"ÑÐ ÐÐÐ ÐÐÑÐÐ. ÐÐÐÐ ÐÐÑÐÑÐÐÐ ÐÐÑÑ ÐÐÐÑÐÐÐ:"
-#: ../meld/dirdiff.py:642
+#: ../meld/dirdiff.py:650
#, python-format
msgid "'%s' hidden by '%s'"
msgstr "â%sâ ÑÐÐÑÐÐÐÐÐ ÐÐ ÑÑÑÐÐÐ â%sâ"
-#: ../meld/dirdiff.py:667 ../meld/filediff.py:940 ../meld/filediff.py:1107
+#: ../meld/dirdiff.py:675 ../meld/filediff.py:979 ../meld/filediff.py:1220
+#: ../meld/vcview.py:572 ../meld/vcview.py:614
msgid "Hi_de"
msgstr "_ÐÐÐÑÐÑ"
-#: ../meld/dirdiff.py:717
+#: ../meld/dirdiff.py:725
#, python-format
msgid ""
"'%s' exists.\n"
@@ -536,7 +541,7 @@ msgstr ""
"â%sâ ÐÐÑÑÐÑÐ.\n"
"ÐÐ ÐÑÐÑÐÐÐÐÐ?"
-#: ../meld/dirdiff.py:724
+#: ../meld/dirdiff.py:732
#, python-format
msgid ""
"Error copying '%s' to '%s'\n"
@@ -547,7 +552,7 @@ msgstr ""
"\n"
"%s."
-#: ../meld/dirdiff.py:742 ../meld/vcview.py:542
+#: ../meld/dirdiff.py:750 ../meld/vcview.py:546
#, python-format
msgid ""
"'%s' is a directory.\n"
@@ -556,7 +561,7 @@ msgstr ""
"â%sâ ÑÐ ÑÐÑÑÐÐÐÐ.\n"
"ÐÐ ÑÐÐÐÐÐÐ ÑÐÐÑÑÐÐÐÐÐ?"
-#: ../meld/dirdiff.py:749 ../meld/vcview.py:547
+#: ../meld/dirdiff.py:757 ../meld/vcview.py:551
#, python-format
msgid ""
"Error removing %s\n"
@@ -567,7 +572,7 @@ msgstr ""
"\n"
"%s."
-#: ../meld/dirdiff.py:832
+#: ../meld/dirdiff.py:842
#, python-format
msgid "%i second"
msgid_plural "%i seconds"
@@ -576,7 +581,7 @@ msgstr[1] "%i ÑÐÐÑÐÐÐ"
msgstr[2] "%i ÑÐÐÑÐÐÐ"
msgstr[3] "%i ÑÐÐÑÐÐÐ"
-#: ../meld/dirdiff.py:833
+#: ../meld/dirdiff.py:843
#, python-format
msgid "%i minute"
msgid_plural "%i minutes"
@@ -585,7 +590,7 @@ msgstr[1] "%i ÐÐÐÑÑÐ"
msgstr[2] "%i ÐÐÐÑÑÐ"
msgstr[3] "%i ÐÐÐÑÑ"
-#: ../meld/dirdiff.py:834
+#: ../meld/dirdiff.py:844
#, python-format
msgid "%i hour"
msgid_plural "%i hours"
@@ -594,7 +599,7 @@ msgstr[1] "%i ÑÐÑÐ"
msgstr[2] "%i ÑÐÑÐ"
msgstr[3] "%i ÑÐÑ"
-#: ../meld/dirdiff.py:835
+#: ../meld/dirdiff.py:845
#, python-format
msgid "%i day"
msgid_plural "%i days"
@@ -603,7 +608,7 @@ msgstr[1] "%i ÐÐÐÐ"
msgstr[2] "%i ÐÐÐÐ"
msgstr[3] "%i ÐÐÐ"
-#: ../meld/dirdiff.py:836
+#: ../meld/dirdiff.py:846
#, python-format
msgid "%i week"
msgid_plural "%i weeks"
@@ -612,7 +617,7 @@ msgstr[1] "%i ÐÐÐÐÑÐ"
msgstr[2] "%i ÐÐÐÐÑÐ"
msgstr[3] "%i ÐÐÐÐÑÐ"
-#: ../meld/dirdiff.py:837
+#: ../meld/dirdiff.py:847
#, python-format
msgid "%i month"
msgid_plural "%i months"
@@ -621,7 +626,7 @@ msgstr[1] "%i ÐÐÑÐÑÐ"
msgstr[2] "%i ÐÐÑÐÑÐ"
msgstr[3] "%i ÐÐÑÐÑ"
-#: ../meld/dirdiff.py:838
+#: ../meld/dirdiff.py:848
#, python-format
msgid "%i year"
msgid_plural "%i years"
@@ -630,159 +635,159 @@ msgstr[1] "%i ÐÐÐÐÐÐ"
msgstr[2] "%i ÐÐÐÐÐÐ"
msgstr[3] "%i ÐÐÐÐÐÐ"
-#: ../meld/filediff.py:187
+#: ../meld/filediff.py:214
msgid "Format as patch..."
msgstr "ÐÐÑÐÐÑÐÑÐÑ ÐÐÐ ÐÑÐÑÐÐÐÑ..."
-#: ../meld/filediff.py:187
+#: ../meld/filediff.py:214
msgid "Create a patch using differences between files"
msgstr "ÐÐÐÑÐÐÐÑÐ ÐÑÐÑÐÐÐÑ ÐÐÑÐÑÑÐÑÐ ÑÐÐÐÐÐÐ ÐÐÐÐÑÑ ÐÐÑÐÑÐÐÐ"
-#: ../meld/filediff.py:188
+#: ../meld/filediff.py:215
msgid "Previous conflict"
msgstr "ÐÑÐÑÑÐÐÐÐ ÑÑÐÐÐ"
-#: ../meld/filediff.py:188
+#: ../meld/filediff.py:215
msgid "Go to the previous conflict"
msgstr "ÐÐÐÑÐ ÐÐ ÐÑÐÑÑÐÐÐÐ ÑÑÐÐÐ"
-#: ../meld/filediff.py:189
+#: ../meld/filediff.py:216
msgid "Next conflict"
msgstr "ÐÐÐÐÐÑÐ ÑÑÐÐÐ"
-#: ../meld/filediff.py:189
+#: ../meld/filediff.py:216
msgid "Go to the next conflict"
msgstr "ÐÐÐÑÐ ÐÐ ÑÐÐÐÐÑÐ ÑÑÐÐÐ"
-#: ../meld/filediff.py:190
+#: ../meld/filediff.py:217
msgid "Push to left"
msgstr "ÐÑÑÐÐ ÑÐÐÐÐ"
-#: ../meld/filediff.py:190
+#: ../meld/filediff.py:217
msgid "Push current change to the left"
msgstr "ÐÑÑÐÐÑÐ ÑÐÐÑÑÑ ÐÐÐÐÐÑ ÑÐÐÐÐ"
-#: ../meld/filediff.py:191
+#: ../meld/filediff.py:218
msgid "Push to right"
msgstr "ÐÑÑÐÐ ÑÐÐÑÐÐ"
-#: ../meld/filediff.py:191
+#: ../meld/filediff.py:218
msgid "Push current change to the right"
msgstr "ÐÑÑÐÐÑÐ ÑÐÐÑÑÑ ÐÐÐÐÐÑ ÑÐÐÑÐÐ"
#. FIXME: using LAST and FIRST is terrible and unreliable icon abuse
-#: ../meld/filediff.py:193
+#: ../meld/filediff.py:220
msgid "Pull from left"
msgstr "ÐÐÐÑÐ Ñ ÐÐÐÐ"
-#: ../meld/filediff.py:193
+#: ../meld/filediff.py:220
msgid "Pull change from the left"
msgstr "ÐÐÐÑÐÑÐ ÐÐÐÐÐÑ Ñ ÐÐÐÐ"
-#: ../meld/filediff.py:194
+#: ../meld/filediff.py:221
msgid "Pull from right"
msgstr "ÐÐÐÑÐ Ñ ÐÐÑÐÐ"
-#: ../meld/filediff.py:194
+#: ../meld/filediff.py:221
msgid "Pull change from the right"
msgstr "ÐÐÐÑÐÑÐ ÐÐÐÐÐÑ Ñ ÐÐÑÐÐ"
-#: ../meld/filediff.py:195
+#: ../meld/filediff.py:222
msgid "Copy above left"
msgstr "ÐÐÐÐÐÐ ÐÐÐÐÐ ÑÐÐÐÐ"
-#: ../meld/filediff.py:195
+#: ../meld/filediff.py:222
msgid "Copy change above the left chunk"
msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÐÐÑ ÐÐÐÐÐ ÐÐÐÐÐÐ ÑÐÐÐÐ"
-#: ../meld/filediff.py:196
+#: ../meld/filediff.py:223
msgid "Copy below left"
msgstr "ÐÐÐÐÐÐ ÐÑÐÐÐ ÑÐÐÐÐ"
-#: ../meld/filediff.py:196
+#: ../meld/filediff.py:223
msgid "Copy change below the left chunk"
msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÐÐÑ ÐÑÐÐÐ ÐÐÐÐÐÐ ÑÐÐÐÐ"
-#: ../meld/filediff.py:197
+#: ../meld/filediff.py:224
msgid "Copy above right"
msgstr "ÐÐÐÐÐÐ ÐÐÐÐÐ ÑÐÐÑÐÐ"
-#: ../meld/filediff.py:197
+#: ../meld/filediff.py:224
msgid "Copy change above the right chunk"
msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÐÐÑ ÐÐÐÐÐ ÐÐÐÐÐÐ ÑÐÐÑÐÐ"
-#: ../meld/filediff.py:198
+#: ../meld/filediff.py:225
msgid "Copy below right"
msgstr "ÐÐÐÐÐÐ ÐÑÐÐÐ ÑÐÐÑÐÐ"
-#: ../meld/filediff.py:198
+#: ../meld/filediff.py:225
msgid "Copy change below the right chunk"
msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÐÐÑ ÐÑÐÐÐ ÐÐÐÐÐÐ ÑÐÐÑÐÐ"
-#: ../meld/filediff.py:199
+#: ../meld/filediff.py:226
msgid "Delete"
msgstr "ÐÐÑÐÑÐ"
-#: ../meld/filediff.py:199
+#: ../meld/filediff.py:226
msgid "Delete change"
msgstr "ÐÐÑÐÑÐÑÐ ÐÐÐÐÐÑ"
-#: ../meld/filediff.py:200
+#: ../meld/filediff.py:227
msgid "Merge all changes from left"
msgstr "ÐÐÑÐÐÐÐÐ ÑÐÐ ÐÐÐÐÐÐ Ñ ÐÐÐÐ"
-#: ../meld/filediff.py:200
+#: ../meld/filediff.py:227
msgid "Merge all non-conflicting changes from the left"
msgstr "ÐÐÑÐÐÐÐÐÑÐ ÑÐÐ ÐÐÑÑÐÐÐÑÐÐÐÑÑÑÐ ÐÐÐÐÐÐ Ñ ÐÐÐÐ"
-#: ../meld/filediff.py:201
+#: ../meld/filediff.py:228
msgid "Merge all changes from right"
msgstr "ÐÐÑÐÐÐÐÐ ÑÐÐ ÐÐÐÐÐÐ Ñ ÐÐÑÐÐ"
-#: ../meld/filediff.py:201
+#: ../meld/filediff.py:228
msgid "Merge all non-conflicting changes from the right"
msgstr "ÐÐÑÐÐÐÐÐÑÐ ÑÐÐ ÐÐÑÑÐÐÐÑÐÐÐÑÑÑÐ ÐÐÐÐÐÐ Ñ ÐÐÑÐÐ"
-#: ../meld/filediff.py:202
+#: ../meld/filediff.py:229
msgid "Merge all non-conflicting"
msgstr "ÐÐÑÐÐÐÐÐ ÑÐÐ ÐÐÑÑÐÐÐÑÐÐÐÑÑÑÐ"
-#: ../meld/filediff.py:202
+#: ../meld/filediff.py:229
msgid "Merge all non-conflicting changes from left and right panes"
msgstr "ÐÐÑÐÐÐÐÐÑÐ ÑÐÐ ÐÐÑÑÐÐÐÑÐÐÐÑÑÑÐ ÐÐÐÐÐÐ Ñ ÐÐÐÐ Ð ÐÐÑÐÐ ÐÐÐÑÑÐ"
-#: ../meld/filediff.py:203
+#: ../meld/filediff.py:230
msgid "Cycle through documents"
msgstr "ÐÑÑÐÐ ÐÑÐÐ ÐÐÐÑÐÐÐÑÐ"
-#: ../meld/filediff.py:203
+#: ../meld/filediff.py:230
msgid "Move keyboard focus to the next document in this comparison"
msgstr "ÐÑÐÐÐÑÑÐÑÐ ÑÐÐÑÑ ÑÐÑÑÐÑÑÑÐ ÐÐ ÑÐÐÐÐÑÐ ÐÐÐÑÐÐÐÑ Ñ ÐÐÐÐ ÐÐÑÐÑÐÑÑ"
-#: ../meld/filediff.py:207
+#: ../meld/filediff.py:234
msgid "Lock scrolling"
msgstr "ÐÐÐÑÑÑÐÑ ÐÐÐÐÐÑÐ"
-#: ../meld/filediff.py:208
+#: ../meld/filediff.py:235
msgid "Lock scrolling of all panes"
msgstr "ÐÐÐÑÑÑÐÑÑÐ ÐÐÐÐÐÑÐ ÑÐÐÑ ÐÐÐÑÑÐ"
#. Abbreviations for insert and overwrite that fit in the status bar
-#: ../meld/filediff.py:318
+#: ../meld/filediff.py:353
msgid "INS"
msgstr "ÐÐÐÐ"
-#: ../meld/filediff.py:318
+#: ../meld/filediff.py:353
msgid "OVR"
msgstr "ÐÐÐÐ"
#. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:320
+#: ../meld/filediff.py:355
#, python-format
msgid "Ln %i, Col %i"
msgstr "ÐÐÐ %i, ÐÐÑÑÐ %i"
-#: ../meld/filediff.py:644
+#: ../meld/filediff.py:682
#, python-format
msgid ""
"Filter '%s' changed the number of lines in the file. Comparison will be "
@@ -791,42 +796,42 @@ msgstr ""
"ÐÐÐÑÐÑ â%sâ ÑÐ ÐÐÐÐÐÐÐ ÐÑÐÑ ÑÐÐÐÐÐ Ñ ÐÐÑÐÑÐÑÐ. ÐÐÑÐÑÐÑÐ ÐÐÑÐ ÐÐÑÐ ÑÐÑÐÐ. ÐÐ "
"ÐÐÑÐ ÐÐÑÐÑÐ ÐÐÐÐÐÐÐÑÑÐ ÐÑÐÑÑÑÐÐÐ ÐÐ ÐÐÑÐÑÐÐÐÐ."
-#: ../meld/filediff.py:928
+#: ../meld/filediff.py:967
#, python-format
msgid "[%s] Set num panes"
msgstr "[%s] ÐÐÑÑÐÐÐ ÐÑÐÑ ÐÐÐÑÐ"
-#: ../meld/filediff.py:934
+#: ../meld/filediff.py:973
#, python-format
msgid "[%s] Opening files"
msgstr "[%s] ÐÑÐÐÑÐÐ ÐÐÑÐÑÐÐÐ"
-#: ../meld/filediff.py:958 ../meld/filediff.py:968 ../meld/filediff.py:981
-#: ../meld/filediff.py:987
+#: ../meld/filediff.py:997 ../meld/filediff.py:1007 ../meld/filediff.py:1020
+#: ../meld/filediff.py:1026
msgid "Could not read file"
msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÑÐÑÐÐ ÐÐÑÐÑÐÐÑ"
-#: ../meld/filediff.py:959
+#: ../meld/filediff.py:998
#, python-format
msgid "[%s] Reading files"
msgstr "[%s] ÐÐÑÐÐ ÐÐÑÐÑÐÐÐ"
-#: ../meld/filediff.py:969
+#: ../meld/filediff.py:1008
#, python-format
msgid "%s appears to be a binary file."
msgstr "â%sâ ÐÐÐÐÐÐÐ ÐÐ ÑÐ ÐÐÐÑÑÐÐ ÐÐÑÐÑÐÐÐ."
-#: ../meld/filediff.py:982
+#: ../meld/filediff.py:1021
#, python-format
msgid "%s is not in encodings: %s"
msgstr "â%sâ ÐÐÑÐ Ñ ÐÐÐÐÑÐÑÐÐÐ: â%sâ"
-#: ../meld/filediff.py:1013
+#: ../meld/filediff.py:1052
#, python-format
msgid "[%s] Computing differences"
msgstr "[%s] ÐÑÐÑÑÐÐÐÐÐ ÑÐÐÐÐÐÐ"
-#: ../meld/filediff.py:1094
+#: ../meld/filediff.py:1207
msgid ""
"Text filters are being used, and may be masking differences between files. "
"Would you like to compare the unfiltered files?"
@@ -834,15 +839,15 @@ msgstr ""
"ÐÐÑÐÑÑÐÐÐ ÑÑ ÑÐÐÑÐÑÐ ÑÐÐÑÑÐ, Ð ÐÐÐÑ ÐÐÑÑÐÑÐÑÐ Ð ÐÐÐÐÑÐÐÑÐÐÐ ÑÐÐÐÐÐÐ ÐÐÐÐÑÑ "
"ÐÐÑÐÑÐÐÐ. ÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÑÐÐÐÑÐ ÐÐÑÐÐÑÑÐÑÐÐÐ ÐÐÑÐÑÐÐÐ?"
-#: ../meld/filediff.py:1100
+#: ../meld/filediff.py:1213
msgid "Files are identical"
msgstr "ÐÐÑÐÑÐÐÐ ÑÑ ÐÑÑÐÐÐÑÐÐ"
-#: ../meld/filediff.py:1110
+#: ../meld/filediff.py:1223
msgid "Show without filters"
msgstr "ÐÑÐÐÐÐÑÑÐ ÐÐÐ ÑÐÐÑÐÑÐ"
-#: ../meld/filediff.py:1303
+#: ../meld/filediff.py:1347
#, python-format
msgid ""
"\"%s\" exists!\n"
@@ -851,7 +856,7 @@ msgstr ""
"â%sâ ÐÐÑÑÐÑÐ!\n"
"ÐÐ ÐÑÐÑÐÐÐÐÐ?"
-#: ../meld/filediff.py:1316
+#: ../meld/filediff.py:1360
#, python-format
msgid ""
"Error writing to %s\n"
@@ -862,12 +867,12 @@ msgstr ""
"\n"
"%s."
-#: ../meld/filediff.py:1325
+#: ../meld/filediff.py:1369
#, python-format
msgid "Choose a name for buffer %i."
msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐÐÐÐ ÐÐ %i. ÐÐÑÐÑ."
-#: ../meld/filediff.py:1340
+#: ../meld/filediff.py:1384
#, python-format
msgid ""
"This file '%s' contains a mixture of line endings.\n"
@@ -878,7 +883,7 @@ msgstr ""
"\n"
"ÐÐÑÐ ÐÐÐÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÑÐÑÑÐÑÐ?"
-#: ../meld/filediff.py:1356
+#: ../meld/filediff.py:1400
#, python-format
msgid ""
"'%s' contains characters not encodable with '%s'\n"
@@ -887,7 +892,7 @@ msgstr ""
"â%sâ ÑÐÐÑÐÐ ÐÐÐÐÐÐÐ ÐÐÑÐ ÑÐ ÐÐ ÐÐÐÑ ÐÐÐÐÑÐÑÐ ÑÐ â%sâ\n"
"ÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐ ÑÐÑÑÐÐÑÐ ÐÐÐ ÐÐÐ-8?"
-#: ../meld/filediff.py:1413
+#: ../meld/filediff.py:1457
#, python-format
msgid ""
"Reloading will discard changes in:\n"
@@ -963,7 +968,6 @@ msgid "Set the target file for saving a merge result"
msgstr "ÐÐÐÐÑÐÐÐ ÑÐÑÐÑ ÐÐÑÐÑÐÐÑ ÐÐ ÑÑÐÐÑÐ ÑÐÐÑÐÑÐÑÐ ÑÑÐÐÐÑÐ"
#: ../meld/meldapp.py:180
-#| msgid "Automatically compare all differing files on startup"
msgid "Automatically merge files"
msgstr "ÐÐÐÐÑÑÐÐÐÐ ÑÑÐÐÐ ÐÐÑÐÑÐÐÐ"
@@ -973,7 +977,6 @@ msgstr "ÐÑÐÐÐ ÑÐÐÐÑÐÐ ÑÐÐÐÐÐÐ ÐÐ ÐÐÑÐÐÑÐ ÐÐ 3 ÐÑ
#: ../meld/meldapp.py:186
#, python-format
-#| msgid "too many arguments (wanted 0-4, got %d)"
msgid "too many arguments (wanted 0-3, got %d)"
msgstr "ÐÑÐÐÐÑÐ ÐÑÐÑÐÐÐÐÑÐ (ÑÑÐÐÐÐÐ ÑÐ 0-3, ÐÐÐÐÑ %d)"
@@ -982,7 +985,6 @@ msgid "can't auto-merge less than 3 files"
msgstr "ÐÐ ÐÐÐÑ ÑÐÐÐÑÑÐÐÐÐ ÐÐ ÑÑÐÐÐÐ ÐÐÑÐ ÐÐ 3 ÐÐÑÐÑÐÐÐ"
#: ../meld/meldapp.py:190
-#| msgid "Flatten directories"
msgid "can't auto-merge directories"
msgstr "ÐÐ ÐÐÐÑ ÑÐÐÐÑÑÐÐÐÐ ÐÐ ÑÑÐÐÐÐ ÐÐÑÐÐÑÐÑÐÑÑÐÐ"
@@ -999,236 +1001,236 @@ msgstr "<ÐÐÐÐÐÐÐÐÐÐ>"
msgid "untitled"
msgstr "ÐÐÐÐÐÐÐÐ"
-#: ../meld/meldwindow.py:132
+#: ../meld/meldwindow.py:110
msgid "_File"
msgstr "_ÐÐÑÐÑÐÐÐ"
-#: ../meld/meldwindow.py:133
+#: ../meld/meldwindow.py:111
msgid "_New..."
msgstr "_ÐÐÐÐ..."
-#: ../meld/meldwindow.py:133
+#: ../meld/meldwindow.py:111
msgid "Start a new comparison"
msgstr "ÐÐÐÐÑÐÐÑÐ ÐÐÐÐ ÐÐÑÐÑÐÑÐ"
-#: ../meld/meldwindow.py:134
+#: ../meld/meldwindow.py:112
msgid "Save the current file"
msgstr "ÐÐÑÑÐÐÑÑÐ ÑÑÐÐÑÑÐÑ ÐÐÑÐÑÐÐÑ"
-#: ../meld/meldwindow.py:136
+#: ../meld/meldwindow.py:114
msgid "Close the current file"
msgstr "ÐÐÑÐÐÑÐÑÐ ÑÑÐÐÑÑÐÑ ÐÐÑÐÑÐÐÑ"
-#: ../meld/meldwindow.py:137
+#: ../meld/meldwindow.py:115
msgid "Quit the program"
msgstr "ÐÐÑÐÐÑÐÑÐ ÐÑÐÐÑÐÐ"
-#: ../meld/meldwindow.py:139
+#: ../meld/meldwindow.py:117
msgid "_Edit"
msgstr "_ÐÑÐÑÐÐÐÑÐ"
-#: ../meld/meldwindow.py:140
+#: ../meld/meldwindow.py:118
msgid "Undo the last action"
msgstr "ÐÐÐÐÐÐÐÑÐ ÐÐÑÐÐÐÑÑ ÑÐÐÑÑ"
-#: ../meld/meldwindow.py:141
+#: ../meld/meldwindow.py:119
msgid "Redo the last undone action"
msgstr "ÐÐÐÐÐÐÑÐ ÐÐÑÐÐÐÑÑ ÐÐÐÐÐÐÐÑ ÑÐÐÑÑ"
-#: ../meld/meldwindow.py:142
+#: ../meld/meldwindow.py:120
msgid "Cut the selection"
msgstr "ÐÑÐÑÐÑÐ ÐÐÐÐÑ"
-#: ../meld/meldwindow.py:143
+#: ../meld/meldwindow.py:121
msgid "Copy the selection"
msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÐÑ"
-#: ../meld/meldwindow.py:144
+#: ../meld/meldwindow.py:122
msgid "Paste the clipboard"
msgstr "ÐÐÐÑÐÑÐ ÐÑÑÐÐÑ"
-#: ../meld/meldwindow.py:145
+#: ../meld/meldwindow.py:123
msgid "Search for text"
msgstr "ÐÑÐÐÐÑÐ ÑÐÐÑÑ"
-#: ../meld/meldwindow.py:146
+#: ../meld/meldwindow.py:124
msgid "Find Ne_xt"
msgstr "ÐÐÑÐ Ñ_ÐÐÐÐÑÐ"
-#: ../meld/meldwindow.py:146
+#: ../meld/meldwindow.py:124
msgid "Search forwards for the same text"
msgstr "ÐÑÐÐÐÑÐ ÑÐÐÐÑÐÐ ÐÑÑÐ ÑÐÐÑÑ"
-#: ../meld/meldwindow.py:147
+#: ../meld/meldwindow.py:125
msgid "Find _Previous"
msgstr "ÐÐÑÐ ÐÑÐ_ÑÑÐÐÐÐ"
-#: ../meld/meldwindow.py:147
+#: ../meld/meldwindow.py:125
msgid "Search backwards for the same text"
msgstr "ÐÑÐÐÐÑÐ ÑÐÐÐÐÐ ÐÑÑÐ ÑÐÐÑÑ"
-#: ../meld/meldwindow.py:148
+#: ../meld/meldwindow.py:126
msgid "Find and replace text"
msgstr "ÐÑÐÐÐÑÐÑÐ Ð ÐÐÐÐÐÐÑÐ ÑÐÐÑÑ"
-#: ../meld/meldwindow.py:149
+#: ../meld/meldwindow.py:127
msgid "Prefere_nces"
msgstr "ÐÐÑ_ÑÐÐÐÐ"
-#: ../meld/meldwindow.py:149
+#: ../meld/meldwindow.py:127
msgid "Configure the application"
msgstr "ÐÐÐÐÑÐÑÐ ÐÑÐÐÑÐÐ"
-#: ../meld/meldwindow.py:151
+#: ../meld/meldwindow.py:129
msgid "_Changes"
msgstr "_ÐÐÐÐÐÐ"
-#: ../meld/meldwindow.py:152
+#: ../meld/meldwindow.py:130
msgid "Next change"
msgstr "ÐÐÐÐÐÑÐ ÐÐÐÐÐÐ"
-#: ../meld/meldwindow.py:152
+#: ../meld/meldwindow.py:130
msgid "Go to the next change"
msgstr "ÐÐÐÑÐ ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÑ"
-#: ../meld/meldwindow.py:153
+#: ../meld/meldwindow.py:131
msgid "Previous change"
msgstr "ÐÑÐÑÑÐÐÐÐ ÐÐÐÐÐÐ"
-#: ../meld/meldwindow.py:153
+#: ../meld/meldwindow.py:131
msgid "Go to the previous change"
msgstr "ÐÐÐÑÐ ÐÐ ÐÑÐÑÑÐÐÐÑ ÐÐÐÐÐÑ"
-#: ../meld/meldwindow.py:154
+#: ../meld/meldwindow.py:132
msgid "Open externally"
msgstr "ÐÑÐÐÑÐ ÑÐÐÑÐÐÐ"
-#: ../meld/meldwindow.py:154
+#: ../meld/meldwindow.py:132
msgid "Open selected file or directory in the default external application"
msgstr "ÐÑÐÐÑÐÑÐ ÐÐÐÐÑÐÐÑ ÐÐÑÐÑÐÐÑ ÐÐÐ ÑÐÑÑÐÐÐÑ Ñ ÐÑÐÐÐÐÐÐ ÑÐÐÑÐÐÐ ÐÑÐÐÑÐÐÑ"
-#: ../meld/meldwindow.py:156
+#: ../meld/meldwindow.py:134
msgid "_View"
msgstr "Ð_ÑÐÐÐÐÐ"
-#: ../meld/meldwindow.py:157
+#: ../meld/meldwindow.py:135
msgid "File status"
msgstr "ÐÑÐÑÐ ÐÐÑÐÑÐÐÐ"
-#: ../meld/meldwindow.py:158
+#: ../meld/meldwindow.py:136
msgid "Version status"
msgstr "ÐÑÐÑÐ ÐÐÐÐÑÐ"
-#: ../meld/meldwindow.py:159
+#: ../meld/meldwindow.py:137
msgid "File filters"
msgstr "ÐÐÐÑÐÑÐ ÐÐÑÐÑÐÐÐ"
-#: ../meld/meldwindow.py:160
+#: ../meld/meldwindow.py:138
msgid "Stop the current action"
msgstr "ÐÐÑÑÑÐÐÐÑÐ ÑÑÐÐÑÑÐÑ ÑÐÐÑÑ"
-#: ../meld/meldwindow.py:161
+#: ../meld/meldwindow.py:139
msgid "Refresh the view"
msgstr "ÐÑÐÐÐÐÑÐ ÐÑÐÐÐÐÐ"
-#: ../meld/meldwindow.py:162
+#: ../meld/meldwindow.py:140
msgid "Reload"
msgstr "ÐÐÐÐÐÐ ÑÑÐÑÐÑ"
-#: ../meld/meldwindow.py:162
+#: ../meld/meldwindow.py:140
msgid "Reload the comparison"
msgstr "ÐÐÐÐÐÐ ÑÑÐÑÐÑÑÐ ÐÐÑÐÑÐÑÐ"
-#: ../meld/meldwindow.py:164
+#: ../meld/meldwindow.py:142
msgid "_Tabs"
msgstr "_ÐÐÐÐÑÑÐ"
-#: ../meld/meldwindow.py:165
+#: ../meld/meldwindow.py:143
msgid "_Previous Tab"
msgstr "ÐÑÐ_ÑÑÐÐÐÐ ÑÐÐÐÑÐÐ"
-#: ../meld/meldwindow.py:165
+#: ../meld/meldwindow.py:143
msgid "Activate previous tab"
msgstr "ÐÐÐÑÐ ÐÐ ÐÑÐÑÑÐÐÐÐ ÐÐÑÑ"
-#: ../meld/meldwindow.py:166
+#: ../meld/meldwindow.py:144
msgid "_Next Tab"
msgstr "ÐÐÐ_ÐÐÑÐ ÑÐÐÐÑÐÐ"
-#: ../meld/meldwindow.py:166
+#: ../meld/meldwindow.py:144
msgid "Activate next tab"
msgstr "ÐÐÐÑÐ ÐÐ ÐÐÑÐÐÐÐ ÐÐÑÑ"
-#: ../meld/meldwindow.py:167
+#: ../meld/meldwindow.py:145
msgid "Move Tab _Left"
msgstr "ÐÑÐÐÐÑÑÐ ÑÐÐÐÑÐÐ _ÐÐÐÐ"
-#: ../meld/meldwindow.py:167
+#: ../meld/meldwindow.py:145
msgid "Move current tab to left"
msgstr "ÐÑÐÐÐÑÑÐÑÐ ÑÑÐÐÑÑÐÐ ÑÐÐÐÑÐÐ ÐÐ ÐÐÐÐ"
-#: ../meld/meldwindow.py:168
+#: ../meld/meldwindow.py:146
msgid "Move Tab _Right"
msgstr "ÐÑÐÐÐÑÑÐ ÑÐÐÐÑÐÐ _ÐÐÑÐÐ"
-#: ../meld/meldwindow.py:168
+#: ../meld/meldwindow.py:146
msgid "Move current tab to right"
msgstr "ÐÑÐÐÐÑÑÐÑÐ ÑÑÐÐÑÑÐÐ ÑÐÐÐÑÐÐ ÐÐ ÐÐÑÐÐ"
-#: ../meld/meldwindow.py:170
+#: ../meld/meldwindow.py:148
msgid "_Help"
msgstr "ÐÐ_ÐÐÑ"
-#: ../meld/meldwindow.py:171
+#: ../meld/meldwindow.py:149
msgid "_Contents"
msgstr "_ÐÐÐÑÐÐÑ"
-#: ../meld/meldwindow.py:171
+#: ../meld/meldwindow.py:149
msgid "Open the Meld manual"
msgstr "ÐÑÐÐÑÐÑÐ ÑÐÑÑÑÑÐÐ ÐÐÐÐÐ"
-#: ../meld/meldwindow.py:172
+#: ../meld/meldwindow.py:150
msgid "Report _Bug"
msgstr "ÐÑÐÑÐÐÐ _ÐÑÐÑÐÑ"
-#: ../meld/meldwindow.py:172
+#: ../meld/meldwindow.py:150
msgid "Report a bug in Meld"
msgstr "ÐÑÐÑÐÐÐÑÐ ÐÑÐÑÐÑ Ñ ÐÐÐÐÑ"
-#: ../meld/meldwindow.py:173
+#: ../meld/meldwindow.py:151
msgid "About this program"
msgstr "Ð ÐÐÐÐ ÐÑÐÐÑÐÐÑ"
-#: ../meld/meldwindow.py:176
+#: ../meld/meldwindow.py:154
msgid "Full Screen"
msgstr "ÐÑÐÐÐ ÑÐÐÐÐ ÐÐÑÐÐÐ"
-#: ../meld/meldwindow.py:176
+#: ../meld/meldwindow.py:154
msgid "View the comparison in full screen"
msgstr "ÐÑÐÐÐÐÐÐÑÑÐ ÐÐÑÐÑÐÑÐ ÐÑÐÐÐ ÑÐÐÐÐ ÐÐÑÐÐÐ"
-#: ../meld/meldwindow.py:177
+#: ../meld/meldwindow.py:155
msgid "_Toolbar"
msgstr "_ÐÐÐÐÑÐ ÐÐÐÑÐ"
-#: ../meld/meldwindow.py:177
+#: ../meld/meldwindow.py:155
msgid "Show or hide the toolbar"
msgstr "ÐÑÐÐÐÐÐÑÐ ÐÐÐ ÑÐÐÑÐÑÑÐ ÐÐÐÐÑÑ ÐÐÐÑÐ"
-#: ../meld/meldwindow.py:178
+#: ../meld/meldwindow.py:156
msgid "_Statusbar"
msgstr "ÐÑÐÐÐ _ÑÑÐÑÐ"
-#: ../meld/meldwindow.py:178
+#: ../meld/meldwindow.py:156
msgid "Show or hide the statusbar"
msgstr "ÐÑÐÐÐÐÐÑÐ ÐÐÐ ÑÐÐÑÐÑÑÐ ÑÑÐÐÑ ÑÑÐÑÐ"
-#: ../meld/meldwindow.py:564
+#: ../meld/meldwindow.py:534
msgid "Switch to this tab"
msgstr "ÐÑÐÐÐÑÐÑÐ ÑÐ ÐÐ ÐÐÐÑ ÑÐÐÐÑÐÐ"
#. exit at first non found directory + file
-#: ../meld/meldwindow.py:669
+#: ../meld/meldwindow.py:638
msgid "Cannot compare a mixture of files and directories.\n"
msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÐÐÐ ÐÐÑÐÐÐÐÑ ÐÐÑÐÑÐÐÐ Ð ÑÐÑÑÐÐÐÐ.\n"
@@ -1313,210 +1315,185 @@ msgstr "ÐÐÑÐÑÐÐ ÑÐÐÐÐÐ\t0\t^[ \\t\\r\\f\\v]*\n"
msgid "Script comment\t0\t#.*"
msgstr "ÐÐÐÐÐÑÐÑ ÑÐÑÐÐÑÐ\t0\t#.*"
-#: ../meld/vcview.py:127
+#: ../meld/vcview.py:126
msgid "Co_mmit"
msgstr "Ð_ÐÑÐÐÐ"
-#: ../meld/vcview.py:127
+#: ../meld/vcview.py:126
msgid "Commit"
msgstr "ÐÐÑÐÐÐÑÐ"
-#: ../meld/vcview.py:128
+#: ../meld/vcview.py:127
msgid "_Update"
msgstr "_ÐÐÑÑÐÑÐÑ"
-#: ../meld/vcview.py:128
+#: ../meld/vcview.py:127
msgid "Update"
msgstr "ÐÐÑÑÐÑÐÑÑÐ"
-#: ../meld/vcview.py:129
+#: ../meld/vcview.py:128
msgid "Add to VC"
msgstr "ÐÐÐÐÑ Ñ ÐÐ"
-#: ../meld/vcview.py:130
-msgid "Add _Binary"
-msgstr "ÐÐÐÐÑ _ÐÐÐÐÑÐÐ"
-
-#: ../meld/vcview.py:130
-msgid "Add binary to VC"
-msgstr "ÐÐÐÐÑ ÐÐÐÐÑÐÐ Ñ ÐÐ"
-
-#: ../meld/vcview.py:131
+#: ../meld/vcview.py:129
msgid "Remove from VC"
msgstr "ÐÐÐÐÐÐ ÐÐ ÐÐ"
-#: ../meld/vcview.py:132
+#: ../meld/vcview.py:130
msgid "_Resolved"
msgstr "_ÐÐÑÐÐÐ"
-#: ../meld/vcview.py:132
+#: ../meld/vcview.py:130
msgid "Mark as resolved for VC"
msgstr "ÐÐÐÐÑÐÐÐ ÐÐÐ ÑÐÑÐÐÐ ÐÐ ÐÐ"
-#: ../meld/vcview.py:133
+#: ../meld/vcview.py:131
msgid "Revert to original"
msgstr "ÐÑÐÑÐ ÐÐ ÐÑÐÐÐÐÐÐ"
-#: ../meld/vcview.py:134
+#: ../meld/vcview.py:132
msgid "Delete locally"
msgstr "ÐÐÑÐÑÐ Ñ ÐÐÐÐÐÑ"
-#: ../meld/vcview.py:138
+#: ../meld/vcview.py:136
msgid "_Flatten"
msgstr "_ÐÐÑÐÐÐÐÑ"
-#: ../meld/vcview.py:138
+#: ../meld/vcview.py:136
msgid "Flatten directories"
msgstr "ÐÐÑÐÐÐÐÑ ÑÐÑÑÐÐÐÐ"
-#: ../meld/vcview.py:139
+#: ../meld/vcview.py:137
msgid "_Modified"
msgstr "ÐÐ_ÐÐÑÐÐ"
-#: ../meld/vcview.py:140
+#: ../meld/vcview.py:138
msgid "_Normal"
msgstr "_ÐÐÐÑÐÐ"
-#: ../meld/vcview.py:140
+#: ../meld/vcview.py:138
msgid "Show normal"
msgstr "ÐÑÐÐÐÐÐ ÐÐÐÑÐÐ"
-#: ../meld/vcview.py:141
+#: ../meld/vcview.py:139
msgid "Non _VC"
msgstr "ÐÐ _ÐÐ"
-#: ../meld/vcview.py:141
+#: ../meld/vcview.py:139
msgid "Show unversioned files"
msgstr "ÐÑÐÐÐÐÑÑÐ ÐÐÐÐÑÐÐÐÐÐÑÐÐÐ ÐÐÑÐÑÐÐÐ"
-#: ../meld/vcview.py:142
+#: ../meld/vcview.py:140
msgid "Ignored"
msgstr "ÐÐÐÐÐÐÑÐÐÐ"
-#: ../meld/vcview.py:142
+#: ../meld/vcview.py:140
msgid "Show ignored files"
msgstr "ÐÑÐÐÐÐÑÑÐ ÐÐÐÐÐÐÑÐÐÐ ÐÐÑÐÑÐÐÐ"
-#: ../meld/vcview.py:192 ../meld/vcview.py:325
+#: ../meld/vcview.py:190 ../meld/vcview.py:322
msgid "Location"
msgstr "ÐÑÑÐÑÐ"
-#: ../meld/vcview.py:193
+#: ../meld/vcview.py:191
msgid "Status"
msgstr "ÐÑÐÑÐ"
-#: ../meld/vcview.py:194
+#: ../meld/vcview.py:192
msgid "Rev"
msgstr "ÐÐÐ"
-#: ../meld/vcview.py:195
+#: ../meld/vcview.py:193
msgid "Tag"
msgstr "ÐÐÐÐÐÐ"
-#: ../meld/vcview.py:196
+#: ../meld/vcview.py:194
msgid "Options"
msgstr "ÐÐÑÐÑÐ"
-#: ../meld/vcview.py:255
+#: ../meld/vcview.py:252
msgid "Choose one Version Control"
msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐÐÑÑÐÐÑ ÐÐÑÐÐÑÐ"
-#: ../meld/vcview.py:256
+#: ../meld/vcview.py:253
msgid "Only one Version Control in this directory"
msgstr "ÐÐÐÐ ÑÐÐÐÐ ÐÐÐÑÑÐÐÐ ÐÐÑÐÐÑÐ Ñ ÐÐÐÐ ÐÐÑÐÐÑÐÑÐÑÑÐÑ"
#. TRANSLATORS: this is an error message when a version control
#. application isn't installed or can't be found
-#: ../meld/vcview.py:269
+#: ../meld/vcview.py:266
#, python-format
msgid "%s Not Installed"
msgstr "â%sâ ÐÐÑÐ ÐÐÑÑÐÐÐÑÐÐ"
#. TRANSLATORS: this is an error message when a version
#. controlled repository is invalid or corrupted
-#: ../meld/vcview.py:273
+#: ../meld/vcview.py:270
msgid "Invalid Repository"
msgstr "ÐÐÐÑÐÑÐÐÐÐ ÑÐÐÐÐÐÑÑÐ"
-#: ../meld/vcview.py:282
+#: ../meld/vcview.py:279
#, python-format
msgid "%s (%s)"
msgstr "%s (%s)"
#. TRANSLATORS: This is the location of the directory the user is diffing
-#: ../meld/vcview.py:325
+#: ../meld/vcview.py:322
#, python-format
msgid "%s: %s"
msgstr "%s: %s"
-#: ../meld/vcview.py:369
+#: ../meld/vcview.py:366
msgid "(Empty)"
msgstr "(ÐÑÐÐÐÐ)"
-#: ../meld/vcview.py:407
+#: ../meld/vcview.py:404
#, python-format
msgid "[%s] Fetching differences"
msgstr "[%s] ÐÑÐÐÐÐÑÐÐ ÑÐÐÐÐÐÐ"
-#: ../meld/vcview.py:415
+#: ../meld/vcview.py:418
#, python-format
msgid "[%s] Applying patch"
msgstr "[%s] ÐÑÐÐÐÑÑÑÐÐ ÐÐÐÑÐÑ"
-#: ../meld/vcview.py:517
+#: ../meld/vcview.py:522
msgid "Select some files first."
msgstr "ÐÑÐÐ ÐÐÐÐÐÑÐÑÐ ÐÐÐÐ ÐÐÑÐÑÐÐÐ."
-#: ../meld/vcview.py:590
+#: ../meld/vcview.py:565
+msgid "Patch tool not found"
+msgstr "ÐÐÑÐÐ ÐÑÐÐÐÑÐÐ ÐÐÐÑ ÐÐÐÑÐÐ"
+
+#: ../meld/vcview.py:566
#, python-format
msgid ""
-"\n"
-" Invoking 'patch' failed.\n"
-" \n"
-" Maybe you don't have 'GNU patch' installed,\n"
-" or you use an untested version of %s.\n"
-" \n"
-" Please send email bug report to:\n"
-" meld-list gnome org\n"
-" \n"
-" Containing the following information:\n"
-" \n"
-" - meld version: '%s'\n"
-" - source control software type: '%s'\n"
-" - source control software version: 'X.Y.Z'\n"
-" - the output of '%s somefile.txt'\n"
-" - patch command: '%s'\n"
-" (no need to actually run it, just provide\n"
-" the command line) \n"
-" \n"
-" Replace 'X.Y.Z' by the actual version for the\n"
-" source control software you use.\n"
-" "
+"Meld needs the <i>patch</i> tool to be installed to perform comparisons in "
+"%s repositories. Please install <i>patch</i> and try again."
msgstr ""
-"\n"
-" ÐÑÐÐÐÐÐÑÐ âpatchâ ÐÐÑÐ ÑÑÐÐÐÐ.\n"
-" \n"
-" ÐÐÐÐÐ ÐÐÑÑÐ ÐÐÑÑÐÐÐÑÐÐÐ âGNU patchâ,\n"
-" ÐÐÐ ÐÐÑÐÑÑÐÑÐ ÐÐÐÑÐÐÐÑÐÐÑ ÐÐÑÐÐÑÑ â%sâ.\n"
-" \n"
-" ÐÐÐÐÐ ÐÐÑÐÑÐÑÐ ÐÐÐÐÑÑÐÑ Ð ÐÑÐÑÑÐ ÐÐ:\n"
-" meld-list gnome org\n"
-" \n"
-" ÐÐÑÐ ÑÐÐÑÐÐ ÑÐÐÐÐÑÐ ÐÐÑÐÑÐÐÑÐÑÐ:\n"
-" \n"
-" â ÐÐÑÐÐÑÐ ÐÐÐÐÐ: â%sâ\n"
-" â ÐÑÑÑÐ ÑÐÑÑÐÐÑÐ ÐÐÐÑÑÐÐÐ ÐÐÐÐÑÐ: â%sâ\n"
-" â ÐÐÑÐÐÑÐ ÑÐÑÑÐÐÑÐ ÐÐÐÑÑÐÐÐ ÐÐÐÐÑÐ: âX.Y.Zâ\n"
-" â ÐÑÐÐÑ â%s ÐÐÐÐÐÐÑÐÑÐÐÐ.txtâ\n"
-" â ÐÐÑÐÐÐÐ ÐÐ ÐÐÑ: â%sâ\n"
-" (ÐÐÑÐ ÐÐÑÑÐÐÐÐ ÑÑÐÐÑÐÐ ÐÐÐÑÐÑÐÑÐ, ÑÐÐÐ\n"
-" ÐÐÐÐÐÐÐÐÑÐ ÐÐÐÐÑÑ ÐÐÑÐÐÐÐ) \n"
-" \n"
-" ÐÐÐÐÐÐÑÐ âX.Y.Zâ ÑÑÐÐÑÑÐÐÐ ÐÐÑÐÐÑÐÐ\n"
-" ÑÐÑÑÐÐÑÐ ÐÐÐÑÑÐÐÐ ÐÐÐÐÑÐ ÐÐÑÐ ÐÐÑÐÑÑÐÑÐ.\n"
-" "
-
-#: ../meld/ui/findbar.py:140
+"ÐÐÐÐ ÐÐÑÑÐÐÐ ÐÐÑÑÐÐÐÑÐÑÑ ÐÐÐÑÐ ÐÐ <i>ÐÐÐÑÐÐ</i> ÐÐ ÐÐ ÐÐÐÐÐÐ ÐÐÑÐÑÐÑÐ Ñ %s "
+"ÑÐÐÐÐÑÐ. ÐÐÐÐÐ ÐÐÑÑÐÐÐÑÐÑÑÐ <i>ÐÐÐÑÐÑ</i> Ð ÐÐÐÑÑÐÑÑÐ ÐÐÐÑ."
+
+#: ../meld/vcview.py:606
+msgid "Error fetching original comparison file"
+msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÐÐÐÐÐÑÐÑÐ ÐÐÐÐÑÐÐ ÐÐÑÐÑÐÐÐ ÐÐÑÐÑÐÑÐ"
+
+#: ../meld/vcview.py:607
+msgid ""
+"Meld couldn't obtain the original version of your comparison file. If you "
+"are using the most recent version of Meld, please report a bug, including as "
+"many details as possible."
+msgstr ""
+"ÐÐÐÐ ÐÐ ÐÐÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐÐÐÑÐÐ ÐÐÐÐÑÐ ÐÐÑÐ ÐÐÑÐÑÐÐÐ ÐÐÑÐÑÐÑÐ. ÐÐÐ ÐÐÑÐÑÑÐÑÐ "
+"ÐÐÑÐÐÐÐÑÐ ÐÐÐÐÑÐ ÐÐÐÐÐ, ÐÑÐÑÐÐÐÑÐ ÐÑÐÑÐÑ, ÑÐÑÑÑÑÑÑÑÐ ÑÑÐ ÑÐ ÐÐÐÑÑÐ ÐÐÑÐ "
+"ÐÐÑÐÑÐ."
+
+#: ../meld/vcview.py:615
+#| msgid "Report _Bug"
+msgid "Report a bug"
+msgstr "ÐÑÐÑÐÐÐÑÐ ÐÑÐÑÐÑ"
+
+#: ../meld/ui/findbar.py:142
#, python-format
msgid ""
"Regular expression error\n"
@@ -1562,7 +1539,7 @@ msgstr ""
"ÐÐÐÐÐÐÑÐÐÐ:ÐÐÐÐÑÐÐÐÐÐÑÐÐÐ:::ÐÑÐÑÐÐ::ÐÐÐÐ ÐÐÐÐÑÐ:ÐÐÐÐÑÐÐÐ:ÐÑÐÐÐ:ÐÐÐÐÑÐÐÐ:"
"ÐÐÐÐÑÑÐÑÑÑÐ:ÐÐÑÐ ÐÑÐÑÑÑÐÐ"
-#: ../meld/vc/cvs.py:163
+#: ../meld/vc/cvs.py:161
#, python-format
msgid ""
"Error converting to a regular expression\n"
@@ -1573,5 +1550,64 @@ msgstr ""
"ÐÐÑÐÐÐÑ ÑÐ ÐÐÐ â%sâ\n"
"ÐÑÐÑÐÐ ÑÐ ÐÐÐÐ â%sâ"
+#: ../meld/vc/git.py:152
+#, python-format
+#| msgid "Merge all changes from left"
+msgid "Mode changed from %s to %s"
+msgstr "ÐÐÐÐÐ ÑÐ ÐÐÐÐÑÐÐ ÐÐ â%sâ Ñ â%sâ"
+
+#~ msgid "Add _Binary"
+#~ msgstr "ÐÐÐÐÑ _ÐÐÐÐÑÐÐ"
+
+#~ msgid "Add binary to VC"
+#~ msgstr "ÐÐÐÐÑ ÐÐÐÐÑÐÐ Ñ ÐÐ"
+
+#~ msgid ""
+#~ "\n"
+#~ " Invoking 'patch' failed.\n"
+#~ " \n"
+#~ " Maybe you don't have 'GNU patch' installed,\n"
+#~ " or you use an untested version of %s.\n"
+#~ " \n"
+#~ " Please send email bug report to:\n"
+#~ " meld-list gnome org\n"
+#~ " \n"
+#~ " Containing the following information:\n"
+#~ " \n"
+#~ " - meld version: '%s'\n"
+#~ " - source control software type: '%s'\n"
+#~ " - source control software version: 'X.Y.Z'\n"
+#~ " - the output of '%s somefile.txt'\n"
+#~ " - patch command: '%s'\n"
+#~ " (no need to actually run it, just provide\n"
+#~ " the command line) \n"
+#~ " \n"
+#~ " Replace 'X.Y.Z' by the actual version for the\n"
+#~ " source control software you use.\n"
+#~ " "
+#~ msgstr ""
+#~ "\n"
+#~ " ÐÑÐÐÐÐÐÑÐ âpatchâ ÐÐÑÐ ÑÑÐÐÐÐ.\n"
+#~ " \n"
+#~ " ÐÐÐÐÐ ÐÐÑÑÐ ÐÐÑÑÐÐÐÑÐÐÐ âGNU patchâ,\n"
+#~ " ÐÐÐ ÐÐÑÐÑÑÐÑÐ ÐÐÐÑÐÐÐÑÐÐÑ ÐÐÑÐÐÑÑ â%sâ.\n"
+#~ " \n"
+#~ " ÐÐÐÐÐ ÐÐÑÐÑÐÑÐ ÐÐÐÐÑÑÐÑ Ð ÐÑÐÑÑÐ ÐÐ:\n"
+#~ " meld-list gnome org\n"
+#~ " \n"
+#~ " ÐÐÑÐ ÑÐÐÑÐÐ ÑÐÐÐÐÑÐ ÐÐÑÐÑÐÐÑÐÑÐ:\n"
+#~ " \n"
+#~ " â ÐÐÑÐÐÑÐ ÐÐÐÐÐ: â%sâ\n"
+#~ " â ÐÑÑÑÐ ÑÐÑÑÐÐÑÐ ÐÐÐÑÑÐÐÐ ÐÐÐÐÑÐ: â%sâ\n"
+#~ " â ÐÐÑÐÐÑÐ ÑÐÑÑÐÐÑÐ ÐÐÐÑÑÐÐÐ ÐÐÐÐÑÐ: âX.Y.Zâ\n"
+#~ " â ÐÑÐÐÑ â%s ÐÐÐÐÐÐÑÐÑÐÐÐ.txtâ\n"
+#~ " â ÐÐÑÐÐÐÐ ÐÐ ÐÐÑ: â%sâ\n"
+#~ " (ÐÐÑÐ ÐÐÑÑÐÐÐÐ ÑÑÐÐÑÐÐ ÐÐÐÑÐÑÐÑÐ, ÑÐÐÐ\n"
+#~ " ÐÐÐÐÐÐÐÐÑÐ ÐÐÐÐÑÑ ÐÐÑÐÐÐÐ) \n"
+#~ " \n"
+#~ " ÐÐÐÐÐÐÑÐ âX.Y.Zâ ÑÑÐÐÑÑÐÐÐ ÐÐÑÐÐÑÐÐ\n"
+#~ " ÑÐÑÑÐÐÑÐ ÐÐÐÑÑÐÐÐ ÐÐÐÐÑÐ ÐÐÑÐ ÐÐÑÐÑÑÐÑÐ.\n"
+#~ " "
+
#~ msgid "can't compare more than three directories"
#~ msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÐÐÐ ÐÐÑÐ ÐÐ ÑÑÐ ÑÐÑÑÐÐÐÐ"
diff --git a/po/sr latin po b/po/sr latin po
index 4dc19e8..4b90704 100644
--- a/po/sr latin po
+++ b/po/sr latin po
@@ -8,8 +8,8 @@ msgstr ""
"Project-Id-Version: meld\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=meld&k";
"eywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-09-25 20:44+0000\n"
-"PO-Revision-Date: 2012-09-29 09:34+0200\n"
+"POT-Creation-Date: 2012-11-05 19:37+0000\n"
+"PO-Revision-Date: 2012-11-09 11:37+0200\n"
"Last-Translator: Miroslav NikoliÄ <miroslavnikolic rocketmail com>\n"
"Language-Team: Serbian <gnom prevod org>\n"
"Language: sr\n"
@@ -53,7 +53,7 @@ msgstr "Spisak za ureÄivanje"
msgid "Active"
msgstr "Aktivan"
-#: ../data/ui/EditableList.ui.h:3 ../meld/vcview.py:166
+#: ../data/ui/EditableList.ui.h:3 ../meld/vcview.py:164
msgid "Name"
msgstr "Naziv"
@@ -65,7 +65,7 @@ msgstr "Obrazac"
msgid "Add new filter"
msgstr "Dodajte novi filter"
-#: ../data/ui/EditableList.ui.h:6 ../meld/vcview.py:129
+#: ../data/ui/EditableList.ui.h:6 ../meld/vcview.py:128
msgid "_Add"
msgstr "_Dodaj"
@@ -73,7 +73,7 @@ msgstr "_Dodaj"
msgid "Remove selected filter"
msgstr "Uklonite izabrani filter"
-#: ../data/ui/EditableList.ui.h:8 ../meld/vcview.py:131
+#: ../data/ui/EditableList.ui.h:8 ../meld/vcview.py:129
msgid "_Remove"
msgstr "_Ukloni"
@@ -113,7 +113,7 @@ msgstr "_Odbaci izmene"
msgid "_Save Selected"
msgstr "_SaÄuvaj izabrano"
-#: ../data/ui/findbar.ui.h:1 ../meld/meldwindow.py:148
+#: ../data/ui/findbar.ui.h:1 ../meld/meldwindow.py:126
msgid "_Replace"
msgstr "_Zameni"
@@ -149,6 +149,10 @@ msgstr "Ce_lu reÄ"
msgid "Regular E_xpression"
msgstr "_Regularan izraz"
+#: ../data/ui/findbar.ui.h:10
+msgid "Wrapped"
+msgstr "Prelomljeno"
+
#: ../data/ui/meldapp.ui.h:2
msgid ""
"Copyright © 2002-2009 Stephen Kennedy\n"
@@ -396,11 +400,11 @@ msgstr "Prethodni dnevnici"
msgid "Log Message"
msgstr "Poruka dnevnika"
-#: ../meld/dirdiff.py:229 ../meld/vcview.py:126
+#: ../meld/dirdiff.py:229 ../meld/vcview.py:125
msgid "_Compare"
msgstr "_Uporedi"
-#: ../meld/dirdiff.py:229 ../meld/vcview.py:126
+#: ../meld/dirdiff.py:229 ../meld/vcview.py:125
msgid "Compare selected"
msgstr "Uporedi izabrano"
@@ -424,7 +428,7 @@ msgstr "UmnoÅite desno"
msgid "Delete selected"
msgstr "ObriÅi izabrano"
-#: ../meld/dirdiff.py:233 ../meld/filediff.py:1103
+#: ../meld/dirdiff.py:233 ../meld/filediff.py:1216
msgid "Hide"
msgstr "Sakrij"
@@ -464,7 +468,7 @@ msgstr "PrikaÅi nove"
msgid "Modified"
msgstr "Izmenjeni"
-#: ../meld/dirdiff.py:240 ../meld/vcview.py:139
+#: ../meld/dirdiff.py:240 ../meld/vcview.py:137
msgid "Show modified"
msgstr "PrikaÅi izmenjene"
@@ -476,41 +480,41 @@ msgstr "Filteri"
msgid "Set active filters"
msgstr "Podesite aktivne filtere"
-#: ../meld/dirdiff.py:398
+#: ../meld/dirdiff.py:406
#, python-format
msgid "Hide %s"
msgstr "Sakrij â%sâ"
-#: ../meld/dirdiff.py:502 ../meld/dirdiff.py:521 ../meld/vcview.py:329
-#: ../meld/vcview.py:353
+#: ../meld/dirdiff.py:510 ../meld/dirdiff.py:529 ../meld/vcview.py:326
+#: ../meld/vcview.py:350
#, python-format
msgid "[%s] Scanning %s"
msgstr "[%s] pregledam â%sâ"
-#: ../meld/dirdiff.py:620
+#: ../meld/dirdiff.py:628
#, python-format
msgid "[%s] Done"
msgstr "[%s] Gotovo"
-#: ../meld/dirdiff.py:624
+#: ../meld/dirdiff.py:632
msgid "Multiple errors occurred while scanning this folder"
msgstr "DoÅlo je do viÅe greÅaka za vreme pretraÅivanja ove fascikle"
-#: ../meld/dirdiff.py:625
+#: ../meld/dirdiff.py:633
msgid "Files with invalid encodings found"
msgstr "PronaÄene su datoteke sa neispravnim kodiranjem"
#. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:627
+#: ../meld/dirdiff.py:635
msgid "Some files were in an incorrect encoding. The names are something like:"
msgstr "Neke datoteke bejahu u neispravnom kodiranju. Nazivi su neÅto kao:"
-#: ../meld/dirdiff.py:629
+#: ../meld/dirdiff.py:637
msgid "Files hidden by case insensitive comparison"
msgstr "Datoteke skrivene poreÄenjem neosetljivim na veliÄinu slova"
#. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:631
+#: ../meld/dirdiff.py:639
msgid ""
"You are running a case insensitive comparison on a case sensitive "
"filesystem. The following files in this folder are hidden:"
@@ -518,16 +522,17 @@ msgstr ""
"Pokrenuli ste poreÄenje nezavisno od veliÄine slova na sistemu datoteka gde "
"je ona bitna. Neke datoteke nisu vidljive:"
-#: ../meld/dirdiff.py:642
+#: ../meld/dirdiff.py:650
#, python-format
msgid "'%s' hidden by '%s'"
msgstr "â%sâ sakriveno od strane â%sâ"
-#: ../meld/dirdiff.py:667 ../meld/filediff.py:940 ../meld/filediff.py:1107
+#: ../meld/dirdiff.py:675 ../meld/filediff.py:979 ../meld/filediff.py:1220
+#: ../meld/vcview.py:572 ../meld/vcview.py:614
msgid "Hi_de"
msgstr "_Sakrij"
-#: ../meld/dirdiff.py:717
+#: ../meld/dirdiff.py:725
#, python-format
msgid ""
"'%s' exists.\n"
@@ -536,7 +541,7 @@ msgstr ""
"â%sâ postoji.\n"
"Da presnimim?"
-#: ../meld/dirdiff.py:724
+#: ../meld/dirdiff.py:732
#, python-format
msgid ""
"Error copying '%s' to '%s'\n"
@@ -547,7 +552,7 @@ msgstr ""
"\n"
"%s."
-#: ../meld/dirdiff.py:742 ../meld/vcview.py:542
+#: ../meld/dirdiff.py:750 ../meld/vcview.py:546
#, python-format
msgid ""
"'%s' is a directory.\n"
@@ -556,7 +561,7 @@ msgstr ""
"â%sâ je fascikla.\n"
"Da uklonim rekurzivno?"
-#: ../meld/dirdiff.py:749 ../meld/vcview.py:547
+#: ../meld/dirdiff.py:757 ../meld/vcview.py:551
#, python-format
msgid ""
"Error removing %s\n"
@@ -567,7 +572,7 @@ msgstr ""
"\n"
"%s."
-#: ../meld/dirdiff.py:832
+#: ../meld/dirdiff.py:842
#, python-format
msgid "%i second"
msgid_plural "%i seconds"
@@ -576,7 +581,7 @@ msgstr[1] "%i sekunde"
msgstr[2] "%i sekunde"
msgstr[3] "%i sekunda"
-#: ../meld/dirdiff.py:833
+#: ../meld/dirdiff.py:843
#, python-format
msgid "%i minute"
msgid_plural "%i minutes"
@@ -585,7 +590,7 @@ msgstr[1] "%i minuta"
msgstr[2] "%i minuta"
msgstr[3] "%i minut"
-#: ../meld/dirdiff.py:834
+#: ../meld/dirdiff.py:844
#, python-format
msgid "%i hour"
msgid_plural "%i hours"
@@ -594,7 +599,7 @@ msgstr[1] "%i sata"
msgstr[2] "%i sati"
msgstr[3] "%i sat"
-#: ../meld/dirdiff.py:835
+#: ../meld/dirdiff.py:845
#, python-format
msgid "%i day"
msgid_plural "%i days"
@@ -603,7 +608,7 @@ msgstr[1] "%i dana"
msgstr[2] "%i dana"
msgstr[3] "%i dan"
-#: ../meld/dirdiff.py:836
+#: ../meld/dirdiff.py:846
#, python-format
msgid "%i week"
msgid_plural "%i weeks"
@@ -612,7 +617,7 @@ msgstr[1] "%i nedelje"
msgstr[2] "%i nedelja"
msgstr[3] "%i nedelja"
-#: ../meld/dirdiff.py:837
+#: ../meld/dirdiff.py:847
#, python-format
msgid "%i month"
msgid_plural "%i months"
@@ -621,7 +626,7 @@ msgstr[1] "%i meseca"
msgstr[2] "%i meseci"
msgstr[3] "%i mesec"
-#: ../meld/dirdiff.py:838
+#: ../meld/dirdiff.py:848
#, python-format
msgid "%i year"
msgid_plural "%i years"
@@ -630,159 +635,159 @@ msgstr[1] "%i godine"
msgstr[2] "%i godina"
msgstr[3] "%i godina"
-#: ../meld/filediff.py:187
+#: ../meld/filediff.py:214
msgid "Format as patch..."
msgstr "Formatiraj kao ispravku..."
-#: ../meld/filediff.py:187
+#: ../meld/filediff.py:214
msgid "Create a patch using differences between files"
msgstr "Napravite ispravku koristeÄi razlike izmeÄu datoteka"
-#: ../meld/filediff.py:188
+#: ../meld/filediff.py:215
msgid "Previous conflict"
msgstr "Prethodni sukob"
-#: ../meld/filediff.py:188
+#: ../meld/filediff.py:215
msgid "Go to the previous conflict"
msgstr "Idite na prethodni sukob"
-#: ../meld/filediff.py:189
+#: ../meld/filediff.py:216
msgid "Next conflict"
msgstr "SledeÄi sukob"
-#: ../meld/filediff.py:189
+#: ../meld/filediff.py:216
msgid "Go to the next conflict"
msgstr "Idite na sledeÄi sukob"
-#: ../meld/filediff.py:190
+#: ../meld/filediff.py:217
msgid "Push to left"
msgstr "Gurni ulevo"
-#: ../meld/filediff.py:190
+#: ../meld/filediff.py:217
msgid "Push current change to the left"
msgstr "Gurnite tekuÄu izmenu ulevo"
-#: ../meld/filediff.py:191
+#: ../meld/filediff.py:218
msgid "Push to right"
msgstr "Gurni udesno"
-#: ../meld/filediff.py:191
+#: ../meld/filediff.py:218
msgid "Push current change to the right"
msgstr "Gurnite tekuÄu izmenu udesno"
#. FIXME: using LAST and FIRST is terrible and unreliable icon abuse
-#: ../meld/filediff.py:193
+#: ../meld/filediff.py:220
msgid "Pull from left"
msgstr "Ubaci s leva"
-#: ../meld/filediff.py:193
+#: ../meld/filediff.py:220
msgid "Pull change from the left"
msgstr "Ubacite izmenu s leva"
-#: ../meld/filediff.py:194
+#: ../meld/filediff.py:221
msgid "Pull from right"
msgstr "Ubaci s desna"
-#: ../meld/filediff.py:194
+#: ../meld/filediff.py:221
msgid "Pull change from the right"
msgstr "Ubacite izmenu s desna"
-#: ../meld/filediff.py:195
+#: ../meld/filediff.py:222
msgid "Copy above left"
msgstr "UmnoÅi iznad ulevo"
-#: ../meld/filediff.py:195
+#: ../meld/filediff.py:222
msgid "Copy change above the left chunk"
msgstr "UmnoÅite izmenu iznad komada ulevo"
-#: ../meld/filediff.py:196
+#: ../meld/filediff.py:223
msgid "Copy below left"
msgstr "UmnoÅi ispod ulevo"
-#: ../meld/filediff.py:196
+#: ../meld/filediff.py:223
msgid "Copy change below the left chunk"
msgstr "UmnoÅite izmenu ispod komada ulevo"
-#: ../meld/filediff.py:197
+#: ../meld/filediff.py:224
msgid "Copy above right"
msgstr "UmnoÅi iznad udesno"
-#: ../meld/filediff.py:197
+#: ../meld/filediff.py:224
msgid "Copy change above the right chunk"
msgstr "UmnoÅite izmenu iznad komada udesno"
-#: ../meld/filediff.py:198
+#: ../meld/filediff.py:225
msgid "Copy below right"
msgstr "UmnoÅi ispod udesno"
-#: ../meld/filediff.py:198
+#: ../meld/filediff.py:225
msgid "Copy change below the right chunk"
msgstr "UmnoÅite izmenu ispod komada udesno"
-#: ../meld/filediff.py:199
+#: ../meld/filediff.py:226
msgid "Delete"
msgstr "ObriÅi"
-#: ../meld/filediff.py:199
+#: ../meld/filediff.py:226
msgid "Delete change"
msgstr "ObriÅite izmenu"
-#: ../meld/filediff.py:200
+#: ../meld/filediff.py:227
msgid "Merge all changes from left"
msgstr "Objedini sve izmene s leva"
-#: ../meld/filediff.py:200
+#: ../meld/filediff.py:227
msgid "Merge all non-conflicting changes from the left"
msgstr "Objedinite sve nesukobljavajuÄe izmene s leva"
-#: ../meld/filediff.py:201
+#: ../meld/filediff.py:228
msgid "Merge all changes from right"
msgstr "Objedini sve izmene s desna"
-#: ../meld/filediff.py:201
+#: ../meld/filediff.py:228
msgid "Merge all non-conflicting changes from the right"
msgstr "Objedinite sve nesukobljavajuÄe izmene s desna"
-#: ../meld/filediff.py:202
+#: ../meld/filediff.py:229
msgid "Merge all non-conflicting"
msgstr "Objedini sve nesukobljavajuÄe"
-#: ../meld/filediff.py:202
+#: ../meld/filediff.py:229
msgid "Merge all non-conflicting changes from left and right panes"
msgstr "Objedinite sve nesukobljavajuÄe izmene s leve i desne povrÅi"
-#: ../meld/filediff.py:203
+#: ../meld/filediff.py:230
msgid "Cycle through documents"
msgstr "KruÅi kroz dokumente"
-#: ../meld/filediff.py:203
+#: ../meld/filediff.py:230
msgid "Move keyboard focus to the next document in this comparison"
msgstr "Premestite fokus tastature na sledeÄi dokument u ovom poreÄenju"
-#: ../meld/filediff.py:207
+#: ../meld/filediff.py:234
msgid "Lock scrolling"
msgstr "ZakljuÄaj klizanje"
-#: ../meld/filediff.py:208
+#: ../meld/filediff.py:235
msgid "Lock scrolling of all panes"
msgstr "ZakljuÄajte klizanje svih povrÅi"
#. Abbreviations for insert and overwrite that fit in the status bar
-#: ../meld/filediff.py:318
+#: ../meld/filediff.py:353
msgid "INS"
msgstr "UMET"
-#: ../meld/filediff.py:318
+#: ../meld/filediff.py:353
msgid "OVR"
msgstr "PREP"
#. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:320
+#: ../meld/filediff.py:355
#, python-format
msgid "Ln %i, Col %i"
msgstr "Red %i, mesto %i"
-#: ../meld/filediff.py:644
+#: ../meld/filediff.py:682
#, python-format
msgid ""
"Filter '%s' changed the number of lines in the file. Comparison will be "
@@ -791,42 +796,42 @@ msgstr ""
"Filter â%sâ je izmenio broj redova u datoteci. PoreÄenje neÄe biti taÄno. Za "
"viÅe detalja pogledajte priruÄnik za korisnike."
-#: ../meld/filediff.py:928
+#: ../meld/filediff.py:967
#, python-format
msgid "[%s] Set num panes"
msgstr "[%s] Postavi broj ploÄa"
-#: ../meld/filediff.py:934
+#: ../meld/filediff.py:973
#, python-format
msgid "[%s] Opening files"
msgstr "[%s] Otvaram datoteke"
-#: ../meld/filediff.py:958 ../meld/filediff.py:968 ../meld/filediff.py:981
-#: ../meld/filediff.py:987
+#: ../meld/filediff.py:997 ../meld/filediff.py:1007 ../meld/filediff.py:1020
+#: ../meld/filediff.py:1026
msgid "Could not read file"
msgstr "Ne mogu da proÄitam datoteku"
-#: ../meld/filediff.py:959
+#: ../meld/filediff.py:998
#, python-format
msgid "[%s] Reading files"
msgstr "[%s] Äitam datoteke"
-#: ../meld/filediff.py:969
+#: ../meld/filediff.py:1008
#, python-format
msgid "%s appears to be a binary file."
msgstr "â%sâ izgleda da je izvrÅna datoteka."
-#: ../meld/filediff.py:982
+#: ../meld/filediff.py:1021
#, python-format
msgid "%s is not in encodings: %s"
msgstr "â%sâ nije u kodiranjima: â%sâ"
-#: ../meld/filediff.py:1013
+#: ../meld/filediff.py:1052
#, python-format
msgid "[%s] Computing differences"
msgstr "[%s] SraÄunavam razlike"
-#: ../meld/filediff.py:1094
+#: ../meld/filediff.py:1207
msgid ""
"Text filters are being used, and may be masking differences between files. "
"Would you like to compare the unfiltered files?"
@@ -834,15 +839,15 @@ msgstr ""
"KoriÅÄeni su filteri teksta, a mogu postojati i zamaskirane razlike izmeÄu "
"datoteka. Da li Åelite da poredite nefiltrirane datoteke?"
-#: ../meld/filediff.py:1100
+#: ../meld/filediff.py:1213
msgid "Files are identical"
msgstr "Datoteke su istovetne"
-#: ../meld/filediff.py:1110
+#: ../meld/filediff.py:1223
msgid "Show without filters"
msgstr "Prikazuje bez filtera"
-#: ../meld/filediff.py:1303
+#: ../meld/filediff.py:1347
#, python-format
msgid ""
"\"%s\" exists!\n"
@@ -851,7 +856,7 @@ msgstr ""
"â%sâ postoji!\n"
"Da presnimim?"
-#: ../meld/filediff.py:1316
+#: ../meld/filediff.py:1360
#, python-format
msgid ""
"Error writing to %s\n"
@@ -862,12 +867,12 @@ msgstr ""
"\n"
"%s."
-#: ../meld/filediff.py:1325
+#: ../meld/filediff.py:1369
#, python-format
msgid "Choose a name for buffer %i."
msgstr "Izaberite naziv za %i. bafer."
-#: ../meld/filediff.py:1340
+#: ../meld/filediff.py:1384
#, python-format
msgid ""
"This file '%s' contains a mixture of line endings.\n"
@@ -878,7 +883,7 @@ msgstr ""
"\n"
"Koji oblik Åelite da koristite?"
-#: ../meld/filediff.py:1356
+#: ../meld/filediff.py:1400
#, python-format
msgid ""
"'%s' contains characters not encodable with '%s'\n"
@@ -887,7 +892,7 @@ msgstr ""
"â%sâ sadrÅi znakove koji se ne mogu kodirati uz â%sâ\n"
"Da li Åelite da saÄuvate kao UTF-8?"
-#: ../meld/filediff.py:1413
+#: ../meld/filediff.py:1457
#, python-format
msgid ""
"Reloading will discard changes in:\n"
@@ -963,7 +968,6 @@ msgid "Set the target file for saving a merge result"
msgstr "PodeÅava ciljnu datoteku za Äuvanje rezultata stapanja"
#: ../meld/meldapp.py:180
-#| msgid "Automatically compare all differing files on startup"
msgid "Automatically merge files"
msgstr "Samostalno stapa datoteke"
@@ -973,7 +977,6 @@ msgstr "Pravi jeziÄak razlika za najviÅe do 3 pridodate datoteke ili fascikle.
#: ../meld/meldapp.py:186
#, python-format
-#| msgid "too many arguments (wanted 0-4, got %d)"
msgid "too many arguments (wanted 0-3, got %d)"
msgstr "previÅe argumenata (traÅeno je 0-3, dobih %d)"
@@ -982,7 +985,6 @@ msgid "can't auto-merge less than 3 files"
msgstr "ne mogu samostalno da stopim manje od 3 datoteke"
#: ../meld/meldapp.py:190
-#| msgid "Flatten directories"
msgid "can't auto-merge directories"
msgstr "ne mogu samostalno da stopim direktorijume"
@@ -999,236 +1001,236 @@ msgstr "<neimenovan>"
msgid "untitled"
msgstr "bezimeni"
-#: ../meld/meldwindow.py:132
+#: ../meld/meldwindow.py:110
msgid "_File"
msgstr "_Datoteka"
-#: ../meld/meldwindow.py:133
+#: ../meld/meldwindow.py:111
msgid "_New..."
msgstr "_Novo..."
-#: ../meld/meldwindow.py:133
+#: ../meld/meldwindow.py:111
msgid "Start a new comparison"
msgstr "ZapoÄnite novo poreÄenje"
-#: ../meld/meldwindow.py:134
+#: ../meld/meldwindow.py:112
msgid "Save the current file"
msgstr "SaÄuvajte trenutnu datoteku"
-#: ../meld/meldwindow.py:136
+#: ../meld/meldwindow.py:114
msgid "Close the current file"
msgstr "Zatvorite trenutnu datoteku"
-#: ../meld/meldwindow.py:137
+#: ../meld/meldwindow.py:115
msgid "Quit the program"
msgstr "Zatvorite program"
-#: ../meld/meldwindow.py:139
+#: ../meld/meldwindow.py:117
msgid "_Edit"
msgstr "_UreÄivanje"
-#: ../meld/meldwindow.py:140
+#: ../meld/meldwindow.py:118
msgid "Undo the last action"
msgstr "Opozovite poslednju radnju"
-#: ../meld/meldwindow.py:141
+#: ../meld/meldwindow.py:119
msgid "Redo the last undone action"
msgstr "Ponovite poslednju opozvanu radnju"
-#: ../meld/meldwindow.py:142
+#: ../meld/meldwindow.py:120
msgid "Cut the selection"
msgstr "Isecite izbor"
-#: ../meld/meldwindow.py:143
+#: ../meld/meldwindow.py:121
msgid "Copy the selection"
msgstr "UmnoÅite izbor"
-#: ../meld/meldwindow.py:144
+#: ../meld/meldwindow.py:122
msgid "Paste the clipboard"
msgstr "Ubacite ostavu"
-#: ../meld/meldwindow.py:145
+#: ../meld/meldwindow.py:123
msgid "Search for text"
msgstr "TraÅite tekst"
-#: ../meld/meldwindow.py:146
+#: ../meld/meldwindow.py:124
msgid "Find Ne_xt"
msgstr "NaÄi s_ledeÄe"
-#: ../meld/meldwindow.py:146
+#: ../meld/meldwindow.py:124
msgid "Search forwards for the same text"
msgstr "TraÅite unapred isti tekst"
-#: ../meld/meldwindow.py:147
+#: ../meld/meldwindow.py:125
msgid "Find _Previous"
msgstr "NaÄi pre_thodno"
-#: ../meld/meldwindow.py:147
+#: ../meld/meldwindow.py:125
msgid "Search backwards for the same text"
msgstr "TraÅite unazad isti tekst"
-#: ../meld/meldwindow.py:148
+#: ../meld/meldwindow.py:126
msgid "Find and replace text"
msgstr "PronaÄite i zamenite tekst"
-#: ../meld/meldwindow.py:149
+#: ../meld/meldwindow.py:127
msgid "Prefere_nces"
msgstr "Pos_tavke"
-#: ../meld/meldwindow.py:149
+#: ../meld/meldwindow.py:127
msgid "Configure the application"
msgstr "Podesite program"
-#: ../meld/meldwindow.py:151
+#: ../meld/meldwindow.py:129
msgid "_Changes"
msgstr "_Izmene"
-#: ../meld/meldwindow.py:152
+#: ../meld/meldwindow.py:130
msgid "Next change"
msgstr "SledeÄa izmena"
-#: ../meld/meldwindow.py:152
+#: ../meld/meldwindow.py:130
msgid "Go to the next change"
msgstr "Idite na sledeÄu izmenu"
-#: ../meld/meldwindow.py:153
+#: ../meld/meldwindow.py:131
msgid "Previous change"
msgstr "Prethodna izmena"
-#: ../meld/meldwindow.py:153
+#: ../meld/meldwindow.py:131
msgid "Go to the previous change"
msgstr "Idite na prethodnu izmenu"
-#: ../meld/meldwindow.py:154
+#: ../meld/meldwindow.py:132
msgid "Open externally"
msgstr "Otvori spoljnim"
-#: ../meld/meldwindow.py:154
+#: ../meld/meldwindow.py:132
msgid "Open selected file or directory in the default external application"
msgstr "Otvorite izabranu datoteku ili fasciklu u osnovnom spoljnom programu"
-#: ../meld/meldwindow.py:156
+#: ../meld/meldwindow.py:134
msgid "_View"
msgstr "P_regled"
-#: ../meld/meldwindow.py:157
+#: ../meld/meldwindow.py:135
msgid "File status"
msgstr "Stanje datoteke"
-#: ../meld/meldwindow.py:158
+#: ../meld/meldwindow.py:136
msgid "Version status"
msgstr "Stanje izdanja"
-#: ../meld/meldwindow.py:159
+#: ../meld/meldwindow.py:137
msgid "File filters"
msgstr "Filteri datoteke"
-#: ../meld/meldwindow.py:160
+#: ../meld/meldwindow.py:138
msgid "Stop the current action"
msgstr "Zaustavite trenutnu radnju"
-#: ../meld/meldwindow.py:161
+#: ../meld/meldwindow.py:139
msgid "Refresh the view"
msgstr "OsveÅite pregled"
-#: ../meld/meldwindow.py:162
+#: ../meld/meldwindow.py:140
msgid "Reload"
msgstr "Ponovo uÄitaj"
-#: ../meld/meldwindow.py:162
+#: ../meld/meldwindow.py:140
msgid "Reload the comparison"
msgstr "Ponovo uÄitajte poreÄenje"
-#: ../meld/meldwindow.py:164
+#: ../meld/meldwindow.py:142
msgid "_Tabs"
msgstr "_JeziÄci"
-#: ../meld/meldwindow.py:165
+#: ../meld/meldwindow.py:143
msgid "_Previous Tab"
msgstr "Pre_thodni jeziÄak"
-#: ../meld/meldwindow.py:165
+#: ../meld/meldwindow.py:143
msgid "Activate previous tab"
msgstr "Idite na prethodni list"
-#: ../meld/meldwindow.py:166
+#: ../meld/meldwindow.py:144
msgid "_Next Tab"
msgstr "Sle_deÄi jeziÄak"
-#: ../meld/meldwindow.py:166
+#: ../meld/meldwindow.py:144
msgid "Activate next tab"
msgstr "Idite na naredni list"
-#: ../meld/meldwindow.py:167
+#: ../meld/meldwindow.py:145
msgid "Move Tab _Left"
msgstr "Premesti jeziÄak _levo"
-#: ../meld/meldwindow.py:167
+#: ../meld/meldwindow.py:145
msgid "Move current tab to left"
msgstr "Premestite trenutni jeziÄak na levo"
-#: ../meld/meldwindow.py:168
+#: ../meld/meldwindow.py:146
msgid "Move Tab _Right"
msgstr "Premesti jeziÄak _desno"
-#: ../meld/meldwindow.py:168
+#: ../meld/meldwindow.py:146
msgid "Move current tab to right"
msgstr "Premestite trenutni jeziÄak na desno"
-#: ../meld/meldwindow.py:170
+#: ../meld/meldwindow.py:148
msgid "_Help"
msgstr "Po_moÄ"
-#: ../meld/meldwindow.py:171
+#: ../meld/meldwindow.py:149
msgid "_Contents"
msgstr "_SadrÅaj"
-#: ../meld/meldwindow.py:171
+#: ../meld/meldwindow.py:149
msgid "Open the Meld manual"
msgstr "Otvorite uputstvo Melda"
-#: ../meld/meldwindow.py:172
+#: ../meld/meldwindow.py:150
msgid "Report _Bug"
msgstr "Prijavi _greÅku"
-#: ../meld/meldwindow.py:172
+#: ../meld/meldwindow.py:150
msgid "Report a bug in Meld"
msgstr "Prijavite greÅku u Meldu"
-#: ../meld/meldwindow.py:173
+#: ../meld/meldwindow.py:151
msgid "About this program"
msgstr "O ovom programu"
-#: ../meld/meldwindow.py:176
+#: ../meld/meldwindow.py:154
msgid "Full Screen"
msgstr "Preko celog ekrana"
-#: ../meld/meldwindow.py:176
+#: ../meld/meldwindow.py:154
msgid "View the comparison in full screen"
msgstr "Pregledajte poreÄenje preko celog ekrana"
-#: ../meld/meldwindow.py:177
+#: ../meld/meldwindow.py:155
msgid "_Toolbar"
msgstr "_Paleta alata"
-#: ../meld/meldwindow.py:177
+#: ../meld/meldwindow.py:155
msgid "Show or hide the toolbar"
msgstr "PrikaÅite ili sakrijte paletu alata"
-#: ../meld/meldwindow.py:178
+#: ../meld/meldwindow.py:156
msgid "_Statusbar"
msgstr "Traka _stanja"
-#: ../meld/meldwindow.py:178
+#: ../meld/meldwindow.py:156
msgid "Show or hide the statusbar"
msgstr "PrikaÅite ili sakrijte traku stanja"
-#: ../meld/meldwindow.py:564
+#: ../meld/meldwindow.py:534
msgid "Switch to this tab"
msgstr "Prebacite se na ovaj jeziÄak"
#. exit at first non found directory + file
-#: ../meld/meldwindow.py:669
+#: ../meld/meldwindow.py:638
msgid "Cannot compare a mixture of files and directories.\n"
msgstr "Ne mogu da poredim meÅavinu datoteka i fascikli.\n"
@@ -1313,210 +1315,185 @@ msgstr "PoÄetni razmak\t0\t^[ \\t\\r\\f\\v]*\n"
msgid "Script comment\t0\t#.*"
msgstr "Komentar skripte\t0\t#.*"
-#: ../meld/vcview.py:127
+#: ../meld/vcview.py:126
msgid "Co_mmit"
msgstr "U_gradi"
-#: ../meld/vcview.py:127
+#: ../meld/vcview.py:126
msgid "Commit"
msgstr "Ugradite"
-#: ../meld/vcview.py:128
+#: ../meld/vcview.py:127
msgid "_Update"
msgstr "_AÅuriraj"
-#: ../meld/vcview.py:128
+#: ../meld/vcview.py:127
msgid "Update"
msgstr "AÅurirajte"
-#: ../meld/vcview.py:129
+#: ../meld/vcview.py:128
msgid "Add to VC"
msgstr "Dodaj u CV"
-#: ../meld/vcview.py:130
-msgid "Add _Binary"
-msgstr "Dodaj _binarno"
-
-#: ../meld/vcview.py:130
-msgid "Add binary to VC"
-msgstr "Dodaj binarno u CV"
-
-#: ../meld/vcview.py:131
+#: ../meld/vcview.py:129
msgid "Remove from VC"
msgstr "Ukloni iz CV"
-#: ../meld/vcview.py:132
+#: ../meld/vcview.py:130
msgid "_Resolved"
msgstr "_ReÅeno"
-#: ../meld/vcview.py:132
+#: ../meld/vcview.py:130
msgid "Mark as resolved for VC"
msgstr "OznaÄava kao reÅeno za CV"
-#: ../meld/vcview.py:133
+#: ../meld/vcview.py:131
msgid "Revert to original"
msgstr "Vrati na original"
-#: ../meld/vcview.py:134
+#: ../meld/vcview.py:132
msgid "Delete locally"
msgstr "ObriÅi u lokalu"
-#: ../meld/vcview.py:138
+#: ../meld/vcview.py:136
msgid "_Flatten"
msgstr "_Izravnaj"
-#: ../meld/vcview.py:138
+#: ../meld/vcview.py:136
msgid "Flatten directories"
msgstr "Izravnaj fascikle"
-#: ../meld/vcview.py:139
+#: ../meld/vcview.py:137
msgid "_Modified"
msgstr "Iz_menjen"
-#: ../meld/vcview.py:140
+#: ../meld/vcview.py:138
msgid "_Normal"
msgstr "_ObiÄno"
-#: ../meld/vcview.py:140
+#: ../meld/vcview.py:138
msgid "Show normal"
msgstr "PrikaÅi obiÄne"
-#: ../meld/vcview.py:141
+#: ../meld/vcview.py:139
msgid "Non _VC"
msgstr "Ne _CV"
-#: ../meld/vcview.py:141
+#: ../meld/vcview.py:139
msgid "Show unversioned files"
msgstr "Prikazuje neverzionirane datoteke"
-#: ../meld/vcview.py:142
+#: ../meld/vcview.py:140
msgid "Ignored"
msgstr "Zanemarene"
-#: ../meld/vcview.py:142
+#: ../meld/vcview.py:140
msgid "Show ignored files"
msgstr "Prikazuje zanemarene datoteke"
-#: ../meld/vcview.py:192 ../meld/vcview.py:325
+#: ../meld/vcview.py:190 ../meld/vcview.py:322
msgid "Location"
msgstr "Putanja"
-#: ../meld/vcview.py:193
+#: ../meld/vcview.py:191
msgid "Status"
msgstr "Stanje"
-#: ../meld/vcview.py:194
+#: ../meld/vcview.py:192
msgid "Rev"
msgstr "Izd"
-#: ../meld/vcview.py:195
+#: ../meld/vcview.py:193
msgid "Tag"
msgstr "Oznaka"
-#: ../meld/vcview.py:196
+#: ../meld/vcview.py:194
msgid "Options"
msgstr "Opcije"
-#: ../meld/vcview.py:255
+#: ../meld/vcview.py:252
msgid "Choose one Version Control"
msgstr "Izaberite Kontrolu verzije"
-#: ../meld/vcview.py:256
+#: ../meld/vcview.py:253
msgid "Only one Version Control in this directory"
msgstr "Samo jedna Kontrola verzija u ovom direktorijumu"
#. TRANSLATORS: this is an error message when a version control
#. application isn't installed or can't be found
-#: ../meld/vcview.py:269
+#: ../meld/vcview.py:266
#, python-format
msgid "%s Not Installed"
msgstr "â%sâ nije instaliran"
#. TRANSLATORS: this is an error message when a version
#. controlled repository is invalid or corrupted
-#: ../meld/vcview.py:273
+#: ../meld/vcview.py:270
msgid "Invalid Repository"
msgstr "Neispravno skladiÅte"
-#: ../meld/vcview.py:282
+#: ../meld/vcview.py:279
#, python-format
msgid "%s (%s)"
msgstr "%s (%s)"
#. TRANSLATORS: This is the location of the directory the user is diffing
-#: ../meld/vcview.py:325
+#: ../meld/vcview.py:322
#, python-format
msgid "%s: %s"
msgstr "%s: %s"
-#: ../meld/vcview.py:369
+#: ../meld/vcview.py:366
msgid "(Empty)"
msgstr "(Prazno)"
-#: ../meld/vcview.py:407
+#: ../meld/vcview.py:404
#, python-format
msgid "[%s] Fetching differences"
msgstr "[%s] Pribavljam razlike"
-#: ../meld/vcview.py:415
+#: ../meld/vcview.py:418
#, python-format
msgid "[%s] Applying patch"
msgstr "[%s] Primenjujem zakrpu"
-#: ../meld/vcview.py:517
+#: ../meld/vcview.py:522
msgid "Select some files first."
msgstr "Prvo izaberite neke datoteke."
-#: ../meld/vcview.py:590
+#: ../meld/vcview.py:565
+msgid "Patch tool not found"
+msgstr "Nisam pronaÅao alat zakrpe"
+
+#: ../meld/vcview.py:566
#, python-format
msgid ""
-"\n"
-" Invoking 'patch' failed.\n"
-" \n"
-" Maybe you don't have 'GNU patch' installed,\n"
-" or you use an untested version of %s.\n"
-" \n"
-" Please send email bug report to:\n"
-" meld-list gnome org\n"
-" \n"
-" Containing the following information:\n"
-" \n"
-" - meld version: '%s'\n"
-" - source control software type: '%s'\n"
-" - source control software version: 'X.Y.Z'\n"
-" - the output of '%s somefile.txt'\n"
-" - patch command: '%s'\n"
-" (no need to actually run it, just provide\n"
-" the command line) \n"
-" \n"
-" Replace 'X.Y.Z' by the actual version for the\n"
-" source control software you use.\n"
-" "
+"Meld needs the <i>patch</i> tool to be installed to perform comparisons in "
+"%s repositories. Please install <i>patch</i> and try again."
msgstr ""
-"\n"
-" Prizivanje âpatchâ nije uspelo.\n"
-" \n"
-" MoÅda niste instalirali âGNU patchâ,\n"
-" ili koristite neproverenu verziju â%sâ.\n"
-" \n"
-" Molim poÅaljite izveÅtaj o greÅci na:\n"
-" meld-list gnome org\n"
-" \n"
-" Koji sadrÅi sledeÄe informacije:\n"
-" \n"
-" â verzija melda: â%sâ\n"
-" â vrsta softvera kontrole izvora: â%sâ\n"
-" â verzija softvera kontrole izvora: âX.Y.Zâ\n"
-" â ispis â%s nekadatoteka.txtâ\n"
-" â naredba za paÄ: â%sâ\n"
-" (nije potrebno stvarno pokretanje, samo\n"
-" obezbedite liniju naredbe) \n"
-" \n"
-" Zamenite âX.Y.Zâ trenutnom verzijom\n"
-" softvera kontrole izvora koji koristite.\n"
-" "
-
-#: ../meld/ui/findbar.py:140
+"Meld zahteva instalaciju alata za <i>zakrpe</i> da bi obavio poreÄenja u %s "
+"riznice. Molim instalirajte <i>zakrpu</i> i pokuÅajte opet."
+
+#: ../meld/vcview.py:606
+msgid "Error fetching original comparison file"
+msgstr "GreÅka prilikom dovlaÄenja izvorne datoteke poreÄenja"
+
+#: ../meld/vcview.py:607
+msgid ""
+"Meld couldn't obtain the original version of your comparison file. If you "
+"are using the most recent version of Meld, please report a bug, including as "
+"many details as possible."
+msgstr ""
+"Meld ne moÅe da dobije izvorno izdanje vaÅe datoteke poreÄenja. Ako koristite "
+"najnovije izdanje Melda, prijavite greÅku, ukljuÄujuÄi Åto je moguÄe viÅe "
+"detalja."
+
+#: ../meld/vcview.py:615
+#| msgid "Report _Bug"
+msgid "Report a bug"
+msgstr "Prijavite greÅku"
+
+#: ../meld/ui/findbar.py:142
#, python-format
msgid ""
"Regular expression error\n"
@@ -1562,7 +1539,7 @@ msgstr ""
"Zanemareno:Neverzionirano:::GreÅka::Novo dodato:Izmenjeno:Sukob:Uklonjeno:"
"NedostajuÄe:Nije prisutno"
-#: ../meld/vc/cvs.py:163
+#: ../meld/vc/cvs.py:161
#, python-format
msgid ""
"Error converting to a regular expression\n"
@@ -1573,5 +1550,64 @@ msgstr ""
"Obrazac je bio â%sâ\n"
"GreÅka je bila â%sâ"
+#: ../meld/vc/git.py:152
+#, python-format
+#| msgid "Merge all changes from left"
+msgid "Mode changed from %s to %s"
+msgstr "ReÅim je izmenjen iz â%sâ u â%sâ"
+
+#~ msgid "Add _Binary"
+#~ msgstr "Dodaj _binarno"
+
+#~ msgid "Add binary to VC"
+#~ msgstr "Dodaj binarno u CV"
+
+#~ msgid ""
+#~ "\n"
+#~ " Invoking 'patch' failed.\n"
+#~ " \n"
+#~ " Maybe you don't have 'GNU patch' installed,\n"
+#~ " or you use an untested version of %s.\n"
+#~ " \n"
+#~ " Please send email bug report to:\n"
+#~ " meld-list gnome org\n"
+#~ " \n"
+#~ " Containing the following information:\n"
+#~ " \n"
+#~ " - meld version: '%s'\n"
+#~ " - source control software type: '%s'\n"
+#~ " - source control software version: 'X.Y.Z'\n"
+#~ " - the output of '%s somefile.txt'\n"
+#~ " - patch command: '%s'\n"
+#~ " (no need to actually run it, just provide\n"
+#~ " the command line) \n"
+#~ " \n"
+#~ " Replace 'X.Y.Z' by the actual version for the\n"
+#~ " source control software you use.\n"
+#~ " "
+#~ msgstr ""
+#~ "\n"
+#~ " Prizivanje âpatchâ nije uspelo.\n"
+#~ " \n"
+#~ " MoÅda niste instalirali âGNU patchâ,\n"
+#~ " ili koristite neproverenu verziju â%sâ.\n"
+#~ " \n"
+#~ " Molim poÅaljite izveÅtaj o greÅci na:\n"
+#~ " meld-list gnome org\n"
+#~ " \n"
+#~ " Koji sadrÅi sledeÄe informacije:\n"
+#~ " \n"
+#~ " â verzija melda: â%sâ\n"
+#~ " â vrsta softvera kontrole izvora: â%sâ\n"
+#~ " â verzija softvera kontrole izvora: âX.Y.Zâ\n"
+#~ " â ispis â%s nekadatoteka.txtâ\n"
+#~ " â naredba za paÄ: â%sâ\n"
+#~ " (nije potrebno stvarno pokretanje, samo\n"
+#~ " obezbedite liniju naredbe) \n"
+#~ " \n"
+#~ " Zamenite âX.Y.Zâ trenutnom verzijom\n"
+#~ " softvera kontrole izvora koji koristite.\n"
+#~ " "
+
#~ msgid "can't compare more than three directories"
#~ msgstr "ne mogu da poredim viÅe od tri fascikle"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
