[meld] Updated Serbian translation
- From: ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ <mirosnik src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld] Updated Serbian translation
- Date: Sun, 20 May 2012 09:26:06 +0000 (UTC)
commit 90396650a1eb082ebd18671663ccc64530375243
Author: ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ <miroslavnikolic rocketmail com>
Date: Sun May 20 11:26:23 2012 +0200
Updated Serbian translation
po/sr.po | 649 ++++++++++++++++++++++++++++----------------------------
po/sr latin po | 649 ++++++++++++++++++++++++++++----------------------------
2 files changed, 652 insertions(+), 646 deletions(-)
---
diff --git a/po/sr.po b/po/sr.po
index ba76cdc..26c55d0 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -8,8 +8,8 @@ msgstr ""
"Project-Id-Version: meld\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=meld&k";
"eywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-12-09 23:15+0000\n"
-"PO-Revision-Date: 2012-02-26 20:22+0200\n"
+"POT-Creation-Date: 2012-04-28 23:20+0000\n"
+"PO-Revision-Date: 2012-05-20 10:52+0200\n"
"Last-Translator: ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ <miroslavnikolic rocketmail com>\n"
"Language-Team: Serbian <gnom prevod org>\n"
"Language: sr\n"
@@ -20,78 +20,78 @@ msgstr ""
"n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
"X-Project-Style: gnome\n"
-#: ../bin/meld:96
+#: ../bin/meld:103
msgid "Cannot import: "
msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÐÐÐÐ: "
-#: ../bin/meld:99
+#: ../bin/meld:106
#, c-format
msgid "Meld requires %s or higher."
msgstr "ÐÐÐÐ ÐÐÑÑÐÐÐ %s ÐÐÐ ÐÐÐÐÑÐ."
-#: ../data/meld.desktop.in.h:1
-msgid "Compare and merge your files"
-msgstr "ÐÐÐÑÐÑÑÑÑÐ Ð ÑÐÐÑÐÑÑÐ ÐÐÑÐ ÐÐÑÐÑÐÐÐ."
+#: ../data/meld.desktop.in.h:1 ../data/ui/meldapp.ui.h:1
+msgid "Meld"
+msgstr "ÐÐÐÐ"
#: ../data/meld.desktop.in.h:2
msgid "Diff Viewer"
msgstr "ÐÑÐÐÐÐÐÐÑ ÑÐÐÐÐÐÐ"
-#: ../data/meld.desktop.in.h:3 ../data/ui/meldapp.ui.h:5
-msgid "Meld"
-msgstr "ÐÐÐÐ"
-
-#: ../data/meld.desktop.in.h:4
+#: ../data/meld.desktop.in.h:3
msgid "Meld Diff Viewer"
msgstr "ÐÑÐÐÐÐÐÐÑ ÑÐÐÐÐÐÐ ÐÐÐÐ"
+#: ../data/meld.desktop.in.h:4
+msgid "Compare and merge your files"
+msgstr "ÐÐÐÑÐÑÑÑÑÐ Ð ÑÐÐÑÐÑÑÐ ÐÐÑÐ ÐÐÑÐÑÐÐÐ."
+
#: ../data/ui/EditableList.ui.h:1
-msgid "Active"
-msgstr "ÐÐÑÐÐÐÐ"
+msgid "Editable List"
+msgstr "ÐÐÐÑÐÐ ÐÐ ÑÑÐÑÐÐÐÑÐ"
#: ../data/ui/EditableList.ui.h:2
-msgid "Add new filter"
-msgstr "ÐÐÐÐÑÑÐ ÐÐÐÐ ÑÐÐÑÐÑ"
+msgid "Active"
+msgstr "ÐÐÑÐÐÐÐ"
-#: ../data/ui/EditableList.ui.h:3
-msgid "Editable List"
-msgstr "ÐÐÐÑÐÐ ÐÐ ÑÑÐÑÐÐÐÑÐ"
+#: ../data/ui/EditableList.ui.h:3 ../meld/vcview.py:166
+msgid "Name"
+msgstr "ÐÐÐÐÐ"
#: ../data/ui/EditableList.ui.h:4
-msgid "Move _Down"
-msgstr "ÐÑÐÐÐÑÑÐ _ÐÐÐÐ"
+msgid "Pattern"
+msgstr "ÐÐÑÐÐÐÑ"
#: ../data/ui/EditableList.ui.h:5
-msgid "Move _Up"
-msgstr "ÐÑÐÐÐÑÑÐ _ÐÐÑÐ"
+msgid "Add new filter"
+msgstr "ÐÐÐÐÑÑÐ ÐÐÐÐ ÑÐÐÑÐÑ"
-#: ../data/ui/EditableList.ui.h:6
-msgid "Move item down"
-msgstr "ÐÑÐÐÐÑÑÐÑÐ ÑÑÐÐÐÑ ÐÐ ÐÐÐÐ"
+#: ../data/ui/EditableList.ui.h:6 ../meld/vcview.py:130
+msgid "_Add"
+msgstr "_ÐÐÐÐÑ"
#: ../data/ui/EditableList.ui.h:7
-msgid "Move item up"
-msgstr "ÐÑÐÐÐÑÑÐÑÐ ÑÑÐÐÐÑ ÐÐ ÐÐÑÐ"
+msgid "Remove selected filter"
+msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÐÑÐÐÐ ÑÐÐÑÐÑ"
-#: ../data/ui/EditableList.ui.h:8 ../meld/vcview.py:158
-msgid "Name"
-msgstr "ÐÐÐÐÐ"
+#: ../data/ui/EditableList.ui.h:8 ../meld/vcview.py:132
+msgid "_Remove"
+msgstr "Ð_ÐÐÐÐÐ"
#: ../data/ui/EditableList.ui.h:9
-msgid "Pattern"
-msgstr "ÐÐÑÐÐÐÑ"
+msgid "Move item up"
+msgstr "ÐÑÐÐÐÑÑÐÑÐ ÑÑÐÐÐÑ ÐÐ ÐÐÑÐ"
#: ../data/ui/EditableList.ui.h:10
-msgid "Remove selected filter"
-msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÐÑÐÐÐ ÑÐÐÑÐÑ"
+msgid "Move _Up"
+msgstr "ÐÑÐÐÐÑÑÐ _ÐÐÑÐ"
-#: ../data/ui/EditableList.ui.h:11 ../meld/vcview.py:122
-msgid "_Add"
-msgstr "_ÐÐÐÐÑ"
+#: ../data/ui/EditableList.ui.h:11
+msgid "Move item down"
+msgstr "ÐÑÐÐÐÑÑÐÑÐ ÑÑÐÐÐÑ ÐÐ ÐÐÐÐ"
-#: ../data/ui/EditableList.ui.h:12 ../meld/vcview.py:124
-msgid "_Remove"
-msgstr "Ð_ÐÐÐÐÐ"
+#: ../data/ui/EditableList.ui.h:12
+msgid "Move _Down"
+msgstr "ÐÑÐÐÐÑÑÐ _ÐÐÐÐ"
#: ../data/ui/filediff.ui.h:1
msgid "Save modified files?"
@@ -113,116 +113,118 @@ msgstr "_ÐÐÐÐÑÐ ÐÐÐÐÐÐ"
msgid "_Save Selected"
msgstr "_ÐÐÑÑÐÐÑ ÐÐÐÐÑÐÐÐ"
-#: ../data/ui/findbar.ui.h:1
-msgid "Regular E_xpression"
-msgstr "_ÐÐÐÑÐÐÑÐÐ ÐÐÑÐÐ"
+#: ../data/ui/findbar.ui.h:1 ../meld/meldwindow.py:141
+msgid "_Replace"
+msgstr "_ÐÐÐÐÐÐ"
#: ../data/ui/findbar.ui.h:2
msgid "Replace _All"
msgstr "ÐÐÐÐÐÐ Ñ_ÐÐ"
#: ../data/ui/findbar.ui.h:3
-msgid "Replace _With"
-msgstr "ÐÐÐÐÐÐ Ñ_Ð"
+msgid "_Previous"
+msgstr "_ÐÑÐÑÑÐÐÐÐ"
#: ../data/ui/findbar.ui.h:4
-msgid "Who_le word"
-msgstr "ÐÐ_ÐÑ ÑÐÑ"
+msgid "_Next"
+msgstr "_ÐÐÐÐÐÑÐ"
#: ../data/ui/findbar.ui.h:5
-msgid "_Match Case"
-msgstr "_ÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐÑ ÑÐÐÐÐ"
+#| msgid "Find"
+msgid "Find:"
+msgstr "ÐÐÑÐ:"
#: ../data/ui/findbar.ui.h:6
-msgid "_Next"
-msgstr "_ÐÐÐÐÐÑÐ"
+#| msgid "Replace _With"
+msgid "Replace _with:"
+msgstr "ÐÐÐÐÐÐ Ñ_Ð:"
#: ../data/ui/findbar.ui.h:7
-msgid "_Previous"
-msgstr "_ÐÑÐÑÑÐÐÐÐ"
+msgid "_Match Case"
+msgstr "_ÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐÑ ÑÐÐÐÐ"
-#: ../data/ui/findbar.ui.h:8 ../meld/meldwindow.py:141
-msgid "_Replace"
-msgstr "_ÐÐÐÐÐÐ"
+#: ../data/ui/findbar.ui.h:8
+msgid "Who_le word"
+msgstr "ÐÐ_ÐÑ ÑÐÑ"
#: ../data/ui/findbar.ui.h:9
-msgid "_Search for"
-msgstr "ÐÐ_ÑÑÐÐÐ"
-
-#: ../data/ui/meldapp.ui.h:1
-msgid "Choose Files"
-msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐÑÐÑÐÐÐ"
+msgid "Regular E_xpression"
+msgstr "_ÐÐÐÑÐÐÑÐÐ ÐÐÑÐÐ"
#: ../data/ui/meldapp.ui.h:2
#| msgid ""
#| "Copyright © 2002-2009 Stephen Kennedy\n"
-#| "Copyright © 2009-2010 Kai Willadsen"
+#| "Copyright © 2009-2011 Kai Willadsen"
msgid ""
"Copyright © 2002-2009 Stephen Kennedy\n"
-"Copyright © 2009-2011 Kai Willadsen"
+"Copyright © 2009-2012 Kai Willadsen"
msgstr ""
"ÐÑÑÐÑÑÐÐ ÐÑÐÐÐ © 2002-2009 ÐÑÐÑÐÐ ÐÐÐÐÐÐ\n"
-"ÐÑÑÐÑÑÐÐ ÐÑÐÐÐ © 2009-2011 ÐÐÑ ÐÐÐÐÐÑÐÐ"
+"ÐÑÑÐÑÑÐÐ ÐÑÐÐÐ © 2009-2012 ÐÐÑ ÐÐÐÐÐÑÐÐ"
#: ../data/ui/meldapp.ui.h:4
-msgid "Directory"
-msgstr "ÐÐÑÑÐÐÐÐ"
+msgid "translator-credits"
+msgstr ""
+"ÐÐÐÐÐÐ ÐÐÐÐÐ <danilo prevod org>\n"
+"ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ <miroslavnikolic rocketmail com>\n"
+"\n"
+"Prevod.org â ÐÑÐÐÐÐ ÐÐ ÑÑÐÑÐÐ ÑÐÐÐÐ."
+
+#: ../data/ui/meldapp.ui.h:5
+msgid "Choose Files"
+msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐÑÐÑÐÐÐ"
+
+#: ../data/ui/meldapp.ui.h:6
+msgid "_Three Way Compare"
+msgstr "ÐÐÑÐÑÐÑÐ ÑÑÐ ÐÐÐÐÐÐÑÐ"
#. Refers to version of the file being compared
-#: ../data/ui/meldapp.ui.h:7
+#: ../data/ui/meldapp.ui.h:8
msgid "Mine"
msgstr "ÐÐÑÐ"
#. Refers to version of the file being compared
-#: ../data/ui/meldapp.ui.h:9
+#: ../data/ui/meldapp.ui.h:10
msgid "Original"
msgstr "ÐÐÐÐÑÐÐ"
#. Refers to version of the file being compared
-#: ../data/ui/meldapp.ui.h:11
+#: ../data/ui/meldapp.ui.h:12
msgid "Other"
msgstr "ÐÑÑÐÐ"
-#: ../data/ui/meldapp.ui.h:12
-msgid "Select VC Directory"
-msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐ ÑÐÑÑÐÐÐÑ"
-
#: ../data/ui/meldapp.ui.h:13
-msgid "_Directory Comparison"
-msgstr "ÐÐÑÐÑÐÑÐ _ÑÐÑÑÐÐÐÐ"
-
-#: ../data/ui/meldapp.ui.h:14
msgid "_File Comparison"
msgstr "ÐÐÑÐÑÐÑÐ _ÐÐÑÐÑÐÐÐ"
+#: ../data/ui/meldapp.ui.h:14
+msgid "_Directory Comparison"
+msgstr "ÐÐÑÐÑÐÑÐ _ÑÐÑÑÐÐÐÐ"
+
#: ../data/ui/meldapp.ui.h:15
-msgid "_Three Way Compare"
-msgstr "ÐÐÑÐÑÐÑÐ ÑÑÐ ÐÐÐÐÐÐÑÐ"
+msgid "Select VC Directory"
+msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐ ÑÐÑÑÐÐÐÑ"
#: ../data/ui/meldapp.ui.h:16
-msgid "_Version Control Browser"
-msgstr "ÐÑÐÐÐÐÐÐÐÐ ÐÐÐÑÑÐÐÐ _ÐÐÑÐÐÑÐ"
+msgid "Directory"
+msgstr "ÐÐÑÑÐÐÐÐ"
#: ../data/ui/meldapp.ui.h:17
-msgid "translator-credits"
-msgstr ""
-"ÐÐÐÐÐÐ ÐÐÐÐÐ <danilo prevod org>\n"
-"ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ <miroslavnikolic rocketmail com>\n"
-"\n"
-"Prevod.org â ÐÑÐÐÐÐ ÐÐ ÑÑÐÑÐÐ ÑÐÐÐÐ."
+msgid "_Version Control Browser"
+msgstr "ÐÑÐÐÐÐÐÐÐÐ ÐÐÐÑÑÐÐÐ _ÐÐÑÐÐÑÐ"
#: ../data/ui/patch-dialog.ui.h:1
-msgid "Copy to Clipboard"
-msgstr "ÐÐÐÐÐÐ Ñ ÐÑÑÐÐÑ"
-
-#: ../data/ui/patch-dialog.ui.h:2
msgid "Create Patch"
msgstr "ÐÐÐÑÐÐÐ ÐÑÐÑÐÐÐÑ"
-#: ../data/ui/patch-dialog.ui.h:3
+#: ../data/ui/patch-dialog.ui.h:2
msgid "Create a patch"
msgstr "ÐÐÐÑÐÐÐÑÐ ÐÑÐÑÐÐÐÑ"
+#: ../data/ui/patch-dialog.ui.h:3
+msgid "Use differences between:"
+msgstr "ÐÐÑÐÑÑÐ ÑÐÐÐÐÐÐ ÐÐÐÐÑÑ:"
+
#: ../data/ui/patch-dialog.ui.h:4
msgid "Left and middle panes"
msgstr "ÐÐÐÐ Ð ÑÑÐÐÑÐ ÐÐÐÑÑ"
@@ -232,91 +234,78 @@ msgid "Middle and right panes"
msgstr "ÐÑÐÐÑÐ Ð ÐÐÑÐÐ ÐÐÐÑÑ"
#: ../data/ui/patch-dialog.ui.h:6
-msgid "Use differences between:"
-msgstr "ÐÐÑÐÑÑÐ ÑÐÐÐÐÐÐ ÐÐÐÐÑÑ:"
-
-#: ../data/ui/patch-dialog.ui.h:7
msgid "_Reverse patch direction"
msgstr "ÐÑÐÐÐÑÐÐÐ ÑÐÐÑ _ÐÑÐÑÐÐÐÐ"
+#: ../data/ui/patch-dialog.ui.h:7
+msgid "Copy to Clipboard"
+msgstr "ÐÐÐÐÐÐ Ñ ÐÑÑÐÐÑ"
+
#: ../data/ui/preferences.ui.h:1
-msgid "Display"
-msgstr "ÐÑÐÐÐÐ"
+msgid "Meld Preferences"
+msgstr "ÐÐÑÑÐÐÐÐ ÐÐÐÐÐ"
#: ../data/ui/preferences.ui.h:2
-msgid "Do not _split words over two lines"
-msgstr "ÐÐÐÐÑ _ÐÐÐÐÐÐÑÐ ÑÐÑÐ Ñ ÐÐÐ ÑÐÐÐ"
+msgid "Font"
+msgstr "ÐÐÐÐÐÐ ÐÐÐ"
#: ../data/ui/preferences.ui.h:3
-msgid "Edito_r command:"
-msgstr "ÐÐÑÐÐÐÐ _ÑÑÐÑÐÐÐÑÐ:"
+msgid "_Use the system fixed width font"
+msgstr "ÐÐÑÐÑÑÐ ÑÐÑÑÐÐÐÐ ÐÐÑÑÐÐÑÐÐÑ ÐÐÐÐÑÐÐÑ _ÑÐÐÑÐ"
#: ../data/ui/preferences.ui.h:4
-msgid "Editor"
-msgstr "ÐÑÐÑÐÐÐÑ"
+msgid "_Editor font:"
+msgstr "_ÐÐÐÑ ÑÑÐÑÐÐÐÑÐ:"
#: ../data/ui/preferences.ui.h:5
-msgid "Enable text _wrapping"
-msgstr "ÐÐÑÑÑÐ _ÐÑÐÐÐÐÐÑÐ ÑÐÐÑÑÐ"
+msgid "Display"
+msgstr "ÐÑÐÐÐÐ"
#: ../data/ui/preferences.ui.h:6
-msgid "Encoding"
-msgstr "ÐÐÐÐÑÐÑÐ"
+msgid "_Tab width:"
+msgstr "_ÐÐÑÐÐÐ ÑÐÐÑÐÐÑÐÑÐ:"
#: ../data/ui/preferences.ui.h:7
-msgid "External editor"
-msgstr "ÐÐÐÑÐÐ ÑÑÐÑÐÐÐÑ"
+msgid "_Insert spaces instead of tabs"
+msgstr "_ÐÐÐÑÐ ÑÐÐÐÐÐÐ ÑÐÐÑÑÐ ÑÐÐÑÐÐÑÐÑÐ"
#: ../data/ui/preferences.ui.h:8
-msgid "File Filters"
-msgstr "ÐÐÐÑÐÑÐ ÐÐÑÐÑÐÐÐ"
+msgid "Enable text _wrapping"
+msgstr "ÐÐÑÑÑÐ _ÐÑÐÐÐÐÐÑÐ ÑÐÐÑÑÐ"
#: ../data/ui/preferences.ui.h:9
-msgid "Font"
-msgstr "ÐÐÐÐÐÐ ÐÐÐ"
+msgid "Do not _split words over two lines"
+msgstr "ÐÐÐÐÑ _ÐÐÐÐÐÐÑÐ ÑÐÑÐ Ñ ÐÐÐ ÑÐÐÐ"
#: ../data/ui/preferences.ui.h:10
-msgid "Ignore changes which insert or delete blank lines"
-msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÐÐÐ ÐÐÑÐ ÑÐÐÑÑÑÑ ÐÐÐ ÐÑÐÑÑ ÐÑÐÐÐÐ ÑÐÐÐÐÐ"
+msgid "Show _line numbers"
+msgstr "ÐÑÐÐÐÐÐ _ÐÑÐÑÐÐÐ ÑÐÐÐÐÐ"
#: ../data/ui/preferences.ui.h:11
-msgid "Ignore symbolic links"
-msgstr "ÐÐÐÐÐÐÑÐ ÑÐÐÐÐÐÐÑÐÐ ÐÐÐÐ"
+msgid "Show w_hitespace"
+msgstr "ÐÑÐÐÐÐÐ _ÑÐÐÐÐÐÐ"
#: ../data/ui/preferences.ui.h:12
-msgid "Loading"
-msgstr "ÐÑÐÑÐÐÐÐ"
+msgid "Use s_yntax highlighting"
+msgstr "ÐÐÑÐÑÑÐ ÐÑÑÐÑÐÑÐ _ÑÐÐÑÐÐÑÐ"
#: ../data/ui/preferences.ui.h:13
-msgid "Meld Preferences"
-msgstr "ÐÐÑÑÐÐÐÐ ÐÐÐÐÐ"
+msgid "External editor"
+msgstr "ÐÐÐÑÐÐ ÑÑÐÑÐÐÐÑ"
#: ../data/ui/preferences.ui.h:14
-msgid "Show _line numbers"
-msgstr "ÐÑÐÐÐÐÐ _ÐÑÐÑÐÐÐ ÑÐÐÐÐÐ"
+msgid "Use _default system editor"
+msgstr "ÐÐÑÐÑÑÐ _ÐÑÐÐÐÐÐ ÑÑÐÑÐÐÐÑ ÑÐÑÑÐÐÐ"
#: ../data/ui/preferences.ui.h:15
-msgid "Show w_hitespace"
-msgstr "ÐÑÐÐÐÐÐ _ÑÐÐÐÐÐÐ"
+msgid "Edito_r command:"
+msgstr "ÐÐÑÐÐÐÐ _ÑÑÐÑÐÐÐÑÐ:"
#: ../data/ui/preferences.ui.h:16
-msgid "Text Filters"
-msgstr "ÐÐÐÑÐÑÐ ÑÐÐÑÑÐ"
+msgid "Editor"
+msgstr "ÐÑÐÑÐÐÐÑ"
#: ../data/ui/preferences.ui.h:17
-msgid "Use _default system editor"
-msgstr "ÐÐÑÐÑÑÐ _ÐÑÐÐÐÐÐ ÑÑÐÑÐÐÐÑ ÑÐÑÑÐÐÐ"
-
-#: ../data/ui/preferences.ui.h:18
-msgid "Use s_yntax highlighting"
-msgstr "ÐÐÑÐÑÑÐ ÐÑÑÐÑÐÑÐ _ÑÐÐÑÐÐÑÐ"
-
-# bug: what encoding is iso8859? it's a registry of encodings, and encoding is eg. iso8859-5
-#: ../data/ui/preferences.ui.h:19
-msgid "When loading, try these codecs in order. (e.g. utf8, iso8859)"
-msgstr "ÐÑÐ ÑÑÐÑÐÐÐÑÑ, ÐÑÐÐÐÑ ÐÐÐ ÐÐÐÐÑÐÑÐ ÑÐÐÐÐ. (ÐÐÑ. utf8, iso8859)"
-
-#: ../data/ui/preferences.ui.h:20
msgid ""
"When performing directory comparisons, you may filter out files and "
"directories by name. Each pattern is a list of shell style wildcards "
@@ -326,7 +315,15 @@ msgstr ""
"ÐÑÐÐÐ ÐÐÐÐÐÑ. ÐÐÐÐÐ ÐÐÑÐÐÐÑ ÑÐ ÑÐÐÑÐÐ ÑÐÐÐÑÐ Ñ ÑÑÐÐÑ ÐÐÐÐÐÐÐ ÑÐÐÐÐÐÑÐÐÐÑ "
"ÑÐÐÐÐÐÐÐ."
-#: ../data/ui/preferences.ui.h:21
+#: ../data/ui/preferences.ui.h:18
+msgid "Ignore symbolic links"
+msgstr "ÐÐÐÐÐÐÑÐ ÑÐÐÐÐÐÐÑÐÐ ÐÐÐÐ"
+
+#: ../data/ui/preferences.ui.h:19
+msgid "File Filters"
+msgstr "ÐÐÐÑÐÑÐ ÐÐÑÐÑÐÐÐ"
+
+#: ../data/ui/preferences.ui.h:20
msgid ""
"When performing file comparisons, you may ignore certain types of changes. "
"Each pattern here is a python regular expression which replaces matching "
@@ -339,149 +336,154 @@ msgstr ""
"ÐÑÐÐÐÐÐ ÐÐÑÐÐÐÐ ÐÑÐ ÐÐÐÑÑÐÐÐÑÐ ÐÐÑÐÑÐÑÐ. ÐÐÐ ÐÐÑÐÐ ÑÐÐÑÐÐ ÐÑÑÐÐ, ÑÐÐÐ ÐÑÑÐÐ "
"ÐÐÐÐÑÑ ÐÐÐÐÑÐÐÐ. ÐÐ ÐÐÑÐ ÐÐÑÐÑÐ ÐÐÐÐÐÐÐÑÑÐ ÑÐÑÑÑÑÐÐ ÐÐ ÐÐÑÐÑÐÐÐÐ."
+#: ../data/ui/preferences.ui.h:21
+msgid "Ignore changes which insert or delete blank lines"
+msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÐÐÐ ÐÐÑÐ ÑÐÐÑÑÑÑ ÐÐÐ ÐÑÐÑÑ ÐÑÐÐÐÐ ÑÐÐÐÐÐ"
+
#: ../data/ui/preferences.ui.h:22
-msgid "_Editor font:"
-msgstr "_ÐÐÐÑ ÑÑÐÑÐÐÐÑÐ:"
+msgid "Text Filters"
+msgstr "ÐÐÐÑÐÑÐ ÑÐÐÑÑÐ"
#: ../data/ui/preferences.ui.h:23
-msgid "_Insert spaces instead of tabs"
-msgstr "_ÐÐÐÑÐ ÑÐÐÐÐÐÐ ÑÐÐÑÑÐ ÑÐÐÑÐÐÑÐÑÐ"
+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
-msgid "_Tab width:"
-msgstr "_ÐÐÑÐÐÐ ÑÐÐÑÐÐÑÐÑÐ:"
+msgid "When loading, try these codecs in order. (e.g. utf8, iso8859)"
+msgstr "ÐÑÐ ÑÑÐÑÐÐÐÑÑ, ÐÑÐÐÐÑ ÐÐÐ ÐÐÐÐÑÐÑÐ ÑÐÐÐÐ. (ÐÐÑ. utf8, iso8859)"
#: ../data/ui/preferences.ui.h:25
-msgid "_Use the system fixed width font"
-msgstr "ÐÐÑÐÑÑÐ ÑÐÑÑÐÐÐÐ ÐÐÑÑÐÐÑÐÐÑ ÐÐÐÐÑÐÐÑ _ÑÐÐÑÐ"
+msgid "Encoding"
+msgstr "ÐÐÐÐÑÐÑÐ"
#: ../data/ui/vcview.ui.h:1
-msgid "Commit Files"
-msgstr "ÐÐÑÐÐÐ ÐÐÑÐÑÐÐÐ"
+msgid "VC Log"
+msgstr "ÐÐ ÐÐÐÐÐÐÐ"
#: ../data/ui/vcview.ui.h:2
-msgid "Log Message"
-msgstr "ÐÐÑÑÐÐ ÐÐÐÐÐÐÐÐ"
+msgid "Commit Files"
+msgstr "ÐÐÑÐÐÐ ÐÐÑÐÑÐÐÐ"
#: ../data/ui/vcview.ui.h:3
msgid "Previous Logs"
msgstr "ÐÑÐÑÑÐÐÐÐ ÐÐÐÐÐÐÑÐ"
#: ../data/ui/vcview.ui.h:4
-msgid "VC Log"
-msgstr "ÐÐ ÐÐÐÐÐÐÐ"
+msgid "Log Message"
+msgstr "ÐÐÑÑÐÐ ÐÐÐÐÐÐÐÐ"
-#: ../meld/dirdiff.py:226 ../meld/vcview.py:119
+#: ../meld/dirdiff.py:232 ../meld/vcview.py:127
msgid "_Compare"
msgstr "_ÐÐÐÑÐÐÐ"
-#: ../meld/dirdiff.py:226 ../meld/vcview.py:119
+#: ../meld/dirdiff.py:232 ../meld/vcview.py:127
msgid "Compare selected"
msgstr "ÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐÐ"
-#: ../meld/dirdiff.py:227
+#: ../meld/dirdiff.py:233
msgid "Copy _Left"
msgstr "ÐÐÐÐÐÐ _ÐÐÐÐ"
-#: ../meld/dirdiff.py:227
+#: ../meld/dirdiff.py:233
msgid "Copy to left"
msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÐ"
-#: ../meld/dirdiff.py:228
+#: ../meld/dirdiff.py:234
msgid "Copy _Right"
msgstr "ÐÐÐÐÐÐ _ÐÐÑÐÐ"
-#: ../meld/dirdiff.py:228
+#: ../meld/dirdiff.py:234
msgid "Copy to right"
msgstr "ÐÐÐÐÐÐÑÐ ÐÐÑÐÐ"
-#: ../meld/dirdiff.py:229
+#: ../meld/dirdiff.py:235
msgid "Delete selected"
msgstr "ÐÐÑÐÑÐ ÐÐÐÐÑÐÐÐ"
-#: ../meld/dirdiff.py:230 ../meld/filediff.py:1157
+#: ../meld/dirdiff.py:236 ../meld/filediff.py:1167
msgid "Hide"
msgstr "ÐÐÐÑÐÑ"
-#: ../meld/dirdiff.py:230
+#: ../meld/dirdiff.py:236
msgid "Hide selected"
msgstr "ÐÐÐÑÐÑ ÐÐÐÐÑÐÐÐ"
-#: ../meld/dirdiff.py:234
+#: ../meld/dirdiff.py:240
msgid "Case"
msgstr "ÐÐÐÐÑÐÐÐ ÑÐÐÐÐ"
-#: ../meld/dirdiff.py:234
+#: ../meld/dirdiff.py:240
msgid "Ignore case of entries"
msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÐÑÐÐÑ ÑÐÐÐÐ ÑÐÐÑÐ"
-#: ../meld/dirdiff.py:235
+#: ../meld/dirdiff.py:241
msgid "Same"
msgstr "ÐÑÑÐ"
-#: ../meld/dirdiff.py:235
+#: ../meld/dirdiff.py:241
msgid "Show identical"
msgstr "ÐÑÐÐÐÐÐ ÐÑÑÐÐÐÑÐÐ"
-#: ../meld/dirdiff.py:236
+#: ../meld/dirdiff.py:242
msgid "New"
msgstr "ÐÐÐÐ"
-#: ../meld/dirdiff.py:236
+#: ../meld/dirdiff.py:242
msgid "Show new"
msgstr "ÐÑÐÐÐÐÐ ÐÐÐÐ"
-#: ../meld/dirdiff.py:237
+#: ../meld/dirdiff.py:243
msgid "Modified"
msgstr "ÐÐÐÐÑÐÐÐ"
-#: ../meld/dirdiff.py:237 ../meld/vcview.py:132
+#: ../meld/dirdiff.py:243 ../meld/vcview.py:140
msgid "Show modified"
msgstr "ÐÑÐÐÐÐÐ ÐÐÐÐÑÐÐÐ"
-#: ../meld/dirdiff.py:239
+#: ../meld/dirdiff.py:245
msgid "Filters"
msgstr "ÐÐÐÑÐÑÐ"
-#: ../meld/dirdiff.py:239
+#: ../meld/dirdiff.py:245
msgid "Set active filters"
msgstr "ÐÐÐÐÑÐÑÐ ÐÐÑÐÐÐÐ ÑÐÐÑÐÑÐ"
-#: ../meld/dirdiff.py:354
+#: ../meld/dirdiff.py:362
#, python-format
msgid "Hide %s"
msgstr "ÐÐÐÑÐÑ â%sâ"
-#: ../meld/dirdiff.py:457 ../meld/dirdiff.py:470 ../meld/vcview.py:306
-#: ../meld/vcview.py:334
+#: ../meld/dirdiff.py:466 ../meld/dirdiff.py:479 ../meld/vcview.py:323
+#: ../meld/vcview.py:347
#, python-format
msgid "[%s] Scanning %s"
msgstr "[%s] ÐÑÐÐÐÐÐÐÐ â%sâ"
-#: ../meld/dirdiff.py:569
+#: ../meld/dirdiff.py:578
#, python-format
msgid "[%s] Done"
msgstr "[%s] ÐÐÑÐÐÐ"
-#: ../meld/dirdiff.py:573
+#: ../meld/dirdiff.py:582
msgid "Multiple errors occurred while scanning this folder"
msgstr "ÐÐÑÐÐ ÑÐ ÐÐ ÐÐÑÐ ÐÑÐÑÐÐÐ ÐÐ ÐÑÐÐÐ ÐÑÐÑÑÐÐÐÐÐÑÐ ÐÐÐ ÑÐÑÑÐÐÐÐ"
-#: ../meld/dirdiff.py:574
+#: ../meld/dirdiff.py:583
msgid "Files with invalid encodings found"
msgstr "ÐÑÐÐÐÑÐÐÐ ÑÑ ÐÐÑÐÑÐÐÐ ÑÐ ÐÐÐÑÐÑÐÐÐÐÐ ÐÐÐÐÑÐÑÐÐ"
#. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:576
+#: ../meld/dirdiff.py:585
msgid "Some files were in an incorrect encoding. The names are something like:"
msgstr "ÐÐÐÐ ÐÐÑÐÑÐÐÐ ÐÐÑÐÑÑ Ñ ÐÐÐÑÐÑÐÐÐÐÐ ÐÐÐÐÑÐÑÑ. ÐÐÐÐÐÐ ÑÑ ÐÐÑÑÐ ÐÐÐ:"
-#: ../meld/dirdiff.py:578
+#: ../meld/dirdiff.py:587
msgid "Files hidden by case insensitive comparison"
msgstr "ÐÐÑÐÑÐÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑÐÑÐÑÐÐ ÐÐÐÑÐÑÑÐÐÐÐ ÐÐ ÐÐÐÐÑÐÐÑ ÑÐÐÐÐ"
#. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:580
+#: ../meld/dirdiff.py:589
msgid ""
"You are running a case insensitive comparison on a case sensitive "
"filesystem. The following files in this folder are hidden:"
@@ -489,16 +491,16 @@ msgstr ""
"ÐÐÐÑÐÐÑÐÐ ÑÑÐ ÐÐÑÐÑÐÑÐ ÐÐÐÐÐÐÑÐÐ ÐÐ ÐÐÐÐÑÐÐÐ ÑÐÐÐÐ ÐÐ ÑÐÑÑÐÐÑ ÐÐÑÐÑÐÐÐ ÐÐÐ "
"ÑÐ ÐÐÐ ÐÐÑÐÐ. ÐÐÐÐ ÐÐÑÐÑÐÐÐ ÐÐÑÑ ÐÐÐÑÐÐÐ:"
-#: ../meld/dirdiff.py:591
+#: ../meld/dirdiff.py:600
#, python-format
msgid "'%s' hidden by '%s'"
msgstr "â%sâ ÑÐÐÑÐÐÐÐÐ ÐÐ ÑÑÑÐÐÐ â%sâ"
-#: ../meld/dirdiff.py:616 ../meld/filediff.py:1008 ../meld/filediff.py:1161
+#: ../meld/dirdiff.py:625 ../meld/filediff.py:1010 ../meld/filediff.py:1171
msgid "Hi_de"
msgstr "_ÐÐÐÑÐÑ"
-#: ../meld/dirdiff.py:666
+#: ../meld/dirdiff.py:675
#, python-format
msgid ""
"'%s' exists.\n"
@@ -507,7 +509,7 @@ msgstr ""
"â%sâ ÐÐÑÑÐÑÐ.\n"
"ÐÐ ÐÑÐÑÐÐÐÐÐ?"
-#: ../meld/dirdiff.py:673
+#: ../meld/dirdiff.py:682
#, python-format
msgid ""
"Error copying '%s' to '%s'\n"
@@ -518,7 +520,7 @@ msgstr ""
"\n"
"%s."
-#: ../meld/dirdiff.py:691 ../meld/vcview.py:503
+#: ../meld/dirdiff.py:700 ../meld/vcview.py:536
#, python-format
msgid ""
"'%s' is a directory.\n"
@@ -527,7 +529,7 @@ msgstr ""
"â%sâ ÑÐ ÑÐÑÑÐÐÐÐ.\n"
"ÐÐ ÑÐÐÐÐÐÐ ÑÐÐÑÑÐÐÐÐÐ?"
-#: ../meld/dirdiff.py:698 ../meld/vcview.py:508
+#: ../meld/dirdiff.py:707 ../meld/vcview.py:541
#, python-format
msgid ""
"Error removing %s\n"
@@ -538,7 +540,7 @@ msgstr ""
"\n"
"%s."
-#: ../meld/dirdiff.py:723
+#: ../meld/dirdiff.py:741
#, python-format
msgid "%i second"
msgid_plural "%i seconds"
@@ -547,7 +549,7 @@ msgstr[1] "%i ÑÐÐÑÐÐÐ"
msgstr[2] "%i ÑÐÐÑÐÐÐ"
msgstr[3] "%i ÑÐÐÑÐÐÐ"
-#: ../meld/dirdiff.py:724
+#: ../meld/dirdiff.py:742
#, python-format
msgid "%i minute"
msgid_plural "%i minutes"
@@ -556,7 +558,7 @@ msgstr[1] "%i ÐÐÐÑÑÐ"
msgstr[2] "%i ÐÐÐÑÑÐ"
msgstr[3] "%i ÐÐÐÑÑ"
-#: ../meld/dirdiff.py:725
+#: ../meld/dirdiff.py:743
#, python-format
msgid "%i hour"
msgid_plural "%i hours"
@@ -565,7 +567,7 @@ msgstr[1] "%i ÑÐÑÐ"
msgstr[2] "%i ÑÐÑÐ"
msgstr[3] "%i ÑÐÑ"
-#: ../meld/dirdiff.py:726
+#: ../meld/dirdiff.py:744
#, python-format
msgid "%i day"
msgid_plural "%i days"
@@ -574,7 +576,7 @@ msgstr[1] "%i ÐÐÐÐ"
msgstr[2] "%i ÐÐÐÐ"
msgstr[3] "%i ÐÐÐ"
-#: ../meld/dirdiff.py:727
+#: ../meld/dirdiff.py:745
#, python-format
msgid "%i week"
msgid_plural "%i weeks"
@@ -583,7 +585,7 @@ msgstr[1] "%i ÐÐÐÐÑÐ"
msgstr[2] "%i ÐÐÐÐÑÐ"
msgstr[3] "%i ÐÐÐÐÑÐ"
-#: ../meld/dirdiff.py:728
+#: ../meld/dirdiff.py:746
#, python-format
msgid "%i month"
msgid_plural "%i months"
@@ -592,7 +594,7 @@ msgstr[1] "%i ÐÐÑÐÑÐ"
msgstr[2] "%i ÐÐÑÐÑÐ"
msgstr[3] "%i ÐÐÑÐÑ"
-#: ../meld/dirdiff.py:729
+#: ../meld/dirdiff.py:747
#, python-format
msgid "%i year"
msgid_plural "%i years"
@@ -601,140 +603,140 @@ msgstr[1] "%i ÐÐÐÐÐÐ"
msgstr[2] "%i ÐÐÐÐÐÐ"
msgstr[3] "%i ÐÐÐÐÐÐ"
-#: ../meld/filediff.py:294
+#: ../meld/filediff.py:295
msgid "Format as patch..."
msgstr "ÐÐÑÐÐÑÐÑÐÑ ÐÐÐ ÐÑÐÑÐÐÐÑ..."
-#: ../meld/filediff.py:294
+#: ../meld/filediff.py:295
msgid "Create a patch using differences between files"
msgstr "ÐÐÐÑÐÐÐÑÐ ÐÑÐÑÐÐÐÑ ÐÐÑÐÑÑÐÑÐ ÑÐÐÐÐÐÐ ÐÐÐÐÑÑ ÐÐÑÐÑÐÐÐ"
-#: ../meld/filediff.py:295
+#: ../meld/filediff.py:296
msgid "Previous conflict"
msgstr "ÐÑÐÑÑÐÐÐÐ ÑÑÐÐÐ"
-#: ../meld/filediff.py:295
+#: ../meld/filediff.py:296
msgid "Go to the previous conflict"
msgstr "ÐÐÐÑÐ ÐÐ ÐÑÐÑÑÐÐÐÐ ÑÑÐÐÐ"
-#: ../meld/filediff.py:296
+#: ../meld/filediff.py:297
msgid "Next conflict"
msgstr "ÐÐÐÐÐÑÐ ÑÑÐÐÐ"
-#: ../meld/filediff.py:296
+#: ../meld/filediff.py:297
msgid "Go to the next conflict"
msgstr "ÐÐÐÑÐ ÐÐ ÑÐÐÐÐÑÐ ÑÑÐÐÐ"
-#: ../meld/filediff.py:297
+#: ../meld/filediff.py:298
msgid "Push to left"
msgstr "ÐÑÑÐÐ ÑÐÐÐÐ"
-#: ../meld/filediff.py:297
+#: ../meld/filediff.py:298
msgid "Push current change to the left"
msgstr "ÐÑÑÐÐÑÐ ÑÐÐÑÑÑ ÐÐÐÐÐÑ ÑÐÐÐÐ"
-#: ../meld/filediff.py:298
+#: ../meld/filediff.py:299
msgid "Push to right"
msgstr "ÐÑÑÐÐ ÑÐÐÑÐÐ"
-#: ../meld/filediff.py:298
+#: ../meld/filediff.py:299
msgid "Push current change to the right"
msgstr "ÐÑÑÐÐÑÐ ÑÐÐÑÑÑ ÐÐÐÐÐÑ ÑÐÐÑÐÐ"
#. FIXME: using LAST and FIRST is terrible and unreliable icon abuse
-#: ../meld/filediff.py:300
+#: ../meld/filediff.py:301
msgid "Pull from left"
msgstr "ÐÐÐÑÐ Ñ ÐÐÐÐ"
-#: ../meld/filediff.py:300
+#: ../meld/filediff.py:301
msgid "Pull change from the left"
msgstr "ÐÐÐÑÐÑÐ ÐÐÐÐÐÑ Ñ ÐÐÐÐ"
-#: ../meld/filediff.py:301
+#: ../meld/filediff.py:302
msgid "Pull from right"
msgstr "ÐÐÐÑÐ Ñ ÐÐÑÐÐ"
-#: ../meld/filediff.py:301
+#: ../meld/filediff.py:302
msgid "Pull change from the right"
msgstr "ÐÐÐÑÐÑÐ ÐÐÐÐÐÑ Ñ ÐÐÑÐÐ"
-#: ../meld/filediff.py:302
+#: ../meld/filediff.py:303
msgid "Copy above left"
msgstr "ÐÐÐÐÐÐ ÐÐÐÐÐ ÑÐÐÐÐ"
-#: ../meld/filediff.py:302
+#: ../meld/filediff.py:303
msgid "Copy change above the left chunk"
msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÐÐÑ ÐÐÐÐÐ ÐÐÐÐÐÐ ÑÐÐÐÐ"
-#: ../meld/filediff.py:303
+#: ../meld/filediff.py:304
msgid "Copy below left"
msgstr "ÐÐÐÐÐÐ ÐÑÐÐÐ ÑÐÐÐÐ"
-#: ../meld/filediff.py:303
+#: ../meld/filediff.py:304
msgid "Copy change below the left chunk"
msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÐÐÑ ÐÑÐÐÐ ÐÐÐÐÐÐ ÑÐÐÐÐ"
-#: ../meld/filediff.py:304
+#: ../meld/filediff.py:305
msgid "Copy above right"
msgstr "ÐÐÐÐÐÐ ÐÐÐÐÐ ÑÐÐÑÐÐ"
-#: ../meld/filediff.py:304
+#: ../meld/filediff.py:305
msgid "Copy change above the right chunk"
msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÐÐÑ ÐÐÐÐÐ ÐÐÐÐÐÐ ÑÐÐÑÐÐ"
-#: ../meld/filediff.py:305
+#: ../meld/filediff.py:306
msgid "Copy below right"
msgstr "ÐÐÐÐÐÐ ÐÑÐÐÐ ÑÐÐÑÐÐ"
-#: ../meld/filediff.py:305
+#: ../meld/filediff.py:306
msgid "Copy change below the right chunk"
msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÐÐÑ ÐÑÐÐÐ ÐÐÐÐÐÐ ÑÐÐÑÐÐ"
-#: ../meld/filediff.py:306
+#: ../meld/filediff.py:307
msgid "Delete"
msgstr "ÐÐÑÐÑÐ"
-#: ../meld/filediff.py:306
+#: ../meld/filediff.py:307
msgid "Delete change"
msgstr "ÐÐÑÐÑÐÑÐ ÐÐÐÐÐÑ"
-#: ../meld/filediff.py:307
+#: ../meld/filediff.py:308
msgid "Merge all changes from left"
msgstr "ÐÐÑÐÐÐÐÐ ÑÐÐ ÐÐÐÐÐÐ Ñ ÐÐÐÐ"
-#: ../meld/filediff.py:307
+#: ../meld/filediff.py:308
msgid "Merge all non-conflicting changes from the left"
msgstr "ÐÐÑÐÐÐÐÐÑÐ ÑÐÐ ÐÐÑÑÐÐÐÑÐÐÐÑÑÑÐ ÐÐÐÐÐÐ Ñ ÐÐÐÐ"
-#: ../meld/filediff.py:308
+#: ../meld/filediff.py:309
msgid "Merge all changes from right"
msgstr "ÐÐÑÐÐÐÐÐ ÑÐÐ ÐÐÐÐÐÐ Ñ ÐÐÑÐÐ"
-#: ../meld/filediff.py:308
+#: ../meld/filediff.py:309
msgid "Merge all non-conflicting changes from the right"
msgstr "ÐÐÑÐÐÐÐÐÑÐ ÑÐÐ ÐÐÑÑÐÐÐÑÐÐÐÑÑÑÐ ÐÐÐÐÐÐ Ñ ÐÐÑÐÐ"
-#: ../meld/filediff.py:309
+#: ../meld/filediff.py:310
msgid "Merge all non-conflicting"
msgstr "ÐÐÑÐÐÐÐÐ ÑÐÐ ÐÐÑÑÐÐÐÑÐÐÐÑÑÑÐ"
-#: ../meld/filediff.py:309
+#: ../meld/filediff.py:310
msgid "Merge all non-conflicting changes from left and right panes"
msgstr "ÐÐÑÐÐÐÐÐÑÐ ÑÐÐ ÐÐÑÑÐÐÐÑÐÐÐÑÑÑÐ ÐÐÐÐÐÐ Ñ ÐÐÐÐ Ð ÐÐÑÐÐ ÐÐÐÑÑÐ"
-#: ../meld/filediff.py:310
+#: ../meld/filediff.py:311
msgid "Cycle through documents"
msgstr "ÐÑÑÐÐ ÐÑÐÐ ÐÐÐÑÐÐÐÑÐ"
-#: ../meld/filediff.py:310
+#: ../meld/filediff.py:311
msgid "Move keyboard focus to the next document in this comparison"
msgstr "ÐÑÐÐÐÑÑÐÑÐ ÑÐÐÑÑ ÑÐÑÑÐÑÑÑÐ ÐÐ ÑÐÐÐÐÑÐ ÐÐÐÑÐÐÐÑ Ñ ÐÐÐÐ ÐÐÑÐÑÐÑÑ"
-#: ../meld/filediff.py:314
+#: ../meld/filediff.py:315
msgid "Lock scrolling"
msgstr "ÐÐÐÑÑÑÐÑ ÐÐÐÐÐÑÐ"
-#: ../meld/filediff.py:315
+#: ../meld/filediff.py:316
msgid "Lock scrolling of all panes"
msgstr "ÐÐÐÑÑÑÐÑÑÐ ÐÐÐÐÐÑÐ ÑÐÐÑ ÐÐÐÑÑÐ"
@@ -767,42 +769,42 @@ msgstr ""
msgid "<unnamed>"
msgstr "<ÐÐÐÐÐÐÐÐÐÐ>"
-#: ../meld/filediff.py:996
+#: ../meld/filediff.py:998
#, python-format
msgid "[%s] Set num panes"
msgstr "[%s] ÐÐÑÑÐÐÐ ÐÑÐÑ ÐÐÐÑÐ"
-#: ../meld/filediff.py:1002
+#: ../meld/filediff.py:1004
#, python-format
msgid "[%s] Opening files"
msgstr "[%s] ÐÑÐÐÑÐÐ ÐÐÑÐÑÐÐÐ"
-#: ../meld/filediff.py:1026 ../meld/filediff.py:1035 ../meld/filediff.py:1047
-#: ../meld/filediff.py:1053
+#: ../meld/filediff.py:1028 ../meld/filediff.py:1037 ../meld/filediff.py:1049
+#: ../meld/filediff.py:1055
msgid "Could not read file"
msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÑÐÑÐÐ ÐÐÑÐÑÐÐÑ"
-#: ../meld/filediff.py:1027
+#: ../meld/filediff.py:1029
#, python-format
msgid "[%s] Reading files"
msgstr "[%s] ÐÐÑÐÐ ÐÐÑÐÑÐÐÐ"
-#: ../meld/filediff.py:1036
+#: ../meld/filediff.py:1038
#, python-format
msgid "%s appears to be a binary file."
msgstr "â%sâ ÐÐÐÐÐÐÐ ÐÐ ÑÐ ÐÐÐÑÑÐÐ ÐÐÑÐÑÐÐÐ."
-#: ../meld/filediff.py:1048
+#: ../meld/filediff.py:1050
#, python-format
msgid "%s is not in encodings: %s"
msgstr "â%sâ ÐÐÑÐ Ñ ÐÐÐÐÑÐÑÐÐÐ: â%sâ"
-#: ../meld/filediff.py:1078 ../meld/filemerge.py:67
+#: ../meld/filediff.py:1080 ../meld/filemerge.py:67
#, python-format
msgid "[%s] Computing differences"
msgstr "[%s] ÐÑÐÑÑÐÐÐÐÐ ÑÐÐÐÐÐÐ"
-#: ../meld/filediff.py:1148
+#: ../meld/filediff.py:1158
msgid ""
"Text filters are being used, and may be masking differences between files. "
"Would you like to compare the unfiltered files?"
@@ -810,15 +812,15 @@ msgstr ""
"ÐÐÑÐÑÑÐÐÐ ÑÑ ÑÐÐÑÐÑÐ ÑÐÐÑÑÐ, Ð ÐÐÐÑ ÐÐÑÑÐÑÐÑÐ Ð ÐÐÐÐÑÐÐÑÐÐÐ ÑÐÐÐÐÐÐ ÐÐÐÐÑÑ "
"ÐÐÑÐÑÐÐÐ. ÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÑÐÐÐÑÐ ÐÐÑÐÐÑÑÐÑÐÐÐ ÐÐÑÐÑÐÐÐ?"
-#: ../meld/filediff.py:1154
+#: ../meld/filediff.py:1164
msgid "Files are identical"
msgstr "ÐÐÑÐÑÐÐÐ ÑÑ ÐÑÑÐÐÐÑÐÐ"
-#: ../meld/filediff.py:1164
+#: ../meld/filediff.py:1174
msgid "Show without filters"
msgstr "ÐÑÐÐÐÐÑÑÐ ÐÐÐ ÑÐÐÑÐÑÐ"
-#: ../meld/filediff.py:1354
+#: ../meld/filediff.py:1363
#, python-format
msgid ""
"\"%s\" exists!\n"
@@ -827,7 +829,7 @@ msgstr ""
"â%sâ ÐÐÑÑÐÑÐ!\n"
"ÐÐ ÐÑÐÑÐÐÐÐÐ?"
-#: ../meld/filediff.py:1367
+#: ../meld/filediff.py:1376
#, python-format
msgid ""
"Error writing to %s\n"
@@ -838,12 +840,12 @@ msgstr ""
"\n"
"%s."
-#: ../meld/filediff.py:1376
+#: ../meld/filediff.py:1385
#, python-format
msgid "Choose a name for buffer %i."
msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐÐÐÐ ÐÐ %i. ÐÐÑÐÑ."
-#: ../meld/filediff.py:1391
+#: ../meld/filediff.py:1400
#, python-format
msgid ""
"This file '%s' contains a mixture of line endings.\n"
@@ -854,7 +856,7 @@ msgstr ""
"\n"
"ÐÐÑÐ ÐÐÐÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÑÐÑÑÐÑÐ?"
-#: ../meld/filediff.py:1407
+#: ../meld/filediff.py:1416
#, python-format
msgid ""
"'%s' contains characters not encodable with '%s'\n"
@@ -863,7 +865,7 @@ msgstr ""
"â%sâ ÑÐÐÑÐÐ ÐÐÐÐÐÐÐ ÐÐÑÐ ÑÐ ÐÐ ÐÐÐÑ ÐÐÐÐÑÐÑÐ ÑÐ â%sâ\n"
"ÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐ ÑÐÑÑÐÐÑÐ ÐÐÐ ÐÐÐ-8?"
-#: ../meld/filediff.py:1466
+#: ../meld/filediff.py:1475
#, python-format
msgid ""
"Reloading will discard changes in:\n"
@@ -881,69 +883,69 @@ msgstr ""
msgid "[%s] Merging files"
msgstr "[%s] ÐÐÑÐÐÐÑÑÑÐÐ ÐÐÑÐÑÐÐÐ"
-#: ../meld/meldapp.py:149
+#: ../meld/meldapp.py:152
msgid "wrong number of arguments supplied to --diff"
msgstr "ÐÐÐÑÐÑÐÐ ÐÑÐÑ ÐÑÐÑÐÐÐÐÑÐ ÐÑÐÐÐÐÐÑ ÑÐ â--diffâ"
-#: ../meld/meldapp.py:153
+#: ../meld/meldapp.py:156
msgid "Start with an empty window"
msgstr "ÐÑÐÐÑÐ ÑÐÐÐÐ ÐÑÐÐÐÐ ÐÑÐÐÐÑ"
# bug: string composition is bad i18n, and will make l10n hard
-#: ../meld/meldapp.py:154 ../meld/meldapp.py:155 ../meld/meldapp.py:157
+#: ../meld/meldapp.py:157 ../meld/meldapp.py:158 ../meld/meldapp.py:160
msgid "file"
msgstr "ÐÐÑÐÑÐÐÐ"
-#: ../meld/meldapp.py:154 ../meld/meldapp.py:156 ../meld/meldapp.py:157
+#: ../meld/meldapp.py:157 ../meld/meldapp.py:159 ../meld/meldapp.py:160
msgid "dir"
msgstr "ÐÐÑ"
-#: ../meld/meldapp.py:154
+#: ../meld/meldapp.py:157
msgid "Start a version control comparison"
msgstr "ÐÐÐÑÐÑÐ ÐÐÑÐÑÐÑÐ ÐÐÐÑÑÐÐÐ ÐÐÑÐÐÑÐ"
-#: ../meld/meldapp.py:155
+#: ../meld/meldapp.py:158
msgid "Start a 2- or 3-way file comparison"
msgstr "ÐÐÐÑÐÑÐ ÐÐÑÐÑÐÑÐ 2 ÐÐÐ 3 ÐÐÐÐÐÐÑÐ ÐÐÑÐÑÐÐÐ"
-#: ../meld/meldapp.py:156
+#: ../meld/meldapp.py:159
msgid "Start a 2- or 3-way directory comparison"
msgstr "ÐÐÐÑÐÑÐ ÐÐÑÐÑÐÑÐ 2 ÐÐÐ 3 ÐÐÐÐÐÐÑÐ ÑÐÑÑÐÐÐÐ"
-#: ../meld/meldapp.py:157
+#: ../meld/meldapp.py:160
msgid "Start a comparison between file and dir/file"
msgstr "ÐÐÐÑÐÑÐ ÐÐÑÐÑÐÑÐ ÐÐÐÐÑÑ ÐÐÑÐÑÐÐÐ Ð ÑÐÑÑÐÐÐÐ/ÐÐÑÐÑÐÐÐ"
-#: ../meld/meldapp.py:163
+#: ../meld/meldapp.py:166
msgid "Meld is a file and directory comparison tool."
msgstr "ÐÐÐÐ ÑÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÐÑÐ ÐÐÑÐÑÐÐÐ Ð ÑÐÑÑÐÐÐÐ."
-#: ../meld/meldapp.py:166
+#: ../meld/meldapp.py:169
msgid "Set label to use instead of file name"
msgstr "ÐÐÐÐÑÐÐÐ ÐÐÐÐÐÑ ÐÐ ÐÐÑÐÑÑÐÑÐ ÑÐÐÑÑÐ ÐÐÐÐÐÐ ÐÐÑÐÑÐÐÐ"
-#: ../meld/meldapp.py:168
+#: ../meld/meldapp.py:171
msgid "Automatically compare all differing files on startup"
msgstr "ÐÐÐÐÑÑÐÐÐÐ ÐÐÑÐÐÐ ÑÐÐ ÑÐÐÐÐÐÑÑÑÑÐ ÐÐÑÐÑÐÐÐ ÐÑÐÐÐÐÐÐ ÐÐÐÑÐÑÐÑÐ"
-#: ../meld/meldapp.py:170
+#: ../meld/meldapp.py:173
msgid "Ignored for compatibility"
msgstr "ÐÐÐÐÐÐÑÐÐÐ ÐÐÐÐ ÑÐÐÐÐÑÐÐÑÑÐ"
-#: ../meld/meldapp.py:173
+#: ../meld/meldapp.py:176
msgid "Set the target file for saving a merge result"
msgstr "ÐÐÐÐÑÐÐÐ ÑÐÑÐÑ ÐÐÑÐÑÐÐÑ ÐÐ ÑÑÐÐÑÐ ÑÐÐÑÐÑÐÑÐ ÑÑÐÐÐÑÐ"
-#: ../meld/meldapp.py:176
+#: ../meld/meldapp.py:179
msgid "Creates a diff tab for up to 3 supplied files or directories."
msgstr "ÐÑÐÐÐ ÑÐÐÐÑÐÐ ÑÐÐÐÐÐÐ ÐÐ ÐÐÑÐÐÑÐ ÐÐ 3 ÐÑÐÐÐÐÐÑÐ ÐÐÑÐÑÐÐÐ ÐÐÐ ÑÐÑÑÐÐÐÐ."
-#: ../meld/meldapp.py:179
+#: ../meld/meldapp.py:182
#, python-format
msgid "too many arguments (wanted 0-4, got %d)"
msgstr "ÐÑÐÐÐÑÐ ÐÑÐÑÐÐÐÐÑÐ (ÑÑÐÐÐÐÐ ÑÐ 0-4, ÐÐÐÐÑ %d)"
-#: ../meld/meldapp.py:181 ../meld/meldapp.py:185
+#: ../meld/meldapp.py:184 ../meld/meldapp.py:188
msgid "can't compare more than three directories"
msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÐÐÐ ÐÐÑÐ ÐÐ ÑÑÐ ÑÐÑÑÐÐÐÐ"
@@ -1175,12 +1177,12 @@ msgstr "ÐÐÐÐÑÐ _ÑÑÐÑÐ"
msgid "Show or hide the statusbar"
msgstr "ÐÑÐÐÐÐÐÑÐ ÐÐÐ ÑÐÐÑÐÑÑÐ ÐÐÐÐÑÑ ÑÑÐÑÐ"
-#: ../meld/meldwindow.py:538
+#: ../meld/meldwindow.py:541
msgid "Switch to this tab"
msgstr "ÐÑÐÐÐÑÐÑÐ ÑÐ ÐÐ ÐÐÐÑ ÑÐÐÐÑÐÐ"
#. exit at first non found directory + file
-#: ../meld/meldwindow.py:629
+#: ../meld/meldwindow.py:639
msgid "Cannot compare a mixture of files and directories.\n"
msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÐÐÐ ÐÐÑÐÐÐÐÑ ÐÐÑÐÑÐÐÐ Ð ÑÐÑÑÐÐÐÐ.\n"
@@ -1201,224 +1203,225 @@ msgstr "ÐÐÑÐÐÑ"
msgid "pattern"
msgstr "ÐÐÑÐÐÐÑ"
-#: ../meld/preferences.py:105
+#: ../meld/preferences.py:111
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:233
+#: ../meld/preferences.py:234
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:235
+#: ../meld/preferences.py:236
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"
+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
+#: ../meld/preferences.py:238
#, 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:239
+#: ../meld/preferences.py:240
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:241
+#: ../meld/preferences.py:242
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:243
+#: ../meld/preferences.py:244
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:245
+#: ../meld/preferences.py:246
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:248
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:249
+#: ../meld/preferences.py:250
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:251
+#: ../meld/preferences.py:252
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:253
+#: ../meld/preferences.py:254
msgid "Script comment\t0\t#.*"
msgstr "ÐÐÐÐÐÑÐÑ ÑÐÑÐÐÑÐ\t0\t#.*"
-#: ../meld/vcview.py:120
+#: ../meld/vcview.py:128
msgid "Co_mmit"
msgstr "Ð_ÐÑÐÐÐ"
-#: ../meld/vcview.py:120
+#: ../meld/vcview.py:128
msgid "Commit"
msgstr "ÐÐÑÐÐÐÑÐ"
-#: ../meld/vcview.py:121
+#: ../meld/vcview.py:129
msgid "_Update"
msgstr "_ÐÐÐÑÐÐ"
-#: ../meld/vcview.py:121
+#: ../meld/vcview.py:129
msgid "Update"
msgstr "ÐÐÐÑÐÐÑÐ"
-#: ../meld/vcview.py:122
+#: ../meld/vcview.py:130
msgid "Add to VC"
msgstr "ÐÐÐÐÑ Ñ ÐÐ"
-#: ../meld/vcview.py:123
+#: ../meld/vcview.py:131
msgid "Add _Binary"
msgstr "ÐÐÐÐÑ _ÐÐÐÐÑÐÐ"
-#: ../meld/vcview.py:123
+#: ../meld/vcview.py:131
msgid "Add binary to VC"
msgstr "ÐÐÐÐÑ ÐÐÐÐÑÐÐ Ñ ÐÐ"
-#: ../meld/vcview.py:124
+#: ../meld/vcview.py:132
msgid "Remove from VC"
msgstr "ÐÐÐÐÐÐ ÐÐ ÐÐ"
-#: ../meld/vcview.py:125
+#: ../meld/vcview.py:133
msgid "_Resolved"
msgstr "_ÐÐÑÐÐÐ"
-#: ../meld/vcview.py:125
+#: ../meld/vcview.py:133
msgid "Mark as resolved for VC"
msgstr "ÐÐÐÐÑÐÐÐ ÐÐÐ ÑÐÑÐÐÐ ÐÐ ÐÐ"
-#: ../meld/vcview.py:126
+#: ../meld/vcview.py:134
msgid "Revert to original"
msgstr "ÐÑÐÑÐ ÐÐ ÐÑÐÐÐÐÐÐ"
-#: ../meld/vcview.py:127
+#: ../meld/vcview.py:135
msgid "Delete locally"
msgstr "ÐÐÑÐÑÐ Ñ ÐÐÐÐÐÑ"
-#: ../meld/vcview.py:131
+#: ../meld/vcview.py:139
msgid "_Flatten"
msgstr "_ÐÐÑÐÐÐÐÑ"
-#: ../meld/vcview.py:131
+#: ../meld/vcview.py:139
msgid "Flatten directories"
msgstr "ÐÐÑÐÐÐÐÑ ÑÐÑÑÐÐÐÐ"
-#: ../meld/vcview.py:132
+#: ../meld/vcview.py:140
msgid "_Modified"
msgstr "ÐÐ_ÐÐÑÐÐ"
-#: ../meld/vcview.py:133
+#: ../meld/vcview.py:141
msgid "_Normal"
msgstr "_ÐÐÐÑÐÐ"
-#: ../meld/vcview.py:133
+#: ../meld/vcview.py:141
msgid "Show normal"
msgstr "ÐÑÐÐÐÐÐ ÐÐÐÑÐÐ"
-#: ../meld/vcview.py:134
+#: ../meld/vcview.py:142
msgid "Non _VC"
msgstr "ÐÐ _ÐÐ"
-#: ../meld/vcview.py:134
+#: ../meld/vcview.py:142
msgid "Show unversioned files"
msgstr "ÐÑÐÐÐÐÑÑÐ ÐÐÐÐÑÐÐÐÐÐÑÐÐÐ ÐÐÑÐÑÐÐÐ"
-#: ../meld/vcview.py:135
+#: ../meld/vcview.py:143
msgid "Ignored"
msgstr "ÐÐÐÐÐÐÑÐÐÐ"
-#: ../meld/vcview.py:135
+#: ../meld/vcview.py:143
msgid "Show ignored files"
msgstr "ÐÑÐÐÐÐÑÑÐ ÐÐÐÐÐÐÑÐÐÐ ÐÐÑÐÑÐÐÐ"
-#: ../meld/vcview.py:178 ../meld/vcview.py:302
+#: ../meld/vcview.py:186 ../meld/vcview.py:319
msgid "Location"
msgstr "ÐÑÑÐÑÐ"
-#: ../meld/vcview.py:179
+#: ../meld/vcview.py:187
msgid "Status"
msgstr "ÐÑÐÑÐ"
-#: ../meld/vcview.py:180
+#: ../meld/vcview.py:188
msgid "Rev"
msgstr "ÐÐÐ"
-#: ../meld/vcview.py:181
+#: ../meld/vcview.py:189
msgid "Tag"
msgstr "ÐÐÐÐÐÐ"
-#: ../meld/vcview.py:182
+#: ../meld/vcview.py:190
msgid "Options"
msgstr "ÐÐÑÐÑÐ"
-#: ../meld/vcview.py:233
+#: ../meld/vcview.py:249
msgid "Choose one Version Control"
msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐÐÑÑÐÐÑ ÐÐÑÐÐÑÐ"
-#: ../meld/vcview.py:234
+#: ../meld/vcview.py:250
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:247
+#: ../meld/vcview.py:263
#, 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:251
+#: ../meld/vcview.py:267
msgid "Invalid Repository"
msgstr "ÐÐÐÑÐÑÐÐÐÐ ÑÐÐÐÐÐÑÑÐ"
-#: ../meld/vcview.py:260
+#: ../meld/vcview.py:276
#, python-format
msgid "%s (%s)"
msgstr "%s (%s)"
#. TRANSLATORS: This is the location of the directory the user is diffing
-#: ../meld/vcview.py:302
+#: ../meld/vcview.py:319
#, python-format
msgid "%s: %s"
msgstr "%s: %s"
-#: ../meld/vcview.py:350
+#: ../meld/vcview.py:363
msgid "(Empty)"
msgstr "(ÐÑÐÐÐÐ)"
-#: ../meld/vcview.py:388
+#: ../meld/vcview.py:401
#, python-format
msgid "[%s] Fetching differences"
msgstr "[%s] ÐÑÐÐÐÐÑÐÐ ÑÐÐÐÐÐÐ"
-#: ../meld/vcview.py:396
+#: ../meld/vcview.py:409
#, python-format
msgid "[%s] Applying patch"
msgstr "[%s] ÐÑÐÐÐÑÑÑÐÐ ÐÐÐÑÐÑ"
-#: ../meld/vcview.py:478
+#: ../meld/vcview.py:511
msgid "Select some files first."
msgstr "ÐÑÐÐ ÐÐÐÐÐÑÐÑÐ ÐÐÐÐ ÐÐÑÐÑÐÐÐ."
-#: ../meld/vcview.py:551
+#: ../meld/vcview.py:584
#, python-format
msgid ""
"\n"
@@ -1467,7 +1470,7 @@ msgstr ""
" ÑÐÑÑÐÐÑÐ ÐÐÐÑÑÐÐÐ ÐÐÐÐÑÐ ÐÐÑÐ ÐÐÑÐÑÑÐÑÐ.\n"
" "
-#: ../meld/ui/findbar.py:127
+#: ../meld/ui/findbar.py:140
#, python-format
msgid ""
"Regular expression error\n"
@@ -1523,6 +1526,9 @@ msgstr ""
"ÐÐÑÐÐÐÑ ÑÐ ÐÐÐ â%sâ\n"
"ÐÑÐÑÐÐ ÑÐ ÐÐÐÐ â%sâ"
+#~ msgid "_Search for"
+#~ msgstr "ÐÐ_ÑÑÐÐÐ"
+
#~ msgid "Compare Options"
#~ msgstr "ÐÐÑÐÑÐ ÐÐÑÐÑÐÑÐ"
@@ -1688,9 +1694,6 @@ msgstr ""
#~ msgid "Edit"
#~ msgstr "ÐÑÐÐÐ"
-#~ msgid "Find"
-#~ msgstr "ÐÑÐÐÐÑÐ"
-
#~ msgid "Match _entire word only"
#~ msgstr "ÐÐÐÐÐÐÐÑÐ ÑÐÐÐ _ÑÐÐÐÑ ÑÐÑÐ"
diff --git a/po/sr latin po b/po/sr latin po
index d6dc7e5..d1ec1db 100644
--- a/po/sr latin po
+++ b/po/sr latin po
@@ -8,8 +8,8 @@ msgstr ""
"Project-Id-Version: meld\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=meld&k";
"eywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-12-09 23:15+0000\n"
-"PO-Revision-Date: 2012-02-26 20:22+0200\n"
+"POT-Creation-Date: 2012-04-28 23:20+0000\n"
+"PO-Revision-Date: 2012-05-20 10:52+0200\n"
"Last-Translator: Miroslav NikoliÄ <miroslavnikolic rocketmail com>\n"
"Language-Team: Serbian <gnom prevod org>\n"
"Language: sr\n"
@@ -20,78 +20,78 @@ msgstr ""
"n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
"X-Project-Style: gnome\n"
-#: ../bin/meld:96
+#: ../bin/meld:103
msgid "Cannot import: "
msgstr "Ne mogu da uvezem: "
-#: ../bin/meld:99
+#: ../bin/meld:106
#, c-format
msgid "Meld requires %s or higher."
msgstr "Meld zahteva %s ili noviji."
-#: ../data/meld.desktop.in.h:1
-msgid "Compare and merge your files"
-msgstr "UporeÄujte i spajajte vaÅe datoteke."
+#: ../data/meld.desktop.in.h:1 ../data/ui/meldapp.ui.h:1
+msgid "Meld"
+msgstr "Meld"
#: ../data/meld.desktop.in.h:2
msgid "Diff Viewer"
msgstr "PregledaÄ razlika"
-#: ../data/meld.desktop.in.h:3 ../data/ui/meldapp.ui.h:5
-msgid "Meld"
-msgstr "Meld"
-
-#: ../data/meld.desktop.in.h:4
+#: ../data/meld.desktop.in.h:3
msgid "Meld Diff Viewer"
msgstr "PregledaÄ razlika Meld"
+#: ../data/meld.desktop.in.h:4
+msgid "Compare and merge your files"
+msgstr "UporeÄujte i spajajte vaÅe datoteke."
+
#: ../data/ui/EditableList.ui.h:1
-msgid "Active"
-msgstr "Aktivan"
+msgid "Editable List"
+msgstr "Spisak za ureÄivanje"
#: ../data/ui/EditableList.ui.h:2
-msgid "Add new filter"
-msgstr "Dodajte novi filter"
+msgid "Active"
+msgstr "Aktivan"
-#: ../data/ui/EditableList.ui.h:3
-msgid "Editable List"
-msgstr "Spisak za ureÄivanje"
+#: ../data/ui/EditableList.ui.h:3 ../meld/vcview.py:166
+msgid "Name"
+msgstr "Naziv"
#: ../data/ui/EditableList.ui.h:4
-msgid "Move _Down"
-msgstr "Premesti _dole"
+msgid "Pattern"
+msgstr "Obrazac"
#: ../data/ui/EditableList.ui.h:5
-msgid "Move _Up"
-msgstr "Premesti _gore"
+msgid "Add new filter"
+msgstr "Dodajte novi filter"
-#: ../data/ui/EditableList.ui.h:6
-msgid "Move item down"
-msgstr "Premestite stavku na dole"
+#: ../data/ui/EditableList.ui.h:6 ../meld/vcview.py:130
+msgid "_Add"
+msgstr "_Dodaj"
#: ../data/ui/EditableList.ui.h:7
-msgid "Move item up"
-msgstr "Premestite stavku na gore"
+msgid "Remove selected filter"
+msgstr "Uklonite izabrani filter"
-#: ../data/ui/EditableList.ui.h:8 ../meld/vcview.py:158
-msgid "Name"
-msgstr "Naziv"
+#: ../data/ui/EditableList.ui.h:8 ../meld/vcview.py:132
+msgid "_Remove"
+msgstr "U_kloni"
#: ../data/ui/EditableList.ui.h:9
-msgid "Pattern"
-msgstr "Obrazac"
+msgid "Move item up"
+msgstr "Premestite stavku na gore"
#: ../data/ui/EditableList.ui.h:10
-msgid "Remove selected filter"
-msgstr "Uklonite izabrani filter"
+msgid "Move _Up"
+msgstr "Premesti _gore"
-#: ../data/ui/EditableList.ui.h:11 ../meld/vcview.py:122
-msgid "_Add"
-msgstr "_Dodaj"
+#: ../data/ui/EditableList.ui.h:11
+msgid "Move item down"
+msgstr "Premestite stavku na dole"
-#: ../data/ui/EditableList.ui.h:12 ../meld/vcview.py:124
-msgid "_Remove"
-msgstr "U_kloni"
+#: ../data/ui/EditableList.ui.h:12
+msgid "Move _Down"
+msgstr "Premesti _dole"
#: ../data/ui/filediff.ui.h:1
msgid "Save modified files?"
@@ -113,116 +113,118 @@ msgstr "_Odbaci izmene"
msgid "_Save Selected"
msgstr "_SaÄuvaj izabrano"
-#: ../data/ui/findbar.ui.h:1
-msgid "Regular E_xpression"
-msgstr "_Regularan izraz"
+#: ../data/ui/findbar.ui.h:1 ../meld/meldwindow.py:141
+msgid "_Replace"
+msgstr "_Zameni"
#: ../data/ui/findbar.ui.h:2
msgid "Replace _All"
msgstr "Zameni s_ve"
#: ../data/ui/findbar.ui.h:3
-msgid "Replace _With"
-msgstr "Zameni s_a"
+msgid "_Previous"
+msgstr "_Prethodno"
#: ../data/ui/findbar.ui.h:4
-msgid "Who_le word"
-msgstr "Ce_lu reÄ"
+msgid "_Next"
+msgstr "_SledeÄe"
#: ../data/ui/findbar.ui.h:5
-msgid "_Match Case"
-msgstr "_Uporedi veliÄinu slova"
+#| msgid "Find"
+msgid "Find:"
+msgstr "NaÄi:"
#: ../data/ui/findbar.ui.h:6
-msgid "_Next"
-msgstr "_SledeÄe"
+#| msgid "Replace _With"
+msgid "Replace _with:"
+msgstr "Zameni s_a:"
#: ../data/ui/findbar.ui.h:7
-msgid "_Previous"
-msgstr "_Prethodno"
+msgid "_Match Case"
+msgstr "_Uporedi veliÄinu slova"
-#: ../data/ui/findbar.ui.h:8 ../meld/meldwindow.py:141
-msgid "_Replace"
-msgstr "_Zameni"
+#: ../data/ui/findbar.ui.h:8
+msgid "Who_le word"
+msgstr "Ce_lu reÄ"
#: ../data/ui/findbar.ui.h:9
-msgid "_Search for"
-msgstr "Po_traÅi"
-
-#: ../data/ui/meldapp.ui.h:1
-msgid "Choose Files"
-msgstr "Izaberite datoteke"
+msgid "Regular E_xpression"
+msgstr "_Regularan izraz"
#: ../data/ui/meldapp.ui.h:2
#| msgid ""
#| "Copyright © 2002-2009 Stephen Kennedy\n"
-#| "Copyright © 2009-2010 Kai Willadsen"
+#| "Copyright © 2009-2011 Kai Willadsen"
msgid ""
"Copyright © 2002-2009 Stephen Kennedy\n"
-"Copyright © 2009-2011 Kai Willadsen"
+"Copyright © 2009-2012 Kai Willadsen"
msgstr ""
"Autorska prava © 2002-2009 Stefen Kenedi\n"
-"Autorska prava © 2009-2011 Kaj Viladsen"
+"Autorska prava © 2009-2012 Kaj Viladsen"
#: ../data/ui/meldapp.ui.h:4
-msgid "Directory"
-msgstr "Fascikla"
+msgid "translator-credits"
+msgstr ""
+"Danilo Åegan <danilo prevod org>\n"
+"Miroslav NikoliÄ <miroslavnikolic rocketmail com>\n"
+"\n"
+"Prevod.org â prevod na srpski jezik."
+
+#: ../data/ui/meldapp.ui.h:5
+msgid "Choose Files"
+msgstr "Izaberite datoteke"
+
+#: ../data/ui/meldapp.ui.h:6
+msgid "_Three Way Compare"
+msgstr "PoreÄenje tri elementa"
#. Refers to version of the file being compared
-#: ../data/ui/meldapp.ui.h:7
+#: ../data/ui/meldapp.ui.h:8
msgid "Mine"
msgstr "Moja"
#. Refers to version of the file being compared
-#: ../data/ui/meldapp.ui.h:9
+#: ../data/ui/meldapp.ui.h:10
msgid "Original"
msgstr "Izvorna"
#. Refers to version of the file being compared
-#: ../data/ui/meldapp.ui.h:11
+#: ../data/ui/meldapp.ui.h:12
msgid "Other"
msgstr "Druga"
-#: ../data/ui/meldapp.ui.h:12
-msgid "Select VC Directory"
-msgstr "Izaberite CV fasciklu"
-
#: ../data/ui/meldapp.ui.h:13
-msgid "_Directory Comparison"
-msgstr "PoreÄenje _fascikli"
-
-#: ../data/ui/meldapp.ui.h:14
msgid "_File Comparison"
msgstr "PoreÄenje _datoteka"
+#: ../data/ui/meldapp.ui.h:14
+msgid "_Directory Comparison"
+msgstr "PoreÄenje _fascikli"
+
#: ../data/ui/meldapp.ui.h:15
-msgid "_Three Way Compare"
-msgstr "PoreÄenje tri elementa"
+msgid "Select VC Directory"
+msgstr "Izaberite CV fasciklu"
#: ../data/ui/meldapp.ui.h:16
-msgid "_Version Control Browser"
-msgstr "Preglednik kontrole _verzija"
+msgid "Directory"
+msgstr "Fascikla"
#: ../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."
+msgid "_Version Control Browser"
+msgstr "Preglednik kontrole _verzija"
#: ../data/ui/patch-dialog.ui.h:1
-msgid "Copy to Clipboard"
-msgstr "UmnoÅi u ostavu"
-
-#: ../data/ui/patch-dialog.ui.h:2
msgid "Create Patch"
msgstr "Napravi ispravku"
-#: ../data/ui/patch-dialog.ui.h:3
+#: ../data/ui/patch-dialog.ui.h:2
msgid "Create a patch"
msgstr "Napravite ispravku"
+#: ../data/ui/patch-dialog.ui.h:3
+msgid "Use differences between:"
+msgstr "Koristi razlike izmeÄu:"
+
#: ../data/ui/patch-dialog.ui.h:4
msgid "Left and middle panes"
msgstr "Leva i srednja povrÅ"
@@ -232,91 +234,78 @@ msgid "Middle and right panes"
msgstr "Srednja i desna povrÅ"
#: ../data/ui/patch-dialog.ui.h:6
-msgid "Use differences between:"
-msgstr "Koristi razlike izmeÄu:"
-
-#: ../data/ui/patch-dialog.ui.h:7
msgid "_Reverse patch direction"
msgstr "Preokreni smer _ispravke"
+#: ../data/ui/patch-dialog.ui.h:7
+msgid "Copy to Clipboard"
+msgstr "UmnoÅi u ostavu"
+
#: ../data/ui/preferences.ui.h:1
-msgid "Display"
-msgstr "Prikaz"
+msgid "Meld Preferences"
+msgstr "Postavke Melda"
#: ../data/ui/preferences.ui.h:2
-msgid "Do not _split words over two lines"
-msgstr "Nemoj _podeliti reÄi u dva reda"
+msgid "Font"
+msgstr "Slovni lik"
#: ../data/ui/preferences.ui.h:3
-msgid "Edito_r command:"
-msgstr "Naredba _ureÄivaÄa:"
+msgid "_Use the system fixed width font"
+msgstr "Koristi sistemom postavljenu veliÄinu _fonta"
#: ../data/ui/preferences.ui.h:4
-msgid "Editor"
-msgstr "UreÄivaÄ"
+msgid "_Editor font:"
+msgstr "_Font ureÄivaÄa:"
#: ../data/ui/preferences.ui.h:5
-msgid "Enable text _wrapping"
-msgstr "UkljuÄi _prelamanje teksta"
+msgid "Display"
+msgstr "Prikaz"
#: ../data/ui/preferences.ui.h:6
-msgid "Encoding"
-msgstr "Kodiranje"
+msgid "_Tab width:"
+msgstr "_Åirina tabulatora:"
#: ../data/ui/preferences.ui.h:7
-msgid "External editor"
-msgstr "Spoljni ureÄivaÄ"
+msgid "_Insert spaces instead of tabs"
+msgstr "_Ubaci razmake umesto tabulatora"
#: ../data/ui/preferences.ui.h:8
-msgid "File Filters"
-msgstr "Filteri datoteka"
+msgid "Enable text _wrapping"
+msgstr "UkljuÄi _prelamanje teksta"
#: ../data/ui/preferences.ui.h:9
-msgid "Font"
-msgstr "Slovni lik"
+msgid "Do not _split words over two lines"
+msgstr "Nemoj _podeliti reÄi u dva reda"
#: ../data/ui/preferences.ui.h:10
-msgid "Ignore changes which insert or delete blank lines"
-msgstr "Zanemari izmene koje ubacuju ili briÅu prazne redove"
+msgid "Show _line numbers"
+msgstr "PrikaÅi _brojeve redova"
#: ../data/ui/preferences.ui.h:11
-msgid "Ignore symbolic links"
-msgstr "Zanemari simboliÄke veze"
+msgid "Show w_hitespace"
+msgstr "PrikaÅi _razmake"
#: ../data/ui/preferences.ui.h:12
-msgid "Loading"
-msgstr "UÄitavam"
+msgid "Use s_yntax highlighting"
+msgstr "Koristi isticanje _sintakse"
#: ../data/ui/preferences.ui.h:13
-msgid "Meld Preferences"
-msgstr "Postavke Melda"
+msgid "External editor"
+msgstr "Spoljni ureÄivaÄ"
#: ../data/ui/preferences.ui.h:14
-msgid "Show _line numbers"
-msgstr "PrikaÅi _brojeve redova"
+msgid "Use _default system editor"
+msgstr "Koristi _osnovni ureÄivaÄ sistema"
#: ../data/ui/preferences.ui.h:15
-msgid "Show w_hitespace"
-msgstr "PrikaÅi _razmake"
+msgid "Edito_r command:"
+msgstr "Naredba _ureÄivaÄa:"
#: ../data/ui/preferences.ui.h:16
-msgid "Text Filters"
-msgstr "Filteri teksta"
+msgid "Editor"
+msgstr "UreÄivaÄ"
#: ../data/ui/preferences.ui.h:17
-msgid "Use _default system editor"
-msgstr "Koristi _osnovni ureÄivaÄ sistema"
-
-#: ../data/ui/preferences.ui.h:18
-msgid "Use s_yntax highlighting"
-msgstr "Koristi isticanje _sintakse"
-
-# bug: what encoding is iso8859? it's a registry of encodings, and encoding is eg. iso8859-5
-#: ../data/ui/preferences.ui.h:19
-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:20
msgid ""
"When performing directory comparisons, you may filter out files and "
"directories by name. Each pattern is a list of shell style wildcards "
@@ -326,7 +315,15 @@ msgstr ""
"prema nazivu. Svaki obrazac je spisak dÅokera u stilu konzole razdvojenih "
"razmakom."
-#: ../data/ui/preferences.ui.h:21
+#: ../data/ui/preferences.ui.h:18
+msgid "Ignore symbolic links"
+msgstr "Zanemari simboliÄke veze"
+
+#: ../data/ui/preferences.ui.h:19
+msgid "File Filters"
+msgstr "Filteri datoteka"
+
+#: ../data/ui/preferences.ui.h:20
msgid ""
"When performing file comparisons, you may ignore certain types of changes. "
"Each pattern here is a python regular expression which replaces matching "
@@ -339,149 +336,154 @@ 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
+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
-msgid "_Editor font:"
-msgstr "_Font ureÄivaÄa:"
+msgid "Text Filters"
+msgstr "Filteri teksta"
#: ../data/ui/preferences.ui.h:23
-msgid "_Insert spaces instead of tabs"
-msgstr "_Ubaci razmake umesto tabulatora"
+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
-msgid "_Tab width:"
-msgstr "_Åirina tabulatora:"
+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
-msgid "_Use the system fixed width font"
-msgstr "Koristi sistemom postavljenu veliÄinu _fonta"
+msgid "Encoding"
+msgstr "Kodiranje"
#: ../data/ui/vcview.ui.h:1
-msgid "Commit Files"
-msgstr "Ugradi datoteke"
+msgid "VC Log"
+msgstr "CV dnevnik"
#: ../data/ui/vcview.ui.h:2
-msgid "Log Message"
-msgstr "Poruka dnevnika"
+msgid "Commit Files"
+msgstr "Ugradi datoteke"
#: ../data/ui/vcview.ui.h:3
msgid "Previous Logs"
msgstr "Prethodni dnevnici"
#: ../data/ui/vcview.ui.h:4
-msgid "VC Log"
-msgstr "CV dnevnik"
+msgid "Log Message"
+msgstr "Poruka dnevnika"
-#: ../meld/dirdiff.py:226 ../meld/vcview.py:119
+#: ../meld/dirdiff.py:232 ../meld/vcview.py:127
msgid "_Compare"
msgstr "_Uporedi"
-#: ../meld/dirdiff.py:226 ../meld/vcview.py:119
+#: ../meld/dirdiff.py:232 ../meld/vcview.py:127
msgid "Compare selected"
msgstr "Uporedi izabrano"
-#: ../meld/dirdiff.py:227
+#: ../meld/dirdiff.py:233
msgid "Copy _Left"
msgstr "UmnoÅi _levo"
-#: ../meld/dirdiff.py:227
+#: ../meld/dirdiff.py:233
msgid "Copy to left"
msgstr "UmnoÅite levo"
-#: ../meld/dirdiff.py:228
+#: ../meld/dirdiff.py:234
msgid "Copy _Right"
msgstr "UmnoÅi _desno"
-#: ../meld/dirdiff.py:228
+#: ../meld/dirdiff.py:234
msgid "Copy to right"
msgstr "UmnoÅite desno"
-#: ../meld/dirdiff.py:229
+#: ../meld/dirdiff.py:235
msgid "Delete selected"
msgstr "ObriÅi izabrano"
-#: ../meld/dirdiff.py:230 ../meld/filediff.py:1157
+#: ../meld/dirdiff.py:236 ../meld/filediff.py:1167
msgid "Hide"
msgstr "Sakrij"
-#: ../meld/dirdiff.py:230
+#: ../meld/dirdiff.py:236
msgid "Hide selected"
msgstr "Sakrij izabrano"
-#: ../meld/dirdiff.py:234
+#: ../meld/dirdiff.py:240
msgid "Case"
msgstr "VeliÄina slova"
-#: ../meld/dirdiff.py:234
+#: ../meld/dirdiff.py:240
msgid "Ignore case of entries"
msgstr "Zanemari veliÄinu slova unosa"
-#: ../meld/dirdiff.py:235
+#: ../meld/dirdiff.py:241
msgid "Same"
msgstr "Isto"
-#: ../meld/dirdiff.py:235
+#: ../meld/dirdiff.py:241
msgid "Show identical"
msgstr "PrikaÅi istovetne"
-#: ../meld/dirdiff.py:236
+#: ../meld/dirdiff.py:242
msgid "New"
msgstr "Novi"
-#: ../meld/dirdiff.py:236
+#: ../meld/dirdiff.py:242
msgid "Show new"
msgstr "PrikaÅi nove"
-#: ../meld/dirdiff.py:237
+#: ../meld/dirdiff.py:243
msgid "Modified"
msgstr "Izmenjeni"
-#: ../meld/dirdiff.py:237 ../meld/vcview.py:132
+#: ../meld/dirdiff.py:243 ../meld/vcview.py:140
msgid "Show modified"
msgstr "PrikaÅi izmenjene"
-#: ../meld/dirdiff.py:239
+#: ../meld/dirdiff.py:245
msgid "Filters"
msgstr "Filteri"
-#: ../meld/dirdiff.py:239
+#: ../meld/dirdiff.py:245
msgid "Set active filters"
msgstr "Podesite aktivne filtere"
-#: ../meld/dirdiff.py:354
+#: ../meld/dirdiff.py:362
#, python-format
msgid "Hide %s"
msgstr "Sakrij â%sâ"
-#: ../meld/dirdiff.py:457 ../meld/dirdiff.py:470 ../meld/vcview.py:306
-#: ../meld/vcview.py:334
+#: ../meld/dirdiff.py:466 ../meld/dirdiff.py:479 ../meld/vcview.py:323
+#: ../meld/vcview.py:347
#, python-format
msgid "[%s] Scanning %s"
msgstr "[%s] pregledam â%sâ"
-#: ../meld/dirdiff.py:569
+#: ../meld/dirdiff.py:578
#, python-format
msgid "[%s] Done"
msgstr "[%s] Gotovo"
-#: ../meld/dirdiff.py:573
+#: ../meld/dirdiff.py:582
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:574
+#: ../meld/dirdiff.py:583
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:576
+#: ../meld/dirdiff.py:585
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:578
+#: ../meld/dirdiff.py:587
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:580
+#: ../meld/dirdiff.py:589
msgid ""
"You are running a case insensitive comparison on a case sensitive "
"filesystem. The following files in this folder are hidden:"
@@ -489,16 +491,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:591
+#: ../meld/dirdiff.py:600
#, python-format
msgid "'%s' hidden by '%s'"
msgstr "â%sâ sakriveno od strane â%sâ"
-#: ../meld/dirdiff.py:616 ../meld/filediff.py:1008 ../meld/filediff.py:1161
+#: ../meld/dirdiff.py:625 ../meld/filediff.py:1010 ../meld/filediff.py:1171
msgid "Hi_de"
msgstr "_Sakrij"
-#: ../meld/dirdiff.py:666
+#: ../meld/dirdiff.py:675
#, python-format
msgid ""
"'%s' exists.\n"
@@ -507,7 +509,7 @@ msgstr ""
"â%sâ postoji.\n"
"Da presnimim?"
-#: ../meld/dirdiff.py:673
+#: ../meld/dirdiff.py:682
#, python-format
msgid ""
"Error copying '%s' to '%s'\n"
@@ -518,7 +520,7 @@ msgstr ""
"\n"
"%s."
-#: ../meld/dirdiff.py:691 ../meld/vcview.py:503
+#: ../meld/dirdiff.py:700 ../meld/vcview.py:536
#, python-format
msgid ""
"'%s' is a directory.\n"
@@ -527,7 +529,7 @@ msgstr ""
"â%sâ je fascikla.\n"
"Da uklonim rekurzivno?"
-#: ../meld/dirdiff.py:698 ../meld/vcview.py:508
+#: ../meld/dirdiff.py:707 ../meld/vcview.py:541
#, python-format
msgid ""
"Error removing %s\n"
@@ -538,7 +540,7 @@ msgstr ""
"\n"
"%s."
-#: ../meld/dirdiff.py:723
+#: ../meld/dirdiff.py:741
#, python-format
msgid "%i second"
msgid_plural "%i seconds"
@@ -547,7 +549,7 @@ msgstr[1] "%i sekunde"
msgstr[2] "%i sekunde"
msgstr[3] "%i sekunda"
-#: ../meld/dirdiff.py:724
+#: ../meld/dirdiff.py:742
#, python-format
msgid "%i minute"
msgid_plural "%i minutes"
@@ -556,7 +558,7 @@ msgstr[1] "%i minuta"
msgstr[2] "%i minuta"
msgstr[3] "%i minut"
-#: ../meld/dirdiff.py:725
+#: ../meld/dirdiff.py:743
#, python-format
msgid "%i hour"
msgid_plural "%i hours"
@@ -565,7 +567,7 @@ msgstr[1] "%i sata"
msgstr[2] "%i sati"
msgstr[3] "%i sat"
-#: ../meld/dirdiff.py:726
+#: ../meld/dirdiff.py:744
#, python-format
msgid "%i day"
msgid_plural "%i days"
@@ -574,7 +576,7 @@ msgstr[1] "%i dana"
msgstr[2] "%i dana"
msgstr[3] "%i dan"
-#: ../meld/dirdiff.py:727
+#: ../meld/dirdiff.py:745
#, python-format
msgid "%i week"
msgid_plural "%i weeks"
@@ -583,7 +585,7 @@ msgstr[1] "%i nedelje"
msgstr[2] "%i nedelja"
msgstr[3] "%i nedelja"
-#: ../meld/dirdiff.py:728
+#: ../meld/dirdiff.py:746
#, python-format
msgid "%i month"
msgid_plural "%i months"
@@ -592,7 +594,7 @@ msgstr[1] "%i meseca"
msgstr[2] "%i meseci"
msgstr[3] "%i mesec"
-#: ../meld/dirdiff.py:729
+#: ../meld/dirdiff.py:747
#, python-format
msgid "%i year"
msgid_plural "%i years"
@@ -601,140 +603,140 @@ msgstr[1] "%i godine"
msgstr[2] "%i godina"
msgstr[3] "%i godina"
-#: ../meld/filediff.py:294
+#: ../meld/filediff.py:295
msgid "Format as patch..."
msgstr "Formatiraj kao ispravku..."
-#: ../meld/filediff.py:294
+#: ../meld/filediff.py:295
msgid "Create a patch using differences between files"
msgstr "Napravite ispravku koristeÄi razlike izmeÄu datoteka"
-#: ../meld/filediff.py:295
+#: ../meld/filediff.py:296
msgid "Previous conflict"
msgstr "Prethodni sukob"
-#: ../meld/filediff.py:295
+#: ../meld/filediff.py:296
msgid "Go to the previous conflict"
msgstr "Idite na prethodni sukob"
-#: ../meld/filediff.py:296
+#: ../meld/filediff.py:297
msgid "Next conflict"
msgstr "SledeÄi sukob"
-#: ../meld/filediff.py:296
+#: ../meld/filediff.py:297
msgid "Go to the next conflict"
msgstr "Idite na sledeÄi sukob"
-#: ../meld/filediff.py:297
+#: ../meld/filediff.py:298
msgid "Push to left"
msgstr "Gurni ulevo"
-#: ../meld/filediff.py:297
+#: ../meld/filediff.py:298
msgid "Push current change to the left"
msgstr "Gurnite tekuÄu izmenu ulevo"
-#: ../meld/filediff.py:298
+#: ../meld/filediff.py:299
msgid "Push to right"
msgstr "Gurni udesno"
-#: ../meld/filediff.py:298
+#: ../meld/filediff.py:299
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:300
+#: ../meld/filediff.py:301
msgid "Pull from left"
msgstr "Ubaci s leva"
-#: ../meld/filediff.py:300
+#: ../meld/filediff.py:301
msgid "Pull change from the left"
msgstr "Ubacite izmenu s leva"
-#: ../meld/filediff.py:301
+#: ../meld/filediff.py:302
msgid "Pull from right"
msgstr "Ubaci s desna"
-#: ../meld/filediff.py:301
+#: ../meld/filediff.py:302
msgid "Pull change from the right"
msgstr "Ubacite izmenu s desna"
-#: ../meld/filediff.py:302
+#: ../meld/filediff.py:303
msgid "Copy above left"
msgstr "UmnoÅi iznad ulevo"
-#: ../meld/filediff.py:302
+#: ../meld/filediff.py:303
msgid "Copy change above the left chunk"
msgstr "UmnoÅite izmenu iznad komada ulevo"
-#: ../meld/filediff.py:303
+#: ../meld/filediff.py:304
msgid "Copy below left"
msgstr "UmnoÅi ispod ulevo"
-#: ../meld/filediff.py:303
+#: ../meld/filediff.py:304
msgid "Copy change below the left chunk"
msgstr "UmnoÅite izmenu ispod komada ulevo"
-#: ../meld/filediff.py:304
+#: ../meld/filediff.py:305
msgid "Copy above right"
msgstr "UmnoÅi iznad udesno"
-#: ../meld/filediff.py:304
+#: ../meld/filediff.py:305
msgid "Copy change above the right chunk"
msgstr "UmnoÅite izmenu iznad komada udesno"
-#: ../meld/filediff.py:305
+#: ../meld/filediff.py:306
msgid "Copy below right"
msgstr "UmnoÅi ispod udesno"
-#: ../meld/filediff.py:305
+#: ../meld/filediff.py:306
msgid "Copy change below the right chunk"
msgstr "UmnoÅite izmenu ispod komada udesno"
-#: ../meld/filediff.py:306
+#: ../meld/filediff.py:307
msgid "Delete"
msgstr "ObriÅi"
-#: ../meld/filediff.py:306
+#: ../meld/filediff.py:307
msgid "Delete change"
msgstr "ObriÅite izmenu"
-#: ../meld/filediff.py:307
+#: ../meld/filediff.py:308
msgid "Merge all changes from left"
msgstr "Objedini sve izmene s leva"
-#: ../meld/filediff.py:307
+#: ../meld/filediff.py:308
msgid "Merge all non-conflicting changes from the left"
msgstr "Objedinite sve nesukobljavajuÄe izmene s leva"
-#: ../meld/filediff.py:308
+#: ../meld/filediff.py:309
msgid "Merge all changes from right"
msgstr "Objedini sve izmene s desna"
-#: ../meld/filediff.py:308
+#: ../meld/filediff.py:309
msgid "Merge all non-conflicting changes from the right"
msgstr "Objedinite sve nesukobljavajuÄe izmene s desna"
-#: ../meld/filediff.py:309
+#: ../meld/filediff.py:310
msgid "Merge all non-conflicting"
msgstr "Objedini sve nesukobljavajuÄe"
-#: ../meld/filediff.py:309
+#: ../meld/filediff.py:310
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:310
+#: ../meld/filediff.py:311
msgid "Cycle through documents"
msgstr "KruÅi kroz dokumente"
-#: ../meld/filediff.py:310
+#: ../meld/filediff.py:311
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:314
+#: ../meld/filediff.py:315
msgid "Lock scrolling"
msgstr "ZakljuÄaj klizanje"
-#: ../meld/filediff.py:315
+#: ../meld/filediff.py:316
msgid "Lock scrolling of all panes"
msgstr "ZakljuÄajte klizanje svih povrÅi"
@@ -767,42 +769,42 @@ msgstr ""
msgid "<unnamed>"
msgstr "<neimenovan>"
-#: ../meld/filediff.py:996
+#: ../meld/filediff.py:998
#, python-format
msgid "[%s] Set num panes"
msgstr "[%s] Postavi broj ploÄa"
-#: ../meld/filediff.py:1002
+#: ../meld/filediff.py:1004
#, python-format
msgid "[%s] Opening files"
msgstr "[%s] Otvaram datoteke"
-#: ../meld/filediff.py:1026 ../meld/filediff.py:1035 ../meld/filediff.py:1047
-#: ../meld/filediff.py:1053
+#: ../meld/filediff.py:1028 ../meld/filediff.py:1037 ../meld/filediff.py:1049
+#: ../meld/filediff.py:1055
msgid "Could not read file"
msgstr "Ne mogu da proÄitam datoteku"
-#: ../meld/filediff.py:1027
+#: ../meld/filediff.py:1029
#, python-format
msgid "[%s] Reading files"
msgstr "[%s] Äitam datoteke"
-#: ../meld/filediff.py:1036
+#: ../meld/filediff.py:1038
#, python-format
msgid "%s appears to be a binary file."
msgstr "â%sâ izgleda da je izvrÅna datoteka."
-#: ../meld/filediff.py:1048
+#: ../meld/filediff.py:1050
#, python-format
msgid "%s is not in encodings: %s"
msgstr "â%sâ nije u kodiranjima: â%sâ"
-#: ../meld/filediff.py:1078 ../meld/filemerge.py:67
+#: ../meld/filediff.py:1080 ../meld/filemerge.py:67
#, python-format
msgid "[%s] Computing differences"
msgstr "[%s] SraÄunavam razlike"
-#: ../meld/filediff.py:1148
+#: ../meld/filediff.py:1158
msgid ""
"Text filters are being used, and may be masking differences between files. "
"Would you like to compare the unfiltered files?"
@@ -810,15 +812,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:1154
+#: ../meld/filediff.py:1164
msgid "Files are identical"
msgstr "Datoteke su istovetne"
-#: ../meld/filediff.py:1164
+#: ../meld/filediff.py:1174
msgid "Show without filters"
msgstr "Prikazuje bez filtera"
-#: ../meld/filediff.py:1354
+#: ../meld/filediff.py:1363
#, python-format
msgid ""
"\"%s\" exists!\n"
@@ -827,7 +829,7 @@ msgstr ""
"â%sâ postoji!\n"
"Da presnimim?"
-#: ../meld/filediff.py:1367
+#: ../meld/filediff.py:1376
#, python-format
msgid ""
"Error writing to %s\n"
@@ -838,12 +840,12 @@ msgstr ""
"\n"
"%s."
-#: ../meld/filediff.py:1376
+#: ../meld/filediff.py:1385
#, python-format
msgid "Choose a name for buffer %i."
msgstr "Izaberite naziv za %i. bafer."
-#: ../meld/filediff.py:1391
+#: ../meld/filediff.py:1400
#, python-format
msgid ""
"This file '%s' contains a mixture of line endings.\n"
@@ -854,7 +856,7 @@ msgstr ""
"\n"
"Koji oblik Åelite da koristite?"
-#: ../meld/filediff.py:1407
+#: ../meld/filediff.py:1416
#, python-format
msgid ""
"'%s' contains characters not encodable with '%s'\n"
@@ -863,7 +865,7 @@ msgstr ""
"â%sâ sadrÅi znakove koji se ne mogu kodirati uz â%sâ\n"
"Da li Åelite da saÄuvate kao UTF-8?"
-#: ../meld/filediff.py:1466
+#: ../meld/filediff.py:1475
#, python-format
msgid ""
"Reloading will discard changes in:\n"
@@ -881,69 +883,69 @@ msgstr ""
msgid "[%s] Merging files"
msgstr "[%s] Objedinjujem datoteke"
-#: ../meld/meldapp.py:149
+#: ../meld/meldapp.py:152
msgid "wrong number of arguments supplied to --diff"
msgstr "pogreÅan broj argumenata pridodat uz â--diffâ"
-#: ../meld/meldapp.py:153
+#: ../meld/meldapp.py:156
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:154 ../meld/meldapp.py:155 ../meld/meldapp.py:157
+#: ../meld/meldapp.py:157 ../meld/meldapp.py:158 ../meld/meldapp.py:160
msgid "file"
msgstr "datoteka"
-#: ../meld/meldapp.py:154 ../meld/meldapp.py:156 ../meld/meldapp.py:157
+#: ../meld/meldapp.py:157 ../meld/meldapp.py:159 ../meld/meldapp.py:160
msgid "dir"
msgstr "dir"
-#: ../meld/meldapp.py:154
+#: ../meld/meldapp.py:157
msgid "Start a version control comparison"
msgstr "PokreÄe poreÄenje kontrole verzije"
-#: ../meld/meldapp.py:155
+#: ../meld/meldapp.py:158
msgid "Start a 2- or 3-way file comparison"
msgstr "PokreÄe poreÄenje 2 ili 3 elementa datoteka"
-#: ../meld/meldapp.py:156
+#: ../meld/meldapp.py:159
msgid "Start a 2- or 3-way directory comparison"
msgstr "PokreÄe poreÄenje 2 ili 3 elementa fascikli"
-#: ../meld/meldapp.py:157
+#: ../meld/meldapp.py:160
msgid "Start a comparison between file and dir/file"
msgstr "PokreÄe poreÄenje izmeÄu datoteke i fascikle/datoteke"
-#: ../meld/meldapp.py:163
+#: ../meld/meldapp.py:166
msgid "Meld is a file and directory comparison tool."
msgstr "Meld je alat za poreÄenje datoteka i fascikli."
-#: ../meld/meldapp.py:166
+#: ../meld/meldapp.py:169
msgid "Set label to use instead of file name"
msgstr "PodeÅava oznaku za koriÅÄenje umesto naziva datoteke"
-#: ../meld/meldapp.py:168
+#: ../meld/meldapp.py:171
msgid "Automatically compare all differing files on startup"
msgstr "Samostalno poredi sve razlikujuÄe datoteke prilikom pokretanja"
-#: ../meld/meldapp.py:170
+#: ../meld/meldapp.py:173
msgid "Ignored for compatibility"
msgstr "Zanemareno zbog saglasnosti"
-#: ../meld/meldapp.py:173
+#: ../meld/meldapp.py:176
msgid "Set the target file for saving a merge result"
msgstr "PodeÅava ciljnu datoteku za Äuvanje rezultata stapanja"
-#: ../meld/meldapp.py:176
+#: ../meld/meldapp.py:179
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:179
+#: ../meld/meldapp.py:182
#, python-format
msgid "too many arguments (wanted 0-4, got %d)"
msgstr "previÅe argumenata (traÅeno je 0-4, dobih %d)"
-#: ../meld/meldapp.py:181 ../meld/meldapp.py:185
+#: ../meld/meldapp.py:184 ../meld/meldapp.py:188
msgid "can't compare more than three directories"
msgstr "ne mogu da poredim viÅe od tri fascikle"
@@ -1175,12 +1177,12 @@ msgstr "Linija _stanja"
msgid "Show or hide the statusbar"
msgstr "PrikaÅite ili sakrijte liniju stanja"
-#: ../meld/meldwindow.py:538
+#: ../meld/meldwindow.py:541
msgid "Switch to this tab"
msgstr "Prebacite se na ovaj jeziÄak"
#. exit at first non found directory + file
-#: ../meld/meldwindow.py:629
+#: ../meld/meldwindow.py:639
msgid "Cannot compare a mixture of files and directories.\n"
msgstr "Ne mogu da poredim meÅavinu datoteka i fascikli.\n"
@@ -1201,224 +1203,225 @@ msgstr "natpis"
msgid "pattern"
msgstr "obrazac"
-#: ../meld/preferences.py:105
+#: ../meld/preferences.py:111
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:233
+#: ../meld/preferences.py:234
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:235
+#: ../meld/preferences.py:236
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"
+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
+#: ../meld/preferences.py:238
#, 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:239
+#: ../meld/preferences.py:240
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:241
+#: ../meld/preferences.py:242
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:243
+#: ../meld/preferences.py:244
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:245
+#: ../meld/preferences.py:246
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:248
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:249
+#: ../meld/preferences.py:250
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:251
+#: ../meld/preferences.py:252
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:253
+#: ../meld/preferences.py:254
msgid "Script comment\t0\t#.*"
msgstr "Komentar skripte\t0\t#.*"
-#: ../meld/vcview.py:120
+#: ../meld/vcview.py:128
msgid "Co_mmit"
msgstr "U_gradi"
-#: ../meld/vcview.py:120
+#: ../meld/vcview.py:128
msgid "Commit"
msgstr "Ugradite"
-#: ../meld/vcview.py:121
+#: ../meld/vcview.py:129
msgid "_Update"
msgstr "_Dopuni"
-#: ../meld/vcview.py:121
+#: ../meld/vcview.py:129
msgid "Update"
msgstr "Dopunite"
-#: ../meld/vcview.py:122
+#: ../meld/vcview.py:130
msgid "Add to VC"
msgstr "Dodaj u CV"
-#: ../meld/vcview.py:123
+#: ../meld/vcview.py:131
msgid "Add _Binary"
msgstr "Dodaj _binarno"
-#: ../meld/vcview.py:123
+#: ../meld/vcview.py:131
msgid "Add binary to VC"
msgstr "Dodaj binarno u CV"
-#: ../meld/vcview.py:124
+#: ../meld/vcview.py:132
msgid "Remove from VC"
msgstr "Ukloni iz CV"
-#: ../meld/vcview.py:125
+#: ../meld/vcview.py:133
msgid "_Resolved"
msgstr "_ReÅeno"
-#: ../meld/vcview.py:125
+#: ../meld/vcview.py:133
msgid "Mark as resolved for VC"
msgstr "OznaÄava kao reÅeno za CV"
-#: ../meld/vcview.py:126
+#: ../meld/vcview.py:134
msgid "Revert to original"
msgstr "Vrati na original"
-#: ../meld/vcview.py:127
+#: ../meld/vcview.py:135
msgid "Delete locally"
msgstr "ObriÅi u lokalu"
-#: ../meld/vcview.py:131
+#: ../meld/vcview.py:139
msgid "_Flatten"
msgstr "_Izravnaj"
-#: ../meld/vcview.py:131
+#: ../meld/vcview.py:139
msgid "Flatten directories"
msgstr "Izravnaj fascikle"
-#: ../meld/vcview.py:132
+#: ../meld/vcview.py:140
msgid "_Modified"
msgstr "Iz_menjen"
-#: ../meld/vcview.py:133
+#: ../meld/vcview.py:141
msgid "_Normal"
msgstr "_ObiÄno"
-#: ../meld/vcview.py:133
+#: ../meld/vcview.py:141
msgid "Show normal"
msgstr "PrikaÅi obiÄne"
-#: ../meld/vcview.py:134
+#: ../meld/vcview.py:142
msgid "Non _VC"
msgstr "Ne _CV"
-#: ../meld/vcview.py:134
+#: ../meld/vcview.py:142
msgid "Show unversioned files"
msgstr "Prikazuje neverzionirane datoteke"
-#: ../meld/vcview.py:135
+#: ../meld/vcview.py:143
msgid "Ignored"
msgstr "Zanemarene"
-#: ../meld/vcview.py:135
+#: ../meld/vcview.py:143
msgid "Show ignored files"
msgstr "Prikazuje zanemarene datoteke"
-#: ../meld/vcview.py:178 ../meld/vcview.py:302
+#: ../meld/vcview.py:186 ../meld/vcview.py:319
msgid "Location"
msgstr "Putanja"
-#: ../meld/vcview.py:179
+#: ../meld/vcview.py:187
msgid "Status"
msgstr "Stanje"
-#: ../meld/vcview.py:180
+#: ../meld/vcview.py:188
msgid "Rev"
msgstr "Izd"
-#: ../meld/vcview.py:181
+#: ../meld/vcview.py:189
msgid "Tag"
msgstr "Oznaka"
-#: ../meld/vcview.py:182
+#: ../meld/vcview.py:190
msgid "Options"
msgstr "Opcije"
-#: ../meld/vcview.py:233
+#: ../meld/vcview.py:249
msgid "Choose one Version Control"
msgstr "Izaberite Kontrolu verzije"
-#: ../meld/vcview.py:234
+#: ../meld/vcview.py:250
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:247
+#: ../meld/vcview.py:263
#, 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:251
+#: ../meld/vcview.py:267
msgid "Invalid Repository"
msgstr "Neispravno skladiÅte"
-#: ../meld/vcview.py:260
+#: ../meld/vcview.py:276
#, python-format
msgid "%s (%s)"
msgstr "%s (%s)"
#. TRANSLATORS: This is the location of the directory the user is diffing
-#: ../meld/vcview.py:302
+#: ../meld/vcview.py:319
#, python-format
msgid "%s: %s"
msgstr "%s: %s"
-#: ../meld/vcview.py:350
+#: ../meld/vcview.py:363
msgid "(Empty)"
msgstr "(Prazno)"
-#: ../meld/vcview.py:388
+#: ../meld/vcview.py:401
#, python-format
msgid "[%s] Fetching differences"
msgstr "[%s] Pribavljam razlike"
-#: ../meld/vcview.py:396
+#: ../meld/vcview.py:409
#, python-format
msgid "[%s] Applying patch"
msgstr "[%s] Primenjujem zakrpu"
-#: ../meld/vcview.py:478
+#: ../meld/vcview.py:511
msgid "Select some files first."
msgstr "Prvo izaberite neke datoteke."
-#: ../meld/vcview.py:551
+#: ../meld/vcview.py:584
#, python-format
msgid ""
"\n"
@@ -1467,7 +1470,7 @@ msgstr ""
" softvera kontrole izvora koji koristite.\n"
" "
-#: ../meld/ui/findbar.py:127
+#: ../meld/ui/findbar.py:140
#, python-format
msgid ""
"Regular expression error\n"
@@ -1523,6 +1526,9 @@ msgstr ""
"Obrazac je bio â%sâ\n"
"GreÅka je bila â%sâ"
+#~ msgid "_Search for"
+#~ msgstr "Po_traÅi"
+
#~ msgid "Compare Options"
#~ msgstr "Opcije poreÄenja"
@@ -1688,9 +1694,6 @@ msgstr ""
#~ msgid "Edit"
#~ msgstr "Uredi"
-#~ msgid "Find"
-#~ msgstr "PronaÄi"
-
#~ msgid "Match _entire word only"
#~ msgstr "Poklapanje samo _celih reÄi"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
