[meld] Updated Serbian translation
- From: ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ <mirosnik src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld] Updated Serbian translation
- Date: Sun, 26 Feb 2012 19:36:44 +0000 (UTC)
commit 73750a744d24d1f6c88de66eb585684fcd19a326
Author: ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ <miroslavnikolic rocketmail com>
Date: Sun Feb 26 20:36:47 2012 +0100
Updated Serbian translation
po/sr.po | 558 +++++++++++++++++++++++++++++---------------------------
po/sr latin po | 558 +++++++++++++++++++++++++++++---------------------------
2 files changed, 572 insertions(+), 544 deletions(-)
---
diff --git a/po/sr.po b/po/sr.po
index d66a733..ba76cdc 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,24 +1,24 @@
# Serbian translation of meld
-# Courtesy of Prevod.org team (http://prevod.org/) -- 2003, 2004.
+# 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.
+# ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ <miroslavnikolic rocketmail com>, 2011, 2012.
msgid ""
msgstr ""
"Project-Id-Version: meld\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=meld&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-06-11 15:41+0000\n"
-"PO-Revision-Date: 2011-06-26 23:07+0200\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=meld&k";
+"eywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2011-12-09 23:15+0000\n"
+"PO-Revision-Date: 2012-02-26 20:22+0200\n"
"Last-Translator: ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ <miroslavnikolic rocketmail com>\n"
"Language-Team: Serbian <gnom prevod org>\n"
+"Language: sr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: Serbian (sr)\n"
-"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : n"
-"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\\n\n"
-"X-Generator: Virtaal 0.5.2\n"
+"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : "
+"n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Project-Style: gnome\n"
#: ../bin/meld:96
msgid "Cannot import: "
@@ -67,15 +67,15 @@ msgstr "ÐÑÐÐÐÑÑÐ _ÐÐÑÐ"
#: ../data/ui/EditableList.ui.h:6
msgid "Move item down"
-msgstr "ÐÑÐÐÐÑÑÐ ÑÑÐÐÐÑ ÐÐÐÐÐÐ"
+msgstr "ÐÑÐÐÐÑÑÐÑÐ ÑÑÐÐÐÑ ÐÐ ÐÐÐÐ"
#: ../data/ui/EditableList.ui.h:7
msgid "Move item up"
-msgstr "ÐÑÐÐÐÑÑÐ ÑÑÐÐÐÑ ÐÐÐÐÑÐ"
+msgstr "ÐÑÐÐÐÑÑÐÑÐ ÑÑÐÐÐÑ ÐÐ ÐÐÑÐ"
-#: ../data/ui/EditableList.ui.h:8 ../meld/vcview.py:157
+#: ../data/ui/EditableList.ui.h:8 ../meld/vcview.py:158
msgid "Name"
-msgstr "ÐÐÐ"
+msgstr "ÐÐÐÐÐ"
#: ../data/ui/EditableList.ui.h:9
msgid "Pattern"
@@ -83,7 +83,7 @@ msgstr "ÐÐÑÐÐÐÑ"
#: ../data/ui/EditableList.ui.h:10
msgid "Remove selected filter"
-msgstr "ÐÐÐÐÑÐ ÐÐÐÐÑÐÐÐ ÑÐÐÑÐÑ"
+msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÐÑÐÐÐ ÑÐÐÑÐÑ"
#: ../data/ui/EditableList.ui.h:11 ../meld/vcview.py:122
msgid "_Add"
@@ -135,11 +135,11 @@ msgstr "_ÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐÑ ÑÐÐÐÐ"
#: ../data/ui/findbar.ui.h:6
msgid "_Next"
-msgstr "ÐÐÐ_ÐÐÑÐ"
+msgstr "_ÐÐÐÐÐÑÐ"
#: ../data/ui/findbar.ui.h:7
msgid "_Previous"
-msgstr "ÐÑÐ_ÑÑÐÐÐÐ"
+msgstr "_ÐÑÐÑÑÐÐÐÐ"
#: ../data/ui/findbar.ui.h:8 ../meld/meldwindow.py:141
msgid "_Replace"
@@ -147,23 +147,26 @@ msgstr "_ÐÐÐÐÐÐ"
#: ../data/ui/findbar.ui.h:9
msgid "_Search for"
-msgstr "_ÐÐÑÑÐÐÐ"
+msgstr "ÐÐ_ÑÑÐÐÐ"
#: ../data/ui/meldapp.ui.h:1
msgid "Choose Files"
msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐÑÐÑÐÐÐ"
#: ../data/ui/meldapp.ui.h:2
+#| msgid ""
+#| "Copyright © 2002-2009 Stephen Kennedy\n"
+#| "Copyright © 2009-2010 Kai Willadsen"
msgid ""
"Copyright © 2002-2009 Stephen Kennedy\n"
-"Copyright © 2009-2010 Kai Willadsen"
+"Copyright © 2009-2011 Kai Willadsen"
msgstr ""
"ÐÑÑÐÑÑÐÐ ÐÑÐÐÐ © 2002-2009 ÐÑÐÑÐÐ ÐÐÐÐÐÐ\n"
-"ÐÑÑÐÑÑÐÐ ÐÑÐÐÐ © 2009-2010 ÐÐÑ ÐÐÐÐÐÑÐÐ"
+"ÐÑÑÐÑÑÐÐ ÐÑÐÐÐ © 2009-2011 ÐÐÑ ÐÐÐÐÐÑÐÐ"
#: ../data/ui/meldapp.ui.h:4
msgid "Directory"
-msgstr "ÐÐÑÐÐÑÐÑÐÑÑÐ"
+msgstr "ÐÐÑÑÐÐÐÐ"
#. Refers to version of the file being compared
#: ../data/ui/meldapp.ui.h:7
@@ -182,15 +185,15 @@ msgstr "ÐÑÑÐÐ"
#: ../data/ui/meldapp.ui.h:12
msgid "Select VC Directory"
-msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐ ÐÐÑÐÐÑÐÑÐÑÑÐ"
+msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐ ÑÐÑÑÐÐÐÑ"
#: ../data/ui/meldapp.ui.h:13
msgid "_Directory Comparison"
-msgstr "ÐÐÑÐÑÐÑÐ ÐÐ_ÑÐÐÑÐÑÐÑÑÐÐ"
+msgstr "ÐÐÑÐÑÐÑÐ _ÑÐÑÑÐÐÐÐ"
#: ../data/ui/meldapp.ui.h:14
msgid "_File Comparison"
-msgstr "ÐÐÑÐÑÐÑÐ ÐÐ_ÑÐÑÐÐÐ"
+msgstr "ÐÐÑÐÑÐÑÐ _ÐÐÑÐÑÐÐÐ"
#: ../data/ui/meldapp.ui.h:15
msgid "_Three Way Compare"
@@ -198,12 +201,13 @@ msgstr "ÐÐÑÐÑÐÑÐ ÑÑÐ ÐÐÐÐÐÐÑÐ"
#: ../data/ui/meldapp.ui.h:16
msgid "_Version Control Browser"
-msgstr "ÐÑÐÑÑÐÐÐÐÐÑ ÐÐÐÑÑÐÐÐ _ÐÐÑÐÐÑÐ"
+msgstr "ÐÑÐÐÐÐÐÐÐÐ ÐÐÐÑÑÐÐÐ _ÐÐÑÐÐÑÐ"
#: ../data/ui/meldapp.ui.h:17
msgid "translator-credits"
msgstr ""
"ÐÐÐÐÐÐ ÐÐÐÐÐ <danilo prevod org>\n"
+"ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ <miroslavnikolic rocketmail com>\n"
"\n"
"Prevod.org â ÐÑÐÐÐÐ ÐÐ ÑÑÐÑÐÐ ÑÐÐÐÐ."
@@ -217,7 +221,7 @@ msgstr "ÐÐÐÑÐÐÐ ÐÑÐÑÐÐÐÑ"
#: ../data/ui/patch-dialog.ui.h:3
msgid "Create a patch"
-msgstr "ÐÑÐÐÐ ÐÑÐÑÐÐÐÑ"
+msgstr "ÐÐÐÑÐÐÐÑÐ ÐÑÐÑÐÐÐÑ"
#: ../data/ui/patch-dialog.ui.h:4
msgid "Left and middle panes"
@@ -233,11 +237,11 @@ msgstr "ÐÐÑÐÑÑÐ ÑÐÐÐÐÐÐ ÐÐÐÐÑÑ:"
#: ../data/ui/patch-dialog.ui.h:7
msgid "_Reverse patch direction"
-msgstr "ÐÑÐÐ_ÐÑÐÐÐ ÑÐÐÑ ÐÑÐÑÐÐÐÐ"
+msgstr "ÐÑÐÐÐÑÐÐÐ ÑÐÐÑ _ÐÑÐÑÐÐÐÐ"
#: ../data/ui/preferences.ui.h:1
msgid "Display"
-msgstr "<b>ÐÑÐÐÐÐ</b>"
+msgstr "ÐÑÐÐÐÐ"
#: ../data/ui/preferences.ui.h:2
msgid "Do not _split words over two lines"
@@ -269,7 +273,7 @@ msgstr "ÐÐÐÑÐÑÐ ÐÐÑÐÑÐÐÐ"
#: ../data/ui/preferences.ui.h:9
msgid "Font"
-msgstr "<b>ÐÐÐÑ</b>"
+msgstr "ÐÐÐÐÐÐ ÐÐÐ"
#: ../data/ui/preferences.ui.h:10
msgid "Ignore changes which insert or delete blank lines"
@@ -289,7 +293,7 @@ msgstr "ÐÐÑÑÐÐÐÐ ÐÐÐÐÐ"
#: ../data/ui/preferences.ui.h:14
msgid "Show _line numbers"
-msgstr "ÐÑÐÐÐÐÐ _ÐÑÐÑÐÐÐ ÐÐÐÐÑÐ"
+msgstr "ÐÑÐÐÐÐÐ _ÐÑÐÑÐÐÐ ÑÐÐÐÐÐ"
#: ../data/ui/preferences.ui.h:15
msgid "Show w_hitespace"
@@ -318,9 +322,9 @@ msgid ""
"directories by name. Each pattern is a list of shell style wildcards "
"separated by spaces."
msgstr ""
-"ÐÑÐÐÐÐÐÐ ÐÐÑÐÑÐÑÐ ÐÐÑÐÐÑÐÑÐÑÑÐÐ, ÐÐÐÐÑÐ ÐÐ ÑÐÐÑÑÐÑÐÑÐ ÐÐÑÐÑÐÐÐ Ð "
-"ÐÐÑÐÐÑÐÑÐÑÑÐÐ ÐÑÐÐÐ ÐÐÐÐÑ. ÐÐÐÐÐ ÐÐÑÐÐÐÑ ÑÐ ÑÐÐÑÐÐ ÑÐÐÐÑÐ Ñ ÑÑÐÐÑ ÐÐÐÐÐÐÐ "
-"ÑÐÐÐÐÐÑÐÐÐÑ ÑÐÐÐÐÐÐÐ."
+"ÐÑÐÐÐÐÐÐ ÐÐÑÐÑÐÑÐ ÐÐÑÐÐÑÐÑÐÑÑÐÐ, ÐÐÐÐÑÐ ÐÐ ÑÐÐÑÑÐÑÐÑÐ ÐÐÑÐÑÐÐÐ Ð ÑÐÑÑÐÐÐÐ "
+"ÐÑÐÐÐ ÐÐÐÐÐÑ. ÐÐÐÐÐ ÐÐÑÐÐÐÑ ÑÐ ÑÐÐÑÐÐ ÑÐÐÐÑÐ Ñ ÑÑÐÐÑ ÐÐÐÐÐÐÐ ÑÐÐÐÐÐÑÐÐÐÑ "
+"ÑÐÐÐÐÐÐÐ."
#: ../data/ui/preferences.ui.h:21
msgid ""
@@ -331,7 +335,7 @@ msgid ""
"details."
msgstr ""
"ÐÑÐÐÐÐÐÐ ÐÐÑÐÑÐÑÐ ÐÐÑÐÑÐÐÐ, ÐÐÐÐÑÐ ÐÐ ÐÐÐÐÐÐÑÐÑÐ ÐÐÑÐÑÐÐÐ ÐÑÑÑÐ ÐÐÐÐÐÐ. "
-"ÐÐÐÐÐ ÐÐÑÐÐÐÑ ÑÐ ÑÐÐÑÐÐÑÐÐ ÐÐÑÐÐ ÐÐÑÑÐÐÐ ÐÐÑÐ ÐÐÐÐÑÑÑÐ ÐÐÐÑÐÐÑÐÑÑÑÐ ÑÐÐÑÑ "
+"ÐÐÐÐÐ ÐÐÑÐÐÐÑ ÑÐ ÑÐÐÑÐÐÑÐÐ ÐÐÑÐÐ ÐÐÑÐÐÐ ÐÐÑÐ ÐÐÐÐÑÑÑÐ ÐÐÐÑÐÐÑÐÑÑÑÐ ÑÐÐÑÑ "
"ÐÑÐÐÐÐÐ ÐÐÑÐÐÐÐ ÐÑÐ ÐÐÐÑÑÐÐÐÑÐ ÐÐÑÐÑÐÑÐ. ÐÐÐ ÐÐÑÐÐ ÑÐÐÑÐÐ ÐÑÑÐÐ, ÑÐÐÐ ÐÑÑÐÐ "
"ÐÐÐÐÑÑ ÐÐÐÐÑÐÐÐ. ÐÐ ÐÐÑÐ ÐÐÑÐÑÐ ÐÐÐÐÐÐÐÑÑÐ ÑÐÑÑÑÑÐÐ ÐÐ ÐÐÑÐÑÐÐÐÐ."
@@ -356,152 +360,128 @@ msgid "Commit Files"
msgstr "ÐÐÑÐÐÐ ÐÐÑÐÑÐÐÐ"
#: ../data/ui/vcview.ui.h:2
-msgid "Compare Options"
-msgstr "ÐÐÑÐÑÐ ÐÐÑÐÑÐÑÐ"
-
-#: ../data/ui/vcview.ui.h:3
-msgid "Date"
-msgstr "ÐÐÑÑÐ"
-
-#: ../data/ui/vcview.ui.h:4
-msgid "Local copy against other remote revision"
-msgstr "ÐÐÐÐÐÐÐ ÐÑÐÐÐÑÐÐ ÐÐÑÐÑÐÐ ÐÑÑÐÐ ÑÐÐÑÐÐÐ ÑÐÐÐÐÐÑÐ"
-
-#: ../data/ui/vcview.ui.h:5
-msgid "Local copy against same remote revision"
-msgstr "ÐÐÐÐÐÐÐ ÐÑÐÐÐÑÐÐ ÐÐÑÐÑÐÐ ÐÑÑÐ ÑÐÐÑÐÐÐ ÑÐÐÐÐÐÑÐ"
-
-#: ../data/ui/vcview.ui.h:6
msgid "Log Message"
msgstr "ÐÐÑÑÐÐ ÐÐÐÐÐÐÐÐ"
-#: ../data/ui/vcview.ui.h:7
+#: ../data/ui/vcview.ui.h:3
msgid "Previous Logs"
msgstr "ÐÑÐÑÑÐÐÐÐ ÐÐÐÐÐÐÑÐ"
-#: ../data/ui/vcview.ui.h:8 ../meld/vcview.py:180
-msgid "Tag"
-msgstr "ÐÐÐÐÐÐ"
-
-#: ../data/ui/vcview.ui.h:9
+#: ../data/ui/vcview.ui.h:4
msgid "VC Log"
msgstr "ÐÐ ÐÐÐÐÐÐÐ"
-#: ../meld/dirdiff.py:227 ../meld/vcview.py:118
+#: ../meld/dirdiff.py:226 ../meld/vcview.py:119
msgid "_Compare"
msgstr "_ÐÐÐÑÐÐÐ"
-#: ../meld/dirdiff.py:227 ../meld/vcview.py:118
+#: ../meld/dirdiff.py:226 ../meld/vcview.py:119
msgid "Compare selected"
msgstr "ÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐÐ"
-#: ../meld/dirdiff.py:228
+#: ../meld/dirdiff.py:227
msgid "Copy _Left"
msgstr "ÐÐÐÐÐÐ _ÐÐÐÐ"
-#: ../meld/dirdiff.py:228
+#: ../meld/dirdiff.py:227
msgid "Copy to left"
msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÐ"
-#: ../meld/dirdiff.py:229
+#: ../meld/dirdiff.py:228
msgid "Copy _Right"
msgstr "ÐÐÐÐÐÐ _ÐÐÑÐÐ"
-#: ../meld/dirdiff.py:229
+#: ../meld/dirdiff.py:228
msgid "Copy to right"
msgstr "ÐÐÐÐÐÐÑÐ ÐÐÑÐÐ"
-#: ../meld/dirdiff.py:230
+#: ../meld/dirdiff.py:229
msgid "Delete selected"
msgstr "ÐÐÑÐÑÐ ÐÐÐÐÑÐÐÐ"
-#: ../meld/dirdiff.py:231 ../meld/filediff.py:1117
+#: ../meld/dirdiff.py:230 ../meld/filediff.py:1157
msgid "Hide"
msgstr "ÐÐÐÑÐÑ"
-#: ../meld/dirdiff.py:231
+#: ../meld/dirdiff.py:230
msgid "Hide selected"
msgstr "ÐÐÐÑÐÑ ÐÐÐÐÑÐÐÐ"
-#: ../meld/dirdiff.py:233 ../meld/filediff.py:267 ../meld/vcview.py:119
-msgid "Open selected"
-msgstr "ÐÑÐÐÑÐ ÐÐÐÐÑÐÐÐ"
-
-#: ../meld/dirdiff.py:237
+#: ../meld/dirdiff.py:234
msgid "Case"
msgstr "ÐÐÐÐÑÐÐÐ ÑÐÐÐÐ"
-#: ../meld/dirdiff.py:237
+#: ../meld/dirdiff.py:234
msgid "Ignore case of entries"
msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÐÑÐÐÑ ÑÐÐÐÐ ÑÐÐÑÐ"
-#: ../meld/dirdiff.py:238
+#: ../meld/dirdiff.py:235
msgid "Same"
msgstr "ÐÑÑÐ"
-#: ../meld/dirdiff.py:238
+#: ../meld/dirdiff.py:235
msgid "Show identical"
msgstr "ÐÑÐÐÐÐÐ ÐÑÑÐÐÐÑÐÐ"
-#: ../meld/dirdiff.py:239
+#: ../meld/dirdiff.py:236
msgid "New"
msgstr "ÐÐÐÐ"
-#: ../meld/dirdiff.py:239
+#: ../meld/dirdiff.py:236
msgid "Show new"
msgstr "ÐÑÐÐÐÐÐ ÐÐÐÐ"
-#: ../meld/dirdiff.py:240
+#: ../meld/dirdiff.py:237
msgid "Modified"
msgstr "ÐÐÐÐÑÐÐÐ"
-#: ../meld/dirdiff.py:240 ../meld/vcview.py:132
+#: ../meld/dirdiff.py:237 ../meld/vcview.py:132
msgid "Show modified"
msgstr "ÐÑÐÐÐÐÐ ÐÐÐÐÑÐÐÐ"
-#: ../meld/dirdiff.py:242
+#: ../meld/dirdiff.py:239
msgid "Filters"
msgstr "ÐÐÐÑÐÑÐ"
-#: ../meld/dirdiff.py:242
+#: ../meld/dirdiff.py:239
msgid "Set active filters"
msgstr "ÐÐÐÐÑÐÑÐ ÐÐÑÐÐÐÐ ÑÐÐÑÐÑÐ"
-#: ../meld/dirdiff.py:359
+#: ../meld/dirdiff.py:354
#, python-format
msgid "Hide %s"
msgstr "ÐÐÐÑÐÑ â%sâ"
-#: ../meld/dirdiff.py:462 ../meld/dirdiff.py:475 ../meld/vcview.py:305
-#: ../meld/vcview.py:333
+#: ../meld/dirdiff.py:457 ../meld/dirdiff.py:470 ../meld/vcview.py:306
+#: ../meld/vcview.py:334
#, python-format
msgid "[%s] Scanning %s"
msgstr "[%s] ÐÑÐÐÐÐÐÐÐ â%sâ"
-#: ../meld/dirdiff.py:574
+#: ../meld/dirdiff.py:569
#, python-format
msgid "[%s] Done"
msgstr "[%s] ÐÐÑÐÐÐ"
-#: ../meld/dirdiff.py:578
+#: ../meld/dirdiff.py:573
msgid "Multiple errors occurred while scanning this folder"
msgstr "ÐÐÑÐÐ ÑÐ ÐÐ ÐÐÑÐ ÐÑÐÑÐÐÐ ÐÐ ÐÑÐÐÐ ÐÑÐÑÑÐÐÐÐÐÑÐ ÐÐÐ ÑÐÑÑÐÐÐÐ"
-#: ../meld/dirdiff.py:579
+#: ../meld/dirdiff.py:574
msgid "Files with invalid encodings found"
msgstr "ÐÑÐÐÐÑÐÐÐ ÑÑ ÐÐÑÐÑÐÐÐ ÑÐ ÐÐÐÑÐÑÐÐÐÐÐ ÐÐÐÐÑÐÑÐÐ"
#. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:581
+#: ../meld/dirdiff.py:576
msgid "Some files were in an incorrect encoding. The names are something like:"
-msgstr "ÐÐÐÐ ÐÐÑÐÑÐÐÐ ÐÐÑÐÑÑ Ñ ÐÐÐÑÐÑÐÐÐÐÐ ÐÐÐÐÑÐÑÑ. ÐÐÐÐÐ ÑÑ ÐÐÑÑÐ ÐÐÐ:"
+msgstr "ÐÐÐÐ ÐÐÑÐÑÐÐÐ ÐÐÑÐÑÑ Ñ ÐÐÐÑÐÑÐÐÐÐÐ ÐÐÐÐÑÐÑÑ. ÐÐÐÐÐÐ ÑÑ ÐÐÑÑÐ ÐÐÐ:"
-#: ../meld/dirdiff.py:583
+#: ../meld/dirdiff.py:578
msgid "Files hidden by case insensitive comparison"
msgstr "ÐÐÑÐÑÐÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑÐÑÐÑÐÐ ÐÐÐÑÐÑÑÐÐÐÐ ÐÐ ÐÐÐÐÑÐÐÑ ÑÐÐÐÐ"
#. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:585
+#: ../meld/dirdiff.py:580
msgid ""
"You are running a case insensitive comparison on a case sensitive "
"filesystem. The following files in this folder are hidden:"
@@ -509,16 +489,16 @@ msgstr ""
"ÐÐÐÑÐÐÑÐÐ ÑÑÐ ÐÐÑÐÑÐÑÐ ÐÐÐÐÐÐÑÐÐ ÐÐ ÐÐÐÐÑÐÐÐ ÑÐÐÐÐ ÐÐ ÑÐÑÑÐÐÑ ÐÐÑÐÑÐÐÐ ÐÐÐ "
"ÑÐ ÐÐÐ ÐÐÑÐÐ. ÐÐÐÐ ÐÐÑÐÑÐÐÐ ÐÐÑÑ ÐÐÐÑÐÐÐ:"
-#: ../meld/dirdiff.py:596
+#: ../meld/dirdiff.py:591
#, python-format
msgid "'%s' hidden by '%s'"
msgstr "â%sâ ÑÐÐÑÐÐÐÐÐ ÐÐ ÑÑÑÐÐÐ â%sâ"
-#: ../meld/dirdiff.py:621 ../meld/filediff.py:981 ../meld/filediff.py:1121
+#: ../meld/dirdiff.py:616 ../meld/filediff.py:1008 ../meld/filediff.py:1161
msgid "Hi_de"
msgstr "_ÐÐÐÑÐÑ"
-#: ../meld/dirdiff.py:671
+#: ../meld/dirdiff.py:666
#, python-format
msgid ""
"'%s' exists.\n"
@@ -527,7 +507,7 @@ msgstr ""
"â%sâ ÐÐÑÑÐÑÐ.\n"
"ÐÐ ÐÑÐÑÐÐÐÐÐ?"
-#: ../meld/dirdiff.py:678
+#: ../meld/dirdiff.py:673
#, python-format
msgid ""
"Error copying '%s' to '%s'\n"
@@ -538,16 +518,16 @@ msgstr ""
"\n"
"%s."
-#: ../meld/dirdiff.py:696 ../meld/vcview.py:505
+#: ../meld/dirdiff.py:691 ../meld/vcview.py:503
#, python-format
msgid ""
"'%s' is a directory.\n"
"Remove recursively?"
msgstr ""
-"â%sâ ÑÐ ÐÐÑÐÐÑÐÑÐÑÑÐ.\n"
+"â%sâ ÑÐ ÑÐÑÑÐÐÐÐ.\n"
"ÐÐ ÑÐÐÐÐÐÐ ÑÐÐÑÑÐÐÐÐÐ?"
-#: ../meld/dirdiff.py:703 ../meld/vcview.py:510
+#: ../meld/dirdiff.py:698 ../meld/vcview.py:508
#, python-format
msgid ""
"Error removing %s\n"
@@ -558,16 +538,16 @@ msgstr ""
"\n"
"%s."
-#: ../meld/dirdiff.py:715
+#: ../meld/dirdiff.py:723
#, python-format
msgid "%i second"
msgid_plural "%i seconds"
msgstr[0] "%i ÑÐÐÑÐÐ"
msgstr[1] "%i ÑÐÐÑÐÐÐ"
-msgstr[2] "%i ÑÐÐÑÐÐÐ"
+msgstr[2] "%i ÑÐÐÑÐÐÐ"
msgstr[3] "%i ÑÐÐÑÐÐÐ"
-#: ../meld/dirdiff.py:716
+#: ../meld/dirdiff.py:724
#, python-format
msgid "%i minute"
msgid_plural "%i minutes"
@@ -576,7 +556,7 @@ msgstr[1] "%i ÐÐÐÑÑÐ"
msgstr[2] "%i ÐÐÐÑÑÐ"
msgstr[3] "%i ÐÐÐÑÑ"
-#: ../meld/dirdiff.py:717
+#: ../meld/dirdiff.py:725
#, python-format
msgid "%i hour"
msgid_plural "%i hours"
@@ -585,7 +565,7 @@ msgstr[1] "%i ÑÐÑÐ"
msgstr[2] "%i ÑÐÑÐ"
msgstr[3] "%i ÑÐÑ"
-#: ../meld/dirdiff.py:718
+#: ../meld/dirdiff.py:726
#, python-format
msgid "%i day"
msgid_plural "%i days"
@@ -594,7 +574,7 @@ msgstr[1] "%i ÐÐÐÐ"
msgstr[2] "%i ÐÐÐÐ"
msgstr[3] "%i ÐÐÐ"
-#: ../meld/dirdiff.py:719
+#: ../meld/dirdiff.py:727
#, python-format
msgid "%i week"
msgid_plural "%i weeks"
@@ -603,7 +583,7 @@ msgstr[1] "%i ÐÐÐÐÑÐ"
msgstr[2] "%i ÐÐÐÐÑÐ"
msgstr[3] "%i ÐÐÐÐÑÐ"
-#: ../meld/dirdiff.py:720
+#: ../meld/dirdiff.py:728
#, python-format
msgid "%i month"
msgid_plural "%i months"
@@ -612,7 +592,7 @@ msgstr[1] "%i ÐÐÑÐÑÐ"
msgstr[2] "%i ÐÐÑÐÑÐ"
msgstr[3] "%i ÐÐÑÐÑ"
-#: ../meld/dirdiff.py:721
+#: ../meld/dirdiff.py:729
#, python-format
msgid "%i year"
msgid_plural "%i years"
@@ -621,159 +601,159 @@ msgstr[1] "%i ÐÐÐÐÐÐ"
msgstr[2] "%i ÐÐÐÐÐÐ"
msgstr[3] "%i ÐÐÐÐÐÐ"
-#: ../meld/filediff.py:268
+#: ../meld/filediff.py:294
msgid "Format as patch..."
msgstr "ÐÐÑÐÐÑÐÑÐÑ ÐÐÐ ÐÑÐÑÐÐÐÑ..."
-#: ../meld/filediff.py:268
+#: ../meld/filediff.py:294
msgid "Create a patch using differences between files"
-msgstr "ÐÑÐÐÐ ÐÑÐÑÐÐÐÑ ÐÐÑÐÑÑÐÑÐ ÑÐÐÐÐÐÐ ÐÐÐÐÑÑ ÐÐÑÐÑÐÐÐ"
+msgstr "ÐÐÐÑÐÐÐÑÐ ÐÑÐÑÐÐÐÑ ÐÐÑÐÑÑÐÑÐ ÑÐÐÐÐÐÐ ÐÐÐÐÑÑ ÐÐÑÐÑÐÐÐ"
-#: ../meld/filediff.py:269
+#: ../meld/filediff.py:295
msgid "Previous conflict"
msgstr "ÐÑÐÑÑÐÐÐÐ ÑÑÐÐÐ"
-#: ../meld/filediff.py:269
+#: ../meld/filediff.py:295
msgid "Go to the previous conflict"
-msgstr "ÐÐÐ ÐÐ ÐÑÐÑÑÐÐÐÐ ÑÑÐÐÐ"
+msgstr "ÐÐÐÑÐ ÐÐ ÐÑÐÑÑÐÐÐÐ ÑÑÐÐÐ"
-#: ../meld/filediff.py:270
+#: ../meld/filediff.py:296
msgid "Next conflict"
msgstr "ÐÐÐÐÐÑÐ ÑÑÐÐÐ"
-#: ../meld/filediff.py:270
+#: ../meld/filediff.py:296
msgid "Go to the next conflict"
-msgstr "ÐÐÐ ÐÐ ÑÐÐÐÐÑÐ ÑÑÐÐÐ"
+msgstr "ÐÐÐÑÐ ÐÐ ÑÐÐÐÐÑÐ ÑÑÐÐÐ"
-#: ../meld/filediff.py:271
+#: ../meld/filediff.py:297
msgid "Push to left"
msgstr "ÐÑÑÐÐ ÑÐÐÐÐ"
-#: ../meld/filediff.py:271
+#: ../meld/filediff.py:297
msgid "Push current change to the left"
-msgstr "ÐÑÑÐ ÑÐÐÑÑÑ ÐÐÐÐÐÑ ÑÐÐÐÐ"
+msgstr "ÐÑÑÐÐÑÐ ÑÐÐÑÑÑ ÐÐÐÐÐÑ ÑÐÐÐÐ"
-#: ../meld/filediff.py:272
+#: ../meld/filediff.py:298
msgid "Push to right"
msgstr "ÐÑÑÐÐ ÑÐÐÑÐÐ"
-#: ../meld/filediff.py:272
+#: ../meld/filediff.py:298
msgid "Push current change to the right"
-msgstr "ÐÑÑÐ ÑÐÐÑÑÑ ÐÐÐÐÐÑ ÑÐÐÑÐÐ"
+msgstr "ÐÑÑÐÐÑÐ ÑÐÐÑÑÑ ÐÐÐÐÐÑ ÑÐÐÑÐÐ"
#. FIXME: using LAST and FIRST is terrible and unreliable icon abuse
-#: ../meld/filediff.py:274
+#: ../meld/filediff.py:300
msgid "Pull from left"
msgstr "ÐÐÐÑÐ Ñ ÐÐÐÐ"
-#: ../meld/filediff.py:274
+#: ../meld/filediff.py:300
msgid "Pull change from the left"
-msgstr "ÐÐÐÑÑÑÐ ÐÐÐÐÐÑ Ñ ÐÐÐÐ"
+msgstr "ÐÐÐÑÐÑÐ ÐÐÐÐÐÑ Ñ ÐÐÐÐ"
-#: ../meld/filediff.py:275
+#: ../meld/filediff.py:301
msgid "Pull from right"
msgstr "ÐÐÐÑÐ Ñ ÐÐÑÐÐ"
-#: ../meld/filediff.py:275
+#: ../meld/filediff.py:301
msgid "Pull change from the right"
-msgstr "ÐÐÐÑÑÑÐ ÐÐÐÐÐÑ Ñ ÐÐÐÐ"
+msgstr "ÐÐÐÑÐÑÐ ÐÐÐÐÐÑ Ñ ÐÐÑÐÐ"
-#: ../meld/filediff.py:276
+#: ../meld/filediff.py:302
msgid "Copy above left"
msgstr "ÐÐÐÐÐÐ ÐÐÐÐÐ ÑÐÐÐÐ"
-#: ../meld/filediff.py:276
+#: ../meld/filediff.py:302
msgid "Copy change above the left chunk"
-msgstr "ÐÐÐÐÐÐÐÐ ÐÐÐÐÐÑ ÐÐÐÐÐ ÐÐÐÐÐÐ ÑÐÐÐÐ"
+msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÐÐÑ ÐÐÐÐÐ ÐÐÐÐÐÐ ÑÐÐÐÐ"
-#: ../meld/filediff.py:277
+#: ../meld/filediff.py:303
msgid "Copy below left"
msgstr "ÐÐÐÐÐÐ ÐÑÐÐÐ ÑÐÐÐÐ"
-#: ../meld/filediff.py:277
+#: ../meld/filediff.py:303
msgid "Copy change below the left chunk"
-msgstr "ÐÐÐÐÐÐÐÐ ÐÐÐÐÐÑ ÐÑÐÐÐ ÐÐÐÐÐÐ ÑÐÐÐÐ"
+msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÐÐÑ ÐÑÐÐÐ ÐÐÐÐÐÐ ÑÐÐÐÐ"
-#: ../meld/filediff.py:278
+#: ../meld/filediff.py:304
msgid "Copy above right"
msgstr "ÐÐÐÐÐÐ ÐÐÐÐÐ ÑÐÐÑÐÐ"
-#: ../meld/filediff.py:278
+#: ../meld/filediff.py:304
msgid "Copy change above the right chunk"
-msgstr "ÐÐÐÐÐÐÐÐ ÐÐÐÐÐÑ ÐÐÐÐÐ ÐÐÐÐÐÐ ÑÐÐÐÐ"
+msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÐÐÑ ÐÐÐÐÐ ÐÐÐÐÐÐ ÑÐÐÑÐÐ"
-#: ../meld/filediff.py:279
+#: ../meld/filediff.py:305
msgid "Copy below right"
msgstr "ÐÐÐÐÐÐ ÐÑÐÐÐ ÑÐÐÑÐÐ"
-#: ../meld/filediff.py:279
+#: ../meld/filediff.py:305
msgid "Copy change below the right chunk"
-msgstr "ÐÐÐÐÐÐÐÐ ÐÐÐÐÐÑ ÐÑÐÐÐ ÐÐÐÐÐÐ ÑÐÐÑÐÐ"
+msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÐÐÑ ÐÑÐÐÐ ÐÐÐÐÐÐ ÑÐÐÑÐÐ"
-#: ../meld/filediff.py:280
+#: ../meld/filediff.py:306
msgid "Delete"
msgstr "ÐÐÑÐÑÐ"
-#: ../meld/filediff.py:280
+#: ../meld/filediff.py:306
msgid "Delete change"
-msgstr "ÐÑÐÑÐ ÐÐÐÐÐÑ"
+msgstr "ÐÐÑÐÑÐÑÐ ÐÐÐÐÐÑ"
-#: ../meld/filediff.py:281
+#: ../meld/filediff.py:307
msgid "Merge all changes from left"
msgstr "ÐÐÑÐÐÐÐÐ ÑÐÐ ÐÐÐÐÐÐ Ñ ÐÐÐÐ"
-#: ../meld/filediff.py:281
+#: ../meld/filediff.py:307
msgid "Merge all non-conflicting changes from the left"
-msgstr "ÐÐÑÐÐÐÑÑÑÐ ÑÐÐ ÐÐÑÑÐÐÐÑÐÐÐÑÑÑÐ ÐÐÐÐÐÐ Ñ ÐÐÐÐ"
+msgstr "ÐÐÑÐÐÐÐÐÑÐ ÑÐÐ ÐÐÑÑÐÐÐÑÐÐÐÑÑÑÐ ÐÐÐÐÐÐ Ñ ÐÐÐÐ"
-#: ../meld/filediff.py:282
+#: ../meld/filediff.py:308
msgid "Merge all changes from right"
msgstr "ÐÐÑÐÐÐÐÐ ÑÐÐ ÐÐÐÐÐÐ Ñ ÐÐÑÐÐ"
-#: ../meld/filediff.py:282
+#: ../meld/filediff.py:308
msgid "Merge all non-conflicting changes from the right"
-msgstr "ÐÐÑÐÐÐÑÑÑÐ ÑÐÐ ÐÐÑÑÐÐÐÑÐÐÐÑÑÑÐ ÐÐÐÐÐÐ Ñ ÐÐÑÐÐ"
+msgstr "ÐÐÑÐÐÐÐÐÑÐ ÑÐÐ ÐÐÑÑÐÐÐÑÐÐÐÑÑÑÐ ÐÐÐÐÐÐ Ñ ÐÐÑÐÐ"
-#: ../meld/filediff.py:283
+#: ../meld/filediff.py:309
msgid "Merge all non-conflicting"
msgstr "ÐÐÑÐÐÐÐÐ ÑÐÐ ÐÐÑÑÐÐÐÑÐÐÐÑÑÑÐ"
-#: ../meld/filediff.py:283
+#: ../meld/filediff.py:309
msgid "Merge all non-conflicting changes from left and right panes"
-msgstr "ÐÐÑÐÐÐÑÑÑÐ ÑÐÐ ÐÐÑÑÐÐÐÑÐÐÐÑÑÑÐ ÐÐÐÐÐÐ Ñ ÐÐÐÐ Ð ÐÐÑÐÐ ÐÐÐÑÑÐ"
+msgstr "ÐÐÑÐÐÐÐÐÑÐ ÑÐÐ ÐÐÑÑÐÐÐÑÐÐÐÑÑÑÐ ÐÐÐÐÐÐ Ñ ÐÐÐÐ Ð ÐÐÑÐÐ ÐÐÐÑÑÐ"
-#: ../meld/filediff.py:284
+#: ../meld/filediff.py:310
msgid "Cycle through documents"
msgstr "ÐÑÑÐÐ ÐÑÐÐ ÐÐÐÑÐÐÐÑÐ"
-#: ../meld/filediff.py:284
+#: ../meld/filediff.py:310
msgid "Move keyboard focus to the next document in this comparison"
-msgstr "ÐÑÐÐÐÑÑÐ ÑÐÐÑÑ ÑÐÑÑÐÑÑÑÐ ÐÐ ÑÐÐÐÐÑÐ ÐÐÐÑÐÐÐÑ Ñ ÐÐÐÐ ÐÐÑÐÑÐÑÑ"
+msgstr "ÐÑÐÐÐÑÑÐÑÐ ÑÐÐÑÑ ÑÐÑÑÐÑÑÑÐ ÐÐ ÑÐÐÐÐÑÐ ÐÐÐÑÐÐÐÑ Ñ ÐÐÐÐ ÐÐÑÐÑÐÑÑ"
-#: ../meld/filediff.py:288
+#: ../meld/filediff.py:314
msgid "Lock scrolling"
msgstr "ÐÐÐÑÑÑÐÑ ÐÐÐÐÐÑÐ"
-#: ../meld/filediff.py:289
+#: ../meld/filediff.py:315
msgid "Lock scrolling of all panes"
-msgstr "ÐÐÐÑÑÑÐÐÐ ÐÐÐÐÐÑÐ ÑÐÐÑ ÐÐÐÑÑÐ"
+msgstr "ÐÐÐÑÑÑÐÑÑÐ ÐÐÐÐÐÑÐ ÑÐÐÑ ÐÐÐÑÑÐ"
#. Abbreviations for insert and overwrite that fit in the status bar
-#: ../meld/filediff.py:381
+#: ../meld/filediff.py:396
msgid "INS"
msgstr "ÐÐÐÐ"
-#: ../meld/filediff.py:381
+#: ../meld/filediff.py:396
msgid "OVR"
msgstr "ÐÐÐÐ"
#. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:383
+#: ../meld/filediff.py:398
#, python-format
msgid "Ln %i, Col %i"
msgstr "ÐÐÐ %i, ÐÐÑÑÐ %i"
-#: ../meld/filediff.py:693
+#: ../meld/filediff.py:722
#, python-format
msgid ""
"Filter '%s' changed the number of lines in the file. Comparison will be "
@@ -783,46 +763,46 @@ msgstr ""
"ÐÐÑÐ ÐÐÑÐÑÐ ÐÐÐÐÐÐÐÑÑÐ ÐÑÐÑÑÑÐÐÐ ÐÐ ÐÐÑÐÑÐÐÐÐ."
#. TRANSLATORS: this is the name of a new file which has not yet been saved
-#: ../meld/filediff.py:780
+#: ../meld/filediff.py:809
msgid "<unnamed>"
msgstr "<ÐÐÐÐÐÐÐÐÐÐ>"
-#: ../meld/filediff.py:969
+#: ../meld/filediff.py:996
#, python-format
msgid "[%s] Set num panes"
msgstr "[%s] ÐÐÑÑÐÐÐ ÐÑÐÑ ÐÐÐÑÐ"
-#: ../meld/filediff.py:975
+#: ../meld/filediff.py:1002
#, python-format
msgid "[%s] Opening files"
msgstr "[%s] ÐÑÐÐÑÐÐ ÐÐÑÐÑÐÐÐ"
-#: ../meld/filediff.py:999 ../meld/filediff.py:1008 ../meld/filediff.py:1020
-#: ../meld/filediff.py:1026
+#: ../meld/filediff.py:1026 ../meld/filediff.py:1035 ../meld/filediff.py:1047
+#: ../meld/filediff.py:1053
msgid "Could not read file"
msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÑÐÑÐÐ ÐÐÑÐÑÐÐÑ"
-#: ../meld/filediff.py:1000
+#: ../meld/filediff.py:1027
#, python-format
msgid "[%s] Reading files"
msgstr "[%s] ÐÐÑÐÐ ÐÐÑÐÑÐÐÐ"
-#: ../meld/filediff.py:1009
+#: ../meld/filediff.py:1036
#, python-format
msgid "%s appears to be a binary file."
msgstr "â%sâ ÐÐÐÐÐÐÐ ÐÐ ÑÐ ÐÐÐÑÑÐÐ ÐÐÑÐÑÐÐÐ."
-#: ../meld/filediff.py:1021
+#: ../meld/filediff.py:1048
#, python-format
msgid "%s is not in encodings: %s"
msgstr "â%sâ ÐÐÑÐ Ñ ÐÐÐÐÑÐÑÐÐÐ: â%sâ"
-#: ../meld/filediff.py:1051 ../meld/filemerge.py:67
+#: ../meld/filediff.py:1078 ../meld/filemerge.py:67
#, python-format
msgid "[%s] Computing differences"
msgstr "[%s] ÐÑÐÑÑÐÐÐÐÐ ÑÐÐÐÐÐÐ"
-#: ../meld/filediff.py:1108
+#: ../meld/filediff.py:1148
msgid ""
"Text filters are being used, and may be masking differences between files. "
"Would you like to compare the unfiltered files?"
@@ -830,15 +810,15 @@ msgstr ""
"ÐÐÑÐÑÑÐÐÐ ÑÑ ÑÐÐÑÐÑÐ ÑÐÐÑÑÐ, Ð ÐÐÐÑ ÐÐÑÑÐÑÐÑÐ Ð ÐÐÐÐÑÐÐÑÐÐÐ ÑÐÐÐÐÐÐ ÐÐÐÐÑÑ "
"ÐÐÑÐÑÐÐÐ. ÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÑÐÐÐÑÐ ÐÐÑÐÐÑÑÐÑÐÐÐ ÐÐÑÐÑÐÐÐ?"
-#: ../meld/filediff.py:1114
+#: ../meld/filediff.py:1154
msgid "Files are identical"
msgstr "ÐÐÑÐÑÐÐÐ ÑÑ ÐÑÑÐÐÐÑÐÐ"
-#: ../meld/filediff.py:1124
+#: ../meld/filediff.py:1164
msgid "Show without filters"
msgstr "ÐÑÐÐÐÐÑÑÐ ÐÐÐ ÑÐÐÑÐÑÐ"
-#: ../meld/filediff.py:1278
+#: ../meld/filediff.py:1354
#, python-format
msgid ""
"\"%s\" exists!\n"
@@ -847,7 +827,7 @@ msgstr ""
"â%sâ ÐÐÑÑÐÑÐ!\n"
"ÐÐ ÐÑÐÑÐÐÐÐÐ?"
-#: ../meld/filediff.py:1291
+#: ../meld/filediff.py:1367
#, python-format
msgid ""
"Error writing to %s\n"
@@ -858,12 +838,12 @@ msgstr ""
"\n"
"%s."
-#: ../meld/filediff.py:1300
+#: ../meld/filediff.py:1376
#, python-format
msgid "Choose a name for buffer %i."
-msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐÐ ÐÐ %i. ÐÐÑÐÑ."
+msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐÐÐÐ ÐÐ %i. ÐÐÑÐÑ."
-#: ../meld/filediff.py:1315
+#: ../meld/filediff.py:1391
#, python-format
msgid ""
"This file '%s' contains a mixture of line endings.\n"
@@ -874,16 +854,16 @@ msgstr ""
"\n"
"ÐÐÑÐ ÐÐÐÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÑÐÑÑÐÑÐ?"
-#: ../meld/filediff.py:1331
+#: ../meld/filediff.py:1407
#, python-format
msgid ""
"'%s' contains characters not encodable with '%s'\n"
"Would you like to save as UTF-8?"
msgstr ""
"â%sâ ÑÐÐÑÐÐ ÐÐÐÐÐÐÐ ÐÐÑÐ ÑÐ ÐÐ ÐÐÐÑ ÐÐÐÐÑÐÑÐ ÑÐ â%sâ\n"
-"ÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐ ÑÐÑÑÐÐÑÐ ÐÐÐ âUTF-8â?"
+"ÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐ ÑÐÑÑÐÐÑÐ ÐÐÐ ÐÐÐ-8?"
-#: ../meld/filediff.py:1390
+#: ../meld/filediff.py:1466
#, python-format
msgid ""
"Reloading will discard changes in:\n"
@@ -928,27 +908,27 @@ msgstr "ÐÐÐÑÐÑÐ ÐÐÑÐÑÐÑÐ 2 ÐÐÐ 3 ÐÐÐÐÐÐÑÐ ÐÐÑÐÑÐ
#: ../meld/meldapp.py:156
msgid "Start a 2- or 3-way directory comparison"
-msgstr "ÐÐÐÑÐÑÐ ÐÐÑÐÑÐÑÐ 2 ÐÐÐ 3 ÐÐÐÐÐÐÑÐ ÐÐÑÐÐÑÐÑÐÑÑÐÐ"
+msgstr "ÐÐÐÑÐÑÐ ÐÐÑÐÑÐÑÐ 2 ÐÐÐ 3 ÐÐÐÐÐÐÑÐ ÑÐÑÑÐÐÐÐ"
#: ../meld/meldapp.py:157
msgid "Start a comparison between file and dir/file"
-msgstr "ÐÐÐÑÐÑÐ ÐÐÑÐÑÐÑÐ ÐÐÐÐÑÑ ÐÐÑÐÑÐÐÐ Ð ÐÐÑÐÐÑÐÑÐÑÑÐÐ/ÐÐÑÐÑÐÐÐ"
+msgstr "ÐÐÐÑÐÑÐ ÐÐÑÐÑÐÑÐ ÐÐÐÐÑÑ ÐÐÑÐÑÐÐÐ Ð ÑÐÑÑÐÐÐÐ/ÐÐÑÐÑÐÐÐ"
#: ../meld/meldapp.py:163
msgid "Meld is a file and directory comparison tool."
-msgstr "ÐÐÐÐ ÑÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÐÑÐ ÐÐÑÐÑÐÐÐ Ð ÐÐÑÐÐÑÐÑÐÑÑÐÐ."
+msgstr "ÐÐÐÐ ÑÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÐÑÐ ÐÐÑÐÑÐÐÐ Ð ÑÐÑÑÐÐÐÐ."
#: ../meld/meldapp.py:166
msgid "Set label to use instead of file name"
-msgstr "ÐÐÐÐÑÐÐÐ ÐÐÐÐÐÑ ÐÐ ÐÐÑÐÑÑÐÑÐ ÑÐÐÑÑÐ ÐÐÐÐÐ ÐÐÑÐÑÐÐÐ"
+msgstr "ÐÐÐÐÑÐÐÐ ÐÐÐÐÐÑ ÐÐ ÐÐÑÐÑÑÐÑÐ ÑÐÐÑÑÐ ÐÐÐÐÐÐ ÐÐÑÐÑÐÐÐ"
#: ../meld/meldapp.py:168
msgid "Automatically compare all differing files on startup"
-msgstr "ÐÑÑÐÐÐÑÑÐÐ ÐÐÑÐÐÐ ÑÐÐ ÑÐÐÐÐÐÑÑÑÑÐ ÐÐÑÐÑÐÐÐ ÐÑÐÐÐÐÐÐ ÐÐÐÑÐÑÐÑÐ"
+msgstr "ÐÐÐÐÑÑÐÐÐÐ ÐÐÑÐÐÐ ÑÐÐ ÑÐÐÐÐÐÑÑÑÑÐ ÐÐÑÐÑÐÐÐ ÐÑÐÐÐÐÐÐ ÐÐÐÑÐÑÐÑÐ"
#: ../meld/meldapp.py:170
msgid "Ignored for compatibility"
-msgstr "ÐÐÐÐÐÐÑÐÐÐ ÐÐÐÐ ÐÐÐÐÐÑÐÐÐÐÐÐÑÑÐ"
+msgstr "ÐÐÐÐÐÐÑÐÐÐ ÐÐÐÐ ÑÐÐÐÐÑÐÐÑÑÐ"
#: ../meld/meldapp.py:173
msgid "Set the target file for saving a merge result"
@@ -956,8 +936,7 @@ msgstr "ÐÐÐÐÑÐÐÐ ÑÐÑÐÑ ÐÐÑÐÑÐÐÑ ÐÐ ÑÑÐÐÑÐ ÑÐÐÑ
#: ../meld/meldapp.py:176
msgid "Creates a diff tab for up to 3 supplied files or directories."
-msgstr ""
-"ÐÑÐÐÐ ÑÐÐÐÑÐÐ ÑÐÐÐÐÐÐ ÐÐ ÐÐÑÐÐÑÐ ÐÐ 3 ÐÑÐÐÐÐÐÑÐ ÐÐÑÐÑÐÐÐ ÐÐÐ ÐÐÑÐÐÑÐÑÐÑÑÐÐ."
+msgstr "ÐÑÐÐÐ ÑÐÐÐÑÐÐ ÑÐÐÐÐÐÐ ÐÐ ÐÐÑÐÐÑÐ ÐÐ 3 ÐÑÐÐÐÐÐÑÐ ÐÐÑÐÑÐÐÐ ÐÐÐ ÑÐÑÑÐÐÐÐ."
#: ../meld/meldapp.py:179
#, python-format
@@ -966,9 +945,9 @@ msgstr "ÐÑÐÐÐÑÐ ÐÑÐÑÐÐÐÐÑÐ (ÑÑÐÐÐÐÐ ÑÐ 0-4, ÐÐÐÐÑ
#: ../meld/meldapp.py:181 ../meld/meldapp.py:185
msgid "can't compare more than three directories"
-msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÐÐÐ ÐÐÑÐ ÐÐ ÑÑÐ ÐÐÑÐÐÑÐÑÐÑÑÐÐ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÐÐÐ ÐÐÑÐ ÐÐ ÑÑÐ ÑÐÑÑÐÐÐÐ"
-#: ../meld/melddoc.py:51 ../meld/melddoc.py:52
+#: ../meld/melddoc.py:56 ../meld/melddoc.py:57
msgid "untitled"
msgstr "ÐÐÐÐÐÐÐÐ"
@@ -978,23 +957,23 @@ msgstr "_ÐÐÑÐÑÐÐÐ"
#: ../meld/meldwindow.py:126
msgid "_New..."
-msgstr "_ÐÐÐÐ..."
+msgstr "_ÐÐÐÐ..."
#: ../meld/meldwindow.py:126
msgid "Start a new comparison"
-msgstr "ÐÐÐÐÑÐÑÐ ÐÐÐÐ ÐÐÑÐÑÐÑÐ"
+msgstr "ÐÐÐÐÑÐÐÑÐ ÐÐÐÐ ÐÐÑÐÑÐÑÐ"
#: ../meld/meldwindow.py:127
msgid "Save the current file"
-msgstr "ÐÑÐÐ ÑÑÐÐÑÑÐÑ ÐÐÑÐÑÐÐÑ"
+msgstr "ÐÐÑÑÐÐÑÑÐ ÑÑÐÐÑÑÐÑ ÐÐÑÐÑÐÐÑ"
#: ../meld/meldwindow.py:129
msgid "Close the current file"
-msgstr "ÐÐÑÐÐÑÐ ÑÑÐÐÑÑÐÑ ÐÐÑÐÑÐÐÑ"
+msgstr "ÐÐÑÐÐÑÐÑÐ ÑÑÐÐÑÑÐÑ ÐÐÑÐÑÐÐÑ"
#: ../meld/meldwindow.py:130
msgid "Quit the program"
-msgstr "ÐÐÑÐÐÑÐ ÐÑÐÐÑÐÐ"
+msgstr "ÐÐÑÐÐÑÐÑÐ ÐÑÐÐÑÐÐ"
#: ../meld/meldwindow.py:132
msgid "_Edit"
@@ -1002,35 +981,35 @@ msgstr "_ÐÑÐÑÐÐÐÑÐ"
#: ../meld/meldwindow.py:133
msgid "Undo the last action"
-msgstr "ÐÐÐÐÐÐÐ ÐÐÑÐÐÐÑÑ ÑÐÐÑÑ"
+msgstr "ÐÐÐÐÐÐÐÑÐ ÐÐÑÐÐÐÑÑ ÑÐÐÑÑ"
#: ../meld/meldwindow.py:134
msgid "Redo the last undone action"
-msgstr "ÐÐÐÐÐÑÐ ÐÐÑÐÐÐÑÑ ÐÐÐÐÐÐÐÑ ÑÐÐÑÑ"
+msgstr "ÐÐÐÐÐÐÑÐ ÐÐÑÐÐÐÑÑ ÐÐÐÐÐÐÐÑ ÑÐÐÑÑ"
#: ../meld/meldwindow.py:135
msgid "Cut the selection"
-msgstr "ÐÑÐÑÐ ÐÐÐÐÑ"
+msgstr "ÐÑÐÑÐÑÐ ÐÐÐÐÑ"
#: ../meld/meldwindow.py:136
msgid "Copy the selection"
-msgstr "ÐÐÐÐÐÐÐÐ ÐÐÐÐÑ"
+msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÐÑ"
#: ../meld/meldwindow.py:137
msgid "Paste the clipboard"
-msgstr "ÐÐÐÑÐ ÐÑÑÐÐÑ"
+msgstr "ÐÐÐÑÐÑÐ ÐÑÑÐÐÑ"
#: ../meld/meldwindow.py:138
msgid "Search for text"
-msgstr "ÐÑÐÐÐ ÑÐÐÑÑ"
+msgstr "ÐÑÐÐÐÑÐ ÑÐÐÑÑ"
#: ../meld/meldwindow.py:139
msgid "Find Ne_xt"
-msgstr "ÐÐÑÐ Ñ_ÐÐÐÑÐ"
+msgstr "ÐÐÑÐ Ñ_ÐÐÐÐÑÐ"
#: ../meld/meldwindow.py:139
msgid "Search forwards for the same text"
-msgstr "ÐÑÐÐÐ ÑÐÐÐÑÐÐ ÐÑÑÐ ÑÐÐÑÑ"
+msgstr "ÐÑÐÐÐÑÐ ÑÐÐÐÑÐÐ ÐÑÑÐ ÑÐÐÑÑ"
#: ../meld/meldwindow.py:140
msgid "Find _Previous"
@@ -1038,11 +1017,11 @@ msgstr "ÐÐÑÐ ÐÑÐ_ÑÑÐÐÐÐ"
#: ../meld/meldwindow.py:140
msgid "Search backwards for the same text"
-msgstr "ÐÑÐÐÐ ÑÐÐÐÐÐ ÐÑÑÐ ÑÐÐÑÑ"
+msgstr "ÐÑÐÐÐÑÐ ÑÐÐÐÐÐ ÐÑÑÐ ÑÐÐÑÑ"
#: ../meld/meldwindow.py:141
msgid "Find and replace text"
-msgstr "ÐÑÐÐÐÐÐÐÐ Ð ÐÐÐÐÑÑÑÐ ÑÐÐÑÑ"
+msgstr "ÐÑÐÐÐÑÐÑÐ Ð ÐÐÐÐÐÐÑÐ ÑÐÐÑÑ"
#: ../meld/meldwindow.py:142
msgid "Prefere_nces"
@@ -1062,7 +1041,7 @@ msgstr "ÐÐÐÐÐÑÐ ÐÐÐÐÐÐ"
#: ../meld/meldwindow.py:145
msgid "Go to the next change"
-msgstr "ÐÐÐ ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÑ"
+msgstr "ÐÐÐÑÐ ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÑ"
#: ../meld/meldwindow.py:146
msgid "Previous change"
@@ -1070,132 +1049,140 @@ msgstr "ÐÑÐÑÑÐÐÐÐ ÐÐÐÐÐÐ"
#: ../meld/meldwindow.py:146
msgid "Go to the previous change"
-msgstr "ÐÐÐ ÐÐ ÐÑÐÑÑÐÐÐÑ ÐÐÐÐÐÑ"
+msgstr "ÐÐÐÑÐ ÐÐ ÐÑÐÑÑÐÐÐÑ ÐÐÐÐÐÑ"
+
+#: ../meld/meldwindow.py:147
+msgid "Open externally"
+msgstr "ÐÑÐÐÑÐ ÑÐÐÑÐÐÐ"
+
+#: ../meld/meldwindow.py:147
+msgid "Open selected file or directory in the default external application"
+msgstr "ÐÑÐÐÑÐÑÐ ÐÐÐÐÑÐÐÑ ÐÐÑÐÑÐÐÑ ÐÐÐ ÑÐÑÑÐÐÐÑ Ñ ÐÑÐÐÐÐÐÐ ÑÐÐÑÐÐÐ ÐÑÐÐÑÐÐÑ"
-#: ../meld/meldwindow.py:148
+#: ../meld/meldwindow.py:149
msgid "_View"
msgstr "Ð_ÑÐÐÐÐÐ"
-#: ../meld/meldwindow.py:149
+#: ../meld/meldwindow.py:150
msgid "File status"
msgstr "ÐÑÐÑÐ ÐÐÑÐÑÐÐÐ"
-#: ../meld/meldwindow.py:150
+#: ../meld/meldwindow.py:151
msgid "Version status"
msgstr "ÐÑÐÑÐ ÐÐÐÐÑÐ"
-#: ../meld/meldwindow.py:151
+#: ../meld/meldwindow.py:152
msgid "File filters"
msgstr "ÐÐÐÑÐÑÐ ÐÐÑÐÑÐÐÐ"
-#: ../meld/meldwindow.py:152
+#: ../meld/meldwindow.py:153
msgid "Stop the current action"
-msgstr "ÐÐÑÑÑÐÐÑÐ ÑÑÐÐÑÑÐÑ ÑÐÐÑÑ"
+msgstr "ÐÐÑÑÑÐÐÐÑÐ ÑÑÐÐÑÑÐÑ ÑÐÐÑÑ"
-#: ../meld/meldwindow.py:153
+#: ../meld/meldwindow.py:154
msgid "Refresh the view"
-msgstr "ÐÑÐÐÐÐÐÐ ÐÑÐÐÐÐÐ"
+msgstr "ÐÑÐÐÐÐÑÐ ÐÑÐÐÐÐÐ"
-#: ../meld/meldwindow.py:154
+#: ../meld/meldwindow.py:155
msgid "Reload"
msgstr "ÐÐÐÐÐÐ ÑÑÐÑÐÑ"
-#: ../meld/meldwindow.py:154
+#: ../meld/meldwindow.py:155
msgid "Reload the comparison"
-msgstr "ÐÐÐÐÐÐ ÑÑÐÑÐÐÐ ÐÐÑÐÑÐÑÐ"
+msgstr "ÐÐÐÐÐÐ ÑÑÐÑÐÑÑÐ ÐÐÑÐÑÐÑÐ"
-#: ../meld/meldwindow.py:156
+#: ../meld/meldwindow.py:157
msgid "_Tabs"
msgstr "_ÐÐÐÐÑÐÐ"
-#: ../meld/meldwindow.py:157
+#: ../meld/meldwindow.py:158
msgid "_Previous Tab"
msgstr "ÐÑÐ_ÑÑÐÐÐÐ ÑÐÐÐÑÐÐ"
-#: ../meld/meldwindow.py:157
+#: ../meld/meldwindow.py:158
msgid "Activate previous tab"
-msgstr "ÐÐÑÐÐÐÑÐ ÐÑÐÑÑÐÐÐÐ ÑÐÐÐÑÐÐ"
+msgstr "ÐÐÑÐÐÐÑÐÑÑÐ ÐÑÐÑÑÐÐÐÐ ÑÐÐÐÑÐÐ"
-#: ../meld/meldwindow.py:158
+#: ../meld/meldwindow.py:159
msgid "_Next Tab"
msgstr "ÐÐÐ_ÐÐÑÐ ÑÐÐÐÑÐÐ"
-#: ../meld/meldwindow.py:158
+#: ../meld/meldwindow.py:159
msgid "Activate next tab"
-msgstr "ÐÐÑÐÐÐÑÐ ÑÐÐÐÐÑÐ ÑÐÐÐÑÐÐ"
+msgstr "ÐÐÑÐÐÐÑÐÑÑÐ ÑÐÐÐÐÑÐ ÑÐÐÐÑÐÐ"
-#: ../meld/meldwindow.py:159
+#: ../meld/meldwindow.py:160
msgid "Move Tab _Left"
msgstr "ÐÑÐÐÐÑÑÐ ÑÐÐÐÑÐÐ Ñ_ÐÐÐÐ"
-#: ../meld/meldwindow.py:159
+#: ../meld/meldwindow.py:160
msgid "Move current tab to left"
-msgstr "ÐÑÐÐÐÑÑÐ ÑÑÐÐÑÑÐÐ ÑÐÐÐÑÐÐ ÐÐ ÐÐÐÐ"
+msgstr "ÐÑÐÐÐÑÑÐÑÐ ÑÑÐÐÑÑÐÐ ÑÐÐÐÑÐÐ ÐÐ ÐÐÐÐ"
-#: ../meld/meldwindow.py:160
+#: ../meld/meldwindow.py:161
msgid "Move Tab _Right"
msgstr "ÐÑÐÐÐÑÑÐ ÑÐÐÐÑÐÐ Ñ_ÐÐÑÐÐ"
-#: ../meld/meldwindow.py:160
+#: ../meld/meldwindow.py:161
msgid "Move current tab to right"
-msgstr "ÐÑÐÐÐÑÑÐ ÑÑÐÐÑÑÐÐ ÑÐÐÐÑÐÐ ÐÐ ÐÐÑÐÐ"
+msgstr "ÐÑÐÐÐÑÑÐÑÐ ÑÑÐÐÑÑÐÐ ÑÐÐÐÑÐÐ ÐÐ ÐÐÑÐÐ"
-#: ../meld/meldwindow.py:162
+#: ../meld/meldwindow.py:163
msgid "_Help"
msgstr "ÐÐÐÐ_Ñ"
-#: ../meld/meldwindow.py:163
+#: ../meld/meldwindow.py:164
msgid "_Contents"
msgstr "_ÐÐÐÑÐÐÑ"
-#: ../meld/meldwindow.py:163
+#: ../meld/meldwindow.py:164
msgid "Open the Meld manual"
msgstr "ÐÑÐÐÑÐÑÐ ÑÐÑÑÑÑÐÐ ÐÐÐÐÐ"
-#: ../meld/meldwindow.py:164
+#: ../meld/meldwindow.py:165
msgid "Report _Bug"
msgstr "ÐÑÐÑÐÐÐ _ÐÑÐÑÐÑ"
-#: ../meld/meldwindow.py:164
+#: ../meld/meldwindow.py:165
msgid "Report a bug in Meld"
msgstr "ÐÑÐÑÐÐÐÑÐ ÐÑÐÑÐÑ Ñ ÐÐÐÐÑ"
-#: ../meld/meldwindow.py:165
+#: ../meld/meldwindow.py:166
msgid "About this program"
msgstr "Ð ÐÐÐÐ ÐÑÐÐÑÐÐÑ"
-#: ../meld/meldwindow.py:168
+#: ../meld/meldwindow.py:169
msgid "Full Screen"
msgstr "ÐÐÐ ÐÐÑÐÐ"
-#: ../meld/meldwindow.py:168
+#: ../meld/meldwindow.py:169
msgid "View the comparison in full screen"
msgstr "ÐÑÐÐÐÐÐÐÑÑÐ ÐÐÑÐÑÐÑÐ ÐÑÐÐÐ ÑÐÐÐÐ ÐÐÑÐÐÐ"
-#: ../meld/meldwindow.py:169
+#: ../meld/meldwindow.py:170
msgid "_Toolbar"
msgstr "ÐÐÐÐÑÐ _ÐÐÐÑÐ"
-#: ../meld/meldwindow.py:169
+#: ../meld/meldwindow.py:170
msgid "Show or hide the toolbar"
-msgstr "ÐÑÐÐÐÐÑÑÐ ÐÐÐ ÑÐÑÐÐÐ ÐÐÐÐÑÑ ÐÐÐÑÐ"
+msgstr "ÐÑÐÐÐÐÐÑÐ ÐÐÐ ÑÐÐÑÐÑÑÐ ÐÐÐÐÑÑ ÐÐÐÑÐ"
-#: ../meld/meldwindow.py:170
+#: ../meld/meldwindow.py:171
msgid "_Statusbar"
msgstr "ÐÐÐÐÑÐ _ÑÑÐÑÐ"
-#: ../meld/meldwindow.py:170
+#: ../meld/meldwindow.py:171
msgid "Show or hide the statusbar"
-msgstr "ÐÑÐÐÐÐÑÑÐ ÐÐÐ ÑÐÑÐÐÐ ÐÐÐÐÑÑ ÑÑÐÑÐ"
+msgstr "ÐÑÐÐÐÐÐÑÐ ÐÐÐ ÑÐÐÑÐÑÑÐ ÐÐÐÐÑÑ ÑÑÐÑÐ"
-#: ../meld/meldwindow.py:534
+#: ../meld/meldwindow.py:538
msgid "Switch to this tab"
-msgstr "ÐÑÐÐÐÑÑÑÐ ÑÐ ÐÐ ÐÐÐÑ ÑÐÐÐÑÐÐ"
+msgstr "ÐÑÐÐÐÑÐÑÐ ÑÐ ÐÐ ÐÐÐÑ ÑÐÐÐÑÐÐ"
#. exit at first non found directory + file
-#: ../meld/meldwindow.py:625
+#: ../meld/meldwindow.py:629
msgid "Cannot compare a mixture of files and directories.\n"
-msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÐÐÐ ÐÐÑÐÐÐÐÑ ÐÐÑÐÑÐÐÐ Ð ÐÐÑÐÐÑÐÑÐÑÑÐÐ.\n"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÐÐÐ ÐÐÑÐÐÐÐÑ ÐÐÑÐÑÐÐÐ Ð ÑÐÑÑÐÐÐÐ.\n"
#. no common path. empty names get changed to "[None]"
#: ../meld/misc.py:174
@@ -1208,7 +1195,7 @@ msgstr "ÐÐÑÑÐÐÑ ÐÑÐÑÐÐÐÑ ÐÐÐ..."
#: ../meld/preferences.py:37
msgid "label"
-msgstr "ÐÐÐÐÐÐ"
+msgstr "ÐÐÑÐÐÑ"
#: ../meld/preferences.py:37
msgid "pattern"
@@ -1221,51 +1208,59 @@ msgstr "ÐÐÑÑÑÐÐÐ ÑÐ ÑÐÐÐ ÐÐÐ ÑÑÐ ÐÐÑÑÐÐÐÑÐÐÐ âg
#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
#: ../meld/preferences.py:233
msgid "Backups\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n"
-msgstr "ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐ\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:235
+msgid ""
+"OS-specific metadata\t0\t.DS_Store ._* .Spotlight-V100 .Trashes Thumbs.db "
+"Desktop.ini\n"
+msgstr "ÐÐ-ÑÐÐÑÐÑÐÑÐÐ ÐÐÑÐÐÐÐÐÑÐ\t0\t.DS_Store ._* .Spotlight-V100 .Trashes Thumbs.db "
+"Desktop.ini\n"
+
+#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
+#: ../meld/preferences.py:237
#, python-format
msgid "Version Control\t1\t%s\n"
-msgstr "ÐÐÐÑÑÐÐÐ ÐÐÑÐÐÑÐ\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:237
+#: ../meld/preferences.py:239
msgid "Binaries\t1\t*.{pyc,a,obj,o,so,la,lib,dll}\n"
msgstr "ÐÐÐÑÑÐÐ\t1\t*.{pyc,a,obj,o,so,la,lib,dll}\n"
#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:239
+#: ../meld/preferences.py:241
msgid "Media\t0\t*.{jpg,gif,png,wav,mp3,ogg,xcf,xpm}"
msgstr "ÐÐÐÐÑÐ\t0\t*.{jpg,gif,png,wav,mp3,ogg,xcf,xpm}"
#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:241
+#: ../meld/preferences.py:243
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:243
+#: ../meld/preferences.py:245
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:245
+#: ../meld/preferences.py:247
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:247
+#: ../meld/preferences.py:249
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:249
+#: ../meld/preferences.py:251
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:251
+#: ../meld/preferences.py:253
msgid "Script comment\t0\t#.*"
msgstr "ÐÐÐÐÐÑÐÑ ÑÐÑÐÐÑÐ\t0\t#.*"
@@ -1275,7 +1270,7 @@ msgstr "Ð_ÐÑÐÐÐ"
#: ../meld/vcview.py:120
msgid "Commit"
-msgstr "ÐÐÑÐÐÐ"
+msgstr "ÐÐÑÐÐÐÑÐ"
#: ../meld/vcview.py:121
msgid "_Update"
@@ -1283,7 +1278,7 @@ msgstr "_ÐÐÐÑÐÐ"
#: ../meld/vcview.py:121
msgid "Update"
-msgstr "ÐÐÐÑÐÐ"
+msgstr "ÐÐÐÑÐÐÑÐ"
#: ../meld/vcview.py:122
msgid "Add to VC"
@@ -1323,7 +1318,7 @@ msgstr "_ÐÐÑÐÐÐÐÑ"
#: ../meld/vcview.py:131
msgid "Flatten directories"
-msgstr "ÐÐÑÐÐÐÐÑ ÐÐÑÐÐÑÐÑÐÑÑÐÐ"
+msgstr "ÐÐÑÐÐÐÐÑ ÑÐÑÑÐÐÐÐ"
#: ../meld/vcview.py:132
msgid "_Modified"
@@ -1347,25 +1342,29 @@ msgstr "ÐÑÐÐÐÐÑÑÐ ÐÐÐÐÑÐÐÐÐÐÑÐÐÐ ÐÐÑÐÑÐÐÐ"
#: ../meld/vcview.py:135
msgid "Ignored"
-msgstr "ÐÐÐÐÐÐÑÐÐ"
+msgstr "ÐÐÐÐÐÐÑÐÐÐ"
#: ../meld/vcview.py:135
msgid "Show ignored files"
msgstr "ÐÑÐÐÐÐÑÑÐ ÐÐÐÐÐÐÑÐÐÐ ÐÐÑÐÑÐÐÐ"
-#: ../meld/vcview.py:177 ../meld/vcview.py:301
+#: ../meld/vcview.py:178 ../meld/vcview.py:302
msgid "Location"
msgstr "ÐÑÑÐÑÐ"
-#: ../meld/vcview.py:178
+#: ../meld/vcview.py:179
msgid "Status"
msgstr "ÐÑÐÑÐ"
-#: ../meld/vcview.py:179
+#: ../meld/vcview.py:180
msgid "Rev"
msgstr "ÐÐÐ"
#: ../meld/vcview.py:181
+msgid "Tag"
+msgstr "ÐÐÐÐÐÐ"
+
+#: ../meld/vcview.py:182
msgid "Options"
msgstr "ÐÐÑÐÑÐ"
@@ -1396,30 +1395,30 @@ msgid "%s (%s)"
msgstr "%s (%s)"
#. TRANSLATORS: This is the location of the directory the user is diffing
-#: ../meld/vcview.py:301
+#: ../meld/vcview.py:302
#, python-format
msgid "%s: %s"
msgstr "%s: %s"
-#: ../meld/vcview.py:349
+#: ../meld/vcview.py:350
msgid "(Empty)"
msgstr "(ÐÑÐÐÐÐ)"
-#: ../meld/vcview.py:387
+#: ../meld/vcview.py:388
#, python-format
msgid "[%s] Fetching differences"
msgstr "[%s] ÐÑÐÐÐÐÑÐÐ ÑÐÐÐÐÐÐ"
-#: ../meld/vcview.py:395
+#: ../meld/vcview.py:396
#, python-format
msgid "[%s] Applying patch"
msgstr "[%s] ÐÑÐÐÐÑÑÑÐÐ ÐÐÐÑÐÑ"
-#: ../meld/vcview.py:480
+#: ../meld/vcview.py:478
msgid "Select some files first."
msgstr "ÐÑÐÐ ÐÐÐÐÐÑÐÑÐ ÐÐÐÐ ÐÐÑÐÑÐÐÐ."
-#: ../meld/vcview.py:553
+#: ../meld/vcview.py:551
#, python-format
msgid ""
"\n"
@@ -1524,6 +1523,21 @@ msgstr ""
"ÐÐÑÐÐÐÑ ÑÐ ÐÐÐ â%sâ\n"
"ÐÑÐÑÐÐ ÑÐ ÐÐÐÐ â%sâ"
+#~ msgid "Compare Options"
+#~ msgstr "ÐÐÑÐÑÐ ÐÐÑÐÑÐÑÐ"
+
+#~ msgid "Date"
+#~ msgstr "ÐÐÑÑÐ"
+
+#~ msgid "Local copy against other remote revision"
+#~ msgstr "ÐÐÐÐÐÐÐ ÐÑÐÐÐÑÐÐ ÐÐÑÐÑÐÐ ÐÑÑÐÐ ÑÐÐÑÐÐÐ ÑÐÐÐÐÐÑÐ"
+
+#~ msgid "Local copy against same remote revision"
+#~ msgstr "ÐÐÐÐÐÐÐ ÐÑÐÐÐÑÐÐ ÐÐÑÐÑÐÐ ÐÑÑÐ ÑÐÐÑÐÐÐ ÑÐÐÐÐÐÑÐ"
+
+#~ msgid "Open selected"
+#~ msgstr "ÐÑÐÐÑÐ ÐÐÐÐÑÐÐÐ"
+
#~ msgid "[%s] Scanning"
#~ msgstr "[%s] ÐÑÐÐÐÐÐÐÐ"
diff --git a/po/sr latin po b/po/sr latin po
index cfb912f..d6dc7e5 100644
--- a/po/sr latin po
+++ b/po/sr latin po
@@ -1,24 +1,24 @@
# Serbian translation of meld
-# Courtesy of Prevod.org team (http://prevod.org/) -- 2003, 2004.
+# 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.
+# Miroslav NikoliÄ <miroslavnikolic rocketmail com>, 2011, 2012.
msgid ""
msgstr ""
"Project-Id-Version: meld\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=meld&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-06-11 15:41+0000\n"
-"PO-Revision-Date: 2011-06-26 23:07+0200\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=meld&k";
+"eywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2011-12-09 23:15+0000\n"
+"PO-Revision-Date: 2012-02-26 20:22+0200\n"
"Last-Translator: Miroslav NikoliÄ <miroslavnikolic rocketmail com>\n"
"Language-Team: Serbian <gnom prevod org>\n"
+"Language: sr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: Serbian (sr)\n"
-"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : n"
-"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\\n\n"
-"X-Generator: Virtaal 0.5.2\n"
+"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : "
+"n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Project-Style: gnome\n"
#: ../bin/meld:96
msgid "Cannot import: "
@@ -67,15 +67,15 @@ msgstr "Premesti _gore"
#: ../data/ui/EditableList.ui.h:6
msgid "Move item down"
-msgstr "PremeÅta stavku nadole"
+msgstr "Premestite stavku na dole"
#: ../data/ui/EditableList.ui.h:7
msgid "Move item up"
-msgstr "PremeÅta stavku nagore"
+msgstr "Premestite stavku na gore"
-#: ../data/ui/EditableList.ui.h:8 ../meld/vcview.py:157
+#: ../data/ui/EditableList.ui.h:8 ../meld/vcview.py:158
msgid "Name"
-msgstr "Ime"
+msgstr "Naziv"
#: ../data/ui/EditableList.ui.h:9
msgid "Pattern"
@@ -83,7 +83,7 @@ msgstr "Obrazac"
#: ../data/ui/EditableList.ui.h:10
msgid "Remove selected filter"
-msgstr "Uklanja izabrani filter"
+msgstr "Uklonite izabrani filter"
#: ../data/ui/EditableList.ui.h:11 ../meld/vcview.py:122
msgid "_Add"
@@ -135,11 +135,11 @@ msgstr "_Uporedi veliÄinu slova"
#: ../data/ui/findbar.ui.h:6
msgid "_Next"
-msgstr "Sle_deÄe"
+msgstr "_SledeÄe"
#: ../data/ui/findbar.ui.h:7
msgid "_Previous"
-msgstr "Pre_thodno"
+msgstr "_Prethodno"
#: ../data/ui/findbar.ui.h:8 ../meld/meldwindow.py:141
msgid "_Replace"
@@ -147,23 +147,26 @@ msgstr "_Zameni"
#: ../data/ui/findbar.ui.h:9
msgid "_Search for"
-msgstr "_PotraÅi"
+msgstr "Po_traÅi"
#: ../data/ui/meldapp.ui.h:1
msgid "Choose Files"
msgstr "Izaberite datoteke"
#: ../data/ui/meldapp.ui.h:2
+#| msgid ""
+#| "Copyright © 2002-2009 Stephen Kennedy\n"
+#| "Copyright © 2009-2010 Kai Willadsen"
msgid ""
"Copyright © 2002-2009 Stephen Kennedy\n"
-"Copyright © 2009-2010 Kai Willadsen"
+"Copyright © 2009-2011 Kai Willadsen"
msgstr ""
"Autorska prava © 2002-2009 Stefen Kenedi\n"
-"Autorska prava © 2009-2010 Kaj Viladsen"
+"Autorska prava © 2009-2011 Kaj Viladsen"
#: ../data/ui/meldapp.ui.h:4
msgid "Directory"
-msgstr "Direktorijum"
+msgstr "Fascikla"
#. Refers to version of the file being compared
#: ../data/ui/meldapp.ui.h:7
@@ -182,15 +185,15 @@ msgstr "Druga"
#: ../data/ui/meldapp.ui.h:12
msgid "Select VC Directory"
-msgstr "Izaberite CV direktorijum"
+msgstr "Izaberite CV fasciklu"
#: ../data/ui/meldapp.ui.h:13
msgid "_Directory Comparison"
-msgstr "PoreÄenje di_rektorijuma"
+msgstr "PoreÄenje _fascikli"
#: ../data/ui/meldapp.ui.h:14
msgid "_File Comparison"
-msgstr "PoreÄenje da_toteka"
+msgstr "PoreÄenje _datoteka"
#: ../data/ui/meldapp.ui.h:15
msgid "_Three Way Compare"
@@ -198,12 +201,13 @@ msgstr "PoreÄenje tri elementa"
#: ../data/ui/meldapp.ui.h:16
msgid "_Version Control Browser"
-msgstr "PretraÅivaÄ kontrole _verzija"
+msgstr "Preglednik kontrole _verzija"
#: ../data/ui/meldapp.ui.h:17
msgid "translator-credits"
msgstr ""
"Danilo Åegan <danilo prevod org>\n"
+"Miroslav NikoliÄ <miroslavnikolic rocketmail com>\n"
"\n"
"Prevod.org â prevod na srpski jezik."
@@ -217,7 +221,7 @@ msgstr "Napravi ispravku"
#: ../data/ui/patch-dialog.ui.h:3
msgid "Create a patch"
-msgstr "Pravi ispravku"
+msgstr "Napravite ispravku"
#: ../data/ui/patch-dialog.ui.h:4
msgid "Left and middle panes"
@@ -233,11 +237,11 @@ msgstr "Koristi razlike izmeÄu:"
#: ../data/ui/patch-dialog.ui.h:7
msgid "_Reverse patch direction"
-msgstr "Preo_kreni smer ispravke"
+msgstr "Preokreni smer _ispravke"
#: ../data/ui/preferences.ui.h:1
msgid "Display"
-msgstr "<b>Prikaz</b>"
+msgstr "Prikaz"
#: ../data/ui/preferences.ui.h:2
msgid "Do not _split words over two lines"
@@ -269,7 +273,7 @@ msgstr "Filteri datoteka"
#: ../data/ui/preferences.ui.h:9
msgid "Font"
-msgstr "<b>Font</b>"
+msgstr "Slovni lik"
#: ../data/ui/preferences.ui.h:10
msgid "Ignore changes which insert or delete blank lines"
@@ -289,7 +293,7 @@ msgstr "Postavke Melda"
#: ../data/ui/preferences.ui.h:14
msgid "Show _line numbers"
-msgstr "PrikaÅi _brojeve linija"
+msgstr "PrikaÅi _brojeve redova"
#: ../data/ui/preferences.ui.h:15
msgid "Show w_hitespace"
@@ -318,9 +322,9 @@ msgid ""
"directories by name. Each pattern is a list of shell style wildcards "
"separated by spaces."
msgstr ""
-"Prilikom poreÄenja direktorijuma, moÅete da filtrirate datoteke i "
-"direktorijume prema imenu. Svaki obrazac je spisak dÅokera u stilu konzole "
-"razdvojenih razmakom."
+"Prilikom poreÄenja direktorijuma, moÅete da filtrirate datoteke i fascikle "
+"prema nazivu. Svaki obrazac je spisak dÅokera u stilu konzole razdvojenih "
+"razmakom."
#: ../data/ui/preferences.ui.h:21
msgid ""
@@ -331,7 +335,7 @@ msgid ""
"details."
msgstr ""
"Prilikom poreÄenja datoteka, moÅete da zanemarite odreÄene vrste izmena. "
-"Svaki obrazac je regularan izraz pajtona koji zamenjuje podudarajuÄi tekst "
+"Svaki obrazac je regularan izraz pitona koji zamenjuje podudarajuÄi tekst "
"praznim niskama pre izvrÅavanja poreÄenja. Ako izraz sadrÅi grupe, samo grupe "
"bivaju zamenjene. Za viÅe detalja pogledajte uputstvo za korisnike."
@@ -356,152 +360,128 @@ msgid "Commit Files"
msgstr "Ugradi datoteke"
#: ../data/ui/vcview.ui.h:2
-msgid "Compare Options"
-msgstr "Opcije poreÄenja"
-
-#: ../data/ui/vcview.ui.h:3
-msgid "Date"
-msgstr "Datum"
-
-#: ../data/ui/vcview.ui.h:4
-msgid "Local copy against other remote revision"
-msgstr "Lokalni primerak naspram druge udaljene revizije"
-
-#: ../data/ui/vcview.ui.h:5
-msgid "Local copy against same remote revision"
-msgstr "Lokalni primerak naspram iste udaljene revizije"
-
-#: ../data/ui/vcview.ui.h:6
msgid "Log Message"
msgstr "Poruka dnevnika"
-#: ../data/ui/vcview.ui.h:7
+#: ../data/ui/vcview.ui.h:3
msgid "Previous Logs"
msgstr "Prethodni dnevnici"
-#: ../data/ui/vcview.ui.h:8 ../meld/vcview.py:180
-msgid "Tag"
-msgstr "Oznaka"
-
-#: ../data/ui/vcview.ui.h:9
+#: ../data/ui/vcview.ui.h:4
msgid "VC Log"
msgstr "CV dnevnik"
-#: ../meld/dirdiff.py:227 ../meld/vcview.py:118
+#: ../meld/dirdiff.py:226 ../meld/vcview.py:119
msgid "_Compare"
msgstr "_Uporedi"
-#: ../meld/dirdiff.py:227 ../meld/vcview.py:118
+#: ../meld/dirdiff.py:226 ../meld/vcview.py:119
msgid "Compare selected"
msgstr "Uporedi izabrano"
-#: ../meld/dirdiff.py:228
+#: ../meld/dirdiff.py:227
msgid "Copy _Left"
msgstr "UmnoÅi _levo"
-#: ../meld/dirdiff.py:228
+#: ../meld/dirdiff.py:227
msgid "Copy to left"
msgstr "UmnoÅite levo"
-#: ../meld/dirdiff.py:229
+#: ../meld/dirdiff.py:228
msgid "Copy _Right"
msgstr "UmnoÅi _desno"
-#: ../meld/dirdiff.py:229
+#: ../meld/dirdiff.py:228
msgid "Copy to right"
msgstr "UmnoÅite desno"
-#: ../meld/dirdiff.py:230
+#: ../meld/dirdiff.py:229
msgid "Delete selected"
msgstr "ObriÅi izabrano"
-#: ../meld/dirdiff.py:231 ../meld/filediff.py:1117
+#: ../meld/dirdiff.py:230 ../meld/filediff.py:1157
msgid "Hide"
msgstr "Sakrij"
-#: ../meld/dirdiff.py:231
+#: ../meld/dirdiff.py:230
msgid "Hide selected"
msgstr "Sakrij izabrano"
-#: ../meld/dirdiff.py:233 ../meld/filediff.py:267 ../meld/vcview.py:119
-msgid "Open selected"
-msgstr "Otvori izabrano"
-
-#: ../meld/dirdiff.py:237
+#: ../meld/dirdiff.py:234
msgid "Case"
msgstr "VeliÄina slova"
-#: ../meld/dirdiff.py:237
+#: ../meld/dirdiff.py:234
msgid "Ignore case of entries"
msgstr "Zanemari veliÄinu slova unosa"
-#: ../meld/dirdiff.py:238
+#: ../meld/dirdiff.py:235
msgid "Same"
msgstr "Isto"
-#: ../meld/dirdiff.py:238
+#: ../meld/dirdiff.py:235
msgid "Show identical"
msgstr "PrikaÅi istovetne"
-#: ../meld/dirdiff.py:239
+#: ../meld/dirdiff.py:236
msgid "New"
msgstr "Novi"
-#: ../meld/dirdiff.py:239
+#: ../meld/dirdiff.py:236
msgid "Show new"
msgstr "PrikaÅi nove"
-#: ../meld/dirdiff.py:240
+#: ../meld/dirdiff.py:237
msgid "Modified"
msgstr "Izmenjeni"
-#: ../meld/dirdiff.py:240 ../meld/vcview.py:132
+#: ../meld/dirdiff.py:237 ../meld/vcview.py:132
msgid "Show modified"
msgstr "PrikaÅi izmenjene"
-#: ../meld/dirdiff.py:242
+#: ../meld/dirdiff.py:239
msgid "Filters"
msgstr "Filteri"
-#: ../meld/dirdiff.py:242
+#: ../meld/dirdiff.py:239
msgid "Set active filters"
msgstr "Podesite aktivne filtere"
-#: ../meld/dirdiff.py:359
+#: ../meld/dirdiff.py:354
#, python-format
msgid "Hide %s"
msgstr "Sakrij â%sâ"
-#: ../meld/dirdiff.py:462 ../meld/dirdiff.py:475 ../meld/vcview.py:305
-#: ../meld/vcview.py:333
+#: ../meld/dirdiff.py:457 ../meld/dirdiff.py:470 ../meld/vcview.py:306
+#: ../meld/vcview.py:334
#, python-format
msgid "[%s] Scanning %s"
msgstr "[%s] pregledam â%sâ"
-#: ../meld/dirdiff.py:574
+#: ../meld/dirdiff.py:569
#, python-format
msgid "[%s] Done"
msgstr "[%s] Gotovo"
-#: ../meld/dirdiff.py:578
+#: ../meld/dirdiff.py:573
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:579
+#: ../meld/dirdiff.py:574
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:581
+#: ../meld/dirdiff.py:576
msgid "Some files were in an incorrect encoding. The names are something like:"
-msgstr "Neke datoteke bejahu u neispravnom kodiranju. Imena su neÅto kao:"
+msgstr "Neke datoteke bejahu u neispravnom kodiranju. Nazivi su neÅto kao:"
-#: ../meld/dirdiff.py:583
+#: ../meld/dirdiff.py:578
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:585
+#: ../meld/dirdiff.py:580
msgid ""
"You are running a case insensitive comparison on a case sensitive "
"filesystem. The following files in this folder are hidden:"
@@ -509,16 +489,16 @@ msgstr ""
"Pokrenuli ste poreÄenje nezavisno od veliÄine slova na sistemu datoteka gde "
"je ona bitna. Neke datoteke nisu vidljive:"
-#: ../meld/dirdiff.py:596
+#: ../meld/dirdiff.py:591
#, python-format
msgid "'%s' hidden by '%s'"
msgstr "â%sâ sakriveno od strane â%sâ"
-#: ../meld/dirdiff.py:621 ../meld/filediff.py:981 ../meld/filediff.py:1121
+#: ../meld/dirdiff.py:616 ../meld/filediff.py:1008 ../meld/filediff.py:1161
msgid "Hi_de"
msgstr "_Sakrij"
-#: ../meld/dirdiff.py:671
+#: ../meld/dirdiff.py:666
#, python-format
msgid ""
"'%s' exists.\n"
@@ -527,7 +507,7 @@ msgstr ""
"â%sâ postoji.\n"
"Da presnimim?"
-#: ../meld/dirdiff.py:678
+#: ../meld/dirdiff.py:673
#, python-format
msgid ""
"Error copying '%s' to '%s'\n"
@@ -538,16 +518,16 @@ msgstr ""
"\n"
"%s."
-#: ../meld/dirdiff.py:696 ../meld/vcview.py:505
+#: ../meld/dirdiff.py:691 ../meld/vcview.py:503
#, python-format
msgid ""
"'%s' is a directory.\n"
"Remove recursively?"
msgstr ""
-"â%sâ je direktorijum.\n"
+"â%sâ je fascikla.\n"
"Da uklonim rekurzivno?"
-#: ../meld/dirdiff.py:703 ../meld/vcview.py:510
+#: ../meld/dirdiff.py:698 ../meld/vcview.py:508
#, python-format
msgid ""
"Error removing %s\n"
@@ -558,16 +538,16 @@ msgstr ""
"\n"
"%s."
-#: ../meld/dirdiff.py:715
+#: ../meld/dirdiff.py:723
#, python-format
msgid "%i second"
msgid_plural "%i seconds"
msgstr[0] "%i sekund"
msgstr[1] "%i sekunde"
-msgstr[2] "%i sekundi"
+msgstr[2] "%i sekunde"
msgstr[3] "%i sekunda"
-#: ../meld/dirdiff.py:716
+#: ../meld/dirdiff.py:724
#, python-format
msgid "%i minute"
msgid_plural "%i minutes"
@@ -576,7 +556,7 @@ msgstr[1] "%i minuta"
msgstr[2] "%i minuta"
msgstr[3] "%i minut"
-#: ../meld/dirdiff.py:717
+#: ../meld/dirdiff.py:725
#, python-format
msgid "%i hour"
msgid_plural "%i hours"
@@ -585,7 +565,7 @@ msgstr[1] "%i sata"
msgstr[2] "%i sati"
msgstr[3] "%i sat"
-#: ../meld/dirdiff.py:718
+#: ../meld/dirdiff.py:726
#, python-format
msgid "%i day"
msgid_plural "%i days"
@@ -594,7 +574,7 @@ msgstr[1] "%i dana"
msgstr[2] "%i dana"
msgstr[3] "%i dan"
-#: ../meld/dirdiff.py:719
+#: ../meld/dirdiff.py:727
#, python-format
msgid "%i week"
msgid_plural "%i weeks"
@@ -603,7 +583,7 @@ msgstr[1] "%i nedelje"
msgstr[2] "%i nedelja"
msgstr[3] "%i nedelja"
-#: ../meld/dirdiff.py:720
+#: ../meld/dirdiff.py:728
#, python-format
msgid "%i month"
msgid_plural "%i months"
@@ -612,7 +592,7 @@ msgstr[1] "%i meseca"
msgstr[2] "%i meseci"
msgstr[3] "%i mesec"
-#: ../meld/dirdiff.py:721
+#: ../meld/dirdiff.py:729
#, python-format
msgid "%i year"
msgid_plural "%i years"
@@ -621,159 +601,159 @@ msgstr[1] "%i godine"
msgstr[2] "%i godina"
msgstr[3] "%i godina"
-#: ../meld/filediff.py:268
+#: ../meld/filediff.py:294
msgid "Format as patch..."
msgstr "Formatiraj kao ispravku..."
-#: ../meld/filediff.py:268
+#: ../meld/filediff.py:294
msgid "Create a patch using differences between files"
-msgstr "Pravi ispravku koristeÄi razlike izmeÄu datoteka"
+msgstr "Napravite ispravku koristeÄi razlike izmeÄu datoteka"
-#: ../meld/filediff.py:269
+#: ../meld/filediff.py:295
msgid "Previous conflict"
msgstr "Prethodni sukob"
-#: ../meld/filediff.py:269
+#: ../meld/filediff.py:295
msgid "Go to the previous conflict"
-msgstr "Ide na prethodni sukob"
+msgstr "Idite na prethodni sukob"
-#: ../meld/filediff.py:270
+#: ../meld/filediff.py:296
msgid "Next conflict"
msgstr "SledeÄi sukob"
-#: ../meld/filediff.py:270
+#: ../meld/filediff.py:296
msgid "Go to the next conflict"
-msgstr "Ide na sledeÄi sukob"
+msgstr "Idite na sledeÄi sukob"
-#: ../meld/filediff.py:271
+#: ../meld/filediff.py:297
msgid "Push to left"
msgstr "Gurni ulevo"
-#: ../meld/filediff.py:271
+#: ../meld/filediff.py:297
msgid "Push current change to the left"
-msgstr "Gura tekuÄu izmenu ulevo"
+msgstr "Gurnite tekuÄu izmenu ulevo"
-#: ../meld/filediff.py:272
+#: ../meld/filediff.py:298
msgid "Push to right"
msgstr "Gurni udesno"
-#: ../meld/filediff.py:272
+#: ../meld/filediff.py:298
msgid "Push current change to the right"
-msgstr "Gura tekuÄu izmenu udesno"
+msgstr "Gurnite tekuÄu izmenu udesno"
#. FIXME: using LAST and FIRST is terrible and unreliable icon abuse
-#: ../meld/filediff.py:274
+#: ../meld/filediff.py:300
msgid "Pull from left"
msgstr "Ubaci s leva"
-#: ../meld/filediff.py:274
+#: ../meld/filediff.py:300
msgid "Pull change from the left"
-msgstr "Ubacuje izmenu s leva"
+msgstr "Ubacite izmenu s leva"
-#: ../meld/filediff.py:275
+#: ../meld/filediff.py:301
msgid "Pull from right"
msgstr "Ubaci s desna"
-#: ../meld/filediff.py:275
+#: ../meld/filediff.py:301
msgid "Pull change from the right"
-msgstr "Ubacuje izmenu s leva"
+msgstr "Ubacite izmenu s desna"
-#: ../meld/filediff.py:276
+#: ../meld/filediff.py:302
msgid "Copy above left"
msgstr "UmnoÅi iznad ulevo"
-#: ../meld/filediff.py:276
+#: ../meld/filediff.py:302
msgid "Copy change above the left chunk"
-msgstr "UmnoÅava izmenu iznad komada ulevo"
+msgstr "UmnoÅite izmenu iznad komada ulevo"
-#: ../meld/filediff.py:277
+#: ../meld/filediff.py:303
msgid "Copy below left"
msgstr "UmnoÅi ispod ulevo"
-#: ../meld/filediff.py:277
+#: ../meld/filediff.py:303
msgid "Copy change below the left chunk"
-msgstr "UmnoÅava izmenu ispod komada ulevo"
+msgstr "UmnoÅite izmenu ispod komada ulevo"
-#: ../meld/filediff.py:278
+#: ../meld/filediff.py:304
msgid "Copy above right"
msgstr "UmnoÅi iznad udesno"
-#: ../meld/filediff.py:278
+#: ../meld/filediff.py:304
msgid "Copy change above the right chunk"
-msgstr "UmnoÅava izmenu iznad komada ulevo"
+msgstr "UmnoÅite izmenu iznad komada udesno"
-#: ../meld/filediff.py:279
+#: ../meld/filediff.py:305
msgid "Copy below right"
msgstr "UmnoÅi ispod udesno"
-#: ../meld/filediff.py:279
+#: ../meld/filediff.py:305
msgid "Copy change below the right chunk"
-msgstr "UmnoÅava izmenu ispod komada udesno"
+msgstr "UmnoÅite izmenu ispod komada udesno"
-#: ../meld/filediff.py:280
+#: ../meld/filediff.py:306
msgid "Delete"
msgstr "ObriÅi"
-#: ../meld/filediff.py:280
+#: ../meld/filediff.py:306
msgid "Delete change"
-msgstr "BriÅe izmenu"
+msgstr "ObriÅite izmenu"
-#: ../meld/filediff.py:281
+#: ../meld/filediff.py:307
msgid "Merge all changes from left"
msgstr "Objedini sve izmene s leva"
-#: ../meld/filediff.py:281
+#: ../meld/filediff.py:307
msgid "Merge all non-conflicting changes from the left"
-msgstr "Objedinjuje sve nesukobljavajuÄe izmene s leva"
+msgstr "Objedinite sve nesukobljavajuÄe izmene s leva"
-#: ../meld/filediff.py:282
+#: ../meld/filediff.py:308
msgid "Merge all changes from right"
msgstr "Objedini sve izmene s desna"
-#: ../meld/filediff.py:282
+#: ../meld/filediff.py:308
msgid "Merge all non-conflicting changes from the right"
-msgstr "Objedinjuje sve nesukobljavajuÄe izmene s desna"
+msgstr "Objedinite sve nesukobljavajuÄe izmene s desna"
-#: ../meld/filediff.py:283
+#: ../meld/filediff.py:309
msgid "Merge all non-conflicting"
msgstr "Objedini sve nesukobljavajuÄe"
-#: ../meld/filediff.py:283
+#: ../meld/filediff.py:309
msgid "Merge all non-conflicting changes from left and right panes"
-msgstr "Objedinjuje sve nesukobljavajuÄe izmene s leve i desne povrÅi"
+msgstr "Objedinite sve nesukobljavajuÄe izmene s leve i desne povrÅi"
-#: ../meld/filediff.py:284
+#: ../meld/filediff.py:310
msgid "Cycle through documents"
msgstr "KruÅi kroz dokumente"
-#: ../meld/filediff.py:284
+#: ../meld/filediff.py:310
msgid "Move keyboard focus to the next document in this comparison"
-msgstr "PremeÅta fokus tastature na sledeÄi dokument u ovom poreÄenju"
+msgstr "Premestite fokus tastature na sledeÄi dokument u ovom poreÄenju"
-#: ../meld/filediff.py:288
+#: ../meld/filediff.py:314
msgid "Lock scrolling"
msgstr "ZakljuÄaj klizanje"
-#: ../meld/filediff.py:289
+#: ../meld/filediff.py:315
msgid "Lock scrolling of all panes"
-msgstr "ZakljuÄava klizanje svih povrÅi"
+msgstr "ZakljuÄajte klizanje svih povrÅi"
#. Abbreviations for insert and overwrite that fit in the status bar
-#: ../meld/filediff.py:381
+#: ../meld/filediff.py:396
msgid "INS"
msgstr "UMET"
-#: ../meld/filediff.py:381
+#: ../meld/filediff.py:396
msgid "OVR"
msgstr "PREP"
#. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:383
+#: ../meld/filediff.py:398
#, python-format
msgid "Ln %i, Col %i"
msgstr "Red %i, mesto %i"
-#: ../meld/filediff.py:693
+#: ../meld/filediff.py:722
#, python-format
msgid ""
"Filter '%s' changed the number of lines in the file. Comparison will be "
@@ -783,46 +763,46 @@ msgstr ""
"viÅe detalja pogledajte priruÄnik za korisnike."
#. TRANSLATORS: this is the name of a new file which has not yet been saved
-#: ../meld/filediff.py:780
+#: ../meld/filediff.py:809
msgid "<unnamed>"
msgstr "<neimenovan>"
-#: ../meld/filediff.py:969
+#: ../meld/filediff.py:996
#, python-format
msgid "[%s] Set num panes"
msgstr "[%s] Postavi broj ploÄa"
-#: ../meld/filediff.py:975
+#: ../meld/filediff.py:1002
#, python-format
msgid "[%s] Opening files"
msgstr "[%s] Otvaram datoteke"
-#: ../meld/filediff.py:999 ../meld/filediff.py:1008 ../meld/filediff.py:1020
-#: ../meld/filediff.py:1026
+#: ../meld/filediff.py:1026 ../meld/filediff.py:1035 ../meld/filediff.py:1047
+#: ../meld/filediff.py:1053
msgid "Could not read file"
msgstr "Ne mogu da proÄitam datoteku"
-#: ../meld/filediff.py:1000
+#: ../meld/filediff.py:1027
#, python-format
msgid "[%s] Reading files"
msgstr "[%s] Äitam datoteke"
-#: ../meld/filediff.py:1009
+#: ../meld/filediff.py:1036
#, 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:1048
#, python-format
msgid "%s is not in encodings: %s"
msgstr "â%sâ nije u kodiranjima: â%sâ"
-#: ../meld/filediff.py:1051 ../meld/filemerge.py:67
+#: ../meld/filediff.py:1078 ../meld/filemerge.py:67
#, python-format
msgid "[%s] Computing differences"
msgstr "[%s] SraÄunavam razlike"
-#: ../meld/filediff.py:1108
+#: ../meld/filediff.py:1148
msgid ""
"Text filters are being used, and may be masking differences between files. "
"Would you like to compare the unfiltered files?"
@@ -830,15 +810,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:1114
+#: ../meld/filediff.py:1154
msgid "Files are identical"
msgstr "Datoteke su istovetne"
-#: ../meld/filediff.py:1124
+#: ../meld/filediff.py:1164
msgid "Show without filters"
msgstr "Prikazuje bez filtera"
-#: ../meld/filediff.py:1278
+#: ../meld/filediff.py:1354
#, python-format
msgid ""
"\"%s\" exists!\n"
@@ -847,7 +827,7 @@ msgstr ""
"â%sâ postoji!\n"
"Da presnimim?"
-#: ../meld/filediff.py:1291
+#: ../meld/filediff.py:1367
#, python-format
msgid ""
"Error writing to %s\n"
@@ -858,12 +838,12 @@ msgstr ""
"\n"
"%s."
-#: ../meld/filediff.py:1300
+#: ../meld/filediff.py:1376
#, python-format
msgid "Choose a name for buffer %i."
-msgstr "Izaberite ime za %i. bafer."
+msgstr "Izaberite naziv za %i. bafer."
-#: ../meld/filediff.py:1315
+#: ../meld/filediff.py:1391
#, python-format
msgid ""
"This file '%s' contains a mixture of line endings.\n"
@@ -874,16 +854,16 @@ msgstr ""
"\n"
"Koji oblik Åelite da koristite?"
-#: ../meld/filediff.py:1331
+#: ../meld/filediff.py:1407
#, python-format
msgid ""
"'%s' contains characters not encodable with '%s'\n"
"Would you like to save as UTF-8?"
msgstr ""
"â%sâ sadrÅi znakove koji se ne mogu kodirati uz â%sâ\n"
-"Da li Åelite da saÄuvate kao âUTF-8â?"
+"Da li Åelite da saÄuvate kao UTF-8?"
-#: ../meld/filediff.py:1390
+#: ../meld/filediff.py:1466
#, python-format
msgid ""
"Reloading will discard changes in:\n"
@@ -928,27 +908,27 @@ msgstr "PokreÄe poreÄenje 2 ili 3 elementa datoteka"
#: ../meld/meldapp.py:156
msgid "Start a 2- or 3-way directory comparison"
-msgstr "PokreÄe poreÄenje 2 ili 3 elementa direktorijuma"
+msgstr "PokreÄe poreÄenje 2 ili 3 elementa fascikli"
#: ../meld/meldapp.py:157
msgid "Start a comparison between file and dir/file"
-msgstr "PokreÄe poreÄenje izmeÄu datoteke i direktorijuma/datoteke"
+msgstr "PokreÄe poreÄenje izmeÄu datoteke i fascikle/datoteke"
#: ../meld/meldapp.py:163
msgid "Meld is a file and directory comparison tool."
-msgstr "Meld je alat za poreÄenje datoteka i direktorijuma."
+msgstr "Meld je alat za poreÄenje datoteka i fascikli."
#: ../meld/meldapp.py:166
msgid "Set label to use instead of file name"
-msgstr "PodeÅava oznaku za koriÅÄenje umesto imena datoteke"
+msgstr "PodeÅava oznaku za koriÅÄenje umesto naziva datoteke"
#: ../meld/meldapp.py:168
msgid "Automatically compare all differing files on startup"
-msgstr "Automatski poredi sve razlikujuÄe datoteke prilikom pokretanja"
+msgstr "Samostalno poredi sve razlikujuÄe datoteke prilikom pokretanja"
#: ../meld/meldapp.py:170
msgid "Ignored for compatibility"
-msgstr "Zanemareno zbog kompatibilnosti"
+msgstr "Zanemareno zbog saglasnosti"
#: ../meld/meldapp.py:173
msgid "Set the target file for saving a merge result"
@@ -956,8 +936,7 @@ msgstr "PodeÅava ciljnu datoteku za Äuvanje rezultata stapanja"
#: ../meld/meldapp.py:176
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 direktorijuma."
+msgstr "Pravi jeziÄak razlika za najviÅe do 3 pridodate datoteke ili fascikle."
#: ../meld/meldapp.py:179
#, python-format
@@ -966,9 +945,9 @@ msgstr "previÅe argumenata (traÅeno je 0-4, dobih %d)"
#: ../meld/meldapp.py:181 ../meld/meldapp.py:185
msgid "can't compare more than three directories"
-msgstr "ne mogu da poredim viÅe od tri direktorijuma"
+msgstr "ne mogu da poredim viÅe od tri fascikle"
-#: ../meld/melddoc.py:51 ../meld/melddoc.py:52
+#: ../meld/melddoc.py:56 ../meld/melddoc.py:57
msgid "untitled"
msgstr "bezimeni"
@@ -978,23 +957,23 @@ msgstr "_Datoteka"
#: ../meld/meldwindow.py:126
msgid "_New..."
-msgstr "_Novi..."
+msgstr "_Novo..."
#: ../meld/meldwindow.py:126
msgid "Start a new comparison"
-msgstr "ZapoÄinje novo poreÄenje"
+msgstr "ZapoÄnite novo poreÄenje"
#: ../meld/meldwindow.py:127
msgid "Save the current file"
-msgstr "Äuva trenutnu datoteku"
+msgstr "SaÄuvajte trenutnu datoteku"
#: ../meld/meldwindow.py:129
msgid "Close the current file"
-msgstr "Zatvara trenutnu datoteku"
+msgstr "Zatvorite trenutnu datoteku"
#: ../meld/meldwindow.py:130
msgid "Quit the program"
-msgstr "Zatvara program"
+msgstr "Zatvorite program"
#: ../meld/meldwindow.py:132
msgid "_Edit"
@@ -1002,35 +981,35 @@ msgstr "_UreÄivanje"
#: ../meld/meldwindow.py:133
msgid "Undo the last action"
-msgstr "Opoziva poslednju radnju"
+msgstr "Opozovite poslednju radnju"
#: ../meld/meldwindow.py:134
msgid "Redo the last undone action"
-msgstr "Ponavlja poslednju opozvanu radnju"
+msgstr "Ponovite poslednju opozvanu radnju"
#: ../meld/meldwindow.py:135
msgid "Cut the selection"
-msgstr "Iseca izbor"
+msgstr "Isecite izbor"
#: ../meld/meldwindow.py:136
msgid "Copy the selection"
-msgstr "UmnoÅava izbor"
+msgstr "UmnoÅite izbor"
#: ../meld/meldwindow.py:137
msgid "Paste the clipboard"
-msgstr "Ubaci ostavu"
+msgstr "Ubacite ostavu"
#: ../meld/meldwindow.py:138
msgid "Search for text"
-msgstr "TraÅi tekst"
+msgstr "TraÅite tekst"
#: ../meld/meldwindow.py:139
msgid "Find Ne_xt"
-msgstr "NaÄi s_edeÄe"
+msgstr "NaÄi s_ledeÄe"
#: ../meld/meldwindow.py:139
msgid "Search forwards for the same text"
-msgstr "TraÅi unapred isti tekst"
+msgstr "TraÅite unapred isti tekst"
#: ../meld/meldwindow.py:140
msgid "Find _Previous"
@@ -1038,11 +1017,11 @@ msgstr "NaÄi pre_thodno"
#: ../meld/meldwindow.py:140
msgid "Search backwards for the same text"
-msgstr "TraÅi unazad isti tekst"
+msgstr "TraÅite unazad isti tekst"
#: ../meld/meldwindow.py:141
msgid "Find and replace text"
-msgstr "Pronalazi i zamenjuje tekst"
+msgstr "PronaÄite i zamenite tekst"
#: ../meld/meldwindow.py:142
msgid "Prefere_nces"
@@ -1062,7 +1041,7 @@ msgstr "SledeÄa izmena"
#: ../meld/meldwindow.py:145
msgid "Go to the next change"
-msgstr "Ide na sledeÄu izmenu"
+msgstr "Idite na sledeÄu izmenu"
#: ../meld/meldwindow.py:146
msgid "Previous change"
@@ -1070,132 +1049,140 @@ msgstr "Prethodna izmena"
#: ../meld/meldwindow.py:146
msgid "Go to the previous change"
-msgstr "Ide na prethodnu izmenu"
+msgstr "Idite na prethodnu izmenu"
+
+#: ../meld/meldwindow.py:147
+msgid "Open externally"
+msgstr "Otvori spoljnim"
+
+#: ../meld/meldwindow.py:147
+msgid "Open selected file or directory in the default external application"
+msgstr "Otvorite izabranu datoteku ili fasciklu u osnovnom spoljnom programu"
-#: ../meld/meldwindow.py:148
+#: ../meld/meldwindow.py:149
msgid "_View"
msgstr "P_regled"
-#: ../meld/meldwindow.py:149
+#: ../meld/meldwindow.py:150
msgid "File status"
msgstr "Stanje datoteke"
-#: ../meld/meldwindow.py:150
+#: ../meld/meldwindow.py:151
msgid "Version status"
msgstr "Stanje izdanja"
-#: ../meld/meldwindow.py:151
+#: ../meld/meldwindow.py:152
msgid "File filters"
msgstr "Filteri datoteke"
-#: ../meld/meldwindow.py:152
+#: ../meld/meldwindow.py:153
msgid "Stop the current action"
-msgstr "Zaustavlja trenutnu radnju"
+msgstr "Zaustavite trenutnu radnju"
-#: ../meld/meldwindow.py:153
+#: ../meld/meldwindow.py:154
msgid "Refresh the view"
-msgstr "OsveÅava pregled"
+msgstr "OsveÅite pregled"
-#: ../meld/meldwindow.py:154
+#: ../meld/meldwindow.py:155
msgid "Reload"
msgstr "Ponovo uÄitaj"
-#: ../meld/meldwindow.py:154
+#: ../meld/meldwindow.py:155
msgid "Reload the comparison"
-msgstr "Ponovo uÄitava poreÄenje"
+msgstr "Ponovo uÄitajte poreÄenje"
-#: ../meld/meldwindow.py:156
+#: ../meld/meldwindow.py:157
msgid "_Tabs"
msgstr "_JeziÄak"
-#: ../meld/meldwindow.py:157
+#: ../meld/meldwindow.py:158
msgid "_Previous Tab"
msgstr "Pre_thodni jeziÄak"
-#: ../meld/meldwindow.py:157
+#: ../meld/meldwindow.py:158
msgid "Activate previous tab"
-msgstr "Aktivira prethodni jeziÄak"
+msgstr "Aktivirajte prethodni jeziÄak"
-#: ../meld/meldwindow.py:158
+#: ../meld/meldwindow.py:159
msgid "_Next Tab"
msgstr "Sle_deÄi jeziÄak"
-#: ../meld/meldwindow.py:158
+#: ../meld/meldwindow.py:159
msgid "Activate next tab"
-msgstr "Aktivira sledeÄi jeziÄak"
+msgstr "Aktivirajte sledeÄi jeziÄak"
-#: ../meld/meldwindow.py:159
+#: ../meld/meldwindow.py:160
msgid "Move Tab _Left"
msgstr "Premesti jeziÄak u_levo"
-#: ../meld/meldwindow.py:159
+#: ../meld/meldwindow.py:160
msgid "Move current tab to left"
-msgstr "PremeÅta trenutni jeziÄak na levo"
+msgstr "Premestite trenutni jeziÄak na levo"
-#: ../meld/meldwindow.py:160
+#: ../meld/meldwindow.py:161
msgid "Move Tab _Right"
msgstr "Premesti jeziÄak u_desno"
-#: ../meld/meldwindow.py:160
+#: ../meld/meldwindow.py:161
msgid "Move current tab to right"
-msgstr "PremeÅta trenutni jeziÄak na desno"
+msgstr "Premestite trenutni jeziÄak na desno"
-#: ../meld/meldwindow.py:162
+#: ../meld/meldwindow.py:163
msgid "_Help"
msgstr "Pomo_Ä"
-#: ../meld/meldwindow.py:163
+#: ../meld/meldwindow.py:164
msgid "_Contents"
msgstr "_SadrÅaj"
-#: ../meld/meldwindow.py:163
+#: ../meld/meldwindow.py:164
msgid "Open the Meld manual"
msgstr "Otvorite uputstvo Melda"
-#: ../meld/meldwindow.py:164
+#: ../meld/meldwindow.py:165
msgid "Report _Bug"
msgstr "Prijavi _greÅku"
-#: ../meld/meldwindow.py:164
+#: ../meld/meldwindow.py:165
msgid "Report a bug in Meld"
msgstr "Prijavite greÅku u Meldu"
-#: ../meld/meldwindow.py:165
+#: ../meld/meldwindow.py:166
msgid "About this program"
msgstr "O ovom programu"
-#: ../meld/meldwindow.py:168
+#: ../meld/meldwindow.py:169
msgid "Full Screen"
msgstr "Ceo ekran"
-#: ../meld/meldwindow.py:168
+#: ../meld/meldwindow.py:169
msgid "View the comparison in full screen"
msgstr "Pregledajte poreÄenje preko celog ekrana"
-#: ../meld/meldwindow.py:169
+#: ../meld/meldwindow.py:170
msgid "_Toolbar"
msgstr "Linija _alata"
-#: ../meld/meldwindow.py:169
+#: ../meld/meldwindow.py:170
msgid "Show or hide the toolbar"
-msgstr "Prikazuje ili skriva liniju alata"
+msgstr "PrikaÅite ili sakrijte liniju alata"
-#: ../meld/meldwindow.py:170
+#: ../meld/meldwindow.py:171
msgid "_Statusbar"
msgstr "Linija _stanja"
-#: ../meld/meldwindow.py:170
+#: ../meld/meldwindow.py:171
msgid "Show or hide the statusbar"
-msgstr "Prikazuje ili skriva liniju stanja"
+msgstr "PrikaÅite ili sakrijte liniju stanja"
-#: ../meld/meldwindow.py:534
+#: ../meld/meldwindow.py:538
msgid "Switch to this tab"
-msgstr "Prebacuje se na ovaj jeziÄak"
+msgstr "Prebacite se na ovaj jeziÄak"
#. exit at first non found directory + file
-#: ../meld/meldwindow.py:625
+#: ../meld/meldwindow.py:629
msgid "Cannot compare a mixture of files and directories.\n"
-msgstr "Ne mogu da poredim meÅavinu datoteka i direktorijuma.\n"
+msgstr "Ne mogu da poredim meÅavinu datoteka i fascikli.\n"
#. no common path. empty names get changed to "[None]"
#: ../meld/misc.py:174
@@ -1208,7 +1195,7 @@ msgstr "SaÄuvaj ispravku kao..."
#: ../meld/preferences.py:37
msgid "label"
-msgstr "oznaka"
+msgstr "natpis"
#: ../meld/preferences.py:37
msgid "pattern"
@@ -1221,51 +1208,59 @@ 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:233
msgid "Backups\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n"
-msgstr "Rezervne kopije\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:235
+msgid ""
+"OS-specific metadata\t0\t.DS_Store ._* .Spotlight-V100 .Trashes Thumbs.db "
+"Desktop.ini\n"
+msgstr "OS-specifiÄni metapodaci\t0\t.DS_Store ._* .Spotlight-V100 .Trashes Thumbs.db "
+"Desktop.ini\n"
+
+#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
+#: ../meld/preferences.py:237
#, python-format
msgid "Version Control\t1\t%s\n"
-msgstr "Kontrola verzija\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:237
+#: ../meld/preferences.py:239
msgid "Binaries\t1\t*.{pyc,a,obj,o,so,la,lib,dll}\n"
msgstr "IzvrÅne\t1\t*.{pyc,a,obj,o,so,la,lib,dll}\n"
#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:239
+#: ../meld/preferences.py:241
msgid "Media\t0\t*.{jpg,gif,png,wav,mp3,ogg,xcf,xpm}"
msgstr "Medija\t0\t*.{jpg,gif,png,wav,mp3,ogg,xcf,xpm}"
#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:241
+#: ../meld/preferences.py:243
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:243
+#: ../meld/preferences.py:245
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:245
+#: ../meld/preferences.py:247
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:247
+#: ../meld/preferences.py:249
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:249
+#: ../meld/preferences.py:251
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:251
+#: ../meld/preferences.py:253
msgid "Script comment\t0\t#.*"
msgstr "Komentar skripte\t0\t#.*"
@@ -1275,7 +1270,7 @@ msgstr "U_gradi"
#: ../meld/vcview.py:120
msgid "Commit"
-msgstr "Ugradi"
+msgstr "Ugradite"
#: ../meld/vcview.py:121
msgid "_Update"
@@ -1283,7 +1278,7 @@ msgstr "_Dopuni"
#: ../meld/vcview.py:121
msgid "Update"
-msgstr "Dopuni"
+msgstr "Dopunite"
#: ../meld/vcview.py:122
msgid "Add to VC"
@@ -1323,7 +1318,7 @@ msgstr "_Izravnaj"
#: ../meld/vcview.py:131
msgid "Flatten directories"
-msgstr "Izravnaj direktorijume"
+msgstr "Izravnaj fascikle"
#: ../meld/vcview.py:132
msgid "_Modified"
@@ -1347,25 +1342,29 @@ msgstr "Prikazuje neverzionirane datoteke"
#: ../meld/vcview.py:135
msgid "Ignored"
-msgstr "Zanemaren"
+msgstr "Zanemarene"
#: ../meld/vcview.py:135
msgid "Show ignored files"
msgstr "Prikazuje zanemarene datoteke"
-#: ../meld/vcview.py:177 ../meld/vcview.py:301
+#: ../meld/vcview.py:178 ../meld/vcview.py:302
msgid "Location"
msgstr "Putanja"
-#: ../meld/vcview.py:178
+#: ../meld/vcview.py:179
msgid "Status"
msgstr "Stanje"
-#: ../meld/vcview.py:179
+#: ../meld/vcview.py:180
msgid "Rev"
msgstr "Izd"
#: ../meld/vcview.py:181
+msgid "Tag"
+msgstr "Oznaka"
+
+#: ../meld/vcview.py:182
msgid "Options"
msgstr "Opcije"
@@ -1396,30 +1395,30 @@ msgid "%s (%s)"
msgstr "%s (%s)"
#. TRANSLATORS: This is the location of the directory the user is diffing
-#: ../meld/vcview.py:301
+#: ../meld/vcview.py:302
#, python-format
msgid "%s: %s"
msgstr "%s: %s"
-#: ../meld/vcview.py:349
+#: ../meld/vcview.py:350
msgid "(Empty)"
msgstr "(Prazno)"
-#: ../meld/vcview.py:387
+#: ../meld/vcview.py:388
#, python-format
msgid "[%s] Fetching differences"
msgstr "[%s] Pribavljam razlike"
-#: ../meld/vcview.py:395
+#: ../meld/vcview.py:396
#, python-format
msgid "[%s] Applying patch"
msgstr "[%s] Primenjujem zakrpu"
-#: ../meld/vcview.py:480
+#: ../meld/vcview.py:478
msgid "Select some files first."
msgstr "Prvo izaberite neke datoteke."
-#: ../meld/vcview.py:553
+#: ../meld/vcview.py:551
#, python-format
msgid ""
"\n"
@@ -1524,6 +1523,21 @@ msgstr ""
"Obrazac je bio â%sâ\n"
"GreÅka je bila â%sâ"
+#~ msgid "Compare Options"
+#~ msgstr "Opcije poreÄenja"
+
+#~ msgid "Date"
+#~ msgstr "Datum"
+
+#~ msgid "Local copy against other remote revision"
+#~ msgstr "Lokalni primerak naspram druge udaljene revizije"
+
+#~ msgid "Local copy against same remote revision"
+#~ msgstr "Lokalni primerak naspram iste udaljene revizije"
+
+#~ msgid "Open selected"
+#~ msgstr "Otvori izabrano"
+
#~ msgid "[%s] Scanning"
#~ msgstr "[%s] pregledam"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
