[meld] Updated Serbian translation
- From: ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ <mirosnik src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld] Updated Serbian translation
- Date: Tue, 8 Jan 2013 20:04:06 +0000 (UTC)
commit 4264f6a1963c52e872e78760fdab9e9592cb6cb9
Author: ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ <miroslavnikolic rocketmail com>
Date: Tue Jan 8 21:05:28 2013 +0100
Updated Serbian translation
po/sr.po | 697 +++++++++++++++++++++++++++++++-------------------------
po/sr latin po | 697 +++++++++++++++++++++++++++++++-------------------------
2 files changed, 772 insertions(+), 622 deletions(-)
---
diff --git a/po/sr.po b/po/sr.po
index 5e064ea..79b4b77 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -2,14 +2,14 @@
# Courtesy of Prevod.org team (http://prevod.org/) -- 2003â2012.
# This file is distributed under the same license as the meld package.
# Maintainer: ÐÐÐÐÐÐ ÐÐÐÐÐ <dsegan gmx net>
-# ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ <miroslavnikolic rocketmail com>, 2011, 2012.
+# ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ <miroslavnikolic rocketmail com>, 2011, 2012, 2013.
msgid ""
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-11-05 19:37+0000\n"
-"PO-Revision-Date: 2012-11-09 11:37+0200\n"
+"POT-Creation-Date: 2013-01-08 19:43+0000\n"
+"PO-Revision-Date: 2013-01-08 21:03+0200\n"
"Last-Translator: ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ <miroslavnikolic rocketmail com>\n"
"Language-Team: Serbian <gnom prevod org>\n"
"Language: sr\n"
@@ -20,11 +20,11 @@ msgstr ""
"n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
"X-Project-Style: gnome\n"
-#: ../bin/meld:103
+#: ../bin/meld:113
msgid "Cannot import: "
msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÐÐÐÐ: "
-#: ../bin/meld:106
+#: ../bin/meld:116
#, c-format
msgid "Meld requires %s or higher."
msgstr "ÐÐÐÐ ÐÐÑÑÐÐÐ %s ÐÐÐ ÐÐÐÐÑÐ."
@@ -53,67 +53,83 @@ msgstr "ÐÐÐÑÐÐ ÐÐ ÑÑÐÑÐÐÐÑÐ"
msgid "Active"
msgstr "ÐÐÑÐÐÐÐ"
-#: ../data/ui/EditableList.ui.h:3 ../meld/vcview.py:164
-msgid "Name"
-msgstr "ÐÐÐÐÐ"
-
-#: ../data/ui/EditableList.ui.h:4
-msgid "Pattern"
-msgstr "ÐÐÑÐÐÐÑ"
-
-#: ../data/ui/EditableList.ui.h:5
-msgid "Add new filter"
-msgstr "ÐÐÐÐÑÑÐ ÐÐÐÐ ÑÐÐÑÐÑ"
+#: ../data/ui/EditableList.ui.h:3
+#| msgid "<unnamed>"
+msgid "Column name"
+msgstr "ÐÐÐÐÐ ÐÐÐÐÐÐ"
-#: ../data/ui/EditableList.ui.h:6 ../meld/vcview.py:128
+#: ../data/ui/EditableList.ui.h:4 ../meld/vcview.py:163
msgid "_Add"
msgstr "_ÐÐÐÐÑ"
-#: ../data/ui/EditableList.ui.h:7
-msgid "Remove selected filter"
-msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÐÑÐÐÐ ÑÐÐÑÐÑ"
-
-#: ../data/ui/EditableList.ui.h:8 ../meld/vcview.py:129
+#: ../data/ui/EditableList.ui.h:5 ../meld/vcview.py:164
msgid "_Remove"
msgstr "_ÐÐÐÐÐÐ"
-#: ../data/ui/EditableList.ui.h:9
+#: ../data/ui/EditableList.ui.h:6
msgid "Move item up"
msgstr "ÐÑÐÐÐÑÑÐÑÐ ÑÑÐÐÐÑ ÐÐ ÐÐÑÐ"
-#: ../data/ui/EditableList.ui.h:10
+#: ../data/ui/EditableList.ui.h:7
msgid "Move _Up"
msgstr "ÐÑÐÐÐÑÑÐ _ÐÐÑÐ"
-#: ../data/ui/EditableList.ui.h:11
+#: ../data/ui/EditableList.ui.h:8
msgid "Move item down"
msgstr "ÐÑÐÐÐÑÑÐÑÐ ÑÑÐÐÐÑ ÐÐ ÐÐÐÐ"
-#: ../data/ui/EditableList.ui.h:12
+#: ../data/ui/EditableList.ui.h:9
msgid "Move _Down"
msgstr "ÐÑÐÐÐÑÑÐ _ÐÐÐÐ"
+#. Create icon and filename CellRenderer
+#: ../data/ui/EditableList.ui.h:10 ../meld/dirdiff.py:303
+#: ../meld/vcview.py:200
+msgid "Name"
+msgstr "ÐÐÐÐÐ"
+
+#: ../data/ui/EditableList.ui.h:11
+msgid "Pattern"
+msgstr "ÐÐÑÐÐÐÑ"
+
+#: ../data/ui/EditableList.ui.h:12
+msgid "Add new filter"
+msgstr "ÐÐÐÐÑÑÐ ÐÐÐÐ ÑÐÐÑÐÑ"
+
+#: ../data/ui/EditableList.ui.h:13
+msgid "Remove selected filter"
+msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÐÑÐÐÐ ÑÐÐÑÐÑ"
+
#: ../data/ui/filediff.ui.h:1
-msgid "Save modified files?"
-msgstr "ÐÐ ÑÐÑÑÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐÑÐÑÐÐÐ?"
+msgid "Save changes to documents before closing?"
+msgstr "ÐÐ ÑÐÑÑÐÐÐ ÐÐÐÐÐÐ Ñ ÐÐÐÑÐÐÐÑÑ ÐÑÐ ÐÐÑÐÐÑÐÑÐ?"
#: ../data/ui/filediff.ui.h:2
-msgid ""
-"Some files have been modified.\n"
-"Which ones would you like to save?"
-msgstr ""
-"ÐÐÐÐ ÐÐÑÐÑÐÐÐ ÑÑ ÐÐÐÐÑÐÐÐ.\n"
-"ÐÐÑÐ ÐÐÐÐÑÐ ÐÐ ÑÐÑÑÐÐÑÐ?"
+msgid "If you don't save, changes will be permanently lost."
+msgstr "ÐÐÐ ÐÐ ÑÐÑÑÐÐÑÐ, ÐÐÐÐÐÐ ÑÐ ÐÐÑÐ ÑÑÐÑÐÐ ÐÐÐÑÐÑÐÐÐ."
+
+#: ../data/ui/filediff.ui.h:3
+msgid "Close _without saving"
+msgstr "ÐÐÑÐÐÑÐ _ÐÐÐ ÑÑÐÐÑÐ"
#: ../data/ui/filediff.ui.h:4
-msgid "_Discard Changes"
-msgstr "_ÐÐÐÐÑÐ ÐÐÐÐÐÐ"
+msgid "_Cancel"
+msgstr "_ÐÑÐÐÐÐ"
#: ../data/ui/filediff.ui.h:5
-msgid "_Save Selected"
-msgstr "_ÐÐÑÑÐÐÑ ÐÐÐÐÑÐÐÐ"
+msgid "_Save"
+msgstr "_ÐÐÑÑÐÐÑ"
-#: ../data/ui/findbar.ui.h:1 ../meld/meldwindow.py:126
+#: ../data/ui/filediff.ui.h:6
+msgid ""
+"This file can not be written to. You may click here to unlock this file and "
+"make changes anyway, but these changes must be saved to a new file."
+msgstr ""
+"Ð ÐÐÑ ÐÐÑÐÑÐÐÑ ÑÐ ÐÐ ÐÐÐÐ ÑÐÐÑÐÐÐÑÐ. ÐÐÐÐÑÐ ÐÐ ÐÐÐÐÐÐÑÐ ÐÐÐÐ ÐÐ ÐÑÐÑÑÑÐÑÐ "
+"ÐÐÑ ÐÐÑÐÑÐÐÑ Ð ÐÐ ÐÐÐÐ ÐÐÑÐÐÐÑÐ ÐÐÐÐÐÐ, ÐÐÐ ÑÐ ÐÐÐÐÐÐ ÐÐÑÐÑÑ ÐÐÑÐ ÑÐÑÑÐÐÐÐ Ñ "
+"ÐÐÐÑ ÐÐÑÐÑÐÐÑ."
+
+#: ../data/ui/findbar.ui.h:1 ../meld/meldwindow.py:132
msgid "_Replace"
msgstr "_ÐÐÐÐÐÐ"
@@ -333,6 +349,24 @@ msgid "Editor"
msgstr "ÐÑÐÑÐÐÐÑ"
#: ../data/ui/preferences.ui.h:17
+#| msgid "Ignore symbolic links"
+msgid "Symbolic links"
+msgstr "ÐÐÐÐÐÐÐÑÐÐ ÐÐÐÐ"
+
+#: ../data/ui/preferences.ui.h:18
+msgid "Ignore symbolic links"
+msgstr "ÐÐÐÐÐÐÑÐ ÑÐÐÐÐÐÐÑÐÐ ÐÐÐÐ"
+
+#: ../data/ui/preferences.ui.h:19
+msgid "Visible columns"
+msgstr "ÐÑÐÐÐÐÐÐÐ ÐÐÐÐÐÐ"
+
+#: ../data/ui/preferences.ui.h:20
+#| msgid "_File Comparison"
+msgid "Folder comparisons"
+msgstr "ÐÐÑÐÑÐÑÐ ÑÐÑÑÐÐÐÐ"
+
+#: ../data/ui/preferences.ui.h:21
msgid ""
"When performing directory comparisons, you may filter out files and "
"directories by name. Each pattern is a list of shell style wildcards "
@@ -342,15 +376,11 @@ msgstr ""
"ÐÑÐÐÐ ÐÐÐÐÐÑ. ÐÐÐÐÐ ÐÐÑÐÐÐÑ ÑÐ ÑÐÐÑÐÐ ÑÐÐÐÑÐ Ñ ÑÑÐÐÑ ÐÐÐÐÐÐÐ ÑÐÐÐÐÐÑÐÐÐÑ "
"ÑÐÐÐÐÐÐÐ."
-#: ../data/ui/preferences.ui.h:18
-msgid "Ignore symbolic links"
-msgstr "ÐÐÐÐÐÐÑÐ ÑÐÐÐÐÐÐÑÐÐ ÐÐÐÐ"
-
-#: ../data/ui/preferences.ui.h:19
+#: ../data/ui/preferences.ui.h:22
msgid "File Filters"
msgstr "ÐÐÐÑÐÑÐ ÐÐÑÐÑÐÐÐ"
-#: ../data/ui/preferences.ui.h:20
+#: ../data/ui/preferences.ui.h:23
msgid ""
"When performing file comparisons, you may ignore certain types of changes. "
"Each pattern here is a python regular expression which replaces matching "
@@ -363,24 +393,24 @@ msgstr ""
"ÐÑÐÐÐÐÐ ÐÐÑÐÐÐÐ ÐÑÐ ÐÐÐÑÑÐÐÐÑÐ ÐÐÑÐÑÐÑÐ. ÐÐÐ ÐÐÑÐÐ ÑÐÐÑÐÐ ÐÑÑÐÐ, ÑÐÐÐ ÐÑÑÐÐ "
"ÐÐÐÐÑÑ ÐÐÐÐÑÐÐÐ. ÐÐ ÐÐÑÐ ÐÐÑÐÑÐ ÐÐÐÐÐÐÐÑÑÐ ÑÐÑÑÑÑÐÐ ÐÐ ÐÐÑÐÑÐÐÐÐ."
-#: ../data/ui/preferences.ui.h:21
+#: ../data/ui/preferences.ui.h:24
msgid "Ignore changes which insert or delete blank lines"
msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÐÐÐ ÐÐÑÐ ÑÐÐÑÑÑÑ ÐÐÐ ÐÑÐÑÑ ÐÑÐÐÐÐ ÑÐÐÐÐÐ"
-#: ../data/ui/preferences.ui.h:22
+#: ../data/ui/preferences.ui.h:25
msgid "Text Filters"
msgstr "ÐÐÐÑÐÑÐ ÑÐÐÑÑÐ"
-#: ../data/ui/preferences.ui.h:23
+#: ../data/ui/preferences.ui.h:26
msgid "Loading"
msgstr "ÐÑÐÑÐÐÐÐ"
# bug: what encoding is iso8859? it's a registry of encodings, and encoding is eg. iso8859-5
-#: ../data/ui/preferences.ui.h:24
+#: ../data/ui/preferences.ui.h:27
msgid "When loading, try these codecs in order. (e.g. utf8, iso8859)"
msgstr "ÐÑÐ ÑÑÐÑÐÐÐÑÑ, ÐÑÐÐÐÑ ÐÐÐ ÐÐÐÐÑÐÑÐ ÑÐÐÐÐ. (ÐÐÑ. utf8, iso8859)"
-#: ../data/ui/preferences.ui.h:25
+#: ../data/ui/preferences.ui.h:28
msgid "Encoding"
msgstr "ÐÐÐÐÑÐÑÐ"
@@ -400,47 +430,47 @@ msgstr "ÐÑÐÑÑÐÐÐÐ ÐÐÐÐÐÐÑÐ"
msgid "Log Message"
msgstr "ÐÐÑÑÐÐ ÐÐÐÐÐÐÐÐ"
-#: ../meld/dirdiff.py:229 ../meld/vcview.py:125
+#: ../meld/dirdiff.py:234 ../meld/vcview.py:160
msgid "_Compare"
msgstr "_ÐÐÐÑÐÐÐ"
-#: ../meld/dirdiff.py:229 ../meld/vcview.py:125
+#: ../meld/dirdiff.py:234 ../meld/vcview.py:160
msgid "Compare selected"
msgstr "ÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐÐ"
-#: ../meld/dirdiff.py:230
+#: ../meld/dirdiff.py:235
msgid "Copy _Left"
msgstr "ÐÐÐÐÐÐ _ÐÐÐÐ"
-#: ../meld/dirdiff.py:230
+#: ../meld/dirdiff.py:235
msgid "Copy to left"
msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÐ"
-#: ../meld/dirdiff.py:231
+#: ../meld/dirdiff.py:236
msgid "Copy _Right"
msgstr "ÐÐÐÐÐÐ _ÐÐÑÐÐ"
-#: ../meld/dirdiff.py:231
+#: ../meld/dirdiff.py:236
msgid "Copy to right"
msgstr "ÐÐÐÐÐÐÑÐ ÐÐÑÐÐ"
-#: ../meld/dirdiff.py:232
+#: ../meld/dirdiff.py:237
msgid "Delete selected"
msgstr "ÐÐÑÐÑÐ ÐÐÐÐÑÐÐÐ"
-#: ../meld/dirdiff.py:233 ../meld/filediff.py:1216
+#: ../meld/dirdiff.py:238 ../meld/filediff.py:1247
msgid "Hide"
msgstr "ÐÐÐÑÐÑ"
-#: ../meld/dirdiff.py:233
+#: ../meld/dirdiff.py:238
msgid "Hide selected"
msgstr "ÐÐÐÑÐÑ ÐÐÐÐÑÐÐÐ"
-#: ../meld/dirdiff.py:237
+#: ../meld/dirdiff.py:242
msgid "Ignore filename case"
msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÐÑÐÐÑ ÑÐÐÐÐ ÐÐÐÐÐÐ ÐÐÑÐÑÐÐÐ"
-#: ../meld/dirdiff.py:237
+#: ../meld/dirdiff.py:242
msgid ""
"Consider differently-cased filenames that are otherwise-identical to be the "
"same"
@@ -448,73 +478,83 @@ msgstr ""
"ÐÐÐÑÑÐÑÐ ÐÑÑÐÐ ÑÐÐÐÐÑÐÑÐ ÐÐÐÐÑÐÐÐ ÑÐÐÐÐ Ñ ÐÐÐÐÐÐÐÐ ÐÐÑÐÑÐÐÐ ÐÐÑÐ ÑÑ "
"ÐÐÑÑÑÐÐÐÐ ÐÑÑÐÐÐÑÐÐ"
-#: ../meld/dirdiff.py:238
+#: ../meld/dirdiff.py:243
msgid "Same"
msgstr "ÐÑÑÐ"
-#: ../meld/dirdiff.py:238
+#: ../meld/dirdiff.py:243
msgid "Show identical"
msgstr "ÐÑÐÐÐÐÐ ÐÑÑÐÐÐÑÐÐ"
-#: ../meld/dirdiff.py:239
+#: ../meld/dirdiff.py:244
msgid "New"
msgstr "ÐÐÐÐ"
-#: ../meld/dirdiff.py:239
+#: ../meld/dirdiff.py:244
msgid "Show new"
msgstr "ÐÑÐÐÐÐÐ ÐÐÐÐ"
-#: ../meld/dirdiff.py:240
+#: ../meld/dirdiff.py:245
msgid "Modified"
msgstr "ÐÐÐÐÑÐÐÐ"
-#: ../meld/dirdiff.py:240 ../meld/vcview.py:137
+#: ../meld/dirdiff.py:245 ../meld/vcview.py:172
msgid "Show modified"
msgstr "ÐÑÐÐÐÐÐ ÐÐÐÐÑÐÐÐ"
-#: ../meld/dirdiff.py:242
+#: ../meld/dirdiff.py:247
msgid "Filters"
msgstr "ÐÐÐÑÐÑÐ"
-#: ../meld/dirdiff.py:242
+#: ../meld/dirdiff.py:247
msgid "Set active filters"
msgstr "ÐÐÐÐÑÐÑÐ ÐÐÑÐÐÐÐ ÑÐÐÑÐÑÐ"
-#: ../meld/dirdiff.py:406
+#. Create file size CellRenderer
+#: ../meld/dirdiff.py:320
+msgid "Size"
+msgstr "ÐÐÐÐÑÐÐÐ"
+
+#. Create date-time CellRenderer
+#: ../meld/dirdiff.py:327
+msgid "Modification time"
+msgstr "ÐÑÐÐÐ ÐÐÐÐÐÐ"
+
+#: ../meld/dirdiff.py:448
#, python-format
msgid "Hide %s"
msgstr "ÐÐÐÑÐÑ â%sâ"
-#: ../meld/dirdiff.py:510 ../meld/dirdiff.py:529 ../meld/vcview.py:326
-#: ../meld/vcview.py:350
+#: ../meld/dirdiff.py:562 ../meld/dirdiff.py:581 ../meld/vcview.py:370
+#: ../meld/vcview.py:394
#, python-format
msgid "[%s] Scanning %s"
msgstr "[%s] ÐÑÐÐÐÐÐÐÐ â%sâ"
-#: ../meld/dirdiff.py:628
+#: ../meld/dirdiff.py:680
#, python-format
msgid "[%s] Done"
msgstr "[%s] ÐÐÑÐÐÐ"
-#: ../meld/dirdiff.py:632
+#: ../meld/dirdiff.py:685
msgid "Multiple errors occurred while scanning this folder"
msgstr "ÐÐÑÐÐ ÑÐ ÐÐ ÐÐÑÐ ÐÑÐÑÐÐÐ ÐÐ ÐÑÐÐÐ ÐÑÐÑÑÐÐÐÐÐÑÐ ÐÐÐ ÑÐÑÑÐÐÐÐ"
-#: ../meld/dirdiff.py:633
+#: ../meld/dirdiff.py:686
msgid "Files with invalid encodings found"
msgstr "ÐÑÐÐÐÑÐÐÐ ÑÑ ÐÐÑÐÑÐÐÐ ÑÐ ÐÐÐÑÐÑÐÐÐÐÐ ÐÐÐÐÑÐÑÐÐ"
#. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:635
+#: ../meld/dirdiff.py:688
msgid "Some files were in an incorrect encoding. The names are something like:"
msgstr "ÐÐÐÐ ÐÐÑÐÑÐÐÐ ÐÐÑÐÑÑ Ñ ÐÐÐÑÐÑÐÐÐÐÐ ÐÐÐÐÑÐÑÑ. ÐÐÐÐÐÐ ÑÑ ÐÐÑÑÐ ÐÐÐ:"
-#: ../meld/dirdiff.py:637
+#: ../meld/dirdiff.py:690
msgid "Files hidden by case insensitive comparison"
msgstr "ÐÐÑÐÑÐÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑÐÑÐÑÐÐ ÐÐÐÑÐÑÑÐÐÐÐ ÐÐ ÐÐÐÐÑÐÐÑ ÑÐÐÐÐ"
#. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:639
+#: ../meld/dirdiff.py:692
msgid ""
"You are running a case insensitive comparison on a case sensitive "
"filesystem. The following files in this folder are hidden:"
@@ -522,17 +562,17 @@ msgstr ""
"ÐÐÐÑÐÐÑÐÐ ÑÑÐ ÐÐÑÐÑÐÑÐ ÐÐÐÐÐÐÑÐÐ ÐÐ ÐÐÐÐÑÐÐÐ ÑÐÐÐÐ ÐÐ ÑÐÑÑÐÐÑ ÐÐÑÐÑÐÐÐ ÐÐÐ "
"ÑÐ ÐÐÐ ÐÐÑÐÐ. ÐÐÐÐ ÐÐÑÐÑÐÐÐ ÐÐÑÑ ÐÐÐÑÐÐÐ:"
-#: ../meld/dirdiff.py:650
+#: ../meld/dirdiff.py:703
#, python-format
msgid "'%s' hidden by '%s'"
msgstr "â%sâ ÑÐÐÑÐÐÐÐÐ ÐÐ ÑÑÑÐÐÐ â%sâ"
-#: ../meld/dirdiff.py:675 ../meld/filediff.py:979 ../meld/filediff.py:1220
-#: ../meld/vcview.py:572 ../meld/vcview.py:614
+#: ../meld/dirdiff.py:728 ../meld/filediff.py:1010 ../meld/filediff.py:1251
+#: ../meld/vcview.py:620 ../meld/vcview.py:662
msgid "Hi_de"
msgstr "_ÐÐÐÑÐÑ"
-#: ../meld/dirdiff.py:725
+#: ../meld/dirdiff.py:760
#, python-format
msgid ""
"'%s' exists.\n"
@@ -541,7 +581,7 @@ msgstr ""
"â%sâ ÐÐÑÑÐÑÐ.\n"
"ÐÐ ÐÑÐÑÐÐÐÐÐ?"
-#: ../meld/dirdiff.py:732
+#: ../meld/dirdiff.py:767
#, python-format
msgid ""
"Error copying '%s' to '%s'\n"
@@ -552,7 +592,7 @@ msgstr ""
"\n"
"%s."
-#: ../meld/dirdiff.py:750 ../meld/vcview.py:546
+#: ../meld/dirdiff.py:785 ../meld/vcview.py:594
#, python-format
msgid ""
"'%s' is a directory.\n"
@@ -561,7 +601,7 @@ msgstr ""
"â%sâ ÑÐ ÑÐÑÑÐÐÐÐ.\n"
"ÐÐ ÑÐÐÐÐÐÐ ÑÐÐÑÑÐÐÐÐÐ?"
-#: ../meld/dirdiff.py:757 ../meld/vcview.py:551
+#: ../meld/dirdiff.py:792 ../meld/vcview.py:599
#, python-format
msgid ""
"Error removing %s\n"
@@ -572,7 +612,7 @@ msgstr ""
"\n"
"%s."
-#: ../meld/dirdiff.py:842
+#: ../meld/dirdiff.py:892
#, python-format
msgid "%i second"
msgid_plural "%i seconds"
@@ -581,7 +621,7 @@ msgstr[1] "%i ÑÐÐÑÐÐÐ"
msgstr[2] "%i ÑÐÐÑÐÐÐ"
msgstr[3] "%i ÑÐÐÑÐÐÐ"
-#: ../meld/dirdiff.py:843
+#: ../meld/dirdiff.py:893
#, python-format
msgid "%i minute"
msgid_plural "%i minutes"
@@ -590,7 +630,7 @@ msgstr[1] "%i ÐÐÐÑÑÐ"
msgstr[2] "%i ÐÐÐÑÑÐ"
msgstr[3] "%i ÐÐÐÑÑ"
-#: ../meld/dirdiff.py:844
+#: ../meld/dirdiff.py:894
#, python-format
msgid "%i hour"
msgid_plural "%i hours"
@@ -599,7 +639,7 @@ msgstr[1] "%i ÑÐÑÐ"
msgstr[2] "%i ÑÐÑÐ"
msgstr[3] "%i ÑÐÑ"
-#: ../meld/dirdiff.py:845
+#: ../meld/dirdiff.py:895
#, python-format
msgid "%i day"
msgid_plural "%i days"
@@ -608,7 +648,7 @@ msgstr[1] "%i ÐÐÐÐ"
msgstr[2] "%i ÐÐÐÐ"
msgstr[3] "%i ÐÐÐ"
-#: ../meld/dirdiff.py:846
+#: ../meld/dirdiff.py:896
#, python-format
msgid "%i week"
msgid_plural "%i weeks"
@@ -617,7 +657,7 @@ msgstr[1] "%i ÐÐÐÐÑÐ"
msgstr[2] "%i ÐÐÐÐÑÐ"
msgstr[3] "%i ÐÐÐÐÑÐ"
-#: ../meld/dirdiff.py:847
+#: ../meld/dirdiff.py:897
#, python-format
msgid "%i month"
msgid_plural "%i months"
@@ -626,7 +666,7 @@ msgstr[1] "%i ÐÐÑÐÑÐ"
msgstr[2] "%i ÐÐÑÐÑÐ"
msgstr[3] "%i ÐÐÑÐÑ"
-#: ../meld/dirdiff.py:848
+#: ../meld/dirdiff.py:898
#, python-format
msgid "%i year"
msgid_plural "%i years"
@@ -635,159 +675,159 @@ msgstr[1] "%i ÐÐÐÐÐÐ"
msgstr[2] "%i ÐÐÐÐÐÐ"
msgstr[3] "%i ÐÐÐÐÐÐ"
-#: ../meld/filediff.py:214
+#: ../meld/filediff.py:228
msgid "Format as patch..."
msgstr "ÐÐÑÐÐÑÐÑÐÑ ÐÐÐ ÐÑÐÑÐÐÐÑ..."
-#: ../meld/filediff.py:214
+#: ../meld/filediff.py:228
msgid "Create a patch using differences between files"
msgstr "ÐÐÐÑÐÐÐÑÐ ÐÑÐÑÐÐÐÑ ÐÐÑÐÑÑÐÑÐ ÑÐÐÐÐÐÐ ÐÐÐÐÑÑ ÐÐÑÐÑÐÐÐ"
-#: ../meld/filediff.py:215
+#: ../meld/filediff.py:229
msgid "Previous conflict"
msgstr "ÐÑÐÑÑÐÐÐÐ ÑÑÐÐÐ"
-#: ../meld/filediff.py:215
+#: ../meld/filediff.py:229
msgid "Go to the previous conflict"
msgstr "ÐÐÐÑÐ ÐÐ ÐÑÐÑÑÐÐÐÐ ÑÑÐÐÐ"
-#: ../meld/filediff.py:216
+#: ../meld/filediff.py:230
msgid "Next conflict"
msgstr "ÐÐÐÐÐÑÐ ÑÑÐÐÐ"
-#: ../meld/filediff.py:216
+#: ../meld/filediff.py:230
msgid "Go to the next conflict"
msgstr "ÐÐÐÑÐ ÐÐ ÑÐÐÐÐÑÐ ÑÑÐÐÐ"
-#: ../meld/filediff.py:217
+#: ../meld/filediff.py:231
msgid "Push to left"
msgstr "ÐÑÑÐÐ ÑÐÐÐÐ"
-#: ../meld/filediff.py:217
+#: ../meld/filediff.py:231
msgid "Push current change to the left"
msgstr "ÐÑÑÐÐÑÐ ÑÐÐÑÑÑ ÐÐÐÐÐÑ ÑÐÐÐÐ"
-#: ../meld/filediff.py:218
+#: ../meld/filediff.py:232
msgid "Push to right"
msgstr "ÐÑÑÐÐ ÑÐÐÑÐÐ"
-#: ../meld/filediff.py:218
+#: ../meld/filediff.py:232
msgid "Push current change to the right"
msgstr "ÐÑÑÐÐÑÐ ÑÐÐÑÑÑ ÐÐÐÐÐÑ ÑÐÐÑÐÐ"
#. FIXME: using LAST and FIRST is terrible and unreliable icon abuse
-#: ../meld/filediff.py:220
+#: ../meld/filediff.py:234
msgid "Pull from left"
msgstr "ÐÐÐÑÐ Ñ ÐÐÐÐ"
-#: ../meld/filediff.py:220
+#: ../meld/filediff.py:234
msgid "Pull change from the left"
msgstr "ÐÐÐÑÐÑÐ ÐÐÐÐÐÑ Ñ ÐÐÐÐ"
-#: ../meld/filediff.py:221
+#: ../meld/filediff.py:235
msgid "Pull from right"
msgstr "ÐÐÐÑÐ Ñ ÐÐÑÐÐ"
-#: ../meld/filediff.py:221
+#: ../meld/filediff.py:235
msgid "Pull change from the right"
msgstr "ÐÐÐÑÐÑÐ ÐÐÐÐÐÑ Ñ ÐÐÑÐÐ"
-#: ../meld/filediff.py:222
+#: ../meld/filediff.py:236
msgid "Copy above left"
msgstr "ÐÐÐÐÐÐ ÐÐÐÐÐ ÑÐÐÐÐ"
-#: ../meld/filediff.py:222
+#: ../meld/filediff.py:236
msgid "Copy change above the left chunk"
msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÐÐÑ ÐÐÐÐÐ ÐÐÐÐÐÐ ÑÐÐÐÐ"
-#: ../meld/filediff.py:223
+#: ../meld/filediff.py:237
msgid "Copy below left"
msgstr "ÐÐÐÐÐÐ ÐÑÐÐÐ ÑÐÐÐÐ"
-#: ../meld/filediff.py:223
+#: ../meld/filediff.py:237
msgid "Copy change below the left chunk"
msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÐÐÑ ÐÑÐÐÐ ÐÐÐÐÐÐ ÑÐÐÐÐ"
-#: ../meld/filediff.py:224
+#: ../meld/filediff.py:238
msgid "Copy above right"
msgstr "ÐÐÐÐÐÐ ÐÐÐÐÐ ÑÐÐÑÐÐ"
-#: ../meld/filediff.py:224
+#: ../meld/filediff.py:238
msgid "Copy change above the right chunk"
msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÐÐÑ ÐÐÐÐÐ ÐÐÐÐÐÐ ÑÐÐÑÐÐ"
-#: ../meld/filediff.py:225
+#: ../meld/filediff.py:239
msgid "Copy below right"
msgstr "ÐÐÐÐÐÐ ÐÑÐÐÐ ÑÐÐÑÐÐ"
-#: ../meld/filediff.py:225
+#: ../meld/filediff.py:239
msgid "Copy change below the right chunk"
msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÐÐÑ ÐÑÐÐÐ ÐÐÐÐÐÐ ÑÐÐÑÐÐ"
-#: ../meld/filediff.py:226
+#: ../meld/filediff.py:240
msgid "Delete"
msgstr "ÐÐÑÐÑÐ"
-#: ../meld/filediff.py:226
+#: ../meld/filediff.py:240
msgid "Delete change"
msgstr "ÐÐÑÐÑÐÑÐ ÐÐÐÐÐÑ"
-#: ../meld/filediff.py:227
+#: ../meld/filediff.py:241
msgid "Merge all changes from left"
msgstr "ÐÐÑÐÐÐÐÐ ÑÐÐ ÐÐÐÐÐÐ Ñ ÐÐÐÐ"
-#: ../meld/filediff.py:227
+#: ../meld/filediff.py:241
msgid "Merge all non-conflicting changes from the left"
msgstr "ÐÐÑÐÐÐÐÐÑÐ ÑÐÐ ÐÐÑÑÐÐÐÑÐÐÐÑÑÑÐ ÐÐÐÐÐÐ Ñ ÐÐÐÐ"
-#: ../meld/filediff.py:228
+#: ../meld/filediff.py:242
msgid "Merge all changes from right"
msgstr "ÐÐÑÐÐÐÐÐ ÑÐÐ ÐÐÐÐÐÐ Ñ ÐÐÑÐÐ"
-#: ../meld/filediff.py:228
+#: ../meld/filediff.py:242
msgid "Merge all non-conflicting changes from the right"
msgstr "ÐÐÑÐÐÐÐÐÑÐ ÑÐÐ ÐÐÑÑÐÐÐÑÐÐÐÑÑÑÐ ÐÐÐÐÐÐ Ñ ÐÐÑÐÐ"
-#: ../meld/filediff.py:229
+#: ../meld/filediff.py:243
msgid "Merge all non-conflicting"
msgstr "ÐÐÑÐÐÐÐÐ ÑÐÐ ÐÐÑÑÐÐÐÑÐÐÐÑÑÑÐ"
-#: ../meld/filediff.py:229
+#: ../meld/filediff.py:243
msgid "Merge all non-conflicting changes from left and right panes"
msgstr "ÐÐÑÐÐÐÐÐÑÐ ÑÐÐ ÐÐÑÑÐÐÐÑÐÐÐÑÑÑÐ ÐÐÐÐÐÐ Ñ ÐÐÐÐ Ð ÐÐÑÐÐ ÐÐÐÑÑÐ"
-#: ../meld/filediff.py:230
+#: ../meld/filediff.py:244
msgid "Cycle through documents"
msgstr "ÐÑÑÐÐ ÐÑÐÐ ÐÐÐÑÐÐÐÑÐ"
-#: ../meld/filediff.py:230
+#: ../meld/filediff.py:244
msgid "Move keyboard focus to the next document in this comparison"
msgstr "ÐÑÐÐÐÑÑÐÑÐ ÑÐÐÑÑ ÑÐÑÑÐÑÑÑÐ ÐÐ ÑÐÐÐÐÑÐ ÐÐÐÑÐÐÐÑ Ñ ÐÐÐÐ ÐÐÑÐÑÐÑÑ"
-#: ../meld/filediff.py:234
+#: ../meld/filediff.py:248
msgid "Lock scrolling"
msgstr "ÐÐÐÑÑÑÐÑ ÐÐÐÐÐÑÐ"
-#: ../meld/filediff.py:235
+#: ../meld/filediff.py:249
msgid "Lock scrolling of all panes"
msgstr "ÐÐÐÑÑÑÐÑÑÐ ÐÐÐÐÐÑÐ ÑÐÐÑ ÐÐÐÑÑÐ"
#. Abbreviations for insert and overwrite that fit in the status bar
-#: ../meld/filediff.py:353
+#: ../meld/filediff.py:365
msgid "INS"
msgstr "ÐÐÐÐ"
-#: ../meld/filediff.py:353
+#: ../meld/filediff.py:365
msgid "OVR"
msgstr "ÐÐÐÐ"
#. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:355
+#: ../meld/filediff.py:367
#, python-format
msgid "Ln %i, Col %i"
msgstr "ÐÐÐ %i, ÐÐÑÑÐ %i"
-#: ../meld/filediff.py:682
+#: ../meld/filediff.py:703
#, python-format
msgid ""
"Filter '%s' changed the number of lines in the file. Comparison will be "
@@ -796,42 +836,42 @@ msgstr ""
"ÐÐÐÑÐÑ â%sâ ÑÐ ÐÐÐÐÐÐÐ ÐÑÐÑ ÑÐÐÐÐÐ Ñ ÐÐÑÐÑÐÑÐ. ÐÐÑÐÑÐÑÐ ÐÐÑÐ ÐÐÑÐ ÑÐÑÐÐ. ÐÐ "
"ÐÐÑÐ ÐÐÑÐÑÐ ÐÐÐÐÐÐÐÑÑÐ ÐÑÐÑÑÑÐÐÐ ÐÐ ÐÐÑÐÑÐÐÐÐ."
-#: ../meld/filediff.py:967
+#: ../meld/filediff.py:998
#, python-format
msgid "[%s] Set num panes"
msgstr "[%s] ÐÐÑÑÐÐÐ ÐÑÐÑ ÐÐÐÑÐ"
-#: ../meld/filediff.py:973
+#: ../meld/filediff.py:1004
#, python-format
msgid "[%s] Opening files"
msgstr "[%s] ÐÑÐÐÑÐÐ ÐÐÑÐÑÐÐÐ"
-#: ../meld/filediff.py:997 ../meld/filediff.py:1007 ../meld/filediff.py:1020
-#: ../meld/filediff.py:1026
+#: ../meld/filediff.py:1028 ../meld/filediff.py:1038 ../meld/filediff.py:1051
+#: ../meld/filediff.py:1057
msgid "Could not read file"
msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÑÐÑÐÐ ÐÐÑÐÑÐÐÑ"
-#: ../meld/filediff.py:998
+#: ../meld/filediff.py:1029
#, python-format
msgid "[%s] Reading files"
msgstr "[%s] ÐÐÑÐÐ ÐÐÑÐÑÐÐÐ"
-#: ../meld/filediff.py:1008
+#: ../meld/filediff.py:1039
#, python-format
msgid "%s appears to be a binary file."
msgstr "â%sâ ÐÐÐÐÐÐÐ ÐÐ ÑÐ ÐÐÐÑÑÐÐ ÐÐÑÐÑÐÐÐ."
-#: ../meld/filediff.py:1021
+#: ../meld/filediff.py:1052
#, python-format
msgid "%s is not in encodings: %s"
msgstr "â%sâ ÐÐÑÐ Ñ ÐÐÐÐÑÐÑÐÐÐ: â%sâ"
-#: ../meld/filediff.py:1052
+#: ../meld/filediff.py:1083
#, python-format
msgid "[%s] Computing differences"
msgstr "[%s] ÐÑÐÑÑÐÐÐÐÐ ÑÐÐÐÐÐÐ"
-#: ../meld/filediff.py:1207
+#: ../meld/filediff.py:1238
msgid ""
"Text filters are being used, and may be masking differences between files. "
"Would you like to compare the unfiltered files?"
@@ -839,15 +879,15 @@ msgstr ""
"ÐÐÑÐÑÑÐÐÐ ÑÑ ÑÐÐÑÐÑÐ ÑÐÐÑÑÐ, Ð ÐÐÐÑ ÐÐÑÑÐÑÐÑÐ Ð ÐÐÐÐÑÐÐÑÐÐÐ ÑÐÐÐÐÐÐ ÐÐÐÐÑÑ "
"ÐÐÑÐÑÐÐÐ. ÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÑÐÐÐÑÐ ÐÐÑÐÐÑÑÐÑÐÐÐ ÐÐÑÐÑÐÐÐ?"
-#: ../meld/filediff.py:1213
+#: ../meld/filediff.py:1244
msgid "Files are identical"
msgstr "ÐÐÑÐÑÐÐÐ ÑÑ ÐÑÑÐÐÐÑÐÐ"
-#: ../meld/filediff.py:1223
+#: ../meld/filediff.py:1254
msgid "Show without filters"
msgstr "ÐÑÐÐÐÐÑÑÐ ÐÐÐ ÑÐÐÑÐÑÐ"
-#: ../meld/filediff.py:1347
+#: ../meld/filediff.py:1378
#, python-format
msgid ""
"\"%s\" exists!\n"
@@ -856,7 +896,7 @@ msgstr ""
"â%sâ ÐÐÑÑÐÑÐ!\n"
"ÐÐ ÐÑÐÑÐÐÐÐÐ?"
-#: ../meld/filediff.py:1360
+#: ../meld/filediff.py:1391
#, python-format
msgid ""
"Error writing to %s\n"
@@ -867,12 +907,12 @@ msgstr ""
"\n"
"%s."
-#: ../meld/filediff.py:1369
+#: ../meld/filediff.py:1400
#, python-format
msgid "Choose a name for buffer %i."
msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐÐÐÐ ÐÐ %i. ÐÐÑÐÑ."
-#: ../meld/filediff.py:1384
+#: ../meld/filediff.py:1416
#, python-format
msgid ""
"This file '%s' contains a mixture of line endings.\n"
@@ -883,7 +923,7 @@ msgstr ""
"\n"
"ÐÐÑÐ ÐÐÐÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÑÐÑÑÐÑÐ?"
-#: ../meld/filediff.py:1400
+#: ../meld/filediff.py:1432
#, python-format
msgid ""
"'%s' contains characters not encodable with '%s'\n"
@@ -892,376 +932,387 @@ msgstr ""
"â%sâ ÑÐÐÑÐÐ ÐÐÐÐÐÐÐ ÐÐÑÐ ÑÐ ÐÐ ÐÐÐÑ ÐÐÐÐÑÐÑÐ ÑÐ â%sâ\n"
"ÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐ ÑÐÑÑÐÐÑÐ ÐÐÐ ÐÐÐ-8?"
-#: ../meld/filediff.py:1457
-#, python-format
-msgid ""
-"Reloading will discard changes in:\n"
-"%s\n"
-"\n"
-"You cannot undo this operation."
-msgstr ""
-"ÐÑÐÐÐÐÐÐÑÐ ÑÐ ÐÐÐÐÑÐÑÐ ÐÐÐÐÐÐ Ñ:\n"
-"%s\n"
-"\n"
-"ÐÐÑ ÐÐÐÑÐÑÐÑÑ ÐÐ ÐÐÐÐÑÐ ÐÐÐÐÐÐÑÐ."
+#: ../meld/filediff.py:1497
+msgid "Save changes to documents before reloading?"
+msgstr "ÐÐ ÑÐÑÑÐÐÐ ÐÐÐÐÐÐ Ñ ÐÐÐÑÐÐÐÑÑ ÐÑÐ ÐÐÐÐÐÐÐÐ ÑÑÐÑÐÐÐÑÐ?"
-#: ../meld/filemerge.py:47
+#: ../meld/filemerge.py:53
#, python-format
msgid "[%s] Merging files"
msgstr "[%s] ÐÐÑÐÐÐÑÑÑÐÐ ÐÐÑÐÑÐÐÐ"
-#: ../meld/meldapp.py:152
+#: ../meld/meldapp.py:95
msgid "wrong number of arguments supplied to --diff"
msgstr "ÐÐÐÑÐÑÐÐ ÐÑÐÑ ÐÑÐÑÐÐÐÐÑÐ ÐÑÐÐÐÐÐÑ ÑÐ â--diffâ"
-#: ../meld/meldapp.py:156
+#: ../meld/meldapp.py:99
msgid "Start with an empty window"
msgstr "ÐÑÐÐÑÐ ÑÐÐÐÐ ÐÑÐÐÐÐ ÐÑÐÐÐÑ"
# bug: string composition is bad i18n, and will make l10n hard
-#: ../meld/meldapp.py:157 ../meld/meldapp.py:158 ../meld/meldapp.py:160
+#: ../meld/meldapp.py:100 ../meld/meldapp.py:102 ../meld/meldapp.py:106
msgid "file"
msgstr "ÐÐÑÐÑÐÐÐ"
-#: ../meld/meldapp.py:157 ../meld/meldapp.py:159 ../meld/meldapp.py:160
+#: ../meld/meldapp.py:100 ../meld/meldapp.py:104 ../meld/meldapp.py:106
msgid "dir"
msgstr "ÐÐÑ"
-#: ../meld/meldapp.py:157
+#: ../meld/meldapp.py:101
msgid "Start a version control comparison"
msgstr "ÐÐÐÑÐÑÐ ÐÐÑÐÑÐÑÐ ÐÐÐÑÑÐÐÐ ÐÐÑÐÐÑÐ"
-#: ../meld/meldapp.py:158
+#: ../meld/meldapp.py:103
msgid "Start a 2- or 3-way file comparison"
msgstr "ÐÐÐÑÐÑÐ ÐÐÑÐÑÐÑÐ 2 ÐÐÐ 3 ÐÐÐÐÐÐÑÐ ÐÐÑÐÑÐÐÐ"
-#: ../meld/meldapp.py:159
+#: ../meld/meldapp.py:105
msgid "Start a 2- or 3-way directory comparison"
msgstr "ÐÐÐÑÐÑÐ ÐÐÑÐÑÐÑÐ 2 ÐÐÐ 3 ÐÐÐÐÐÐÑÐ ÑÐÑÑÐÐÐÐ"
-#: ../meld/meldapp.py:160
+#: ../meld/meldapp.py:107
msgid "Start a comparison between file and dir/file"
msgstr "ÐÐÐÑÐÑÐ ÐÐÑÐÑÐÑÐ ÐÐÐÐÑÑ ÐÐÑÐÑÐÐÐ Ð ÑÐÑÑÐÐÐÐ/ÐÐÑÐÑÐÐÐ"
-#: ../meld/meldapp.py:166
+#: ../meld/meldapp.py:114
msgid "Meld is a file and directory comparison tool."
msgstr "ÐÐÐÐ ÑÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÐÑÐ ÐÐÑÐÑÐÐÐ Ð ÑÐÑÑÐÐÐÐ."
-#: ../meld/meldapp.py:169
+#: ../meld/meldapp.py:117
msgid "Set label to use instead of file name"
msgstr "ÐÐÐÐÑÐÐÐ ÐÐÐÐÐÑ ÐÐ ÐÐÑÐÑÑÐÑÐ ÑÐÐÑÑÐ ÐÐÐÐÐÐ ÐÐÑÐÑÐÐÐ"
-#: ../meld/meldapp.py:171
+#: ../meld/meldapp.py:119
msgid "Open a new tab in an already running instance"
msgstr "ÐÑÐÐÑÐ ÐÐÐÐ ÑÐÐÐÑÐÐ Ñ ÑÐÐÐÐÐ ÐÐÑ ÐÑÐÐÑÐÐÐÐ ÐÑÐÐÐÑÐÑ"
-#: ../meld/meldapp.py:173
+#: ../meld/meldapp.py:122
msgid "Automatically compare all differing files on startup"
msgstr "ÐÐÐÐÑÑÐÐÐÐ ÐÐÑÐÐÐ ÑÐÐ ÑÐÐÐÐÐÑÑÑÑÐ ÐÐÑÐÑÐÐÐ ÐÑÐÐÐÐÐÐ ÐÐÐÑÐÑÐÑÐ"
-#: ../meld/meldapp.py:175
+#: ../meld/meldapp.py:124
msgid "Ignored for compatibility"
msgstr "ÐÐÐÐÐÐÑÐÐÐ ÐÐÐÐ ÑÐÐÐÐÑÐÐÑÑÐ"
-#: ../meld/meldapp.py:178
+#: ../meld/meldapp.py:127
msgid "Set the target file for saving a merge result"
msgstr "ÐÐÐÐÑÐÐÐ ÑÐÑÐÑ ÐÐÑÐÑÐÐÑ ÐÐ ÑÑÐÐÑÐ ÑÐÐÑÐÑÐÑÐ ÑÑÐÐÐÑÐ"
-#: ../meld/meldapp.py:180
+#: ../meld/meldapp.py:129
msgid "Automatically merge files"
msgstr "ÐÐÐÐÑÑÐÐÐÐ ÑÑÐÐÐ ÐÐÑÐÑÐÐÐ"
-#: ../meld/meldapp.py:183
-msgid "Creates a diff tab for up to 3 supplied files or directories."
-msgstr "ÐÑÐÐÐ ÑÐÐÐÑÐÐ ÑÐÐÐÐÐÐ ÐÐ ÐÐÑÐÐÑÐ ÐÐ 3 ÐÑÐÐÐÐÐÑÐ ÐÐÑÐÑÐÐÐ ÐÐÐ ÑÐÑÑÐÐÐÐ."
+#: ../meld/meldapp.py:132
+msgid "Load a saved comparison from a Meld comparison file"
+msgstr "ÐÑÐÑÐÐÐ ÑÐÑÑÐÐÐÐ ÐÐÑÐÑÐÑÐ ÐÐ ÐÐÐÐÐÐÐ ÐÐÑÐÑÐÐÐ ÐÐÑÐÑÐÑÐ"
+
+#: ../meld/meldapp.py:135
+#| msgid "Creates a diff tab for up to 3 supplied files or directories."
+msgid "Create a diff tab for the supplied files or folders"
+msgstr "ÐÑÐÐÐ ÑÐÐÐÑÐÐ ÑÐÐÐÐÐÐ ÐÑÐÐÐÐÐÑÐ ÐÐÑÐÑÐÐÐ ÐÐÐ ÑÐÑÑÐÐÐÐ"
-#: ../meld/meldapp.py:186
+#: ../meld/meldapp.py:138
#, python-format
msgid "too many arguments (wanted 0-3, got %d)"
msgstr "ÐÑÐÐÐÑÐ ÐÑÐÑÐÐÐÐÑÐ (ÑÑÐÐÐÐÐ ÑÐ 0-3, ÐÐÐÐÑ %d)"
-#: ../meld/meldapp.py:188
+#: ../meld/meldapp.py:141
msgid "can't auto-merge less than 3 files"
msgstr "ÐÐ ÐÐÐÑ ÑÐÐÐÑÑÐÐÐÐ ÐÐ ÑÑÐÐÐÐ ÐÐÑÐ ÐÐ 3 ÐÐÑÐÑÐÐÐ"
-#: ../meld/meldapp.py:190
+#: ../meld/meldapp.py:143
msgid "can't auto-merge directories"
msgstr "ÐÐ ÐÐÐÑ ÑÐÐÐÑÑÐÐÐÐ ÐÐ ÑÑÐÐÐÐ ÐÐÑÐÐÑÐÑÐÑÑÐÐ"
-#: ../meld/meldapp.py:196
+#: ../meld/meldapp.py:149
msgid "D-Bus error; comparisons will open in a new window."
msgstr "ÐÑÐÑÐÐ Ð-ÑÐÐÐÑÐÐÑÐ; ÐÐÑÐÑÐÑÐ ÑÐ ÑÐ ÐÑÐÐÑÐÑÐ Ñ ÐÐÐÐÐ ÐÑÐÐÐÑÑ."
+#: ../meld/meldapp.py:167
+#| msgid "Error fetching original comparison file"
+msgid "Error reading saved comparison file"
+msgstr "ÐÑÐÑÐÐ ÑÐÑÐÑÐ ÑÐÑÑÐÐÐÐ ÐÐÑÐÑÐÐÐ ÐÐÑÐÑÐÑÐ"
+
#. TRANSLATORS: This is the label of a new, currently-unnamed file.
-#: ../meld/meldbuffer.py:83
+#: ../meld/meldbuffer.py:89
msgid "<unnamed>"
msgstr "<ÐÐÐÐÐÐÐÐÐÐ>"
-#: ../meld/melddoc.py:57 ../meld/melddoc.py:58
+#: ../meld/melddoc.py:58 ../meld/melddoc.py:59
msgid "untitled"
msgstr "ÐÐÐÐÐÐÐÐ"
-#: ../meld/meldwindow.py:110
+#: ../meld/meldwindow.py:116
msgid "_File"
msgstr "_ÐÐÑÐÑÐÐÐ"
-#: ../meld/meldwindow.py:111
+#: ../meld/meldwindow.py:117
msgid "_New..."
msgstr "_ÐÐÐÐ..."
-#: ../meld/meldwindow.py:111
+#: ../meld/meldwindow.py:117
msgid "Start a new comparison"
msgstr "ÐÐÐÐÑÐÐÑÐ ÐÐÐÐ ÐÐÑÐÑÐÑÐ"
-#: ../meld/meldwindow.py:112
+#: ../meld/meldwindow.py:118
msgid "Save the current file"
msgstr "ÐÐÑÑÐÐÑÑÐ ÑÑÐÐÑÑÐÑ ÐÐÑÐÑÐÐÑ"
-#: ../meld/meldwindow.py:114
+#: ../meld/meldwindow.py:120
msgid "Close the current file"
msgstr "ÐÐÑÐÐÑÐÑÐ ÑÑÐÐÑÑÐÑ ÐÐÑÐÑÐÐÑ"
-#: ../meld/meldwindow.py:115
+#: ../meld/meldwindow.py:121
msgid "Quit the program"
msgstr "ÐÐÑÐÐÑÐÑÐ ÐÑÐÐÑÐÐ"
-#: ../meld/meldwindow.py:117
+#: ../meld/meldwindow.py:123
msgid "_Edit"
msgstr "_ÐÑÐÑÐÐÐÑÐ"
-#: ../meld/meldwindow.py:118
+#: ../meld/meldwindow.py:124
msgid "Undo the last action"
msgstr "ÐÐÐÐÐÐÐÑÐ ÐÐÑÐÐÐÑÑ ÑÐÐÑÑ"
-#: ../meld/meldwindow.py:119
+#: ../meld/meldwindow.py:125
msgid "Redo the last undone action"
msgstr "ÐÐÐÐÐÐÑÐ ÐÐÑÐÐÐÑÑ ÐÐÐÐÐÐÐÑ ÑÐÐÑÑ"
-#: ../meld/meldwindow.py:120
+#: ../meld/meldwindow.py:126
msgid "Cut the selection"
msgstr "ÐÑÐÑÐÑÐ ÐÐÐÐÑ"
-#: ../meld/meldwindow.py:121
+#: ../meld/meldwindow.py:127
msgid "Copy the selection"
msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÐÑ"
-#: ../meld/meldwindow.py:122
+#: ../meld/meldwindow.py:128
msgid "Paste the clipboard"
msgstr "ÐÐÐÑÐÑÐ ÐÑÑÐÐÑ"
-#: ../meld/meldwindow.py:123
+#: ../meld/meldwindow.py:129
msgid "Search for text"
msgstr "ÐÑÐÐÐÑÐ ÑÐÐÑÑ"
-#: ../meld/meldwindow.py:124
+#: ../meld/meldwindow.py:130
msgid "Find Ne_xt"
msgstr "ÐÐÑÐ Ñ_ÐÐÐÐÑÐ"
-#: ../meld/meldwindow.py:124
+#: ../meld/meldwindow.py:130
msgid "Search forwards for the same text"
msgstr "ÐÑÐÐÐÑÐ ÑÐÐÐÑÐÐ ÐÑÑÐ ÑÐÐÑÑ"
-#: ../meld/meldwindow.py:125
+#: ../meld/meldwindow.py:131
msgid "Find _Previous"
msgstr "ÐÐÑÐ ÐÑÐ_ÑÑÐÐÐÐ"
-#: ../meld/meldwindow.py:125
+#: ../meld/meldwindow.py:131
msgid "Search backwards for the same text"
msgstr "ÐÑÐÐÐÑÐ ÑÐÐÐÐÐ ÐÑÑÐ ÑÐÐÑÑ"
-#: ../meld/meldwindow.py:126
+#: ../meld/meldwindow.py:132
msgid "Find and replace text"
msgstr "ÐÑÐÐÐÑÐÑÐ Ð ÐÐÐÐÐÐÑÐ ÑÐÐÑÑ"
-#: ../meld/meldwindow.py:127
+#: ../meld/meldwindow.py:133
msgid "Prefere_nces"
msgstr "ÐÐÑ_ÑÐÐÐÐ"
-#: ../meld/meldwindow.py:127
+#: ../meld/meldwindow.py:133
msgid "Configure the application"
msgstr "ÐÐÐÐÑÐÑÐ ÐÑÐÐÑÐÐ"
-#: ../meld/meldwindow.py:129
+#: ../meld/meldwindow.py:135
msgid "_Changes"
msgstr "_ÐÐÐÐÐÐ"
-#: ../meld/meldwindow.py:130
+#: ../meld/meldwindow.py:136
msgid "Next change"
msgstr "ÐÐÐÐÐÑÐ ÐÐÐÐÐÐ"
-#: ../meld/meldwindow.py:130
+#: ../meld/meldwindow.py:136
msgid "Go to the next change"
msgstr "ÐÐÐÑÐ ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÑ"
-#: ../meld/meldwindow.py:131
+#: ../meld/meldwindow.py:137
msgid "Previous change"
msgstr "ÐÑÐÑÑÐÐÐÐ ÐÐÐÐÐÐ"
-#: ../meld/meldwindow.py:131
+#: ../meld/meldwindow.py:137
msgid "Go to the previous change"
msgstr "ÐÐÐÑÐ ÐÐ ÐÑÐÑÑÐÐÐÑ ÐÐÐÐÐÑ"
-#: ../meld/meldwindow.py:132
+#: ../meld/meldwindow.py:138
msgid "Open externally"
msgstr "ÐÑÐÐÑÐ ÑÐÐÑÐÐÐ"
-#: ../meld/meldwindow.py:132
+#: ../meld/meldwindow.py:138
msgid "Open selected file or directory in the default external application"
msgstr "ÐÑÐÐÑÐÑÐ ÐÐÐÐÑÐÐÑ ÐÐÑÐÑÐÐÑ ÐÐÐ ÑÐÑÑÐÐÐÑ Ñ ÐÑÐÐÐÐÐÐ ÑÐÐÑÐÐÐ ÐÑÐÐÑÐÐÑ"
-#: ../meld/meldwindow.py:134
+#: ../meld/meldwindow.py:140
msgid "_View"
msgstr "Ð_ÑÐÐÐÐÐ"
-#: ../meld/meldwindow.py:135
+#: ../meld/meldwindow.py:141
msgid "File status"
msgstr "ÐÑÐÑÐ ÐÐÑÐÑÐÐÐ"
-#: ../meld/meldwindow.py:136
+#: ../meld/meldwindow.py:142
msgid "Version status"
msgstr "ÐÑÐÑÐ ÐÐÐÐÑÐ"
-#: ../meld/meldwindow.py:137
+#: ../meld/meldwindow.py:143
msgid "File filters"
msgstr "ÐÐÐÑÐÑÐ ÐÐÑÐÑÐÐÐ"
-#: ../meld/meldwindow.py:138
+#: ../meld/meldwindow.py:144
msgid "Stop the current action"
msgstr "ÐÐÑÑÑÐÐÐÑÐ ÑÑÐÐÑÑÐÑ ÑÐÐÑÑ"
-#: ../meld/meldwindow.py:139
+#: ../meld/meldwindow.py:145
msgid "Refresh the view"
msgstr "ÐÑÐÐÐÐÑÐ ÐÑÐÐÐÐÐ"
-#: ../meld/meldwindow.py:140
+#: ../meld/meldwindow.py:146
msgid "Reload"
msgstr "ÐÐÐÐÐÐ ÑÑÐÑÐÑ"
-#: ../meld/meldwindow.py:140
+#: ../meld/meldwindow.py:146
msgid "Reload the comparison"
msgstr "ÐÐÐÐÐÐ ÑÑÐÑÐÑÑÐ ÐÐÑÐÑÐÑÐ"
-#: ../meld/meldwindow.py:142
+#: ../meld/meldwindow.py:148
msgid "_Tabs"
msgstr "_ÐÐÐÐÑÑÐ"
-#: ../meld/meldwindow.py:143
+#: ../meld/meldwindow.py:149
msgid "_Previous Tab"
msgstr "ÐÑÐ_ÑÑÐÐÐÐ ÑÐÐÐÑÐÐ"
-#: ../meld/meldwindow.py:143
+#: ../meld/meldwindow.py:149
msgid "Activate previous tab"
msgstr "ÐÐÐÑÐ ÐÐ ÐÑÐÑÑÐÐÐÐ ÐÐÑÑ"
-#: ../meld/meldwindow.py:144
+#: ../meld/meldwindow.py:150
msgid "_Next Tab"
msgstr "ÐÐÐ_ÐÐÑÐ ÑÐÐÐÑÐÐ"
-#: ../meld/meldwindow.py:144
+#: ../meld/meldwindow.py:150
msgid "Activate next tab"
msgstr "ÐÐÐÑÐ ÐÐ ÐÐÑÐÐÐÐ ÐÐÑÑ"
-#: ../meld/meldwindow.py:145
+#: ../meld/meldwindow.py:151
msgid "Move Tab _Left"
msgstr "ÐÑÐÐÐÑÑÐ ÑÐÐÐÑÐÐ _ÐÐÐÐ"
-#: ../meld/meldwindow.py:145
+#: ../meld/meldwindow.py:151
msgid "Move current tab to left"
msgstr "ÐÑÐÐÐÑÑÐÑÐ ÑÑÐÐÑÑÐÐ ÑÐÐÐÑÐÐ ÐÐ ÐÐÐÐ"
-#: ../meld/meldwindow.py:146
+#: ../meld/meldwindow.py:152
msgid "Move Tab _Right"
msgstr "ÐÑÐÐÐÑÑÐ ÑÐÐÐÑÐÐ _ÐÐÑÐÐ"
-#: ../meld/meldwindow.py:146
+#: ../meld/meldwindow.py:152
msgid "Move current tab to right"
msgstr "ÐÑÐÐÐÑÑÐÑÐ ÑÑÐÐÑÑÐÐ ÑÐÐÐÑÐÐ ÐÐ ÐÐÑÐÐ"
-#: ../meld/meldwindow.py:148
+#: ../meld/meldwindow.py:154
msgid "_Help"
msgstr "ÐÐ_ÐÐÑ"
-#: ../meld/meldwindow.py:149
+#: ../meld/meldwindow.py:155
msgid "_Contents"
msgstr "_ÐÐÐÑÐÐÑ"
-#: ../meld/meldwindow.py:149
+#: ../meld/meldwindow.py:155
msgid "Open the Meld manual"
msgstr "ÐÑÐÐÑÐÑÐ ÑÐÑÑÑÑÐÐ ÐÐÐÐÐ"
-#: ../meld/meldwindow.py:150
+#: ../meld/meldwindow.py:156
msgid "Report _Bug"
msgstr "ÐÑÐÑÐÐÐ _ÐÑÐÑÐÑ"
-#: ../meld/meldwindow.py:150
+#: ../meld/meldwindow.py:156
msgid "Report a bug in Meld"
msgstr "ÐÑÐÑÐÐÐÑÐ ÐÑÐÑÐÑ Ñ ÐÐÐÐÑ"
-#: ../meld/meldwindow.py:151
+#: ../meld/meldwindow.py:157
msgid "About this program"
msgstr "Ð ÐÐÐÐ ÐÑÐÐÑÐÐÑ"
-#: ../meld/meldwindow.py:154
+#: ../meld/meldwindow.py:160
msgid "Full Screen"
msgstr "ÐÑÐÐÐ ÑÐÐÐÐ ÐÐÑÐÐÐ"
-#: ../meld/meldwindow.py:154
+#: ../meld/meldwindow.py:160
msgid "View the comparison in full screen"
msgstr "ÐÑÐÐÐÐÐÐÑÑÐ ÐÐÑÐÑÐÑÐ ÐÑÐÐÐ ÑÐÐÐÐ ÐÐÑÐÐÐ"
-#: ../meld/meldwindow.py:155
+#: ../meld/meldwindow.py:161
msgid "_Toolbar"
msgstr "_ÐÐÐÐÑÐ ÐÐÐÑÐ"
-#: ../meld/meldwindow.py:155
+#: ../meld/meldwindow.py:161
msgid "Show or hide the toolbar"
msgstr "ÐÑÐÐÐÐÐÑÐ ÐÐÐ ÑÐÐÑÐÑÑÐ ÐÐÐÐÑÑ ÐÐÐÑÐ"
-#: ../meld/meldwindow.py:156
+#: ../meld/meldwindow.py:162
msgid "_Statusbar"
msgstr "ÐÑÐÐÐ _ÑÑÐÑÐ"
-#: ../meld/meldwindow.py:156
+#: ../meld/meldwindow.py:162
msgid "Show or hide the statusbar"
msgstr "ÐÑÐÐÐÐÐÑÐ ÐÐÐ ÑÐÐÑÐÑÑÐ ÑÑÐÐÑ ÑÑÐÑÐ"
-#: ../meld/meldwindow.py:534
+#: ../meld/meldwindow.py:170
+#| msgid "Open externally"
+msgid "Open Recent"
+msgstr "ÐÑÐÐÑÐ ÑÐÐÑÐÑÑÐ"
+
+#: ../meld/meldwindow.py:171
+#| msgid "Select file"
+msgid "Open recent files"
+msgstr "ÐÑÐÐÑÐÑÐ ÑÐÐÑÐÑÑÐ ÐÐÑÐÑÐÐÐ"
+
+#: ../meld/meldwindow.py:569
msgid "Switch to this tab"
msgstr "ÐÑÐÐÐÑÐÑÐ ÑÐ ÐÐ ÐÐÐÑ ÑÐÐÐÑÐÐ"
#. exit at first non found directory + file
-#: ../meld/meldwindow.py:638
+#: ../meld/meldwindow.py:674
msgid "Cannot compare a mixture of files and directories.\n"
msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÐÐÐ ÐÐÑÐÐÐÐÑ ÐÐÑÐÑÐÐÐ Ð ÑÐÑÑÐÐÐÐ.\n"
#. no common path. empty names get changed to "[None]"
-#: ../meld/misc.py:177
+#: ../meld/misc.py:180
msgid "[None]"
msgstr "[ÐÐÑÑÐ]"
-#: ../meld/patchdialog.py:122
+#: ../meld/patchdialog.py:124
msgid "Save Patch As..."
msgstr "ÐÐÑÑÐÐÑ ÐÑÐÑÐÐÐÑ ÐÐÐ..."
-#: ../meld/preferences.py:37
+#: ../meld/preferences.py:38
msgid "label"
msgstr "ÐÐÑÐÐÑ"
-#: ../meld/preferences.py:37
+#: ../meld/preferences.py:38
msgid "pattern"
msgstr "ÐÐÑÐÐÐÑ"
-#: ../meld/preferences.py:111
+#: ../meld/preferences.py:142
msgid "Only available if you have gnome-python-desktop installed"
msgstr "ÐÐÑÑÑÐÐÐ ÑÐ ÑÐÐÐ ÐÐÐ ÑÑÐ ÐÐÑÑÐÐÐÑÐÐÐ âgnome-python-desktopâ"
#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:228
+#: ../meld/preferences.py:263
msgid "Backups\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n"
msgstr "ÐÐÐÐÑÐÐ 1\t#*# .#* ~* *~ *.{orig,bak,swp}\n"
#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:230
+#: ../meld/preferences.py:265
msgid ""
"OS-specific metadata\t0\t.DS_Store ._* .Spotlight-V100 .Trashes Thumbs.db "
"Desktop.ini\n"
@@ -1270,202 +1321,198 @@ msgstr ""
"db Desktop.ini\n"
#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:232
+#: ../meld/preferences.py:267
#, python-format
msgid "Version Control\t1\t%s\n"
msgstr "ÐÐÐÑÑÐÐÐ ÐÐÑÐÐÑÐ 1\t%s\n"
#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:234
+#: ../meld/preferences.py:269
msgid "Binaries\t1\t*.{pyc,a,obj,o,so,la,lib,dll,exe}\n"
msgstr "ÐÐÐÑÑÐÐ \t1\t*.{pyc,a,obj,o,so,la,lib,dll,exe}\n"
#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:236
+#: ../meld/preferences.py:271
msgid "Media\t0\t*.{jpg,gif,png,bmp,wav,mp3,ogg,flac,avi,mpg,xcf,xpm}"
msgstr "ÐÐÐÐÑÐ\t0\t*.{jpg,gif,png,bmp,wav,mp3,ogg,flac,avi,mpg,xcf,xpm}"
#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:238
+#: ../meld/preferences.py:273
msgid "CVS keywords\t0\t\\$\\w+(:[^\\n$]+)?\\$\n"
msgstr "ÐÐÐ ÐÑÑÑÐÐ ÑÐÑÐ\t0\t\\$\\w+(:[^\\n$]+)?\\$\n"
#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:240
+#: ../meld/preferences.py:275
msgid "C++ comment\t0\t//.*\n"
msgstr "Ð++ ÐÐÐÐÐÑÐÑ\t0\t//.*\n"
#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:242
+#: ../meld/preferences.py:277
msgid "C comment\t0\t/\\*.*?\\*/\n"
msgstr "Ð ÐÐÐÐÐÑÐÑ\t0\t/\\*.*?\\*/\n"
#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:244
+#: ../meld/preferences.py:279
msgid "All whitespace\t0\t[ \\t\\r\\f\\v]*\n"
msgstr "ÐÐÐ ÑÐÐÐÐÑÐ\t0\t[ \\t\\r\\f\\v]*\n"
#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:246
+#: ../meld/preferences.py:281
msgid "Leading whitespace\t0\t^[ \\t\\r\\f\\v]*\n"
msgstr "ÐÐÑÐÑÐÐ ÑÐÐÐÐÐ\t0\t^[ \\t\\r\\f\\v]*\n"
#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:248
+#: ../meld/preferences.py:283
msgid "Script comment\t0\t#.*"
msgstr "ÐÐÐÐÐÑÐÑ ÑÐÑÐÐÑÐ\t0\t#.*"
-#: ../meld/vcview.py:126
+#: ../meld/vcview.py:161
msgid "Co_mmit"
msgstr "Ð_ÐÑÐÐÐ"
-#: ../meld/vcview.py:126
+#: ../meld/vcview.py:161
msgid "Commit"
msgstr "ÐÐÑÐÐÐÑÐ"
-#: ../meld/vcview.py:127
+#: ../meld/vcview.py:162
msgid "_Update"
msgstr "_ÐÐÑÑÐÑÐÑ"
-#: ../meld/vcview.py:127
+#: ../meld/vcview.py:162
msgid "Update"
msgstr "ÐÐÑÑÐÑÐÑÑÐ"
-#: ../meld/vcview.py:128
+#: ../meld/vcview.py:163
msgid "Add to VC"
msgstr "ÐÐÐÐÑ Ñ ÐÐ"
-#: ../meld/vcview.py:129
+#: ../meld/vcview.py:164
msgid "Remove from VC"
msgstr "ÐÐÐÐÐÐ ÐÐ ÐÐ"
-#: ../meld/vcview.py:130
+#: ../meld/vcview.py:165
msgid "_Resolved"
msgstr "_ÐÐÑÐÐÐ"
-#: ../meld/vcview.py:130
+#: ../meld/vcview.py:165
msgid "Mark as resolved for VC"
msgstr "ÐÐÐÐÑÐÐÐ ÐÐÐ ÑÐÑÐÐÐ ÐÐ ÐÐ"
-#: ../meld/vcview.py:131
+#: ../meld/vcview.py:166
msgid "Revert to original"
msgstr "ÐÑÐÑÐ ÐÐ ÐÑÐÐÐÐÐÐ"
-#: ../meld/vcview.py:132
+#: ../meld/vcview.py:167
msgid "Delete locally"
msgstr "ÐÐÑÐÑÐ Ñ ÐÐÐÐÐÑ"
-#: ../meld/vcview.py:136
+#: ../meld/vcview.py:171
msgid "_Flatten"
msgstr "_ÐÐÑÐÐÐÐÑ"
-#: ../meld/vcview.py:136
+#: ../meld/vcview.py:171
msgid "Flatten directories"
msgstr "ÐÐÑÐÐÐÐÑ ÑÐÑÑÐÐÐÐ"
-#: ../meld/vcview.py:137
+#: ../meld/vcview.py:172
msgid "_Modified"
msgstr "ÐÐ_ÐÐÑÐÐ"
-#: ../meld/vcview.py:138
+#: ../meld/vcview.py:173
msgid "_Normal"
msgstr "_ÐÐÐÑÐÐ"
-#: ../meld/vcview.py:138
+#: ../meld/vcview.py:173
msgid "Show normal"
msgstr "ÐÑÐÐÐÐÐ ÐÐÐÑÐÐ"
-#: ../meld/vcview.py:139
+#: ../meld/vcview.py:174
msgid "Non _VC"
msgstr "ÐÐ _ÐÐ"
-#: ../meld/vcview.py:139
+#: ../meld/vcview.py:174
msgid "Show unversioned files"
msgstr "ÐÑÐÐÐÐÑÑÐ ÐÐÐÐÑÐÐÐÐÐÑÐÐÐ ÐÐÑÐÑÐÐÐ"
-#: ../meld/vcview.py:140
+#: ../meld/vcview.py:175
msgid "Ignored"
msgstr "ÐÐÐÐÐÐÑÐÐÐ"
-#: ../meld/vcview.py:140
+#: ../meld/vcview.py:175
msgid "Show ignored files"
msgstr "ÐÑÐÐÐÐÑÑÐ ÐÐÐÐÐÐÑÐÐÐ ÐÐÑÐÑÐÐÐ"
-#: ../meld/vcview.py:190 ../meld/vcview.py:322
+#: ../meld/vcview.py:226 ../meld/vcview.py:366
msgid "Location"
msgstr "ÐÑÑÐÑÐ"
-#: ../meld/vcview.py:191
+#: ../meld/vcview.py:227
msgid "Status"
msgstr "ÐÑÐÑÐ"
-#: ../meld/vcview.py:192
+#: ../meld/vcview.py:228
msgid "Rev"
msgstr "ÐÐÐ"
-#: ../meld/vcview.py:193
+#: ../meld/vcview.py:229
msgid "Tag"
msgstr "ÐÐÐÐÐÐ"
-#: ../meld/vcview.py:194
+#: ../meld/vcview.py:230
msgid "Options"
msgstr "ÐÐÑÐÑÐ"
-#: ../meld/vcview.py:252
+#: ../meld/vcview.py:292
msgid "Choose one Version Control"
msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐÐÑÑÐÐÑ ÐÐÑÐÐÑÐ"
-#: ../meld/vcview.py:253
+#: ../meld/vcview.py:293
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:266
+#: ../meld/vcview.py:306
#, 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:270
+#: ../meld/vcview.py:310
msgid "Invalid Repository"
msgstr "ÐÐÐÑÐÑÐÐÐÐ ÑÐÐÐÐÐÑÑÐ"
-#: ../meld/vcview.py:279
+#: ../meld/vcview.py:319
#, python-format
msgid "%s (%s)"
msgstr "%s (%s)"
#. TRANSLATORS: This is the location of the directory the user is diffing
-#: ../meld/vcview.py:322
+#: ../meld/vcview.py:366
#, python-format
msgid "%s: %s"
msgstr "%s: %s"
-#: ../meld/vcview.py:366
+#: ../meld/vcview.py:409
msgid "(Empty)"
msgstr "(ÐÑÐÐÐÐ)"
-#: ../meld/vcview.py:404
+#: ../meld/vcview.py:441
#, python-format
msgid "[%s] Fetching differences"
msgstr "[%s] ÐÑÐÐÐÐÑÐÐ ÑÐÐÐÐÐÐ"
-#: ../meld/vcview.py:418
+#: ../meld/vcview.py:454
#, python-format
msgid "[%s] Applying patch"
msgstr "[%s] ÐÑÐÐÐÑÑÑÐÐ ÐÐÐÑÐÑ"
-#: ../meld/vcview.py:522
-msgid "Select some files first."
-msgstr "ÐÑÐÐ ÐÐÐÐÐÑÐÑÐ ÐÐÐÐ ÐÐÑÐÑÐÐÐ."
-
-#: ../meld/vcview.py:565
+#: ../meld/vcview.py:613
msgid "Patch tool not found"
msgstr "ÐÐÑÐÐ ÐÑÐÐÐÑÐÐ ÐÐÐÑ ÐÐÐÑÐÐ"
-#: ../meld/vcview.py:566
+#: ../meld/vcview.py:614
#, python-format
msgid ""
"Meld needs the <i>patch</i> tool to be installed to perform comparisons in "
@@ -1474,11 +1521,11 @@ msgstr ""
"ÐÐÐÐ ÐÐÑÑÐÐÐ ÐÐÑÑÐÐÐÑÐÑÑ ÐÐÐÑÐ ÐÐ <i>ÐÐÐÑÐÐ</i> ÐÐ ÐÐ ÐÐÐÐÐÐ ÐÐÑÐÑÐÑÐ Ñ %s "
"ÑÐÐÐÐÑÐ. ÐÐÐÐÐ ÐÐÑÑÐÐÐÑÐÑÑÐ <i>ÐÐÐÑÐÑ</i> Ð ÐÐÐÑÑÐÑÑÐ ÐÐÐÑ."
-#: ../meld/vcview.py:606
+#: ../meld/vcview.py:654
msgid "Error fetching original comparison file"
msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÐÐÐÐÐÑÐÑÐ ÐÐÐÐÑÐÐ ÐÐÑÐÑÐÐÐ ÐÐÑÐÑÐÑÐ"
-#: ../meld/vcview.py:607
+#: ../meld/vcview.py:655
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 "
@@ -1488,12 +1535,11 @@ msgstr ""
"ÐÐÑÐÐÐÐÑÐ ÐÐÐÐÑÐ ÐÐÐÐÐ, ÐÑÐÑÐÐÐÑÐ ÐÑÐÑÐÑ, ÑÐÑÑÑÑÑÑÑÐ ÑÑÐ ÑÐ ÐÐÐÑÑÐ ÐÐÑÐ "
"ÐÐÑÐÑÐ."
-#: ../meld/vcview.py:615
-#| msgid "Report _Bug"
+#: ../meld/vcview.py:663
msgid "Report a bug"
msgstr "ÐÑÐÑÐÐÐÑÐ ÐÑÐÑÐÑ"
-#: ../meld/ui/findbar.py:142
+#: ../meld/ui/findbar.py:145
#, python-format
msgid ""
"Regular expression error\n"
@@ -1502,31 +1548,31 @@ msgstr ""
"ÐÑÐÑÐÐ ÑÐ ÑÐÐÑÐÐÑÐÐÐ ÐÐÑÐÐÐÐ\n"
"â%sâ"
-#: ../meld/ui/historyentry.py:293
+#: ../meld/ui/historyentry.py:296
msgid "_Browse..."
msgstr "_ÐÐÐÐÐÐÐÐÑ..."
-#: ../meld/ui/historyentry.py:301
+#: ../meld/ui/historyentry.py:304
msgid "Path"
msgstr "ÐÑÑÐÑÐ"
-#: ../meld/ui/historyentry.py:302
+#: ../meld/ui/historyentry.py:305
msgid "Path to file"
msgstr "ÐÑÑÐÑÐ ÐÐ ÐÐÑÐÑÐÐÐ"
-#: ../meld/ui/historyentry.py:303
+#: ../meld/ui/historyentry.py:306
msgid "Pop up a file selector to choose a file"
msgstr "ÐÐÐÐÑÑÑÐ ÐÐÑÐÑÐ ÐÐÑÐÑÐÐÐ ÐÐ ÐÐÐÐÑ ÐÐÑÐÑÐÐÐ"
-#: ../meld/ui/historyentry.py:441
+#: ../meld/ui/historyentry.py:444
msgid "Select directory"
msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐÑÐÐÑÐÑÐÑÑÐ"
-#: ../meld/ui/historyentry.py:445
+#: ../meld/ui/historyentry.py:448
msgid "Select file"
msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐÑÐÑÐÐÑ"
-#: ../meld/ui/notebooklabel.py:60
+#: ../meld/ui/notebooklabel.py:61
msgid "Close tab"
msgstr "ÐÐÑÐÐÑÐÑÐ ÑÐÐÐÑÐÐ"
@@ -1539,7 +1585,7 @@ msgstr ""
"ÐÐÐÐÐÐÑÐÐÐ:ÐÐÐÐÑÐÐÐÐÐÑÐÐÐ:::ÐÑÐÑÐÐ::ÐÐÐÐ ÐÐÐÐÑÐ:ÐÐÐÐÑÐÐÐ:ÐÑÐÐÐ:ÐÐÐÐÑÐÐÐ:"
"ÐÐÐÐÑÑÐÑÑÑÐ:ÐÐÑÐ ÐÑÐÑÑÑÐÐ"
-#: ../meld/vc/cvs.py:161
+#: ../meld/vc/cvs.py:165
#, python-format
msgid ""
"Error converting to a regular expression\n"
@@ -1550,12 +1596,41 @@ msgstr ""
"ÐÐÑÐÐÐÑ ÑÐ ÐÐÐ â%sâ\n"
"ÐÑÐÑÐÐ ÑÐ ÐÐÐÐ â%sâ"
-#: ../meld/vc/git.py:152
+#: ../meld/vc/git.py:181
#, python-format
-#| msgid "Merge all changes from left"
msgid "Mode changed from %s to %s"
msgstr "ÐÐÐÐÐ ÑÐ ÐÐÐÐÑÐÐ ÐÐ â%sâ Ñ â%sâ"
+#~ msgid "Save modified files?"
+#~ msgstr "ÐÐ ÑÐÑÑÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐÑÐÑÐÐÐ?"
+
+#~ msgid ""
+#~ "Some files have been modified.\n"
+#~ "Which ones would you like to save?"
+#~ msgstr ""
+#~ "ÐÐÐÐ ÐÐÑÐÑÐÐÐ ÑÑ ÐÐÐÐÑÐÐÐ.\n"
+#~ "ÐÐÑÐ ÐÐÐÐÑÐ ÐÐ ÑÐÑÑÐÐÑÐ?"
+
+#~ msgid "_Discard Changes"
+#~ msgstr "_ÐÐÐÐÑÐ ÐÐÐÐÐÐ"
+
+#~ msgid "_Save Selected"
+#~ msgstr "_ÐÐÑÑÐÐÑ ÐÐÐÐÑÐÐÐ"
+
+#~ msgid ""
+#~ "Reloading will discard changes in:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "You cannot undo this operation."
+#~ msgstr ""
+#~ "ÐÑÐÐÐÐÐÐÑÐ ÑÐ ÐÐÐÐÑÐÑÐ ÐÐÐÐÐÐ Ñ:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "ÐÐÑ ÐÐÐÑÐÑÐÑÑ ÐÐ ÐÐÐÐÑÐ ÐÐÐÐÐÐÑÐ."
+
+#~ msgid "Select some files first."
+#~ msgstr "ÐÑÐÐ ÐÐÐÐÐÑÐÑÐ ÐÐÐÐ ÐÐÑÐÑÐÐÐ."
+
#~ msgid "Add _Binary"
#~ msgstr "ÐÐÐÐÑ _ÐÐÐÐÑÐÐ"
diff --git a/po/sr latin po b/po/sr latin po
index 4b90704..cd3dc3a 100644
--- a/po/sr latin po
+++ b/po/sr latin po
@@ -2,14 +2,14 @@
# Courtesy of Prevod.org team (http://prevod.org/) -- 2003â2012.
# This file is distributed under the same license as the meld package.
# Maintainer: Danilo Åegan <dsegan gmx net>
-# Miroslav NikoliÄ <miroslavnikolic rocketmail com>, 2011, 2012.
+# Miroslav NikoliÄ <miroslavnikolic rocketmail com>, 2011, 2012, 2013.
msgid ""
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-11-05 19:37+0000\n"
-"PO-Revision-Date: 2012-11-09 11:37+0200\n"
+"POT-Creation-Date: 2013-01-08 19:43+0000\n"
+"PO-Revision-Date: 2013-01-08 21:03+0200\n"
"Last-Translator: Miroslav NikoliÄ <miroslavnikolic rocketmail com>\n"
"Language-Team: Serbian <gnom prevod org>\n"
"Language: sr\n"
@@ -20,11 +20,11 @@ msgstr ""
"n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
"X-Project-Style: gnome\n"
-#: ../bin/meld:103
+#: ../bin/meld:113
msgid "Cannot import: "
msgstr "Ne mogu da uvezem: "
-#: ../bin/meld:106
+#: ../bin/meld:116
#, c-format
msgid "Meld requires %s or higher."
msgstr "Meld zahteva %s ili noviji."
@@ -53,67 +53,83 @@ msgstr "Spisak za ureÄivanje"
msgid "Active"
msgstr "Aktivan"
-#: ../data/ui/EditableList.ui.h:3 ../meld/vcview.py:164
-msgid "Name"
-msgstr "Naziv"
-
-#: ../data/ui/EditableList.ui.h:4
-msgid "Pattern"
-msgstr "Obrazac"
-
-#: ../data/ui/EditableList.ui.h:5
-msgid "Add new filter"
-msgstr "Dodajte novi filter"
+#: ../data/ui/EditableList.ui.h:3
+#| msgid "<unnamed>"
+msgid "Column name"
+msgstr "Naziv kolone"
-#: ../data/ui/EditableList.ui.h:6 ../meld/vcview.py:128
+#: ../data/ui/EditableList.ui.h:4 ../meld/vcview.py:163
msgid "_Add"
msgstr "_Dodaj"
-#: ../data/ui/EditableList.ui.h:7
-msgid "Remove selected filter"
-msgstr "Uklonite izabrani filter"
-
-#: ../data/ui/EditableList.ui.h:8 ../meld/vcview.py:129
+#: ../data/ui/EditableList.ui.h:5 ../meld/vcview.py:164
msgid "_Remove"
msgstr "_Ukloni"
-#: ../data/ui/EditableList.ui.h:9
+#: ../data/ui/EditableList.ui.h:6
msgid "Move item up"
msgstr "Premestite stavku na gore"
-#: ../data/ui/EditableList.ui.h:10
+#: ../data/ui/EditableList.ui.h:7
msgid "Move _Up"
msgstr "Premesti _gore"
-#: ../data/ui/EditableList.ui.h:11
+#: ../data/ui/EditableList.ui.h:8
msgid "Move item down"
msgstr "Premestite stavku na dole"
-#: ../data/ui/EditableList.ui.h:12
+#: ../data/ui/EditableList.ui.h:9
msgid "Move _Down"
msgstr "Premesti _dole"
+#. Create icon and filename CellRenderer
+#: ../data/ui/EditableList.ui.h:10 ../meld/dirdiff.py:303
+#: ../meld/vcview.py:200
+msgid "Name"
+msgstr "Naziv"
+
+#: ../data/ui/EditableList.ui.h:11
+msgid "Pattern"
+msgstr "Obrazac"
+
+#: ../data/ui/EditableList.ui.h:12
+msgid "Add new filter"
+msgstr "Dodajte novi filter"
+
+#: ../data/ui/EditableList.ui.h:13
+msgid "Remove selected filter"
+msgstr "Uklonite izabrani filter"
+
#: ../data/ui/filediff.ui.h:1
-msgid "Save modified files?"
-msgstr "Da saÄuvam izmenjene datoteke?"
+msgid "Save changes to documents before closing?"
+msgstr "Da saÄuvam izmene u dokumentu pre zatvaranja?"
#: ../data/ui/filediff.ui.h:2
-msgid ""
-"Some files have been modified.\n"
-"Which ones would you like to save?"
-msgstr ""
-"Neke datoteke su izmenjene.\n"
-"Koje Åelite da saÄuvate?"
+msgid "If you don't save, changes will be permanently lost."
+msgstr "Ako ne saÄuvate, izmene Äe biti trajno izgubljene."
+
+#: ../data/ui/filediff.ui.h:3
+msgid "Close _without saving"
+msgstr "Zatvori _bez Äuvanja"
#: ../data/ui/filediff.ui.h:4
-msgid "_Discard Changes"
-msgstr "_Odbaci izmene"
+msgid "_Cancel"
+msgstr "_OtkaÅi"
#: ../data/ui/filediff.ui.h:5
-msgid "_Save Selected"
-msgstr "_SaÄuvaj izabrano"
+msgid "_Save"
+msgstr "_SaÄuvaj"
-#: ../data/ui/findbar.ui.h:1 ../meld/meldwindow.py:126
+#: ../data/ui/filediff.ui.h:6
+msgid ""
+"This file can not be written to. You may click here to unlock this file and "
+"make changes anyway, but these changes must be saved to a new file."
+msgstr ""
+"U ovu datoteku se ne moÅe upisivati. MoÅete da kliknete ovde da otkljuÄate "
+"ovu datoteku i da ipak naÄinite izmene, ali te izmene moraju biti saÄuvane u "
+"novu datoteku."
+
+#: ../data/ui/findbar.ui.h:1 ../meld/meldwindow.py:132
msgid "_Replace"
msgstr "_Zameni"
@@ -333,6 +349,24 @@ msgid "Editor"
msgstr "UreÄivaÄ"
#: ../data/ui/preferences.ui.h:17
+#| msgid "Ignore symbolic links"
+msgid "Symbolic links"
+msgstr "SimboliÄke veze"
+
+#: ../data/ui/preferences.ui.h:18
+msgid "Ignore symbolic links"
+msgstr "Zanemari simboliÄke veze"
+
+#: ../data/ui/preferences.ui.h:19
+msgid "Visible columns"
+msgstr "Prikazane kolone"
+
+#: ../data/ui/preferences.ui.h:20
+#| msgid "_File Comparison"
+msgid "Folder comparisons"
+msgstr "PoreÄenje fascikli"
+
+#: ../data/ui/preferences.ui.h:21
msgid ""
"When performing directory comparisons, you may filter out files and "
"directories by name. Each pattern is a list of shell style wildcards "
@@ -342,15 +376,11 @@ msgstr ""
"prema nazivu. Svaki obrazac je spisak dÅokera u stilu konzole razdvojenih "
"razmakom."
-#: ../data/ui/preferences.ui.h:18
-msgid "Ignore symbolic links"
-msgstr "Zanemari simboliÄke veze"
-
-#: ../data/ui/preferences.ui.h:19
+#: ../data/ui/preferences.ui.h:22
msgid "File Filters"
msgstr "Filteri datoteka"
-#: ../data/ui/preferences.ui.h:20
+#: ../data/ui/preferences.ui.h:23
msgid ""
"When performing file comparisons, you may ignore certain types of changes. "
"Each pattern here is a python regular expression which replaces matching "
@@ -363,24 +393,24 @@ msgstr ""
"praznim niskama pre izvrÅavanja poreÄenja. Ako izraz sadrÅi grupe, samo grupe "
"bivaju zamenjene. Za viÅe detalja pogledajte uputstvo za korisnike."
-#: ../data/ui/preferences.ui.h:21
+#: ../data/ui/preferences.ui.h:24
msgid "Ignore changes which insert or delete blank lines"
msgstr "Zanemari izmene koje ubacuju ili briÅu prazne redove"
-#: ../data/ui/preferences.ui.h:22
+#: ../data/ui/preferences.ui.h:25
msgid "Text Filters"
msgstr "Filteri teksta"
-#: ../data/ui/preferences.ui.h:23
+#: ../data/ui/preferences.ui.h:26
msgid "Loading"
msgstr "UÄitavam"
# bug: what encoding is iso8859? it's a registry of encodings, and encoding is eg. iso8859-5
-#: ../data/ui/preferences.ui.h:24
+#: ../data/ui/preferences.ui.h:27
msgid "When loading, try these codecs in order. (e.g. utf8, iso8859)"
msgstr "Pri uÄitavanju, probaj ova kodiranja redom. (npr. utf8, iso8859)"
-#: ../data/ui/preferences.ui.h:25
+#: ../data/ui/preferences.ui.h:28
msgid "Encoding"
msgstr "Kodiranje"
@@ -400,47 +430,47 @@ msgstr "Prethodni dnevnici"
msgid "Log Message"
msgstr "Poruka dnevnika"
-#: ../meld/dirdiff.py:229 ../meld/vcview.py:125
+#: ../meld/dirdiff.py:234 ../meld/vcview.py:160
msgid "_Compare"
msgstr "_Uporedi"
-#: ../meld/dirdiff.py:229 ../meld/vcview.py:125
+#: ../meld/dirdiff.py:234 ../meld/vcview.py:160
msgid "Compare selected"
msgstr "Uporedi izabrano"
-#: ../meld/dirdiff.py:230
+#: ../meld/dirdiff.py:235
msgid "Copy _Left"
msgstr "UmnoÅi _levo"
-#: ../meld/dirdiff.py:230
+#: ../meld/dirdiff.py:235
msgid "Copy to left"
msgstr "UmnoÅite levo"
-#: ../meld/dirdiff.py:231
+#: ../meld/dirdiff.py:236
msgid "Copy _Right"
msgstr "UmnoÅi _desno"
-#: ../meld/dirdiff.py:231
+#: ../meld/dirdiff.py:236
msgid "Copy to right"
msgstr "UmnoÅite desno"
-#: ../meld/dirdiff.py:232
+#: ../meld/dirdiff.py:237
msgid "Delete selected"
msgstr "ObriÅi izabrano"
-#: ../meld/dirdiff.py:233 ../meld/filediff.py:1216
+#: ../meld/dirdiff.py:238 ../meld/filediff.py:1247
msgid "Hide"
msgstr "Sakrij"
-#: ../meld/dirdiff.py:233
+#: ../meld/dirdiff.py:238
msgid "Hide selected"
msgstr "Sakrij izabrano"
-#: ../meld/dirdiff.py:237
+#: ../meld/dirdiff.py:242
msgid "Ignore filename case"
msgstr "Zanemari veliÄinu slova naziva datoteke"
-#: ../meld/dirdiff.py:237
+#: ../meld/dirdiff.py:242
msgid ""
"Consider differently-cased filenames that are otherwise-identical to be the "
"same"
@@ -448,73 +478,83 @@ msgstr ""
"SmatraÄe istim razliÄite veliÄine slova u nazivima datoteka koje su "
"meÄusobno istovetne"
-#: ../meld/dirdiff.py:238
+#: ../meld/dirdiff.py:243
msgid "Same"
msgstr "Isto"
-#: ../meld/dirdiff.py:238
+#: ../meld/dirdiff.py:243
msgid "Show identical"
msgstr "PrikaÅi istovetne"
-#: ../meld/dirdiff.py:239
+#: ../meld/dirdiff.py:244
msgid "New"
msgstr "Novi"
-#: ../meld/dirdiff.py:239
+#: ../meld/dirdiff.py:244
msgid "Show new"
msgstr "PrikaÅi nove"
-#: ../meld/dirdiff.py:240
+#: ../meld/dirdiff.py:245
msgid "Modified"
msgstr "Izmenjeni"
-#: ../meld/dirdiff.py:240 ../meld/vcview.py:137
+#: ../meld/dirdiff.py:245 ../meld/vcview.py:172
msgid "Show modified"
msgstr "PrikaÅi izmenjene"
-#: ../meld/dirdiff.py:242
+#: ../meld/dirdiff.py:247
msgid "Filters"
msgstr "Filteri"
-#: ../meld/dirdiff.py:242
+#: ../meld/dirdiff.py:247
msgid "Set active filters"
msgstr "Podesite aktivne filtere"
-#: ../meld/dirdiff.py:406
+#. Create file size CellRenderer
+#: ../meld/dirdiff.py:320
+msgid "Size"
+msgstr "VeliÄina"
+
+#. Create date-time CellRenderer
+#: ../meld/dirdiff.py:327
+msgid "Modification time"
+msgstr "Vreme izmene"
+
+#: ../meld/dirdiff.py:448
#, python-format
msgid "Hide %s"
msgstr "Sakrij â%sâ"
-#: ../meld/dirdiff.py:510 ../meld/dirdiff.py:529 ../meld/vcview.py:326
-#: ../meld/vcview.py:350
+#: ../meld/dirdiff.py:562 ../meld/dirdiff.py:581 ../meld/vcview.py:370
+#: ../meld/vcview.py:394
#, python-format
msgid "[%s] Scanning %s"
msgstr "[%s] pregledam â%sâ"
-#: ../meld/dirdiff.py:628
+#: ../meld/dirdiff.py:680
#, python-format
msgid "[%s] Done"
msgstr "[%s] Gotovo"
-#: ../meld/dirdiff.py:632
+#: ../meld/dirdiff.py:685
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:633
+#: ../meld/dirdiff.py:686
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:635
+#: ../meld/dirdiff.py:688
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:637
+#: ../meld/dirdiff.py:690
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:639
+#: ../meld/dirdiff.py:692
msgid ""
"You are running a case insensitive comparison on a case sensitive "
"filesystem. The following files in this folder are hidden:"
@@ -522,17 +562,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:650
+#: ../meld/dirdiff.py:703
#, python-format
msgid "'%s' hidden by '%s'"
msgstr "â%sâ sakriveno od strane â%sâ"
-#: ../meld/dirdiff.py:675 ../meld/filediff.py:979 ../meld/filediff.py:1220
-#: ../meld/vcview.py:572 ../meld/vcview.py:614
+#: ../meld/dirdiff.py:728 ../meld/filediff.py:1010 ../meld/filediff.py:1251
+#: ../meld/vcview.py:620 ../meld/vcview.py:662
msgid "Hi_de"
msgstr "_Sakrij"
-#: ../meld/dirdiff.py:725
+#: ../meld/dirdiff.py:760
#, python-format
msgid ""
"'%s' exists.\n"
@@ -541,7 +581,7 @@ msgstr ""
"â%sâ postoji.\n"
"Da presnimim?"
-#: ../meld/dirdiff.py:732
+#: ../meld/dirdiff.py:767
#, python-format
msgid ""
"Error copying '%s' to '%s'\n"
@@ -552,7 +592,7 @@ msgstr ""
"\n"
"%s."
-#: ../meld/dirdiff.py:750 ../meld/vcview.py:546
+#: ../meld/dirdiff.py:785 ../meld/vcview.py:594
#, python-format
msgid ""
"'%s' is a directory.\n"
@@ -561,7 +601,7 @@ msgstr ""
"â%sâ je fascikla.\n"
"Da uklonim rekurzivno?"
-#: ../meld/dirdiff.py:757 ../meld/vcview.py:551
+#: ../meld/dirdiff.py:792 ../meld/vcview.py:599
#, python-format
msgid ""
"Error removing %s\n"
@@ -572,7 +612,7 @@ msgstr ""
"\n"
"%s."
-#: ../meld/dirdiff.py:842
+#: ../meld/dirdiff.py:892
#, python-format
msgid "%i second"
msgid_plural "%i seconds"
@@ -581,7 +621,7 @@ msgstr[1] "%i sekunde"
msgstr[2] "%i sekunde"
msgstr[3] "%i sekunda"
-#: ../meld/dirdiff.py:843
+#: ../meld/dirdiff.py:893
#, python-format
msgid "%i minute"
msgid_plural "%i minutes"
@@ -590,7 +630,7 @@ msgstr[1] "%i minuta"
msgstr[2] "%i minuta"
msgstr[3] "%i minut"
-#: ../meld/dirdiff.py:844
+#: ../meld/dirdiff.py:894
#, python-format
msgid "%i hour"
msgid_plural "%i hours"
@@ -599,7 +639,7 @@ msgstr[1] "%i sata"
msgstr[2] "%i sati"
msgstr[3] "%i sat"
-#: ../meld/dirdiff.py:845
+#: ../meld/dirdiff.py:895
#, python-format
msgid "%i day"
msgid_plural "%i days"
@@ -608,7 +648,7 @@ msgstr[1] "%i dana"
msgstr[2] "%i dana"
msgstr[3] "%i dan"
-#: ../meld/dirdiff.py:846
+#: ../meld/dirdiff.py:896
#, python-format
msgid "%i week"
msgid_plural "%i weeks"
@@ -617,7 +657,7 @@ msgstr[1] "%i nedelje"
msgstr[2] "%i nedelja"
msgstr[3] "%i nedelja"
-#: ../meld/dirdiff.py:847
+#: ../meld/dirdiff.py:897
#, python-format
msgid "%i month"
msgid_plural "%i months"
@@ -626,7 +666,7 @@ msgstr[1] "%i meseca"
msgstr[2] "%i meseci"
msgstr[3] "%i mesec"
-#: ../meld/dirdiff.py:848
+#: ../meld/dirdiff.py:898
#, python-format
msgid "%i year"
msgid_plural "%i years"
@@ -635,159 +675,159 @@ msgstr[1] "%i godine"
msgstr[2] "%i godina"
msgstr[3] "%i godina"
-#: ../meld/filediff.py:214
+#: ../meld/filediff.py:228
msgid "Format as patch..."
msgstr "Formatiraj kao ispravku..."
-#: ../meld/filediff.py:214
+#: ../meld/filediff.py:228
msgid "Create a patch using differences between files"
msgstr "Napravite ispravku koristeÄi razlike izmeÄu datoteka"
-#: ../meld/filediff.py:215
+#: ../meld/filediff.py:229
msgid "Previous conflict"
msgstr "Prethodni sukob"
-#: ../meld/filediff.py:215
+#: ../meld/filediff.py:229
msgid "Go to the previous conflict"
msgstr "Idite na prethodni sukob"
-#: ../meld/filediff.py:216
+#: ../meld/filediff.py:230
msgid "Next conflict"
msgstr "SledeÄi sukob"
-#: ../meld/filediff.py:216
+#: ../meld/filediff.py:230
msgid "Go to the next conflict"
msgstr "Idite na sledeÄi sukob"
-#: ../meld/filediff.py:217
+#: ../meld/filediff.py:231
msgid "Push to left"
msgstr "Gurni ulevo"
-#: ../meld/filediff.py:217
+#: ../meld/filediff.py:231
msgid "Push current change to the left"
msgstr "Gurnite tekuÄu izmenu ulevo"
-#: ../meld/filediff.py:218
+#: ../meld/filediff.py:232
msgid "Push to right"
msgstr "Gurni udesno"
-#: ../meld/filediff.py:218
+#: ../meld/filediff.py:232
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:220
+#: ../meld/filediff.py:234
msgid "Pull from left"
msgstr "Ubaci s leva"
-#: ../meld/filediff.py:220
+#: ../meld/filediff.py:234
msgid "Pull change from the left"
msgstr "Ubacite izmenu s leva"
-#: ../meld/filediff.py:221
+#: ../meld/filediff.py:235
msgid "Pull from right"
msgstr "Ubaci s desna"
-#: ../meld/filediff.py:221
+#: ../meld/filediff.py:235
msgid "Pull change from the right"
msgstr "Ubacite izmenu s desna"
-#: ../meld/filediff.py:222
+#: ../meld/filediff.py:236
msgid "Copy above left"
msgstr "UmnoÅi iznad ulevo"
-#: ../meld/filediff.py:222
+#: ../meld/filediff.py:236
msgid "Copy change above the left chunk"
msgstr "UmnoÅite izmenu iznad komada ulevo"
-#: ../meld/filediff.py:223
+#: ../meld/filediff.py:237
msgid "Copy below left"
msgstr "UmnoÅi ispod ulevo"
-#: ../meld/filediff.py:223
+#: ../meld/filediff.py:237
msgid "Copy change below the left chunk"
msgstr "UmnoÅite izmenu ispod komada ulevo"
-#: ../meld/filediff.py:224
+#: ../meld/filediff.py:238
msgid "Copy above right"
msgstr "UmnoÅi iznad udesno"
-#: ../meld/filediff.py:224
+#: ../meld/filediff.py:238
msgid "Copy change above the right chunk"
msgstr "UmnoÅite izmenu iznad komada udesno"
-#: ../meld/filediff.py:225
+#: ../meld/filediff.py:239
msgid "Copy below right"
msgstr "UmnoÅi ispod udesno"
-#: ../meld/filediff.py:225
+#: ../meld/filediff.py:239
msgid "Copy change below the right chunk"
msgstr "UmnoÅite izmenu ispod komada udesno"
-#: ../meld/filediff.py:226
+#: ../meld/filediff.py:240
msgid "Delete"
msgstr "ObriÅi"
-#: ../meld/filediff.py:226
+#: ../meld/filediff.py:240
msgid "Delete change"
msgstr "ObriÅite izmenu"
-#: ../meld/filediff.py:227
+#: ../meld/filediff.py:241
msgid "Merge all changes from left"
msgstr "Objedini sve izmene s leva"
-#: ../meld/filediff.py:227
+#: ../meld/filediff.py:241
msgid "Merge all non-conflicting changes from the left"
msgstr "Objedinite sve nesukobljavajuÄe izmene s leva"
-#: ../meld/filediff.py:228
+#: ../meld/filediff.py:242
msgid "Merge all changes from right"
msgstr "Objedini sve izmene s desna"
-#: ../meld/filediff.py:228
+#: ../meld/filediff.py:242
msgid "Merge all non-conflicting changes from the right"
msgstr "Objedinite sve nesukobljavajuÄe izmene s desna"
-#: ../meld/filediff.py:229
+#: ../meld/filediff.py:243
msgid "Merge all non-conflicting"
msgstr "Objedini sve nesukobljavajuÄe"
-#: ../meld/filediff.py:229
+#: ../meld/filediff.py:243
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:230
+#: ../meld/filediff.py:244
msgid "Cycle through documents"
msgstr "KruÅi kroz dokumente"
-#: ../meld/filediff.py:230
+#: ../meld/filediff.py:244
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:234
+#: ../meld/filediff.py:248
msgid "Lock scrolling"
msgstr "ZakljuÄaj klizanje"
-#: ../meld/filediff.py:235
+#: ../meld/filediff.py:249
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:353
+#: ../meld/filediff.py:365
msgid "INS"
msgstr "UMET"
-#: ../meld/filediff.py:353
+#: ../meld/filediff.py:365
msgid "OVR"
msgstr "PREP"
#. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:355
+#: ../meld/filediff.py:367
#, python-format
msgid "Ln %i, Col %i"
msgstr "Red %i, mesto %i"
-#: ../meld/filediff.py:682
+#: ../meld/filediff.py:703
#, python-format
msgid ""
"Filter '%s' changed the number of lines in the file. Comparison will be "
@@ -796,42 +836,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:967
+#: ../meld/filediff.py:998
#, python-format
msgid "[%s] Set num panes"
msgstr "[%s] Postavi broj ploÄa"
-#: ../meld/filediff.py:973
+#: ../meld/filediff.py:1004
#, python-format
msgid "[%s] Opening files"
msgstr "[%s] Otvaram datoteke"
-#: ../meld/filediff.py:997 ../meld/filediff.py:1007 ../meld/filediff.py:1020
-#: ../meld/filediff.py:1026
+#: ../meld/filediff.py:1028 ../meld/filediff.py:1038 ../meld/filediff.py:1051
+#: ../meld/filediff.py:1057
msgid "Could not read file"
msgstr "Ne mogu da proÄitam datoteku"
-#: ../meld/filediff.py:998
+#: ../meld/filediff.py:1029
#, python-format
msgid "[%s] Reading files"
msgstr "[%s] Äitam datoteke"
-#: ../meld/filediff.py:1008
+#: ../meld/filediff.py:1039
#, python-format
msgid "%s appears to be a binary file."
msgstr "â%sâ izgleda da je izvrÅna datoteka."
-#: ../meld/filediff.py:1021
+#: ../meld/filediff.py:1052
#, python-format
msgid "%s is not in encodings: %s"
msgstr "â%sâ nije u kodiranjima: â%sâ"
-#: ../meld/filediff.py:1052
+#: ../meld/filediff.py:1083
#, python-format
msgid "[%s] Computing differences"
msgstr "[%s] SraÄunavam razlike"
-#: ../meld/filediff.py:1207
+#: ../meld/filediff.py:1238
msgid ""
"Text filters are being used, and may be masking differences between files. "
"Would you like to compare the unfiltered files?"
@@ -839,15 +879,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:1213
+#: ../meld/filediff.py:1244
msgid "Files are identical"
msgstr "Datoteke su istovetne"
-#: ../meld/filediff.py:1223
+#: ../meld/filediff.py:1254
msgid "Show without filters"
msgstr "Prikazuje bez filtera"
-#: ../meld/filediff.py:1347
+#: ../meld/filediff.py:1378
#, python-format
msgid ""
"\"%s\" exists!\n"
@@ -856,7 +896,7 @@ msgstr ""
"â%sâ postoji!\n"
"Da presnimim?"
-#: ../meld/filediff.py:1360
+#: ../meld/filediff.py:1391
#, python-format
msgid ""
"Error writing to %s\n"
@@ -867,12 +907,12 @@ msgstr ""
"\n"
"%s."
-#: ../meld/filediff.py:1369
+#: ../meld/filediff.py:1400
#, python-format
msgid "Choose a name for buffer %i."
msgstr "Izaberite naziv za %i. bafer."
-#: ../meld/filediff.py:1384
+#: ../meld/filediff.py:1416
#, python-format
msgid ""
"This file '%s' contains a mixture of line endings.\n"
@@ -883,7 +923,7 @@ msgstr ""
"\n"
"Koji oblik Åelite da koristite?"
-#: ../meld/filediff.py:1400
+#: ../meld/filediff.py:1432
#, python-format
msgid ""
"'%s' contains characters not encodable with '%s'\n"
@@ -892,376 +932,387 @@ 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:1457
-#, python-format
-msgid ""
-"Reloading will discard changes in:\n"
-"%s\n"
-"\n"
-"You cannot undo this operation."
-msgstr ""
-"OsveÅavanje Äe odbaciti izmene u:\n"
-"%s\n"
-"\n"
-"Ovu operaciju ne moÅete opozvati."
+#: ../meld/filediff.py:1497
+msgid "Save changes to documents before reloading?"
+msgstr "Da saÄuvam izmene u dokumentu pre ponovnog uÄitavanja?"
-#: ../meld/filemerge.py:47
+#: ../meld/filemerge.py:53
#, python-format
msgid "[%s] Merging files"
msgstr "[%s] Objedinjujem datoteke"
-#: ../meld/meldapp.py:152
+#: ../meld/meldapp.py:95
msgid "wrong number of arguments supplied to --diff"
msgstr "pogreÅan broj argumenata pridodat uz â--diffâ"
-#: ../meld/meldapp.py:156
+#: ../meld/meldapp.py:99
msgid "Start with an empty window"
msgstr "Otvara jedan prazan prozor"
# bug: string composition is bad i18n, and will make l10n hard
-#: ../meld/meldapp.py:157 ../meld/meldapp.py:158 ../meld/meldapp.py:160
+#: ../meld/meldapp.py:100 ../meld/meldapp.py:102 ../meld/meldapp.py:106
msgid "file"
msgstr "datoteka"
-#: ../meld/meldapp.py:157 ../meld/meldapp.py:159 ../meld/meldapp.py:160
+#: ../meld/meldapp.py:100 ../meld/meldapp.py:104 ../meld/meldapp.py:106
msgid "dir"
msgstr "dir"
-#: ../meld/meldapp.py:157
+#: ../meld/meldapp.py:101
msgid "Start a version control comparison"
msgstr "PokreÄe poreÄenje kontrole verzije"
-#: ../meld/meldapp.py:158
+#: ../meld/meldapp.py:103
msgid "Start a 2- or 3-way file comparison"
msgstr "PokreÄe poreÄenje 2 ili 3 elementa datoteka"
-#: ../meld/meldapp.py:159
+#: ../meld/meldapp.py:105
msgid "Start a 2- or 3-way directory comparison"
msgstr "PokreÄe poreÄenje 2 ili 3 elementa fascikli"
-#: ../meld/meldapp.py:160
+#: ../meld/meldapp.py:107
msgid "Start a comparison between file and dir/file"
msgstr "PokreÄe poreÄenje izmeÄu datoteke i fascikle/datoteke"
-#: ../meld/meldapp.py:166
+#: ../meld/meldapp.py:114
msgid "Meld is a file and directory comparison tool."
msgstr "Meld je alat za poreÄenje datoteka i fascikli."
-#: ../meld/meldapp.py:169
+#: ../meld/meldapp.py:117
msgid "Set label to use instead of file name"
msgstr "PodeÅava oznaku za koriÅÄenje umesto naziva datoteke"
-#: ../meld/meldapp.py:171
+#: ../meld/meldapp.py:119
msgid "Open a new tab in an already running instance"
msgstr "Otvara novi jeziÄak u jednom veÄ otvorenom primerku"
-#: ../meld/meldapp.py:173
+#: ../meld/meldapp.py:122
msgid "Automatically compare all differing files on startup"
msgstr "Samostalno poredi sve razlikujuÄe datoteke prilikom pokretanja"
-#: ../meld/meldapp.py:175
+#: ../meld/meldapp.py:124
msgid "Ignored for compatibility"
msgstr "Zanemareno zbog saglasnosti"
-#: ../meld/meldapp.py:178
+#: ../meld/meldapp.py:127
msgid "Set the target file for saving a merge result"
msgstr "PodeÅava ciljnu datoteku za Äuvanje rezultata stapanja"
-#: ../meld/meldapp.py:180
+#: ../meld/meldapp.py:129
msgid "Automatically merge files"
msgstr "Samostalno stapa datoteke"
-#: ../meld/meldapp.py:183
-msgid "Creates a diff tab for up to 3 supplied files or directories."
-msgstr "Pravi jeziÄak razlika za najviÅe do 3 pridodate datoteke ili fascikle."
+#: ../meld/meldapp.py:132
+msgid "Load a saved comparison from a Meld comparison file"
+msgstr "UÄitava saÄuvano poreÄenje iz Meldove datoteke poreÄenja"
+
+#: ../meld/meldapp.py:135
+#| msgid "Creates a diff tab for up to 3 supplied files or directories."
+msgid "Create a diff tab for the supplied files or folders"
+msgstr "Pravi jeziÄak razlika pridodate datoteke ili fascikle"
-#: ../meld/meldapp.py:186
+#: ../meld/meldapp.py:138
#, python-format
msgid "too many arguments (wanted 0-3, got %d)"
msgstr "previÅe argumenata (traÅeno je 0-3, dobih %d)"
-#: ../meld/meldapp.py:188
+#: ../meld/meldapp.py:141
msgid "can't auto-merge less than 3 files"
msgstr "ne mogu samostalno da stopim manje od 3 datoteke"
-#: ../meld/meldapp.py:190
+#: ../meld/meldapp.py:143
msgid "can't auto-merge directories"
msgstr "ne mogu samostalno da stopim direktorijume"
-#: ../meld/meldapp.py:196
+#: ../meld/meldapp.py:149
msgid "D-Bus error; comparisons will open in a new window."
msgstr "GreÅka D-sabirnice; poreÄenje Äe se otvoriti u novom prozoru."
+#: ../meld/meldapp.py:167
+#| msgid "Error fetching original comparison file"
+msgid "Error reading saved comparison file"
+msgstr "GreÅka Äitanja saÄuvane datoteke poreÄenja"
+
#. TRANSLATORS: This is the label of a new, currently-unnamed file.
-#: ../meld/meldbuffer.py:83
+#: ../meld/meldbuffer.py:89
msgid "<unnamed>"
msgstr "<neimenovan>"
-#: ../meld/melddoc.py:57 ../meld/melddoc.py:58
+#: ../meld/melddoc.py:58 ../meld/melddoc.py:59
msgid "untitled"
msgstr "bezimeni"
-#: ../meld/meldwindow.py:110
+#: ../meld/meldwindow.py:116
msgid "_File"
msgstr "_Datoteka"
-#: ../meld/meldwindow.py:111
+#: ../meld/meldwindow.py:117
msgid "_New..."
msgstr "_Novo..."
-#: ../meld/meldwindow.py:111
+#: ../meld/meldwindow.py:117
msgid "Start a new comparison"
msgstr "ZapoÄnite novo poreÄenje"
-#: ../meld/meldwindow.py:112
+#: ../meld/meldwindow.py:118
msgid "Save the current file"
msgstr "SaÄuvajte trenutnu datoteku"
-#: ../meld/meldwindow.py:114
+#: ../meld/meldwindow.py:120
msgid "Close the current file"
msgstr "Zatvorite trenutnu datoteku"
-#: ../meld/meldwindow.py:115
+#: ../meld/meldwindow.py:121
msgid "Quit the program"
msgstr "Zatvorite program"
-#: ../meld/meldwindow.py:117
+#: ../meld/meldwindow.py:123
msgid "_Edit"
msgstr "_UreÄivanje"
-#: ../meld/meldwindow.py:118
+#: ../meld/meldwindow.py:124
msgid "Undo the last action"
msgstr "Opozovite poslednju radnju"
-#: ../meld/meldwindow.py:119
+#: ../meld/meldwindow.py:125
msgid "Redo the last undone action"
msgstr "Ponovite poslednju opozvanu radnju"
-#: ../meld/meldwindow.py:120
+#: ../meld/meldwindow.py:126
msgid "Cut the selection"
msgstr "Isecite izbor"
-#: ../meld/meldwindow.py:121
+#: ../meld/meldwindow.py:127
msgid "Copy the selection"
msgstr "UmnoÅite izbor"
-#: ../meld/meldwindow.py:122
+#: ../meld/meldwindow.py:128
msgid "Paste the clipboard"
msgstr "Ubacite ostavu"
-#: ../meld/meldwindow.py:123
+#: ../meld/meldwindow.py:129
msgid "Search for text"
msgstr "TraÅite tekst"
-#: ../meld/meldwindow.py:124
+#: ../meld/meldwindow.py:130
msgid "Find Ne_xt"
msgstr "NaÄi s_ledeÄe"
-#: ../meld/meldwindow.py:124
+#: ../meld/meldwindow.py:130
msgid "Search forwards for the same text"
msgstr "TraÅite unapred isti tekst"
-#: ../meld/meldwindow.py:125
+#: ../meld/meldwindow.py:131
msgid "Find _Previous"
msgstr "NaÄi pre_thodno"
-#: ../meld/meldwindow.py:125
+#: ../meld/meldwindow.py:131
msgid "Search backwards for the same text"
msgstr "TraÅite unazad isti tekst"
-#: ../meld/meldwindow.py:126
+#: ../meld/meldwindow.py:132
msgid "Find and replace text"
msgstr "PronaÄite i zamenite tekst"
-#: ../meld/meldwindow.py:127
+#: ../meld/meldwindow.py:133
msgid "Prefere_nces"
msgstr "Pos_tavke"
-#: ../meld/meldwindow.py:127
+#: ../meld/meldwindow.py:133
msgid "Configure the application"
msgstr "Podesite program"
-#: ../meld/meldwindow.py:129
+#: ../meld/meldwindow.py:135
msgid "_Changes"
msgstr "_Izmene"
-#: ../meld/meldwindow.py:130
+#: ../meld/meldwindow.py:136
msgid "Next change"
msgstr "SledeÄa izmena"
-#: ../meld/meldwindow.py:130
+#: ../meld/meldwindow.py:136
msgid "Go to the next change"
msgstr "Idite na sledeÄu izmenu"
-#: ../meld/meldwindow.py:131
+#: ../meld/meldwindow.py:137
msgid "Previous change"
msgstr "Prethodna izmena"
-#: ../meld/meldwindow.py:131
+#: ../meld/meldwindow.py:137
msgid "Go to the previous change"
msgstr "Idite na prethodnu izmenu"
-#: ../meld/meldwindow.py:132
+#: ../meld/meldwindow.py:138
msgid "Open externally"
msgstr "Otvori spoljnim"
-#: ../meld/meldwindow.py:132
+#: ../meld/meldwindow.py:138
msgid "Open selected file or directory in the default external application"
msgstr "Otvorite izabranu datoteku ili fasciklu u osnovnom spoljnom programu"
-#: ../meld/meldwindow.py:134
+#: ../meld/meldwindow.py:140
msgid "_View"
msgstr "P_regled"
-#: ../meld/meldwindow.py:135
+#: ../meld/meldwindow.py:141
msgid "File status"
msgstr "Stanje datoteke"
-#: ../meld/meldwindow.py:136
+#: ../meld/meldwindow.py:142
msgid "Version status"
msgstr "Stanje izdanja"
-#: ../meld/meldwindow.py:137
+#: ../meld/meldwindow.py:143
msgid "File filters"
msgstr "Filteri datoteke"
-#: ../meld/meldwindow.py:138
+#: ../meld/meldwindow.py:144
msgid "Stop the current action"
msgstr "Zaustavite trenutnu radnju"
-#: ../meld/meldwindow.py:139
+#: ../meld/meldwindow.py:145
msgid "Refresh the view"
msgstr "OsveÅite pregled"
-#: ../meld/meldwindow.py:140
+#: ../meld/meldwindow.py:146
msgid "Reload"
msgstr "Ponovo uÄitaj"
-#: ../meld/meldwindow.py:140
+#: ../meld/meldwindow.py:146
msgid "Reload the comparison"
msgstr "Ponovo uÄitajte poreÄenje"
-#: ../meld/meldwindow.py:142
+#: ../meld/meldwindow.py:148
msgid "_Tabs"
msgstr "_JeziÄci"
-#: ../meld/meldwindow.py:143
+#: ../meld/meldwindow.py:149
msgid "_Previous Tab"
msgstr "Pre_thodni jeziÄak"
-#: ../meld/meldwindow.py:143
+#: ../meld/meldwindow.py:149
msgid "Activate previous tab"
msgstr "Idite na prethodni list"
-#: ../meld/meldwindow.py:144
+#: ../meld/meldwindow.py:150
msgid "_Next Tab"
msgstr "Sle_deÄi jeziÄak"
-#: ../meld/meldwindow.py:144
+#: ../meld/meldwindow.py:150
msgid "Activate next tab"
msgstr "Idite na naredni list"
-#: ../meld/meldwindow.py:145
+#: ../meld/meldwindow.py:151
msgid "Move Tab _Left"
msgstr "Premesti jeziÄak _levo"
-#: ../meld/meldwindow.py:145
+#: ../meld/meldwindow.py:151
msgid "Move current tab to left"
msgstr "Premestite trenutni jeziÄak na levo"
-#: ../meld/meldwindow.py:146
+#: ../meld/meldwindow.py:152
msgid "Move Tab _Right"
msgstr "Premesti jeziÄak _desno"
-#: ../meld/meldwindow.py:146
+#: ../meld/meldwindow.py:152
msgid "Move current tab to right"
msgstr "Premestite trenutni jeziÄak na desno"
-#: ../meld/meldwindow.py:148
+#: ../meld/meldwindow.py:154
msgid "_Help"
msgstr "Po_moÄ"
-#: ../meld/meldwindow.py:149
+#: ../meld/meldwindow.py:155
msgid "_Contents"
msgstr "_SadrÅaj"
-#: ../meld/meldwindow.py:149
+#: ../meld/meldwindow.py:155
msgid "Open the Meld manual"
msgstr "Otvorite uputstvo Melda"
-#: ../meld/meldwindow.py:150
+#: ../meld/meldwindow.py:156
msgid "Report _Bug"
msgstr "Prijavi _greÅku"
-#: ../meld/meldwindow.py:150
+#: ../meld/meldwindow.py:156
msgid "Report a bug in Meld"
msgstr "Prijavite greÅku u Meldu"
-#: ../meld/meldwindow.py:151
+#: ../meld/meldwindow.py:157
msgid "About this program"
msgstr "O ovom programu"
-#: ../meld/meldwindow.py:154
+#: ../meld/meldwindow.py:160
msgid "Full Screen"
msgstr "Preko celog ekrana"
-#: ../meld/meldwindow.py:154
+#: ../meld/meldwindow.py:160
msgid "View the comparison in full screen"
msgstr "Pregledajte poreÄenje preko celog ekrana"
-#: ../meld/meldwindow.py:155
+#: ../meld/meldwindow.py:161
msgid "_Toolbar"
msgstr "_Paleta alata"
-#: ../meld/meldwindow.py:155
+#: ../meld/meldwindow.py:161
msgid "Show or hide the toolbar"
msgstr "PrikaÅite ili sakrijte paletu alata"
-#: ../meld/meldwindow.py:156
+#: ../meld/meldwindow.py:162
msgid "_Statusbar"
msgstr "Traka _stanja"
-#: ../meld/meldwindow.py:156
+#: ../meld/meldwindow.py:162
msgid "Show or hide the statusbar"
msgstr "PrikaÅite ili sakrijte traku stanja"
-#: ../meld/meldwindow.py:534
+#: ../meld/meldwindow.py:170
+#| msgid "Open externally"
+msgid "Open Recent"
+msgstr "Otvori skoraÅnje"
+
+#: ../meld/meldwindow.py:171
+#| msgid "Select file"
+msgid "Open recent files"
+msgstr "Otvorite skoraÅnje datoteke"
+
+#: ../meld/meldwindow.py:569
msgid "Switch to this tab"
msgstr "Prebacite se na ovaj jeziÄak"
#. exit at first non found directory + file
-#: ../meld/meldwindow.py:638
+#: ../meld/meldwindow.py:674
msgid "Cannot compare a mixture of files and directories.\n"
msgstr "Ne mogu da poredim meÅavinu datoteka i fascikli.\n"
#. no common path. empty names get changed to "[None]"
-#: ../meld/misc.py:177
+#: ../meld/misc.py:180
msgid "[None]"
msgstr "[niÅta]"
-#: ../meld/patchdialog.py:122
+#: ../meld/patchdialog.py:124
msgid "Save Patch As..."
msgstr "SaÄuvaj ispravku kao..."
-#: ../meld/preferences.py:37
+#: ../meld/preferences.py:38
msgid "label"
msgstr "natpis"
-#: ../meld/preferences.py:37
+#: ../meld/preferences.py:38
msgid "pattern"
msgstr "obrazac"
-#: ../meld/preferences.py:111
+#: ../meld/preferences.py:142
msgid "Only available if you have gnome-python-desktop installed"
msgstr "Dostupno je samo ako ste instalirali âgnome-python-desktopâ"
#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:228
+#: ../meld/preferences.py:263
msgid "Backups\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n"
msgstr "Rezerve 1\t#*# .#* ~* *~ *.{orig,bak,swp}\n"
#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:230
+#: ../meld/preferences.py:265
msgid ""
"OS-specific metadata\t0\t.DS_Store ._* .Spotlight-V100 .Trashes Thumbs.db "
"Desktop.ini\n"
@@ -1270,202 +1321,198 @@ msgstr ""
"db Desktop.ini\n"
#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:232
+#: ../meld/preferences.py:267
#, python-format
msgid "Version Control\t1\t%s\n"
msgstr "Kontrola verzija 1\t%s\n"
#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:234
+#: ../meld/preferences.py:269
msgid "Binaries\t1\t*.{pyc,a,obj,o,so,la,lib,dll,exe}\n"
msgstr "IzvrÅne \t1\t*.{pyc,a,obj,o,so,la,lib,dll,exe}\n"
#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:236
+#: ../meld/preferences.py:271
msgid "Media\t0\t*.{jpg,gif,png,bmp,wav,mp3,ogg,flac,avi,mpg,xcf,xpm}"
msgstr "Medija\t0\t*.{jpg,gif,png,bmp,wav,mp3,ogg,flac,avi,mpg,xcf,xpm}"
#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:238
+#: ../meld/preferences.py:273
msgid "CVS keywords\t0\t\\$\\w+(:[^\\n$]+)?\\$\n"
msgstr "CVS kljuÄne reÄi\t0\t\\$\\w+(:[^\\n$]+)?\\$\n"
#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:240
+#: ../meld/preferences.py:275
msgid "C++ comment\t0\t//.*\n"
msgstr "C++ komentar\t0\t//.*\n"
#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:242
+#: ../meld/preferences.py:277
msgid "C comment\t0\t/\\*.*?\\*/\n"
msgstr "C komentar\t0\t/\\*.*?\\*/\n"
#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:244
+#: ../meld/preferences.py:279
msgid "All whitespace\t0\t[ \\t\\r\\f\\v]*\n"
msgstr "Svi razmaci\t0\t[ \\t\\r\\f\\v]*\n"
#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:246
+#: ../meld/preferences.py:281
msgid "Leading whitespace\t0\t^[ \\t\\r\\f\\v]*\n"
msgstr "PoÄetni razmak\t0\t^[ \\t\\r\\f\\v]*\n"
#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:248
+#: ../meld/preferences.py:283
msgid "Script comment\t0\t#.*"
msgstr "Komentar skripte\t0\t#.*"
-#: ../meld/vcview.py:126
+#: ../meld/vcview.py:161
msgid "Co_mmit"
msgstr "U_gradi"
-#: ../meld/vcview.py:126
+#: ../meld/vcview.py:161
msgid "Commit"
msgstr "Ugradite"
-#: ../meld/vcview.py:127
+#: ../meld/vcview.py:162
msgid "_Update"
msgstr "_AÅuriraj"
-#: ../meld/vcview.py:127
+#: ../meld/vcview.py:162
msgid "Update"
msgstr "AÅurirajte"
-#: ../meld/vcview.py:128
+#: ../meld/vcview.py:163
msgid "Add to VC"
msgstr "Dodaj u CV"
-#: ../meld/vcview.py:129
+#: ../meld/vcview.py:164
msgid "Remove from VC"
msgstr "Ukloni iz CV"
-#: ../meld/vcview.py:130
+#: ../meld/vcview.py:165
msgid "_Resolved"
msgstr "_ReÅeno"
-#: ../meld/vcview.py:130
+#: ../meld/vcview.py:165
msgid "Mark as resolved for VC"
msgstr "OznaÄava kao reÅeno za CV"
-#: ../meld/vcview.py:131
+#: ../meld/vcview.py:166
msgid "Revert to original"
msgstr "Vrati na original"
-#: ../meld/vcview.py:132
+#: ../meld/vcview.py:167
msgid "Delete locally"
msgstr "ObriÅi u lokalu"
-#: ../meld/vcview.py:136
+#: ../meld/vcview.py:171
msgid "_Flatten"
msgstr "_Izravnaj"
-#: ../meld/vcview.py:136
+#: ../meld/vcview.py:171
msgid "Flatten directories"
msgstr "Izravnaj fascikle"
-#: ../meld/vcview.py:137
+#: ../meld/vcview.py:172
msgid "_Modified"
msgstr "Iz_menjen"
-#: ../meld/vcview.py:138
+#: ../meld/vcview.py:173
msgid "_Normal"
msgstr "_ObiÄno"
-#: ../meld/vcview.py:138
+#: ../meld/vcview.py:173
msgid "Show normal"
msgstr "PrikaÅi obiÄne"
-#: ../meld/vcview.py:139
+#: ../meld/vcview.py:174
msgid "Non _VC"
msgstr "Ne _CV"
-#: ../meld/vcview.py:139
+#: ../meld/vcview.py:174
msgid "Show unversioned files"
msgstr "Prikazuje neverzionirane datoteke"
-#: ../meld/vcview.py:140
+#: ../meld/vcview.py:175
msgid "Ignored"
msgstr "Zanemarene"
-#: ../meld/vcview.py:140
+#: ../meld/vcview.py:175
msgid "Show ignored files"
msgstr "Prikazuje zanemarene datoteke"
-#: ../meld/vcview.py:190 ../meld/vcview.py:322
+#: ../meld/vcview.py:226 ../meld/vcview.py:366
msgid "Location"
msgstr "Putanja"
-#: ../meld/vcview.py:191
+#: ../meld/vcview.py:227
msgid "Status"
msgstr "Stanje"
-#: ../meld/vcview.py:192
+#: ../meld/vcview.py:228
msgid "Rev"
msgstr "Izd"
-#: ../meld/vcview.py:193
+#: ../meld/vcview.py:229
msgid "Tag"
msgstr "Oznaka"
-#: ../meld/vcview.py:194
+#: ../meld/vcview.py:230
msgid "Options"
msgstr "Opcije"
-#: ../meld/vcview.py:252
+#: ../meld/vcview.py:292
msgid "Choose one Version Control"
msgstr "Izaberite Kontrolu verzije"
-#: ../meld/vcview.py:253
+#: ../meld/vcview.py:293
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:266
+#: ../meld/vcview.py:306
#, 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:270
+#: ../meld/vcview.py:310
msgid "Invalid Repository"
msgstr "Neispravno skladiÅte"
-#: ../meld/vcview.py:279
+#: ../meld/vcview.py:319
#, python-format
msgid "%s (%s)"
msgstr "%s (%s)"
#. TRANSLATORS: This is the location of the directory the user is diffing
-#: ../meld/vcview.py:322
+#: ../meld/vcview.py:366
#, python-format
msgid "%s: %s"
msgstr "%s: %s"
-#: ../meld/vcview.py:366
+#: ../meld/vcview.py:409
msgid "(Empty)"
msgstr "(Prazno)"
-#: ../meld/vcview.py:404
+#: ../meld/vcview.py:441
#, python-format
msgid "[%s] Fetching differences"
msgstr "[%s] Pribavljam razlike"
-#: ../meld/vcview.py:418
+#: ../meld/vcview.py:454
#, python-format
msgid "[%s] Applying patch"
msgstr "[%s] Primenjujem zakrpu"
-#: ../meld/vcview.py:522
-msgid "Select some files first."
-msgstr "Prvo izaberite neke datoteke."
-
-#: ../meld/vcview.py:565
+#: ../meld/vcview.py:613
msgid "Patch tool not found"
msgstr "Nisam pronaÅao alat zakrpe"
-#: ../meld/vcview.py:566
+#: ../meld/vcview.py:614
#, python-format
msgid ""
"Meld needs the <i>patch</i> tool to be installed to perform comparisons in "
@@ -1474,11 +1521,11 @@ msgstr ""
"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
+#: ../meld/vcview.py:654
msgid "Error fetching original comparison file"
msgstr "GreÅka prilikom dovlaÄenja izvorne datoteke poreÄenja"
-#: ../meld/vcview.py:607
+#: ../meld/vcview.py:655
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 "
@@ -1488,12 +1535,11 @@ msgstr ""
"najnovije izdanje Melda, prijavite greÅku, ukljuÄujuÄi Åto je moguÄe viÅe "
"detalja."
-#: ../meld/vcview.py:615
-#| msgid "Report _Bug"
+#: ../meld/vcview.py:663
msgid "Report a bug"
msgstr "Prijavite greÅku"
-#: ../meld/ui/findbar.py:142
+#: ../meld/ui/findbar.py:145
#, python-format
msgid ""
"Regular expression error\n"
@@ -1502,31 +1548,31 @@ msgstr ""
"GreÅka sa regularnim izrazom\n"
"â%sâ"
-#: ../meld/ui/historyentry.py:293
+#: ../meld/ui/historyentry.py:296
msgid "_Browse..."
msgstr "_Razgledaj..."
-#: ../meld/ui/historyentry.py:301
+#: ../meld/ui/historyentry.py:304
msgid "Path"
msgstr "Putanja"
-#: ../meld/ui/historyentry.py:302
+#: ../meld/ui/historyentry.py:305
msgid "Path to file"
msgstr "Putanja do datoteke"
-#: ../meld/ui/historyentry.py:303
+#: ../meld/ui/historyentry.py:306
msgid "Pop up a file selector to choose a file"
msgstr "Izbacuje biraÄa datoteka za izbor datoteke"
-#: ../meld/ui/historyentry.py:441
+#: ../meld/ui/historyentry.py:444
msgid "Select directory"
msgstr "Izaberite direktorijum"
-#: ../meld/ui/historyentry.py:445
+#: ../meld/ui/historyentry.py:448
msgid "Select file"
msgstr "Izaberite datoteku"
-#: ../meld/ui/notebooklabel.py:60
+#: ../meld/ui/notebooklabel.py:61
msgid "Close tab"
msgstr "Zatvorite jeziÄak"
@@ -1539,7 +1585,7 @@ msgstr ""
"Zanemareno:Neverzionirano:::GreÅka::Novo dodato:Izmenjeno:Sukob:Uklonjeno:"
"NedostajuÄe:Nije prisutno"
-#: ../meld/vc/cvs.py:161
+#: ../meld/vc/cvs.py:165
#, python-format
msgid ""
"Error converting to a regular expression\n"
@@ -1550,12 +1596,41 @@ msgstr ""
"Obrazac je bio â%sâ\n"
"GreÅka je bila â%sâ"
-#: ../meld/vc/git.py:152
+#: ../meld/vc/git.py:181
#, 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 "Save modified files?"
+#~ msgstr "Da saÄuvam izmenjene datoteke?"
+
+#~ msgid ""
+#~ "Some files have been modified.\n"
+#~ "Which ones would you like to save?"
+#~ msgstr ""
+#~ "Neke datoteke su izmenjene.\n"
+#~ "Koje Åelite da saÄuvate?"
+
+#~ msgid "_Discard Changes"
+#~ msgstr "_Odbaci izmene"
+
+#~ msgid "_Save Selected"
+#~ msgstr "_SaÄuvaj izabrano"
+
+#~ msgid ""
+#~ "Reloading will discard changes in:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "You cannot undo this operation."
+#~ msgstr ""
+#~ "OsveÅavanje Äe odbaciti izmene u:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Ovu operaciju ne moÅete opozvati."
+
+#~ msgid "Select some files first."
+#~ msgstr "Prvo izaberite neke datoteke."
+
#~ msgid "Add _Binary"
#~ msgstr "Dodaj _binarno"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
