[meld] Updated Serbian translation
- From: ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ <mirosnik src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld] Updated Serbian translation
- Date: Tue, 7 Aug 2012 20:46:03 +0000 (UTC)
commit e54f94b7ff32b9c28c7fe8a3e9aa18f4eb4e8822
Author: ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ <miroslavnikolic rocketmail com>
Date: Tue Aug 7 22:46:17 2012 +0200
Updated Serbian translation
po/sr.po | 808 +++++++++++++++-----------------------------------------
po/sr latin po | 808 +++++++++++++++-----------------------------------------
2 files changed, 434 insertions(+), 1182 deletions(-)
---
diff --git a/po/sr.po b/po/sr.po
index 26c55d0..7411f9f 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -8,8 +8,8 @@ msgstr ""
"Project-Id-Version: meld\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=meld&k";
"eywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-04-28 23:20+0000\n"
-"PO-Revision-Date: 2012-05-20 10:52+0200\n"
+"POT-Creation-Date: 2012-06-17 00:26+0000\n"
+"PO-Revision-Date: 2012-08-07 22:43+0200\n"
"Last-Translator: ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ <miroslavnikolic rocketmail com>\n"
"Language-Team: Serbian <gnom prevod org>\n"
"Language: sr\n"
@@ -43,7 +43,7 @@ msgstr "ÐÑÐÐÐÐÐÐÑ ÑÐÐÐÐÐÐ ÐÐÐÐ"
#: ../data/meld.desktop.in.h:4
msgid "Compare and merge your files"
-msgstr "ÐÐÐÑÐÑÑÑÑÐ Ð ÑÐÐÑÐÑÑÐ ÐÐÑÐ ÐÐÑÐÑÐÐÐ."
+msgstr "ÐÐÐÑÐÑÑÑÑÐ Ð ÑÐÐÑÐÑÑÐ ÐÐÑÐ ÐÐÑÐÑÐÐÐ"
#: ../data/ui/EditableList.ui.h:1
msgid "Editable List"
@@ -75,7 +75,7 @@ msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÐÑÐÐÐ ÑÐÐÑÐÑ"
#: ../data/ui/EditableList.ui.h:8 ../meld/vcview.py:132
msgid "_Remove"
-msgstr "Ð_ÐÐÐÐÐ"
+msgstr "_ÐÐÐÐÐÐ"
#: ../data/ui/EditableList.ui.h:9
msgid "Move item up"
@@ -113,7 +113,7 @@ msgstr "_ÐÐÐÐÑÐ ÐÐÐÐÐÐ"
msgid "_Save Selected"
msgstr "_ÐÐÑÑÐÐÑ ÐÐÐÐÑÐÐÐ"
-#: ../data/ui/findbar.ui.h:1 ../meld/meldwindow.py:141
+#: ../data/ui/findbar.ui.h:1 ../meld/meldwindow.py:147
msgid "_Replace"
msgstr "_ÐÐÐÐÐÐ"
@@ -130,12 +130,10 @@ msgid "_Next"
msgstr "_ÐÐÐÐÐÑÐ"
#: ../data/ui/findbar.ui.h:5
-#| msgid "Find"
msgid "Find:"
msgstr "ÐÐÑÐ:"
#: ../data/ui/findbar.ui.h:6
-#| msgid "Replace _With"
msgid "Replace _with:"
msgstr "ÐÐÐÐÐÐ Ñ_Ð:"
@@ -152,9 +150,6 @@ msgid "Regular E_xpression"
msgstr "_ÐÐÐÑÐÐÑÐÐ ÐÐÑÐÐ"
#: ../data/ui/meldapp.ui.h:2
-#| msgid ""
-#| "Copyright © 2002-2009 Stephen Kennedy\n"
-#| "Copyright © 2009-2011 Kai Willadsen"
msgid ""
"Copyright © 2002-2009 Stephen Kennedy\n"
"Copyright © 2009-2012 Kai Willadsen"
@@ -176,7 +171,7 @@ msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐÑÐÑÐÐÐ"
#: ../data/ui/meldapp.ui.h:6
msgid "_Three Way Compare"
-msgstr "ÐÐÑÐÑÐÑÐ ÑÑÐ ÐÐÐÐÐÐÑÐ"
+msgstr "ÐÐÑÐÑÐÑÐ _ÑÑÐ ÐÐÐÐÐÐÑÐ"
#. Refers to version of the file being compared
#: ../data/ui/meldapp.ui.h:8
@@ -251,11 +246,11 @@ msgstr "ÐÐÐÐÐÐ ÐÐÐ"
#: ../data/ui/preferences.ui.h:3
msgid "_Use the system fixed width font"
-msgstr "ÐÐÑÐÑÑÐ ÑÐÑÑÐÐÐÐ ÐÐÑÑÐÐÑÐÐÑ ÐÐÐÐÑÐÐÑ _ÑÐÐÑÐ"
+msgstr "_ÐÐÑÐÑÑÐ ÑÐÑÑÐÐÑÐÐ ÑÐÐÐÐÐ ÐÐÐ ÑÑÐÐÐÐ ÑÐÑÐÐÐ"
#: ../data/ui/preferences.ui.h:4
msgid "_Editor font:"
-msgstr "_ÐÐÐÑ ÑÑÐÑÐÐÐÑÐ:"
+msgstr "_ÐÐÐÐÐÐ ÐÐÐ ÑÑÐÑÐÐÐÑÐ:"
#: ../data/ui/preferences.ui.h:5
msgid "Display"
@@ -263,7 +258,7 @@ msgstr "ÐÑÐÐÐÐ"
#: ../data/ui/preferences.ui.h:6
msgid "_Tab width:"
-msgstr "_ÐÐÑÐÐÐ ÑÐÐÑÐÐÑÐÑÐ:"
+msgstr "ÐÐÑÐÐÐ _ÑÐÐÑÐÐÑÐÑÐ:"
#: ../data/ui/preferences.ui.h:7
msgid "_Insert spaces instead of tabs"
@@ -275,7 +270,7 @@ msgstr "ÐÐÑÑÑÐ _ÐÑÐÐÐÐÐÑÐ ÑÐÐÑÑÐ"
#: ../data/ui/preferences.ui.h:9
msgid "Do not _split words over two lines"
-msgstr "ÐÐÐÐÑ _ÐÐÐÐÐÐÑÐ ÑÐÑÐ Ñ ÐÐÐ ÑÐÐÐ"
+msgstr "ÐÐÐÐÑ _ÐÐÐÐÑÐ ÑÐÑÐ Ñ ÐÐÐ ÑÐÐÐ"
#: ../data/ui/preferences.ui.h:10
msgid "Show _line numbers"
@@ -373,117 +368,121 @@ msgstr "ÐÑÐÑÑÐÐÐÐ ÐÐÐÐÐÐÑÐ"
msgid "Log Message"
msgstr "ÐÐÑÑÐÐ ÐÐÐÐÐÐÐÐ"
-#: ../meld/dirdiff.py:232 ../meld/vcview.py:127
+#: ../meld/dirdiff.py:230 ../meld/vcview.py:127
msgid "_Compare"
msgstr "_ÐÐÐÑÐÐÐ"
-#: ../meld/dirdiff.py:232 ../meld/vcview.py:127
+#: ../meld/dirdiff.py:230 ../meld/vcview.py:127
msgid "Compare selected"
msgstr "ÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐÐ"
-#: ../meld/dirdiff.py:233
+#: ../meld/dirdiff.py:231
msgid "Copy _Left"
msgstr "ÐÐÐÐÐÐ _ÐÐÐÐ"
-#: ../meld/dirdiff.py:233
+#: ../meld/dirdiff.py:231
msgid "Copy to left"
msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÐ"
-#: ../meld/dirdiff.py:234
+#: ../meld/dirdiff.py:232
msgid "Copy _Right"
msgstr "ÐÐÐÐÐÐ _ÐÐÑÐÐ"
-#: ../meld/dirdiff.py:234
+#: ../meld/dirdiff.py:232
msgid "Copy to right"
msgstr "ÐÐÐÐÐÐÑÐ ÐÐÑÐÐ"
-#: ../meld/dirdiff.py:235
+#: ../meld/dirdiff.py:233
msgid "Delete selected"
msgstr "ÐÐÑÐÑÐ ÐÐÐÐÑÐÐÐ"
-#: ../meld/dirdiff.py:236 ../meld/filediff.py:1167
+#: ../meld/dirdiff.py:234 ../meld/filediff.py:1078
msgid "Hide"
msgstr "ÐÐÐÑÐÑ"
-#: ../meld/dirdiff.py:236
+#: ../meld/dirdiff.py:234
msgid "Hide selected"
msgstr "ÐÐÐÑÐÑ ÐÐÐÐÑÐÐÐ"
-#: ../meld/dirdiff.py:240
-msgid "Case"
-msgstr "ÐÐÐÐÑÐÐÐ ÑÐÐÐÐ"
+#: ../meld/dirdiff.py:238
+msgid "Ignore filename case"
+msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÐÑÐÐÑ ÑÐÐÐÐ ÐÐÐÐÐÐ ÐÐÑÐÑÐÐÐ"
-#: ../meld/dirdiff.py:240
-msgid "Ignore case of entries"
-msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÐÑÐÐÑ ÑÐÐÐÐ ÑÐÐÑÐ"
+#: ../meld/dirdiff.py:238
+msgid ""
+"Consider differently-cased filenames that are otherwise-identical to be the "
+"same"
+msgstr ""
+"ÐÐÐÑÑÐÑÐ ÐÑÑÐÐ ÑÐÐÐÐÑÐÑÐ ÐÐÐÐÑÐÐÐ ÑÐÐÐÐ Ñ ÐÐÐÐÐÐÐÐ ÐÐÑÐÑÐÐÐ ÐÐÑÐ ÑÑ "
+"ÐÐÑÑÑÐÐÐÐ ÐÑÑÐÐÐÑÐÐ"
-#: ../meld/dirdiff.py:241
+#: ../meld/dirdiff.py:239
msgid "Same"
msgstr "ÐÑÑÐ"
-#: ../meld/dirdiff.py:241
+#: ../meld/dirdiff.py:239
msgid "Show identical"
msgstr "ÐÑÐÐÐÐÐ ÐÑÑÐÐÐÑÐÐ"
-#: ../meld/dirdiff.py:242
+#: ../meld/dirdiff.py:240
msgid "New"
msgstr "ÐÐÐÐ"
-#: ../meld/dirdiff.py:242
+#: ../meld/dirdiff.py:240
msgid "Show new"
msgstr "ÐÑÐÐÐÐÐ ÐÐÐÐ"
-#: ../meld/dirdiff.py:243
+#: ../meld/dirdiff.py:241
msgid "Modified"
msgstr "ÐÐÐÐÑÐÐÐ"
-#: ../meld/dirdiff.py:243 ../meld/vcview.py:140
+#: ../meld/dirdiff.py:241 ../meld/vcview.py:140
msgid "Show modified"
msgstr "ÐÑÐÐÐÐÐ ÐÐÐÐÑÐÐÐ"
-#: ../meld/dirdiff.py:245
+#: ../meld/dirdiff.py:243
msgid "Filters"
msgstr "ÐÐÐÑÐÑÐ"
-#: ../meld/dirdiff.py:245
+#: ../meld/dirdiff.py:243
msgid "Set active filters"
msgstr "ÐÐÐÐÑÐÑÐ ÐÐÑÐÐÐÐ ÑÐÐÑÐÑÐ"
-#: ../meld/dirdiff.py:362
+#: ../meld/dirdiff.py:360
#, python-format
msgid "Hide %s"
msgstr "ÐÐÐÑÐÑ â%sâ"
-#: ../meld/dirdiff.py:466 ../meld/dirdiff.py:479 ../meld/vcview.py:323
+#: ../meld/dirdiff.py:464 ../meld/dirdiff.py:477 ../meld/vcview.py:323
#: ../meld/vcview.py:347
#, python-format
msgid "[%s] Scanning %s"
msgstr "[%s] ÐÑÐÐÐÐÐÐÐ â%sâ"
-#: ../meld/dirdiff.py:578
+#: ../meld/dirdiff.py:576
#, python-format
msgid "[%s] Done"
msgstr "[%s] ÐÐÑÐÐÐ"
-#: ../meld/dirdiff.py:582
+#: ../meld/dirdiff.py:580
msgid "Multiple errors occurred while scanning this folder"
msgstr "ÐÐÑÐÐ ÑÐ ÐÐ ÐÐÑÐ ÐÑÐÑÐÐÐ ÐÐ ÐÑÐÐÐ ÐÑÐÑÑÐÐÐÐÐÑÐ ÐÐÐ ÑÐÑÑÐÐÐÐ"
-#: ../meld/dirdiff.py:583
+#: ../meld/dirdiff.py:581
msgid "Files with invalid encodings found"
msgstr "ÐÑÐÐÐÑÐÐÐ ÑÑ ÐÐÑÐÑÐÐÐ ÑÐ ÐÐÐÑÐÑÐÐÐÐÐ ÐÐÐÐÑÐÑÐÐ"
#. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:585
+#: ../meld/dirdiff.py:583
msgid "Some files were in an incorrect encoding. The names are something like:"
msgstr "ÐÐÐÐ ÐÐÑÐÑÐÐÐ ÐÐÑÐÑÑ Ñ ÐÐÐÑÐÑÐÐÐÐÐ ÐÐÐÐÑÐÑÑ. ÐÐÐÐÐÐ ÑÑ ÐÐÑÑÐ ÐÐÐ:"
-#: ../meld/dirdiff.py:587
+#: ../meld/dirdiff.py:585
msgid "Files hidden by case insensitive comparison"
msgstr "ÐÐÑÐÑÐÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑÐÑÐÑÐÐ ÐÐÐÑÐÑÑÐÐÐÐ ÐÐ ÐÐÐÐÑÐÐÑ ÑÐÐÐÐ"
#. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:589
+#: ../meld/dirdiff.py:587
msgid ""
"You are running a case insensitive comparison on a case sensitive "
"filesystem. The following files in this folder are hidden:"
@@ -491,16 +490,16 @@ msgstr ""
"ÐÐÐÑÐÐÑÐÐ ÑÑÐ ÐÐÑÐÑÐÑÐ ÐÐÐÐÐÐÑÐÐ ÐÐ ÐÐÐÐÑÐÐÐ ÑÐÐÐÐ ÐÐ ÑÐÑÑÐÐÑ ÐÐÑÐÑÐÐÐ ÐÐÐ "
"ÑÐ ÐÐÐ ÐÐÑÐÐ. ÐÐÐÐ ÐÐÑÐÑÐÐÐ ÐÐÑÑ ÐÐÐÑÐÐÐ:"
-#: ../meld/dirdiff.py:600
+#: ../meld/dirdiff.py:598
#, python-format
msgid "'%s' hidden by '%s'"
msgstr "â%sâ ÑÐÐÑÐÐÐÐÐ ÐÐ ÑÑÑÐÐÐ â%sâ"
-#: ../meld/dirdiff.py:625 ../meld/filediff.py:1010 ../meld/filediff.py:1171
+#: ../meld/dirdiff.py:623 ../meld/filediff.py:921 ../meld/filediff.py:1082
msgid "Hi_de"
msgstr "_ÐÐÐÑÐÑ"
-#: ../meld/dirdiff.py:675
+#: ../meld/dirdiff.py:673
#, python-format
msgid ""
"'%s' exists.\n"
@@ -509,7 +508,7 @@ msgstr ""
"â%sâ ÐÐÑÑÐÑÐ.\n"
"ÐÐ ÐÑÐÑÐÐÐÐÐ?"
-#: ../meld/dirdiff.py:682
+#: ../meld/dirdiff.py:680
#, python-format
msgid ""
"Error copying '%s' to '%s'\n"
@@ -520,7 +519,7 @@ msgstr ""
"\n"
"%s."
-#: ../meld/dirdiff.py:700 ../meld/vcview.py:536
+#: ../meld/dirdiff.py:698 ../meld/vcview.py:536
#, python-format
msgid ""
"'%s' is a directory.\n"
@@ -529,7 +528,7 @@ msgstr ""
"â%sâ ÑÐ ÑÐÑÑÐÐÐÐ.\n"
"ÐÐ ÑÐÐÐÐÐÐ ÑÐÐÑÑÐÐÐÐÐ?"
-#: ../meld/dirdiff.py:707 ../meld/vcview.py:541
+#: ../meld/dirdiff.py:705 ../meld/vcview.py:541
#, python-format
msgid ""
"Error removing %s\n"
@@ -540,7 +539,7 @@ msgstr ""
"\n"
"%s."
-#: ../meld/dirdiff.py:741
+#: ../meld/dirdiff.py:739
#, python-format
msgid "%i second"
msgid_plural "%i seconds"
@@ -549,7 +548,7 @@ msgstr[1] "%i ÑÐÐÑÐÐÐ"
msgstr[2] "%i ÑÐÐÑÐÐÐ"
msgstr[3] "%i ÑÐÐÑÐÐÐ"
-#: ../meld/dirdiff.py:742
+#: ../meld/dirdiff.py:740
#, python-format
msgid "%i minute"
msgid_plural "%i minutes"
@@ -558,7 +557,7 @@ msgstr[1] "%i ÐÐÐÑÑÐ"
msgstr[2] "%i ÐÐÐÑÑÐ"
msgstr[3] "%i ÐÐÐÑÑ"
-#: ../meld/dirdiff.py:743
+#: ../meld/dirdiff.py:741
#, python-format
msgid "%i hour"
msgid_plural "%i hours"
@@ -567,7 +566,7 @@ msgstr[1] "%i ÑÐÑÐ"
msgstr[2] "%i ÑÐÑÐ"
msgstr[3] "%i ÑÐÑ"
-#: ../meld/dirdiff.py:744
+#: ../meld/dirdiff.py:742
#, python-format
msgid "%i day"
msgid_plural "%i days"
@@ -576,7 +575,7 @@ msgstr[1] "%i ÐÐÐÐ"
msgstr[2] "%i ÐÐÐÐ"
msgstr[3] "%i ÐÐÐ"
-#: ../meld/dirdiff.py:745
+#: ../meld/dirdiff.py:743
#, python-format
msgid "%i week"
msgid_plural "%i weeks"
@@ -585,7 +584,7 @@ msgstr[1] "%i ÐÐÐÐÑÐ"
msgstr[2] "%i ÐÐÐÐÑÐ"
msgstr[3] "%i ÐÐÐÐÑÐ"
-#: ../meld/dirdiff.py:746
+#: ../meld/dirdiff.py:744
#, python-format
msgid "%i month"
msgid_plural "%i months"
@@ -594,7 +593,7 @@ msgstr[1] "%i ÐÐÑÐÑÐ"
msgstr[2] "%i ÐÐÑÐÑÐ"
msgstr[3] "%i ÐÐÑÐÑ"
-#: ../meld/dirdiff.py:747
+#: ../meld/dirdiff.py:745
#, python-format
msgid "%i year"
msgid_plural "%i years"
@@ -603,159 +602,159 @@ msgstr[1] "%i ÐÐÐÐÐÐ"
msgstr[2] "%i ÐÐÐÐÐÐ"
msgstr[3] "%i ÐÐÐÐÐÐ"
-#: ../meld/filediff.py:295
+#: ../meld/filediff.py:204
msgid "Format as patch..."
msgstr "ÐÐÑÐÐÑÐÑÐÑ ÐÐÐ ÐÑÐÑÐÐÐÑ..."
-#: ../meld/filediff.py:295
+#: ../meld/filediff.py:204
msgid "Create a patch using differences between files"
msgstr "ÐÐÐÑÐÐÐÑÐ ÐÑÐÑÐÐÐÑ ÐÐÑÐÑÑÐÑÐ ÑÐÐÐÐÐÐ ÐÐÐÐÑÑ ÐÐÑÐÑÐÐÐ"
-#: ../meld/filediff.py:296
+#: ../meld/filediff.py:205
msgid "Previous conflict"
msgstr "ÐÑÐÑÑÐÐÐÐ ÑÑÐÐÐ"
-#: ../meld/filediff.py:296
+#: ../meld/filediff.py:205
msgid "Go to the previous conflict"
msgstr "ÐÐÐÑÐ ÐÐ ÐÑÐÑÑÐÐÐÐ ÑÑÐÐÐ"
-#: ../meld/filediff.py:297
+#: ../meld/filediff.py:206
msgid "Next conflict"
msgstr "ÐÐÐÐÐÑÐ ÑÑÐÐÐ"
-#: ../meld/filediff.py:297
+#: ../meld/filediff.py:206
msgid "Go to the next conflict"
msgstr "ÐÐÐÑÐ ÐÐ ÑÐÐÐÐÑÐ ÑÑÐÐÐ"
-#: ../meld/filediff.py:298
+#: ../meld/filediff.py:207
msgid "Push to left"
msgstr "ÐÑÑÐÐ ÑÐÐÐÐ"
-#: ../meld/filediff.py:298
+#: ../meld/filediff.py:207
msgid "Push current change to the left"
msgstr "ÐÑÑÐÐÑÐ ÑÐÐÑÑÑ ÐÐÐÐÐÑ ÑÐÐÐÐ"
-#: ../meld/filediff.py:299
+#: ../meld/filediff.py:208
msgid "Push to right"
msgstr "ÐÑÑÐÐ ÑÐÐÑÐÐ"
-#: ../meld/filediff.py:299
+#: ../meld/filediff.py:208
msgid "Push current change to the right"
msgstr "ÐÑÑÐÐÑÐ ÑÐÐÑÑÑ ÐÐÐÐÐÑ ÑÐÐÑÐÐ"
#. FIXME: using LAST and FIRST is terrible and unreliable icon abuse
-#: ../meld/filediff.py:301
+#: ../meld/filediff.py:210
msgid "Pull from left"
msgstr "ÐÐÐÑÐ Ñ ÐÐÐÐ"
-#: ../meld/filediff.py:301
+#: ../meld/filediff.py:210
msgid "Pull change from the left"
msgstr "ÐÐÐÑÐÑÐ ÐÐÐÐÐÑ Ñ ÐÐÐÐ"
-#: ../meld/filediff.py:302
+#: ../meld/filediff.py:211
msgid "Pull from right"
msgstr "ÐÐÐÑÐ Ñ ÐÐÑÐÐ"
-#: ../meld/filediff.py:302
+#: ../meld/filediff.py:211
msgid "Pull change from the right"
msgstr "ÐÐÐÑÐÑÐ ÐÐÐÐÐÑ Ñ ÐÐÑÐÐ"
-#: ../meld/filediff.py:303
+#: ../meld/filediff.py:212
msgid "Copy above left"
msgstr "ÐÐÐÐÐÐ ÐÐÐÐÐ ÑÐÐÐÐ"
-#: ../meld/filediff.py:303
+#: ../meld/filediff.py:212
msgid "Copy change above the left chunk"
msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÐÐÑ ÐÐÐÐÐ ÐÐÐÐÐÐ ÑÐÐÐÐ"
-#: ../meld/filediff.py:304
+#: ../meld/filediff.py:213
msgid "Copy below left"
msgstr "ÐÐÐÐÐÐ ÐÑÐÐÐ ÑÐÐÐÐ"
-#: ../meld/filediff.py:304
+#: ../meld/filediff.py:213
msgid "Copy change below the left chunk"
msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÐÐÑ ÐÑÐÐÐ ÐÐÐÐÐÐ ÑÐÐÐÐ"
-#: ../meld/filediff.py:305
+#: ../meld/filediff.py:214
msgid "Copy above right"
msgstr "ÐÐÐÐÐÐ ÐÐÐÐÐ ÑÐÐÑÐÐ"
-#: ../meld/filediff.py:305
+#: ../meld/filediff.py:214
msgid "Copy change above the right chunk"
msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÐÐÑ ÐÐÐÐÐ ÐÐÐÐÐÐ ÑÐÐÑÐÐ"
-#: ../meld/filediff.py:306
+#: ../meld/filediff.py:215
msgid "Copy below right"
msgstr "ÐÐÐÐÐÐ ÐÑÐÐÐ ÑÐÐÑÐÐ"
-#: ../meld/filediff.py:306
+#: ../meld/filediff.py:215
msgid "Copy change below the right chunk"
msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÐÐÑ ÐÑÐÐÐ ÐÐÐÐÐÐ ÑÐÐÑÐÐ"
-#: ../meld/filediff.py:307
+#: ../meld/filediff.py:216
msgid "Delete"
msgstr "ÐÐÑÐÑÐ"
-#: ../meld/filediff.py:307
+#: ../meld/filediff.py:216
msgid "Delete change"
msgstr "ÐÐÑÐÑÐÑÐ ÐÐÐÐÐÑ"
-#: ../meld/filediff.py:308
+#: ../meld/filediff.py:217
msgid "Merge all changes from left"
msgstr "ÐÐÑÐÐÐÐÐ ÑÐÐ ÐÐÐÐÐÐ Ñ ÐÐÐÐ"
-#: ../meld/filediff.py:308
+#: ../meld/filediff.py:217
msgid "Merge all non-conflicting changes from the left"
msgstr "ÐÐÑÐÐÐÐÐÑÐ ÑÐÐ ÐÐÑÑÐÐÐÑÐÐÐÑÑÑÐ ÐÐÐÐÐÐ Ñ ÐÐÐÐ"
-#: ../meld/filediff.py:309
+#: ../meld/filediff.py:218
msgid "Merge all changes from right"
msgstr "ÐÐÑÐÐÐÐÐ ÑÐÐ ÐÐÐÐÐÐ Ñ ÐÐÑÐÐ"
-#: ../meld/filediff.py:309
+#: ../meld/filediff.py:218
msgid "Merge all non-conflicting changes from the right"
msgstr "ÐÐÑÐÐÐÐÐÑÐ ÑÐÐ ÐÐÑÑÐÐÐÑÐÐÐÑÑÑÐ ÐÐÐÐÐÐ Ñ ÐÐÑÐÐ"
-#: ../meld/filediff.py:310
+#: ../meld/filediff.py:219
msgid "Merge all non-conflicting"
msgstr "ÐÐÑÐÐÐÐÐ ÑÐÐ ÐÐÑÑÐÐÐÑÐÐÐÑÑÑÐ"
-#: ../meld/filediff.py:310
+#: ../meld/filediff.py:219
msgid "Merge all non-conflicting changes from left and right panes"
msgstr "ÐÐÑÐÐÐÐÐÑÐ ÑÐÐ ÐÐÑÑÐÐÐÑÐÐÐÑÑÑÐ ÐÐÐÐÐÐ Ñ ÐÐÐÐ Ð ÐÐÑÐÐ ÐÐÐÑÑÐ"
-#: ../meld/filediff.py:311
+#: ../meld/filediff.py:220
msgid "Cycle through documents"
msgstr "ÐÑÑÐÐ ÐÑÐÐ ÐÐÐÑÐÐÐÑÐ"
-#: ../meld/filediff.py:311
+#: ../meld/filediff.py:220
msgid "Move keyboard focus to the next document in this comparison"
msgstr "ÐÑÐÐÐÑÑÐÑÐ ÑÐÐÑÑ ÑÐÑÑÐÑÑÑÐ ÐÐ ÑÐÐÐÐÑÐ ÐÐÐÑÐÐÐÑ Ñ ÐÐÐÐ ÐÐÑÐÑÐÑÑ"
-#: ../meld/filediff.py:315
+#: ../meld/filediff.py:224
msgid "Lock scrolling"
msgstr "ÐÐÐÑÑÑÐÑ ÐÐÐÐÐÑÐ"
-#: ../meld/filediff.py:316
+#: ../meld/filediff.py:225
msgid "Lock scrolling of all panes"
msgstr "ÐÐÐÑÑÑÐÑÑÐ ÐÐÐÐÐÑÐ ÑÐÐÑ ÐÐÐÑÑÐ"
#. Abbreviations for insert and overwrite that fit in the status bar
-#: ../meld/filediff.py:396
+#: ../meld/filediff.py:305
msgid "INS"
msgstr "ÐÐÐÐ"
-#: ../meld/filediff.py:396
+#: ../meld/filediff.py:305
msgid "OVR"
msgstr "ÐÐÐÐ"
#. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:398
+#: ../meld/filediff.py:307
#, python-format
msgid "Ln %i, Col %i"
msgstr "ÐÐÐ %i, ÐÐÑÑÐ %i"
-#: ../meld/filediff.py:722
+#: ../meld/filediff.py:631
#, python-format
msgid ""
"Filter '%s' changed the number of lines in the file. Comparison will be "
@@ -764,47 +763,42 @@ msgstr ""
"ÐÐÐÑÐÑ â%sâ ÑÐ ÐÐÐÐÐÐÐ ÐÑÐÑ ÑÐÐÐÐÐ Ñ ÐÐÑÐÑÐÑÐ. ÐÐÑÐÑÐÑÐ ÐÐÑÐ ÐÐÑÐ ÑÐÑÐÐ. ÐÐ "
"ÐÐÑÐ ÐÐÑÐÑÐ ÐÐÐÐÐÐÐÑÑÐ ÐÑÐÑÑÑÐÐÐ ÐÐ ÐÐÑÐÑÐÐÐÐ."
-#. TRANSLATORS: this is the name of a new file which has not yet been saved
-#: ../meld/filediff.py:809
-msgid "<unnamed>"
-msgstr "<ÐÐÐÐÐÐÐÐÐÐ>"
-
-#: ../meld/filediff.py:998
+#: ../meld/filediff.py:909
#, python-format
msgid "[%s] Set num panes"
msgstr "[%s] ÐÐÑÑÐÐÐ ÐÑÐÑ ÐÐÐÑÐ"
-#: ../meld/filediff.py:1004
+#: ../meld/filediff.py:915
#, python-format
msgid "[%s] Opening files"
msgstr "[%s] ÐÑÐÐÑÐÐ ÐÐÑÐÑÐÐÐ"
-#: ../meld/filediff.py:1028 ../meld/filediff.py:1037 ../meld/filediff.py:1049
-#: ../meld/filediff.py:1055
+#: ../meld/filediff.py:939 ../meld/filediff.py:948 ../meld/filediff.py:960
+#: ../meld/filediff.py:966
msgid "Could not read file"
msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÑÐÑÐÐ ÐÐÑÐÑÐÐÑ"
-#: ../meld/filediff.py:1029
+#: ../meld/filediff.py:940
#, python-format
msgid "[%s] Reading files"
msgstr "[%s] ÐÐÑÐÐ ÐÐÑÐÑÐÐÐ"
-#: ../meld/filediff.py:1038
+#: ../meld/filediff.py:949
#, python-format
msgid "%s appears to be a binary file."
msgstr "â%sâ ÐÐÐÐÐÐÐ ÐÐ ÑÐ ÐÐÐÑÑÐÐ ÐÐÑÐÑÐÐÐ."
-#: ../meld/filediff.py:1050
+#: ../meld/filediff.py:961
#, python-format
msgid "%s is not in encodings: %s"
msgstr "â%sâ ÐÐÑÐ Ñ ÐÐÐÐÑÐÑÐÐÐ: â%sâ"
-#: ../meld/filediff.py:1080 ../meld/filemerge.py:67
+#: ../meld/filediff.py:991 ../meld/filemerge.py:67
#, python-format
msgid "[%s] Computing differences"
msgstr "[%s] ÐÑÐÑÑÐÐÐÐÐ ÑÐÐÐÐÐÐ"
-#: ../meld/filediff.py:1158
+#: ../meld/filediff.py:1069
msgid ""
"Text filters are being used, and may be masking differences between files. "
"Would you like to compare the unfiltered files?"
@@ -812,15 +806,15 @@ msgstr ""
"ÐÐÑÐÑÑÐÐÐ ÑÑ ÑÐÐÑÐÑÐ ÑÐÐÑÑÐ, Ð ÐÐÐÑ ÐÐÑÑÐÑÐÑÐ Ð ÐÐÐÐÑÐÐÑÐÐÐ ÑÐÐÐÐÐÐ ÐÐÐÐÑÑ "
"ÐÐÑÐÑÐÐÐ. ÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÑÐÐÐÑÐ ÐÐÑÐÐÑÑÐÑÐÐÐ ÐÐÑÐÑÐÐÐ?"
-#: ../meld/filediff.py:1164
+#: ../meld/filediff.py:1075
msgid "Files are identical"
msgstr "ÐÐÑÐÑÐÐÐ ÑÑ ÐÑÑÐÐÐÑÐÐ"
-#: ../meld/filediff.py:1174
+#: ../meld/filediff.py:1085
msgid "Show without filters"
msgstr "ÐÑÐÐÐÐÑÑÐ ÐÐÐ ÑÐÐÑÐÑÐ"
-#: ../meld/filediff.py:1363
+#: ../meld/filediff.py:1274
#, python-format
msgid ""
"\"%s\" exists!\n"
@@ -829,7 +823,7 @@ msgstr ""
"â%sâ ÐÐÑÑÐÑÐ!\n"
"ÐÐ ÐÑÐÑÐÐÐÐÐ?"
-#: ../meld/filediff.py:1376
+#: ../meld/filediff.py:1287
#, python-format
msgid ""
"Error writing to %s\n"
@@ -840,12 +834,12 @@ msgstr ""
"\n"
"%s."
-#: ../meld/filediff.py:1385
+#: ../meld/filediff.py:1296
#, python-format
msgid "Choose a name for buffer %i."
msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐÐÐÐ ÐÐ %i. ÐÐÑÐÑ."
-#: ../meld/filediff.py:1400
+#: ../meld/filediff.py:1311
#, python-format
msgid ""
"This file '%s' contains a mixture of line endings.\n"
@@ -856,7 +850,7 @@ msgstr ""
"\n"
"ÐÐÑÐ ÐÐÐÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÑÐÑÑÐÑÐ?"
-#: ../meld/filediff.py:1416
+#: ../meld/filediff.py:1327
#, python-format
msgid ""
"'%s' contains characters not encodable with '%s'\n"
@@ -865,7 +859,7 @@ msgstr ""
"â%sâ ÑÐÐÑÐÐ ÐÐÐÐÐÐÐ ÐÐÑÐ ÑÐ ÐÐ ÐÐÐÑ ÐÐÐÐÑÐÑÐ ÑÐ â%sâ\n"
"ÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐ ÑÐÑÑÐÐÑÐ ÐÐÐ ÐÐÐ-8?"
-#: ../meld/filediff.py:1475
+#: ../meld/filediff.py:1384
#, python-format
msgid ""
"Reloading will discard changes in:\n"
@@ -925,264 +919,277 @@ msgid "Set label to use instead of file name"
msgstr "ÐÐÐÐÑÐÐÐ ÐÐÐÐÐÑ ÐÐ ÐÐÑÐÑÑÐÑÐ ÑÐÐÑÑÐ ÐÐÐÐÐÐ ÐÐÑÐÑÐÐÐ"
#: ../meld/meldapp.py:171
+msgid "Open a new tab in an already running instance"
+msgstr "ÐÑÐÐÑÐ ÐÐÐÐ ÑÐÐÐÑÐÐ Ñ ÑÐÐÐÐÐ ÐÐÑ ÐÑÐÐÑÐÐÐÐ ÐÑÐÐÐÑÐÑ"
+
+#: ../meld/meldapp.py:173
msgid "Automatically compare all differing files on startup"
msgstr "ÐÐÐÐÑÑÐÐÐÐ ÐÐÑÐÐÐ ÑÐÐ ÑÐÐÐÐÐÑÑÑÑÐ ÐÐÑÐÑÐÐÐ ÐÑÐÐÐÐÐÐ ÐÐÐÑÐÑÐÑÐ"
-#: ../meld/meldapp.py:173
+#: ../meld/meldapp.py:175
msgid "Ignored for compatibility"
msgstr "ÐÐÐÐÐÐÑÐÐÐ ÐÐÐÐ ÑÐÐÐÐÑÐÐÑÑÐ"
-#: ../meld/meldapp.py:176
+#: ../meld/meldapp.py:178
msgid "Set the target file for saving a merge result"
msgstr "ÐÐÐÐÑÐÐÐ ÑÐÑÐÑ ÐÐÑÐÑÐÐÑ ÐÐ ÑÑÐÐÑÐ ÑÐÐÑÐÑÐÑÐ ÑÑÐÐÐÑÐ"
-#: ../meld/meldapp.py:179
+#: ../meld/meldapp.py:181
msgid "Creates a diff tab for up to 3 supplied files or directories."
msgstr "ÐÑÐÐÐ ÑÐÐÐÑÐÐ ÑÐÐÐÐÐÐ ÐÐ ÐÐÑÐÐÑÐ ÐÐ 3 ÐÑÐÐÐÐÐÑÐ ÐÐÑÐÑÐÐÐ ÐÐÐ ÑÐÑÑÐÐÐÐ."
-#: ../meld/meldapp.py:182
+#: ../meld/meldapp.py:184
#, python-format
msgid "too many arguments (wanted 0-4, got %d)"
msgstr "ÐÑÐÐÐÑÐ ÐÑÐÑÐÐÐÐÑÐ (ÑÑÐÐÐÐÐ ÑÐ 0-4, ÐÐÐÐÑ %d)"
-#: ../meld/meldapp.py:184 ../meld/meldapp.py:188
+#: ../meld/meldapp.py:186 ../meld/meldapp.py:199
msgid "can't compare more than three directories"
msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÐÐÐ ÐÐÑÐ ÐÐ ÑÑÐ ÑÐÑÑÐÐÐÐ"
-#: ../meld/melddoc.py:56 ../meld/melddoc.py:57
+#: ../meld/meldapp.py:192
+msgid "D-Bus error; comparisons will open in a new window."
+msgstr "ÐÑÐÑÐÐ Ð-ÑÐÐÐÑÐÐÑÐ; ÐÐÑÐÑÐÑÐ ÑÐ ÑÐ ÐÑÐÐÑÐÑÐ Ñ ÐÐÐÐÐ ÐÑÐÐÐÑÑ."
+
+#. TRANSLATORS: This is the label of a new, currently-unnamed file.
+#: ../meld/meldbuffer.py:83
+msgid "<unnamed>"
+msgstr "<ÐÐÐÐÐÐÐÐÐÐ>"
+
+#: ../meld/melddoc.py:57 ../meld/melddoc.py:58
msgid "untitled"
msgstr "ÐÐÐÐÐÐÐÐ"
-#: ../meld/meldwindow.py:125
+#: ../meld/meldwindow.py:131
msgid "_File"
msgstr "_ÐÐÑÐÑÐÐÐ"
-#: ../meld/meldwindow.py:126
+#: ../meld/meldwindow.py:132
msgid "_New..."
msgstr "_ÐÐÐÐ..."
-#: ../meld/meldwindow.py:126
+#: ../meld/meldwindow.py:132
msgid "Start a new comparison"
msgstr "ÐÐÐÐÑÐÐÑÐ ÐÐÐÐ ÐÐÑÐÑÐÑÐ"
-#: ../meld/meldwindow.py:127
+#: ../meld/meldwindow.py:133
msgid "Save the current file"
msgstr "ÐÐÑÑÐÐÑÑÐ ÑÑÐÐÑÑÐÑ ÐÐÑÐÑÐÐÑ"
-#: ../meld/meldwindow.py:129
+#: ../meld/meldwindow.py:135
msgid "Close the current file"
msgstr "ÐÐÑÐÐÑÐÑÐ ÑÑÐÐÑÑÐÑ ÐÐÑÐÑÐÐÑ"
-#: ../meld/meldwindow.py:130
+#: ../meld/meldwindow.py:136
msgid "Quit the program"
msgstr "ÐÐÑÐÐÑÐÑÐ ÐÑÐÐÑÐÐ"
-#: ../meld/meldwindow.py:132
+#: ../meld/meldwindow.py:138
msgid "_Edit"
msgstr "_ÐÑÐÑÐÐÐÑÐ"
-#: ../meld/meldwindow.py:133
+#: ../meld/meldwindow.py:139
msgid "Undo the last action"
msgstr "ÐÐÐÐÐÐÐÑÐ ÐÐÑÐÐÐÑÑ ÑÐÐÑÑ"
-#: ../meld/meldwindow.py:134
+#: ../meld/meldwindow.py:140
msgid "Redo the last undone action"
msgstr "ÐÐÐÐÐÐÑÐ ÐÐÑÐÐÐÑÑ ÐÐÐÐÐÐÐÑ ÑÐÐÑÑ"
-#: ../meld/meldwindow.py:135
+#: ../meld/meldwindow.py:141
msgid "Cut the selection"
msgstr "ÐÑÐÑÐÑÐ ÐÐÐÐÑ"
-#: ../meld/meldwindow.py:136
+#: ../meld/meldwindow.py:142
msgid "Copy the selection"
msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÐÑ"
-#: ../meld/meldwindow.py:137
+#: ../meld/meldwindow.py:143
msgid "Paste the clipboard"
msgstr "ÐÐÐÑÐÑÐ ÐÑÑÐÐÑ"
-#: ../meld/meldwindow.py:138
+#: ../meld/meldwindow.py:144
msgid "Search for text"
msgstr "ÐÑÐÐÐÑÐ ÑÐÐÑÑ"
-#: ../meld/meldwindow.py:139
+#: ../meld/meldwindow.py:145
msgid "Find Ne_xt"
msgstr "ÐÐÑÐ Ñ_ÐÐÐÐÑÐ"
-#: ../meld/meldwindow.py:139
+#: ../meld/meldwindow.py:145
msgid "Search forwards for the same text"
msgstr "ÐÑÐÐÐÑÐ ÑÐÐÐÑÐÐ ÐÑÑÐ ÑÐÐÑÑ"
-#: ../meld/meldwindow.py:140
+#: ../meld/meldwindow.py:146
msgid "Find _Previous"
msgstr "ÐÐÑÐ ÐÑÐ_ÑÑÐÐÐÐ"
-#: ../meld/meldwindow.py:140
+#: ../meld/meldwindow.py:146
msgid "Search backwards for the same text"
msgstr "ÐÑÐÐÐÑÐ ÑÐÐÐÐÐ ÐÑÑÐ ÑÐÐÑÑ"
-#: ../meld/meldwindow.py:141
+#: ../meld/meldwindow.py:147
msgid "Find and replace text"
msgstr "ÐÑÐÐÐÑÐÑÐ Ð ÐÐÐÐÐÐÑÐ ÑÐÐÑÑ"
-#: ../meld/meldwindow.py:142
+#: ../meld/meldwindow.py:148
msgid "Prefere_nces"
-msgstr "_ÐÐÑÑÐÐÐÐ"
+msgstr "ÐÐÑ_ÑÐÐÐÐ"
-#: ../meld/meldwindow.py:142
+#: ../meld/meldwindow.py:148
msgid "Configure the application"
msgstr "ÐÐÐÐÑÐÑÐ ÐÑÐÐÑÐÐ"
-#: ../meld/meldwindow.py:144
+#: ../meld/meldwindow.py:150
msgid "_Changes"
msgstr "_ÐÐÐÐÐÐ"
-#: ../meld/meldwindow.py:145
+#: ../meld/meldwindow.py:151
msgid "Next change"
msgstr "ÐÐÐÐÐÑÐ ÐÐÐÐÐÐ"
-#: ../meld/meldwindow.py:145
+#: ../meld/meldwindow.py:151
msgid "Go to the next change"
msgstr "ÐÐÐÑÐ ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÑ"
-#: ../meld/meldwindow.py:146
+#: ../meld/meldwindow.py:152
msgid "Previous change"
msgstr "ÐÑÐÑÑÐÐÐÐ ÐÐÐÐÐÐ"
-#: ../meld/meldwindow.py:146
+#: ../meld/meldwindow.py:152
msgid "Go to the previous change"
msgstr "ÐÐÐÑÐ ÐÐ ÐÑÐÑÑÐÐÐÑ ÐÐÐÐÐÑ"
-#: ../meld/meldwindow.py:147
+#: ../meld/meldwindow.py:153
msgid "Open externally"
msgstr "ÐÑÐÐÑÐ ÑÐÐÑÐÐÐ"
-#: ../meld/meldwindow.py:147
+#: ../meld/meldwindow.py:153
msgid "Open selected file or directory in the default external application"
msgstr "ÐÑÐÐÑÐÑÐ ÐÐÐÐÑÐÐÑ ÐÐÑÐÑÐÐÑ ÐÐÐ ÑÐÑÑÐÐÐÑ Ñ ÐÑÐÐÐÐÐÐ ÑÐÐÑÐÐÐ ÐÑÐÐÑÐÐÑ"
-#: ../meld/meldwindow.py:149
+#: ../meld/meldwindow.py:155
msgid "_View"
msgstr "Ð_ÑÐÐÐÐÐ"
-#: ../meld/meldwindow.py:150
+#: ../meld/meldwindow.py:156
msgid "File status"
msgstr "ÐÑÐÑÐ ÐÐÑÐÑÐÐÐ"
-#: ../meld/meldwindow.py:151
+#: ../meld/meldwindow.py:157
msgid "Version status"
msgstr "ÐÑÐÑÐ ÐÐÐÐÑÐ"
-#: ../meld/meldwindow.py:152
+#: ../meld/meldwindow.py:158
msgid "File filters"
msgstr "ÐÐÐÑÐÑÐ ÐÐÑÐÑÐÐÐ"
-#: ../meld/meldwindow.py:153
+#: ../meld/meldwindow.py:159
msgid "Stop the current action"
msgstr "ÐÐÑÑÑÐÐÐÑÐ ÑÑÐÐÑÑÐÑ ÑÐÐÑÑ"
-#: ../meld/meldwindow.py:154
+#: ../meld/meldwindow.py:160
msgid "Refresh the view"
msgstr "ÐÑÐÐÐÐÑÐ ÐÑÐÐÐÐÐ"
-#: ../meld/meldwindow.py:155
+#: ../meld/meldwindow.py:161
msgid "Reload"
msgstr "ÐÐÐÐÐÐ ÑÑÐÑÐÑ"
-#: ../meld/meldwindow.py:155
+#: ../meld/meldwindow.py:161
msgid "Reload the comparison"
msgstr "ÐÐÐÐÐÐ ÑÑÐÑÐÑÑÐ ÐÐÑÐÑÐÑÐ"
-#: ../meld/meldwindow.py:157
+#: ../meld/meldwindow.py:163
msgid "_Tabs"
-msgstr "_ÐÐÐÐÑÐÐ"
+msgstr "_ÐÐÐÐÑÑÐ"
-#: ../meld/meldwindow.py:158
+#: ../meld/meldwindow.py:164
msgid "_Previous Tab"
msgstr "ÐÑÐ_ÑÑÐÐÐÐ ÑÐÐÐÑÐÐ"
-#: ../meld/meldwindow.py:158
+#: ../meld/meldwindow.py:164
msgid "Activate previous tab"
-msgstr "ÐÐÑÐÐÐÑÐÑÑÐ ÐÑÐÑÑÐÐÐÐ ÑÐÐÐÑÐÐ"
+msgstr "ÐÐÐÑÐ ÐÐ ÐÑÐÑÑÐÐÐÐ ÐÐÑÑ"
-#: ../meld/meldwindow.py:159
+#: ../meld/meldwindow.py:165
msgid "_Next Tab"
msgstr "ÐÐÐ_ÐÐÑÐ ÑÐÐÐÑÐÐ"
-#: ../meld/meldwindow.py:159
+#: ../meld/meldwindow.py:165
msgid "Activate next tab"
-msgstr "ÐÐÑÐÐÐÑÐÑÑÐ ÑÐÐÐÐÑÐ ÑÐÐÐÑÐÐ"
+msgstr "ÐÐÐÑÐ ÐÐ ÐÐÑÐÐÐÐ ÐÐÑÑ"
-#: ../meld/meldwindow.py:160
+#: ../meld/meldwindow.py:166
msgid "Move Tab _Left"
-msgstr "ÐÑÐÐÐÑÑÐ ÑÐÐÐÑÐÐ Ñ_ÐÐÐÐ"
+msgstr "ÐÑÐÐÐÑÑÐ ÑÐÐÐÑÐÐ _ÐÐÐÐ"
-#: ../meld/meldwindow.py:160
+#: ../meld/meldwindow.py:166
msgid "Move current tab to left"
msgstr "ÐÑÐÐÐÑÑÐÑÐ ÑÑÐÐÑÑÐÐ ÑÐÐÐÑÐÐ ÐÐ ÐÐÐÐ"
-#: ../meld/meldwindow.py:161
+#: ../meld/meldwindow.py:167
msgid "Move Tab _Right"
-msgstr "ÐÑÐÐÐÑÑÐ ÑÐÐÐÑÐÐ Ñ_ÐÐÑÐÐ"
+msgstr "ÐÑÐÐÐÑÑÐ ÑÐÐÐÑÐÐ _ÐÐÑÐÐ"
-#: ../meld/meldwindow.py:161
+#: ../meld/meldwindow.py:167
msgid "Move current tab to right"
msgstr "ÐÑÐÐÐÑÑÐÑÐ ÑÑÐÐÑÑÐÐ ÑÐÐÐÑÐÐ ÐÐ ÐÐÑÐÐ"
-#: ../meld/meldwindow.py:163
+#: ../meld/meldwindow.py:169
msgid "_Help"
-msgstr "ÐÐÐÐ_Ñ"
+msgstr "ÐÐ_ÐÐÑ"
-#: ../meld/meldwindow.py:164
+#: ../meld/meldwindow.py:170
msgid "_Contents"
msgstr "_ÐÐÐÑÐÐÑ"
-#: ../meld/meldwindow.py:164
+#: ../meld/meldwindow.py:170
msgid "Open the Meld manual"
msgstr "ÐÑÐÐÑÐÑÐ ÑÐÑÑÑÑÐÐ ÐÐÐÐÐ"
-#: ../meld/meldwindow.py:165
+#: ../meld/meldwindow.py:171
msgid "Report _Bug"
msgstr "ÐÑÐÑÐÐÐ _ÐÑÐÑÐÑ"
-#: ../meld/meldwindow.py:165
+#: ../meld/meldwindow.py:171
msgid "Report a bug in Meld"
msgstr "ÐÑÐÑÐÐÐÑÐ ÐÑÐÑÐÑ Ñ ÐÐÐÐÑ"
-#: ../meld/meldwindow.py:166
+#: ../meld/meldwindow.py:172
msgid "About this program"
msgstr "Ð ÐÐÐÐ ÐÑÐÐÑÐÐÑ"
-#: ../meld/meldwindow.py:169
+#: ../meld/meldwindow.py:175
msgid "Full Screen"
-msgstr "ÐÐÐ ÐÐÑÐÐ"
+msgstr "ÐÑÐÐÐ ÑÐÐÐÐ ÐÐÑÐÐÐ"
-#: ../meld/meldwindow.py:169
+#: ../meld/meldwindow.py:175
msgid "View the comparison in full screen"
msgstr "ÐÑÐÐÐÐÐÐÑÑÐ ÐÐÑÐÑÐÑÐ ÐÑÐÐÐ ÑÐÐÐÐ ÐÐÑÐÐÐ"
-#: ../meld/meldwindow.py:170
+#: ../meld/meldwindow.py:176
msgid "_Toolbar"
-msgstr "ÐÐÐÐÑÐ _ÐÐÐÑÐ"
+msgstr "_ÐÐÐÐÑÐ ÐÐÐÑÐ"
-#: ../meld/meldwindow.py:170
+#: ../meld/meldwindow.py:176
msgid "Show or hide the toolbar"
-msgstr "ÐÑÐÐÐÐÐÑÐ ÐÐÐ ÑÐÐÑÐÑÑÐ ÐÐÐÐÑÑ ÐÐÐÑÐ"
+msgstr "ÐÑÐÐÐÐÐÑÐ ÐÐÐ ÑÐÐÑÐÑÑÐ ÐÐÐÐÑÑ ÐÐÐÑÐ"
-#: ../meld/meldwindow.py:171
+#: ../meld/meldwindow.py:177
msgid "_Statusbar"
-msgstr "ÐÐÐÐÑÐ _ÑÑÐÑÐ"
+msgstr "ÐÑÐÐÐ _ÑÑÐÑÐ"
-#: ../meld/meldwindow.py:171
+#: ../meld/meldwindow.py:177
msgid "Show or hide the statusbar"
-msgstr "ÐÑÐÐÐÐÐÑÐ ÐÐÐ ÑÐÐÑÐÑÑÐ ÐÐÐÐÑÑ ÑÑÐÑÐ"
+msgstr "ÐÑÐÐÐÐÐÑÐ ÐÐÐ ÑÐÐÑÐÑÑÐ ÑÑÐÐÑ ÑÑÐÑÐ"
-#: ../meld/meldwindow.py:541
+#: ../meld/meldwindow.py:563
msgid "Switch to this tab"
msgstr "ÐÑÐÐÐÑÐÑÐ ÑÐ ÐÐ ÐÐÐÑ ÑÐÐÐÑÐÐ"
#. exit at first non found directory + file
-#: ../meld/meldwindow.py:639
+#: ../meld/meldwindow.py:664
msgid "Cannot compare a mixture of files and directories.\n"
msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÐÐÐ ÐÐÑÐÐÐÐÑ ÐÐÑÐÑÐÐÐ Ð ÑÐÑÑÐÐÐÐ.\n"
@@ -1208,12 +1215,12 @@ 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:234
+#: ../meld/preferences.py:233
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:236
+#: ../meld/preferences.py:235
msgid ""
"OS-specific metadata\t0\t.DS_Store ._* .Spotlight-V100 .Trashes Thumbs.db "
"Desktop.ini\n"
@@ -1222,48 +1229,48 @@ msgstr ""
"db Desktop.ini\n"
#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:238
+#: ../meld/preferences.py:237
#, 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:240
+#: ../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:242
+#: ../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:244
+#: ../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:246
+#: ../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:248
+#: ../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:250
+#: ../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:252
+#: ../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:254
+#: ../meld/preferences.py:253
msgid "Script comment\t0\t#.*"
msgstr "ÐÐÐÐÐÑÐÑ ÑÐÑÐÐÑÐ\t0\t#.*"
@@ -1277,11 +1284,11 @@ msgstr "ÐÐÑÐÐÐÑÐ"
#: ../meld/vcview.py:129
msgid "_Update"
-msgstr "_ÐÐÐÑÐÐ"
+msgstr "_ÐÐÑÑÐÑÐÑ"
#: ../meld/vcview.py:129
msgid "Update"
-msgstr "ÐÐÐÑÐÐÑÐ"
+msgstr "ÐÐÑÑÐÑÐÑÑÐ"
#: ../meld/vcview.py:130
msgid "Add to VC"
@@ -1481,7 +1488,7 @@ msgstr ""
#: ../meld/ui/historyentry.py:293
msgid "_Browse..."
-msgstr "ÐÑÐ_ÑÑÐÐÐ..."
+msgstr "_ÐÐÐÐÐÐÐÐÑ..."
#: ../meld/ui/historyentry.py:301
msgid "Path"
@@ -1505,7 +1512,7 @@ msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐÑÐÑÐÐÑ"
#: ../meld/ui/notebooklabel.py:60
msgid "Close tab"
-msgstr "ÐÐÑÐÐÑÐ ÑÐÐÐÑÐÐ"
+msgstr "ÐÐÑÐÐÑÐÑÐ ÑÐÐÐÑÐÐ"
#. These are the possible states of files. Be sure to get the colons correct.
#: ../meld/vc/_vc.py:40
@@ -1525,384 +1532,3 @@ msgstr ""
"ÐÑÐÑÐÐ ÐÑÐ ÐÑÐÑÐÐÑÐÑÑ Ñ ÑÐÐÑÐÐÑÐÐ ÐÐÑÐÐ\n"
"ÐÐÑÐÐÐÑ ÑÐ ÐÐÐ â%sâ\n"
"ÐÑÐÑÐÐ ÑÐ ÐÐÐÐ â%sâ"
-
-#~ msgid "_Search for"
-#~ msgstr "ÐÐ_ÑÑÐÐÐ"
-
-#~ 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] ÐÑÐÐÐÐÐÐÐ"
-
-#~ msgid "Error converting pattern '%s' to regular expression"
-#~ msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÑÐÑÐÐÑÐÑÑ ÐÐÑÐÑÑÐ â%sâ Ñ ÑÐÐÑÐÐÑÐÐ ÐÐÑÐÐ"
-
-# bug: plural-forms
-#~ msgid ""
-#~ "second,seconds:minute,minutes:hour,hours:day,days:week,weeks:month,months:"
-#~ "year,years"
-#~ msgstr ""
-#~ "ÑÐÐÑÐÐÑ,ÑÐÐÑÐÐÐ:ÐÐÐÑÑ,ÐÐÐÑÑÐ:ÑÐÑ,ÑÐÑÐ:ÐÐÐ,ÐÐÐÐ:ÐÐÐÐÑÑ,ÐÐÐÐÑÐ:ÐÐÑÐÑ,ÐÐÑÐÑÐ:"
-#~ "ÐÐÐÐÐÑ,ÐÐÐÐÐÐ"
-
-#~ msgid "The regular expression '%s' was not found."
-#~ msgstr "ÐÐÐÑÐÐÑÐÐ ÐÐÑÐÐ â%sâ ÐÐÑÐ ÐÐÑÐÐ."
-
-#~ msgid "The text '%s' was not found."
-#~ msgstr "ÐÐÐÑÑ â%sâ ÐÐÑÐ ÐÐÑÐÐ."
-
-#~ msgid ""
-#~ "Could not open '%s' for reading.\n"
-#~ "\n"
-#~ "The error was:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ â%sâ ÑÐÐÐ ÑÐÑÐÑÐ.\n"
-#~ "\n"
-#~ "ÐÑÐÑÐÐ ÐÐÑÐ:\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Could not read from '%s'.\n"
-#~ "\n"
-#~ "I tried encodings %s."
-#~ msgstr ""
-#~ "ÐÐ ÐÐÐÑ ÐÐ ÑÐÑÐÐ ÐÐ â%sâ.\n"
-#~ "\n"
-#~ "ÐÐÐÑÑÐÑ ÐÐÐÐÑÐÑÐ %s."
-
-#~ msgid ""
-#~ "Could not read from '%s'.\n"
-#~ "\n"
-#~ "The error was:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "ÐÐ ÐÐÐÑ ÐÐ ÑÐÑÐÐ ÐÐ â%sâ.\n"
-#~ "\n"
-#~ "ÐÑÐÑÐÐ ÐÐÑÐ:\n"
-#~ "%s."
-
-#~ msgid "Meld requires a recent version of pygtk."
-#~ msgstr "ÐÐÐÐ ÐÐÑÑÐÐÐ ÑÐÐÑÐ ÐÐÐÐÑÐ ÐÐÐÑÐ-Ð."
-
-#~ msgid "pygtk-%s or higher is recommended."
-#~ msgstr "ÐÑÐÐÐÑÑÑÑÑÐ ÑÐ ÐÐÐÑÐ %s ÐÐÐ ÐÐÐÐÑÐ."
-
-#~ msgid "Meld works best with pygtk-%s or higher. (found %s)"
-#~ msgstr "ÐÐÐÐ ÐÐÑÐÐÑÐ ÑÐÐÐ ÑÐ ÐÐÐÑÐ %s ÐÐÐ ÐÐÐÐÑÐ. (ÐÐÑÐÑ %s)"
-
-#~ msgid ""
-#~ "Due to incompatible API changes some functions may not operate as "
-#~ "expected."
-#~ msgstr ""
-#~ "ÐÐÐÐ ÐÐÑÐÐÐÐÑÐÐÑ ÐÐÐÐÐÐ ÐÑÐÐÑÐÐÐÑÑÐÐ ÑÐÑÐÐÐ, ÐÐÐÐ ÑÑÐÐÑÐÑÐ ÐÐÐÐÐ ÐÐÑÐ "
-#~ "ÑÐÐÐÑÐ ÐÐÐÐ ÑÑÐÐÐ."
-
-#~ msgid "Modified File"
-#~ msgstr "ÐÐÐÐÑÐÐÐ ÐÐÑÐÑÐÐÐ"
-
-#~ msgid "Other Changes"
-#~ msgstr "ÐÑÑÐÐÐ ÐÐÐÐÐÐ"
-
-#~ msgid "Common Ancestor"
-#~ msgstr "ÐÐÑÐÐÐÐÑÐÐ ÐÑÐÐÐÐ"
-
-#~ msgid "Original Directory"
-#~ msgstr "ÐÐÐÐÑÐÐ ÐÐÑÐÐÑÐÑÐÑÑÐ"
-
-#~ msgid "Modified Directory"
-#~ msgstr "ÐÐÐÐÑÐÐ ÐÐÑÐÐÑÐÑÐÑÑÐ"
-
-#~ msgid ""
-#~ "Meld is a file and directory comparison tool. Usage:\n"
-#~ "\n"
-#~ " meld Start with no windows open\n"
-#~ " meld <dir> Start with CVS browser in 'dir'\n"
-#~ " meld <file> Start with CVS diff of 'file'\n"
-#~ " meld <file> <file> [file] Start with 2 or 3 way file comparison\n"
-#~ " meld <dir> <dir> [dir] Start with 2 or 3 way directory "
-#~ "comparison\n"
-#~ "\n"
-#~ "For more information choose help -> contents.\n"
-#~ "Report bugs at http://bugzilla.gnome.org/buglist.cgi?product=meld\n";
-#~ "stevek gnome org\n"
-#~ msgstr ""
-#~ "ÐÐÐÐ ÑÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÐÑÐ ÐÐÑÐÑÐÐÐ Ð ÐÐÑÐÐÑÐÑÐÑÑÐÐ. ÐÐÐÑÑÐÐÐ:\n"
-#~ "\n"
-#~ " meld ÐÐÐÑÐÐÐ ÐÐÐ ÐÑÐÐÑÐÐÐÑ ÐÑÐÐÐÑÐ\n"
-#~ " meld <ÐÐÑ> ÐÐÐÑÐÐÐ ÑÐ CVS ÐÑÐÐÐÐÐÐÑÐÐ Ñ âÐÐÑâ\n"
-#~ " meld <ÐÐÑÐÑÐÐÐ> ÐÐÐÑÐÐÐ CVS ÑÐÐÐÐÐÐ ÐÐ âÐÐÑÐÑÐÐÐâ\n"
-#~ " meld <ÐÐÑÐÑÐÐÐ> <ÐÐÑÐÑÐÐÐ> [ÐÐÑÐÑÐÐÐ]\n"
-#~ " ÐÐÐÑÐÐÐ ÐÐÐ- ÐÐÐ ÑÑÐÑÐÐÑÐÐ ÐÐÑÐÑÐÑÐ "
-#~ "ÐÐÑÐÑÐÐÐ\n"
-#~ " meld <ÐÐÑ> <ÐÐÑ> [ÐÐÑ] ÐÐÐÑÐÐÐ ÐÐÐ- ÐÐÐ ÑÑÐÑÐÐÑÐÐ ÐÐÑÐÑÐÑÐ \n"
-#~ " ÐÐÑÐÐÑÐÑÐÑÑÐÐ\n"
-#~ "\n"
-#~ "ÐÐ ÐÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÐÑÐÑÐ ÐÐÐÐÑ -> ÑÐÐÑÐÐÑ.\n"
-#~ "ÐÑÐÑÐÐÐÑÐ ÐÑÐÑÐÐ ÐÐ http://bugzilla.gnome.org/buglist.cgi?product=meld\n";
-#~ "http://mail.gnome.org/mailman/listinfo/meld-list\n";
-
-#~ msgid ""
-#~ "Meld %s\n"
-#~ "Written by Stephen Kennedy <stevek gnome org>"
-#~ msgstr ""
-#~ "ÐÐÐÐ %s\n"
-#~ "ÐÐÐÐÑÐÐ ÐÑÐÑÐÐ ÐÐÐÐÐÐ (Stephen Kennedy) <stevek gnome org>"
-
-#~ msgid "`%s' is not a directory or file, cannot open cvs view"
-#~ msgstr ""
-#~ "â%sâ ÐÐ ÐÑÐÐÑÑÐÐÑÐ ÐÐÑÐÐÑÐÑÐÑÑÐ ÐÐ ÐÐÑÐÑÐÐÑ, ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ CVS "
-#~ "ÐÑÐÐÐÐÐ"
-
-#~ msgid "folder"
-#~ msgstr "ÐÐÑÐÐÑÐÑÐÑÑÐ"
-
-#~ msgid "*"
-#~ msgstr "*"
-
-#~ msgid "Remove _Locally"
-#~ msgstr "ÐÐÐÐÐÐ Ñ _ÐÐÐÐÐÑ"
-
-#~ msgid "Show non-CVS"
-#~ msgstr "ÐÑÐÐÐÐÐ ÐÐ-CVS"
-
-#~ msgid "_Commit"
-#~ msgstr "Ð_ÐÑÐÐÐ"
-
-#~ msgid "_Diff"
-#~ msgstr "_ÐÐÐÐÐÐÐ"
-
-#~ msgid "Copy All _Left"
-#~ msgstr "ÐÐÐÐÐÐ ÑÐÐ _ÐÐÐÐ"
-
-#~ msgid "Copy All _Right"
-#~ msgstr "ÐÐÐÐÐÐ ÑÐÐ _ÐÐÑÐÐ"
-
-#~ msgid "Edit"
-#~ msgstr "ÐÑÐÐÐ"
-
-#~ msgid "Match _entire word only"
-#~ msgstr "ÐÐÐÐÐÐÐÑÐ ÑÐÐÐ _ÑÐÐÐÑ ÑÐÑÐ"
-
-#~ msgid "_Wrap around"
-#~ msgstr "Ð _ÐÑÑÐ"
-
-#~ msgid "Diff"
-#~ msgstr "ÐÐÐÐÐÐÐ"
-
-#~ msgid "Hide..."
-#~ msgstr "ÐÐÐÑÐÑ..."
-
-#~ msgid "Left"
-#~ msgstr "ÐÐÐÐ"
-
-#~ msgid "Right"
-#~ msgstr "ÐÐÑÐÐ"
-
-# bug: plural-forms
-#~ msgid " spaces."
-#~ msgstr " ÑÐÐÐÐÐÐ."
-
-#~ msgid "(gnome-default-editor)"
-#~ msgstr "(ÐÐÐÑÐÐÑÐÐÐÐÐÐ-ÑÑÐÑÐÐÐÑ-ÐÐÐÐÐ)"
-
-#~ msgid "<b>Drawing Style</b>"
-#~ msgstr "<b>ÐÑÐÐ ÐÑÑÑÑÐÐÐÑÐ</b>"
-
-#~ msgid "<b>Edit Menu</b>"
-#~ msgstr "<b>ÐÐÐÐ ÐÐ ÑÑÐÑÐÐÐÑÐ</b>"
-
-#~ msgid "<b>Font</b>"
-#~ msgstr "<b>ÐÐÐÑ</b>"
-
-#~ msgid "<b>Global options</b>"
-#~ msgstr "<b>ÐÐÑÑÐ ÐÐÑÐÑÐ</b>"
-
-#~ msgid "<b>Loading</b>"
-#~ msgstr "<b>ÐÑÐÑÐÐÐÑÐ</b>"
-
-#~ msgid "<b>Misc</b>"
-#~ msgstr "<b>ÐÐÐÐÐ</b>"
-
-#~ msgid "<b>Saving</b>"
-#~ msgstr "<b>ÐÑÐÐÑÐ</b>"
-
-#~ msgid "<b>Toolbar Appearance</b>"
-#~ msgstr "<b>ÐÐÐÐÐÐ ÐÐÐÑÐÐ</b>"
-
-#~ msgid "<b>Update Options</b>"
-#~ msgstr "<b>ÐÐÑÐÑÐ ÐÐÐÑÑÐÐÐÑÐ</b>"
-
-#~ msgid "<b>Whitespace</b>"
-#~ msgstr "<b>ÐÐÐÐÐÐ</b>"
-
-#~ msgid "<span weight=\"bold\" size=\"x-large\">Binary Files</span>"
-#~ msgstr "<span weight=\"bold\" size=\"x-large\">ÐÐÐÐÑÐÐ ÐÐÑÐÑÐÐÐ</span>"
-
-#~ msgid "<span weight=\"bold\" size=\"x-large\">CVS</span>"
-#~ msgstr "<span weight=\"bold\" size=\"x-large\">CVS</span>"
-
-#~ msgid "<span weight=\"bold\" size=\"x-large\">Diff</span>"
-#~ msgstr "<span weight=\"bold\" size=\"x-large\">ÐÐÐÐÐÐÐ</span>"
-
-#~ msgid "<span weight=\"bold\" size=\"x-large\">Display</span>"
-#~ msgstr "<span weight=\"bold\" size=\"x-large\">ÐÑÐÐÐÐ</span>"
-
-#~ msgid "<span weight=\"bold\" size=\"x-large\">Editor</span>"
-#~ msgstr "<span weight=\"bold\" size=\"x-large\">ÐÑÐÑÐÐÐÑ</span>"
-
-#~ msgid "<span weight=\"bold\" size=\"x-large\">Encoding</span>"
-#~ msgstr "<span weight=\"bold\" size=\"x-large\">ÐÐÐÐÑÐÑÐ</span>"
-
-#~ msgid "<span weight=\"bold\" size=\"x-large\">File Filters</span>"
-#~ msgstr "<span weight=\"bold\" size=\"x-large\">ÐÐÐÑÐÑÐ ÐÐÑÐÑÐÐÐ</span>"
-
-#~ msgid "<span weight=\"bold\" size=\"x-large\">Text Filters</span>"
-#~ msgstr "<span weight=\"bold\" size=\"x-large\">ÐÐÐÑÐÑÐ ÑÐÐÑÑÐ</span>"
-
-#~ msgid "Automatically supply missing newline at end of file."
-#~ msgstr "ÐÐÐ ÐÐÐÐÑ ÐÐÐÐÑÑÐÑÑÑÐ ÐÐÐÐ-ÑÐÐ ÐÐ ÐÑÐÑÑ ÐÐÑÐÑÐÐÐ."
-
-#~ msgid ""
-#~ "Binary files do not have text filters applied to them when comparing."
-#~ msgstr "ÐÐ ÐÐÐÐÑÐÐ ÐÐÑÐÑÐÐÐ ÑÐ ÐÐ ÐÑÐÐÐÑÑÑÑ ÑÐÐÑÐÑÐ ÑÐÐÑÑÐ ÐÑÐ ÐÐÑÐÑÐÑÑ."
-
-#~ msgid "CVS"
-#~ msgstr "CVS"
-
-#~ msgid "CVS binary"
-#~ msgstr "CVS ÐÑÐÐÑÐÐ"
-
-#~ msgid "CVS view"
-#~ msgstr "CVS ÐÑÐÐÐÐÐ"
-
-#~ msgid ""
-#~ "Choose how the central bar of the diff viewer is drawn. You may wish to "
-#~ "choose a simpler mode if you find scrolling is slow."
-#~ msgstr ""
-#~ "ÐÐÐÐÐÑÐÑÐ ÐÐÐÐ ÑÐ ÐÑÑÑÑÐÐÐ ÑÐÐÑÑÐÐÐÐ ÑÑÐÐÐ ÐÑÐÐÐÐÐÐÐÑÐ ÑÐÐÐÐÐÐ. ÐÐÐÐÑÐ "
-#~ "ÐÐÐÐÑÐ ÐÐ ÐÐÐÐÐÑÐÑÐ ÑÐÐÐÐÑÑÐÐÐÐÑÐ ÐÐÑÐÐ ÐÐÐ ÑÐ ÐÐÐÐÐÑÐ ÑÐÐÑÐ."
-
-#~ msgid "Copyright (C) 2002 Stephen Kennedy"
-#~ msgstr "ÐÐÐ ÐÑÐÐÐ ÐÐÐÑÐÐÐÐ Â 2002 ÐÑÐÑÐÐ ÐÐÐÐÐÐ (Stephen Kennedy)"
-
-#~ msgid "Create missing directories (-d)"
-#~ msgstr "ÐÐÐÑÐÐÐ ÐÐÐÐÑÑÐÑÑÑÐ ÐÐÑÐÐÑÐÑÐÑÑÐÐ (-d)"
-
-#~ msgid "Curved : Filled Curves"
-#~ msgstr "ÐÑÐÐÐ : ÐÑÐÑÑÐÐÐ ÐÑÐÐÐ"
-
-#~ msgid "Edit menu popup invokes"
-#~ msgstr "ÐÑÐÐÑÑÑÐ ÐÑÐÐÐÑ ÐÐÐÐÑÐ ÐÐ ÑÑÐÑÐÐÐÑÐ ÐÐÐÑÐÑÐ"
-
-#~ msgid "Gnome Default"
-#~ msgstr "ÐÐÐÑÐÐÑÐÐÐÐÐÐ Ñ ÐÐÐÐÑ"
-
-#~ msgid "Icons Only"
-#~ msgstr "ÐÐÐÐ ÑÐÐÐÐ"
-
-#~ msgid "Ignore .cvsrc (-f)"
-#~ msgstr "ÐÐÐÐÐÐÑÐ .cvsrc (-f)"
-
-#~ msgid "Ignore changes in amount of white space"
-#~ msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÐÐ"
-
-#~ msgid ""
-#~ "Ignore changes in case; consider upper and lower-case letters equivalent"
-#~ msgstr ""
-#~ "ÐÐÐÐÐÐÑÐ ÐÐÐÐÐÐ ÐÐÐÐÑÐÐÐ ÑÐÐÐÐ; ÑÐÐÑÑÐÑ ÐÐÐÐÐÐ Ð ÐÐÐÐ ÑÐÐÐÐ ÑÐÐÐÐÐÐÐ"
-
-#~ msgid "Locate CVS binary : Meld"
-#~ msgstr "ÐÑÐÐÐÑÐ CVS ÐÑÐÐÑÐÐ : ÐÐÐÐ"
-
-#~ msgid "Prune empty directories (-P)"
-#~ msgstr "ÐÐÑÐÑÐ ÐÑÐÐÐÐ ÐÐÑÐÐÑÐÑÐÑÑÐÐ (-P)"
-
-#~ msgid "Quiet mode (-q)"
-#~ msgstr "ÐÐÑÐ ÑÐÐÐÐ (-q)"
-
-#~ msgid "Save File 1"
-#~ msgstr "ÐÐÑÑÐÐÑ 1. ÐÐÑÐÑÐÐÑ"
-
-#~ msgid "Save File 2"
-#~ msgstr "ÐÐÑÑÐÐÑ 2. ÐÐÑÐÑÐÐÑ"
-
-#~ msgid "Save File 3"
-#~ msgstr "ÐÐÑÑÐÐÑ 3. ÐÐÑÐÑÐÐÑ"
-
-#~ msgid "Save in UTF-8 encoding"
-#~ msgstr "ÐÐÑÑÐÐÑ ÑÐ ÐÐÐ-8 ÐÐÐÐÑÐÑÐÐ"
-
-#~ msgid "Save in the files original encoding"
-#~ msgstr "ÐÐÑÑÐÐÑ ÐÐÑÐÑÐÐÐ ÑÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÑÐÐ"
-
-#~ msgid "Simple : Lines only"
-#~ msgstr "ÐÐÐÐÐÑÑÐÐÐÐ : ÑÐÐÐ ÐÐÐÐÑÐ"
-
-# bug: missing colon ":", s/quadilaterals/quadrilaterals/
-#~ msgid "Solid Filled Quadilaterals"
-#~ msgstr "ÐÑÐÑÑÐÐÐ : ÐÑÐÑÑÐÐÐ ÐÑÐÐÐÑÐÐÐÐÐÑÐ"
-
-#~ msgid "Tabs equivalent to "
-#~ msgstr "ÐÐÐÑÐÐÑÐÑÐ ÑÑ ÐÑÑÐÐÐÑÐÐ ÑÐ "
-
-#~ msgid "Text Beside Icons"
-#~ msgstr "ÐÐÐÑÑ ÐÐÑÐÐ ÐÐÐÐÐ"
-
-#~ msgid "Text Only"
-#~ msgstr "ÐÐÐÐ ÑÐÐÑÑ"
-
-#~ msgid "Text Under Icons"
-#~ msgstr "ÐÐÐÑÑ ÐÑÐÐÐ ÐÐÐÐÐ"
-
-#~ msgid "Two way directory"
-#~ msgstr "ÐÐÐÑÐÐÑÐÐ ÐÐÑÐÐÑÐÑÐÑÑÐ"
-
-#~ msgid "Two way file"
-#~ msgstr "ÐÐÐÑÐÐÑÐÐ ÐÐÑÐÑÐÐÐ"
-
-#~ msgid "Use Compression (-z)"
-#~ msgstr "ÐÐÑÐÑÑÐ ÑÐÐÐÐÐÑÐ (-z)"
-
-#~ msgid "Use GNOME monospace font."
-#~ msgstr "ÐÐÑÐÑÑÐ ÐÐÐÐÐÐ ÑÐÐÑ ÑÑÐÑÑÐÐÐ ÑÐÑÐÐÐ."
-
-#~ msgid "Use custom font."
-#~ msgstr "ÐÐÑÐÑÑÐ ÐÐÑÐÐÐÐ ÑÐÐÑ."
-
-#~ msgid "Whitespace is significant"
-#~ msgstr "ÐÐÐÐÐÐ ÑÑ ÐÐÑÐÐ"
-
-#~ msgid "_Binary Files"
-#~ msgstr "_ÐÐÐÐÑÐÐ ÐÐÑÐÑÐÐÐ"
-
-#~ msgid "_Logo"
-#~ msgstr "_ÐÐÐÐÑÐÐ"
-
-#~ msgid "_Save"
-#~ msgstr "_ÐÐÑÑÐÐÑ"
-
-#~ msgid "http://meld.sourceforge.net";
-#~ msgstr "http://meld.sourceforge.net";
-
-#~ msgid "utf8 iso8859"
-#~ msgstr "utf8 iso8859-5 iso8859-2 iso8859"
-
-#~ msgid "window1"
-#~ msgstr "ÐÑÐÐÐÑ1"
-
-#~ msgid "Recurse"
-#~ msgstr "ÐÐÐÑÑÐÐÐÐÐ"
diff --git a/po/sr latin po b/po/sr latin po
index d1ec1db..61cae1c 100644
--- a/po/sr latin po
+++ b/po/sr latin po
@@ -8,8 +8,8 @@ msgstr ""
"Project-Id-Version: meld\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=meld&k";
"eywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-04-28 23:20+0000\n"
-"PO-Revision-Date: 2012-05-20 10:52+0200\n"
+"POT-Creation-Date: 2012-06-17 00:26+0000\n"
+"PO-Revision-Date: 2012-08-07 22:43+0200\n"
"Last-Translator: Miroslav NikoliÄ <miroslavnikolic rocketmail com>\n"
"Language-Team: Serbian <gnom prevod org>\n"
"Language: sr\n"
@@ -43,7 +43,7 @@ msgstr "PregledaÄ razlika Meld"
#: ../data/meld.desktop.in.h:4
msgid "Compare and merge your files"
-msgstr "UporeÄujte i spajajte vaÅe datoteke."
+msgstr "UporeÄujte i spajajte vaÅe datoteke"
#: ../data/ui/EditableList.ui.h:1
msgid "Editable List"
@@ -75,7 +75,7 @@ msgstr "Uklonite izabrani filter"
#: ../data/ui/EditableList.ui.h:8 ../meld/vcview.py:132
msgid "_Remove"
-msgstr "U_kloni"
+msgstr "_Ukloni"
#: ../data/ui/EditableList.ui.h:9
msgid "Move item up"
@@ -113,7 +113,7 @@ msgstr "_Odbaci izmene"
msgid "_Save Selected"
msgstr "_SaÄuvaj izabrano"
-#: ../data/ui/findbar.ui.h:1 ../meld/meldwindow.py:141
+#: ../data/ui/findbar.ui.h:1 ../meld/meldwindow.py:147
msgid "_Replace"
msgstr "_Zameni"
@@ -130,12 +130,10 @@ msgid "_Next"
msgstr "_SledeÄe"
#: ../data/ui/findbar.ui.h:5
-#| msgid "Find"
msgid "Find:"
msgstr "NaÄi:"
#: ../data/ui/findbar.ui.h:6
-#| msgid "Replace _With"
msgid "Replace _with:"
msgstr "Zameni s_a:"
@@ -152,9 +150,6 @@ msgid "Regular E_xpression"
msgstr "_Regularan izraz"
#: ../data/ui/meldapp.ui.h:2
-#| msgid ""
-#| "Copyright © 2002-2009 Stephen Kennedy\n"
-#| "Copyright © 2009-2011 Kai Willadsen"
msgid ""
"Copyright © 2002-2009 Stephen Kennedy\n"
"Copyright © 2009-2012 Kai Willadsen"
@@ -176,7 +171,7 @@ msgstr "Izaberite datoteke"
#: ../data/ui/meldapp.ui.h:6
msgid "_Three Way Compare"
-msgstr "PoreÄenje tri elementa"
+msgstr "PoreÄenje _tri elementa"
#. Refers to version of the file being compared
#: ../data/ui/meldapp.ui.h:8
@@ -251,11 +246,11 @@ msgstr "Slovni lik"
#: ../data/ui/preferences.ui.h:3
msgid "_Use the system fixed width font"
-msgstr "Koristi sistemom postavljenu veliÄinu _fonta"
+msgstr "_Koristi sistemski slovni lik stalne Åirine"
#: ../data/ui/preferences.ui.h:4
msgid "_Editor font:"
-msgstr "_Font ureÄivaÄa:"
+msgstr "_Slovni lik ureÄivaÄa:"
#: ../data/ui/preferences.ui.h:5
msgid "Display"
@@ -263,7 +258,7 @@ msgstr "Prikaz"
#: ../data/ui/preferences.ui.h:6
msgid "_Tab width:"
-msgstr "_Åirina tabulatora:"
+msgstr "Åirina _tabulatora:"
#: ../data/ui/preferences.ui.h:7
msgid "_Insert spaces instead of tabs"
@@ -275,7 +270,7 @@ msgstr "UkljuÄi _prelamanje teksta"
#: ../data/ui/preferences.ui.h:9
msgid "Do not _split words over two lines"
-msgstr "Nemoj _podeliti reÄi u dva reda"
+msgstr "Nemoj _deliti reÄi u dva reda"
#: ../data/ui/preferences.ui.h:10
msgid "Show _line numbers"
@@ -373,117 +368,121 @@ msgstr "Prethodni dnevnici"
msgid "Log Message"
msgstr "Poruka dnevnika"
-#: ../meld/dirdiff.py:232 ../meld/vcview.py:127
+#: ../meld/dirdiff.py:230 ../meld/vcview.py:127
msgid "_Compare"
msgstr "_Uporedi"
-#: ../meld/dirdiff.py:232 ../meld/vcview.py:127
+#: ../meld/dirdiff.py:230 ../meld/vcview.py:127
msgid "Compare selected"
msgstr "Uporedi izabrano"
-#: ../meld/dirdiff.py:233
+#: ../meld/dirdiff.py:231
msgid "Copy _Left"
msgstr "UmnoÅi _levo"
-#: ../meld/dirdiff.py:233
+#: ../meld/dirdiff.py:231
msgid "Copy to left"
msgstr "UmnoÅite levo"
-#: ../meld/dirdiff.py:234
+#: ../meld/dirdiff.py:232
msgid "Copy _Right"
msgstr "UmnoÅi _desno"
-#: ../meld/dirdiff.py:234
+#: ../meld/dirdiff.py:232
msgid "Copy to right"
msgstr "UmnoÅite desno"
-#: ../meld/dirdiff.py:235
+#: ../meld/dirdiff.py:233
msgid "Delete selected"
msgstr "ObriÅi izabrano"
-#: ../meld/dirdiff.py:236 ../meld/filediff.py:1167
+#: ../meld/dirdiff.py:234 ../meld/filediff.py:1078
msgid "Hide"
msgstr "Sakrij"
-#: ../meld/dirdiff.py:236
+#: ../meld/dirdiff.py:234
msgid "Hide selected"
msgstr "Sakrij izabrano"
-#: ../meld/dirdiff.py:240
-msgid "Case"
-msgstr "VeliÄina slova"
+#: ../meld/dirdiff.py:238
+msgid "Ignore filename case"
+msgstr "Zanemari veliÄinu slova naziva datoteke"
-#: ../meld/dirdiff.py:240
-msgid "Ignore case of entries"
-msgstr "Zanemari veliÄinu slova unosa"
+#: ../meld/dirdiff.py:238
+msgid ""
+"Consider differently-cased filenames that are otherwise-identical to be the "
+"same"
+msgstr ""
+"SmatraÄe istim razliÄite veliÄine slova u nazivima datoteka koje su "
+"meÄusobno istovetne"
-#: ../meld/dirdiff.py:241
+#: ../meld/dirdiff.py:239
msgid "Same"
msgstr "Isto"
-#: ../meld/dirdiff.py:241
+#: ../meld/dirdiff.py:239
msgid "Show identical"
msgstr "PrikaÅi istovetne"
-#: ../meld/dirdiff.py:242
+#: ../meld/dirdiff.py:240
msgid "New"
msgstr "Novi"
-#: ../meld/dirdiff.py:242
+#: ../meld/dirdiff.py:240
msgid "Show new"
msgstr "PrikaÅi nove"
-#: ../meld/dirdiff.py:243
+#: ../meld/dirdiff.py:241
msgid "Modified"
msgstr "Izmenjeni"
-#: ../meld/dirdiff.py:243 ../meld/vcview.py:140
+#: ../meld/dirdiff.py:241 ../meld/vcview.py:140
msgid "Show modified"
msgstr "PrikaÅi izmenjene"
-#: ../meld/dirdiff.py:245
+#: ../meld/dirdiff.py:243
msgid "Filters"
msgstr "Filteri"
-#: ../meld/dirdiff.py:245
+#: ../meld/dirdiff.py:243
msgid "Set active filters"
msgstr "Podesite aktivne filtere"
-#: ../meld/dirdiff.py:362
+#: ../meld/dirdiff.py:360
#, python-format
msgid "Hide %s"
msgstr "Sakrij â%sâ"
-#: ../meld/dirdiff.py:466 ../meld/dirdiff.py:479 ../meld/vcview.py:323
+#: ../meld/dirdiff.py:464 ../meld/dirdiff.py:477 ../meld/vcview.py:323
#: ../meld/vcview.py:347
#, python-format
msgid "[%s] Scanning %s"
msgstr "[%s] pregledam â%sâ"
-#: ../meld/dirdiff.py:578
+#: ../meld/dirdiff.py:576
#, python-format
msgid "[%s] Done"
msgstr "[%s] Gotovo"
-#: ../meld/dirdiff.py:582
+#: ../meld/dirdiff.py:580
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:583
+#: ../meld/dirdiff.py:581
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:585
+#: ../meld/dirdiff.py:583
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:587
+#: ../meld/dirdiff.py:585
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:589
+#: ../meld/dirdiff.py:587
msgid ""
"You are running a case insensitive comparison on a case sensitive "
"filesystem. The following files in this folder are hidden:"
@@ -491,16 +490,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:600
+#: ../meld/dirdiff.py:598
#, python-format
msgid "'%s' hidden by '%s'"
msgstr "â%sâ sakriveno od strane â%sâ"
-#: ../meld/dirdiff.py:625 ../meld/filediff.py:1010 ../meld/filediff.py:1171
+#: ../meld/dirdiff.py:623 ../meld/filediff.py:921 ../meld/filediff.py:1082
msgid "Hi_de"
msgstr "_Sakrij"
-#: ../meld/dirdiff.py:675
+#: ../meld/dirdiff.py:673
#, python-format
msgid ""
"'%s' exists.\n"
@@ -509,7 +508,7 @@ msgstr ""
"â%sâ postoji.\n"
"Da presnimim?"
-#: ../meld/dirdiff.py:682
+#: ../meld/dirdiff.py:680
#, python-format
msgid ""
"Error copying '%s' to '%s'\n"
@@ -520,7 +519,7 @@ msgstr ""
"\n"
"%s."
-#: ../meld/dirdiff.py:700 ../meld/vcview.py:536
+#: ../meld/dirdiff.py:698 ../meld/vcview.py:536
#, python-format
msgid ""
"'%s' is a directory.\n"
@@ -529,7 +528,7 @@ msgstr ""
"â%sâ je fascikla.\n"
"Da uklonim rekurzivno?"
-#: ../meld/dirdiff.py:707 ../meld/vcview.py:541
+#: ../meld/dirdiff.py:705 ../meld/vcview.py:541
#, python-format
msgid ""
"Error removing %s\n"
@@ -540,7 +539,7 @@ msgstr ""
"\n"
"%s."
-#: ../meld/dirdiff.py:741
+#: ../meld/dirdiff.py:739
#, python-format
msgid "%i second"
msgid_plural "%i seconds"
@@ -549,7 +548,7 @@ msgstr[1] "%i sekunde"
msgstr[2] "%i sekunde"
msgstr[3] "%i sekunda"
-#: ../meld/dirdiff.py:742
+#: ../meld/dirdiff.py:740
#, python-format
msgid "%i minute"
msgid_plural "%i minutes"
@@ -558,7 +557,7 @@ msgstr[1] "%i minuta"
msgstr[2] "%i minuta"
msgstr[3] "%i minut"
-#: ../meld/dirdiff.py:743
+#: ../meld/dirdiff.py:741
#, python-format
msgid "%i hour"
msgid_plural "%i hours"
@@ -567,7 +566,7 @@ msgstr[1] "%i sata"
msgstr[2] "%i sati"
msgstr[3] "%i sat"
-#: ../meld/dirdiff.py:744
+#: ../meld/dirdiff.py:742
#, python-format
msgid "%i day"
msgid_plural "%i days"
@@ -576,7 +575,7 @@ msgstr[1] "%i dana"
msgstr[2] "%i dana"
msgstr[3] "%i dan"
-#: ../meld/dirdiff.py:745
+#: ../meld/dirdiff.py:743
#, python-format
msgid "%i week"
msgid_plural "%i weeks"
@@ -585,7 +584,7 @@ msgstr[1] "%i nedelje"
msgstr[2] "%i nedelja"
msgstr[3] "%i nedelja"
-#: ../meld/dirdiff.py:746
+#: ../meld/dirdiff.py:744
#, python-format
msgid "%i month"
msgid_plural "%i months"
@@ -594,7 +593,7 @@ msgstr[1] "%i meseca"
msgstr[2] "%i meseci"
msgstr[3] "%i mesec"
-#: ../meld/dirdiff.py:747
+#: ../meld/dirdiff.py:745
#, python-format
msgid "%i year"
msgid_plural "%i years"
@@ -603,159 +602,159 @@ msgstr[1] "%i godine"
msgstr[2] "%i godina"
msgstr[3] "%i godina"
-#: ../meld/filediff.py:295
+#: ../meld/filediff.py:204
msgid "Format as patch..."
msgstr "Formatiraj kao ispravku..."
-#: ../meld/filediff.py:295
+#: ../meld/filediff.py:204
msgid "Create a patch using differences between files"
msgstr "Napravite ispravku koristeÄi razlike izmeÄu datoteka"
-#: ../meld/filediff.py:296
+#: ../meld/filediff.py:205
msgid "Previous conflict"
msgstr "Prethodni sukob"
-#: ../meld/filediff.py:296
+#: ../meld/filediff.py:205
msgid "Go to the previous conflict"
msgstr "Idite na prethodni sukob"
-#: ../meld/filediff.py:297
+#: ../meld/filediff.py:206
msgid "Next conflict"
msgstr "SledeÄi sukob"
-#: ../meld/filediff.py:297
+#: ../meld/filediff.py:206
msgid "Go to the next conflict"
msgstr "Idite na sledeÄi sukob"
-#: ../meld/filediff.py:298
+#: ../meld/filediff.py:207
msgid "Push to left"
msgstr "Gurni ulevo"
-#: ../meld/filediff.py:298
+#: ../meld/filediff.py:207
msgid "Push current change to the left"
msgstr "Gurnite tekuÄu izmenu ulevo"
-#: ../meld/filediff.py:299
+#: ../meld/filediff.py:208
msgid "Push to right"
msgstr "Gurni udesno"
-#: ../meld/filediff.py:299
+#: ../meld/filediff.py:208
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:301
+#: ../meld/filediff.py:210
msgid "Pull from left"
msgstr "Ubaci s leva"
-#: ../meld/filediff.py:301
+#: ../meld/filediff.py:210
msgid "Pull change from the left"
msgstr "Ubacite izmenu s leva"
-#: ../meld/filediff.py:302
+#: ../meld/filediff.py:211
msgid "Pull from right"
msgstr "Ubaci s desna"
-#: ../meld/filediff.py:302
+#: ../meld/filediff.py:211
msgid "Pull change from the right"
msgstr "Ubacite izmenu s desna"
-#: ../meld/filediff.py:303
+#: ../meld/filediff.py:212
msgid "Copy above left"
msgstr "UmnoÅi iznad ulevo"
-#: ../meld/filediff.py:303
+#: ../meld/filediff.py:212
msgid "Copy change above the left chunk"
msgstr "UmnoÅite izmenu iznad komada ulevo"
-#: ../meld/filediff.py:304
+#: ../meld/filediff.py:213
msgid "Copy below left"
msgstr "UmnoÅi ispod ulevo"
-#: ../meld/filediff.py:304
+#: ../meld/filediff.py:213
msgid "Copy change below the left chunk"
msgstr "UmnoÅite izmenu ispod komada ulevo"
-#: ../meld/filediff.py:305
+#: ../meld/filediff.py:214
msgid "Copy above right"
msgstr "UmnoÅi iznad udesno"
-#: ../meld/filediff.py:305
+#: ../meld/filediff.py:214
msgid "Copy change above the right chunk"
msgstr "UmnoÅite izmenu iznad komada udesno"
-#: ../meld/filediff.py:306
+#: ../meld/filediff.py:215
msgid "Copy below right"
msgstr "UmnoÅi ispod udesno"
-#: ../meld/filediff.py:306
+#: ../meld/filediff.py:215
msgid "Copy change below the right chunk"
msgstr "UmnoÅite izmenu ispod komada udesno"
-#: ../meld/filediff.py:307
+#: ../meld/filediff.py:216
msgid "Delete"
msgstr "ObriÅi"
-#: ../meld/filediff.py:307
+#: ../meld/filediff.py:216
msgid "Delete change"
msgstr "ObriÅite izmenu"
-#: ../meld/filediff.py:308
+#: ../meld/filediff.py:217
msgid "Merge all changes from left"
msgstr "Objedini sve izmene s leva"
-#: ../meld/filediff.py:308
+#: ../meld/filediff.py:217
msgid "Merge all non-conflicting changes from the left"
msgstr "Objedinite sve nesukobljavajuÄe izmene s leva"
-#: ../meld/filediff.py:309
+#: ../meld/filediff.py:218
msgid "Merge all changes from right"
msgstr "Objedini sve izmene s desna"
-#: ../meld/filediff.py:309
+#: ../meld/filediff.py:218
msgid "Merge all non-conflicting changes from the right"
msgstr "Objedinite sve nesukobljavajuÄe izmene s desna"
-#: ../meld/filediff.py:310
+#: ../meld/filediff.py:219
msgid "Merge all non-conflicting"
msgstr "Objedini sve nesukobljavajuÄe"
-#: ../meld/filediff.py:310
+#: ../meld/filediff.py:219
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:311
+#: ../meld/filediff.py:220
msgid "Cycle through documents"
msgstr "KruÅi kroz dokumente"
-#: ../meld/filediff.py:311
+#: ../meld/filediff.py:220
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:315
+#: ../meld/filediff.py:224
msgid "Lock scrolling"
msgstr "ZakljuÄaj klizanje"
-#: ../meld/filediff.py:316
+#: ../meld/filediff.py:225
msgid "Lock scrolling of all panes"
msgstr "ZakljuÄajte klizanje svih povrÅi"
#. Abbreviations for insert and overwrite that fit in the status bar
-#: ../meld/filediff.py:396
+#: ../meld/filediff.py:305
msgid "INS"
msgstr "UMET"
-#: ../meld/filediff.py:396
+#: ../meld/filediff.py:305
msgid "OVR"
msgstr "PREP"
#. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:398
+#: ../meld/filediff.py:307
#, python-format
msgid "Ln %i, Col %i"
msgstr "Red %i, mesto %i"
-#: ../meld/filediff.py:722
+#: ../meld/filediff.py:631
#, python-format
msgid ""
"Filter '%s' changed the number of lines in the file. Comparison will be "
@@ -764,47 +763,42 @@ msgstr ""
"Filter â%sâ je izmenio broj redova u datoteci. PoreÄenje neÄe biti taÄno. Za "
"viÅe detalja pogledajte priruÄnik za korisnike."
-#. TRANSLATORS: this is the name of a new file which has not yet been saved
-#: ../meld/filediff.py:809
-msgid "<unnamed>"
-msgstr "<neimenovan>"
-
-#: ../meld/filediff.py:998
+#: ../meld/filediff.py:909
#, python-format
msgid "[%s] Set num panes"
msgstr "[%s] Postavi broj ploÄa"
-#: ../meld/filediff.py:1004
+#: ../meld/filediff.py:915
#, python-format
msgid "[%s] Opening files"
msgstr "[%s] Otvaram datoteke"
-#: ../meld/filediff.py:1028 ../meld/filediff.py:1037 ../meld/filediff.py:1049
-#: ../meld/filediff.py:1055
+#: ../meld/filediff.py:939 ../meld/filediff.py:948 ../meld/filediff.py:960
+#: ../meld/filediff.py:966
msgid "Could not read file"
msgstr "Ne mogu da proÄitam datoteku"
-#: ../meld/filediff.py:1029
+#: ../meld/filediff.py:940
#, python-format
msgid "[%s] Reading files"
msgstr "[%s] Äitam datoteke"
-#: ../meld/filediff.py:1038
+#: ../meld/filediff.py:949
#, python-format
msgid "%s appears to be a binary file."
msgstr "â%sâ izgleda da je izvrÅna datoteka."
-#: ../meld/filediff.py:1050
+#: ../meld/filediff.py:961
#, python-format
msgid "%s is not in encodings: %s"
msgstr "â%sâ nije u kodiranjima: â%sâ"
-#: ../meld/filediff.py:1080 ../meld/filemerge.py:67
+#: ../meld/filediff.py:991 ../meld/filemerge.py:67
#, python-format
msgid "[%s] Computing differences"
msgstr "[%s] SraÄunavam razlike"
-#: ../meld/filediff.py:1158
+#: ../meld/filediff.py:1069
msgid ""
"Text filters are being used, and may be masking differences between files. "
"Would you like to compare the unfiltered files?"
@@ -812,15 +806,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:1164
+#: ../meld/filediff.py:1075
msgid "Files are identical"
msgstr "Datoteke su istovetne"
-#: ../meld/filediff.py:1174
+#: ../meld/filediff.py:1085
msgid "Show without filters"
msgstr "Prikazuje bez filtera"
-#: ../meld/filediff.py:1363
+#: ../meld/filediff.py:1274
#, python-format
msgid ""
"\"%s\" exists!\n"
@@ -829,7 +823,7 @@ msgstr ""
"â%sâ postoji!\n"
"Da presnimim?"
-#: ../meld/filediff.py:1376
+#: ../meld/filediff.py:1287
#, python-format
msgid ""
"Error writing to %s\n"
@@ -840,12 +834,12 @@ msgstr ""
"\n"
"%s."
-#: ../meld/filediff.py:1385
+#: ../meld/filediff.py:1296
#, python-format
msgid "Choose a name for buffer %i."
msgstr "Izaberite naziv za %i. bafer."
-#: ../meld/filediff.py:1400
+#: ../meld/filediff.py:1311
#, python-format
msgid ""
"This file '%s' contains a mixture of line endings.\n"
@@ -856,7 +850,7 @@ msgstr ""
"\n"
"Koji oblik Åelite da koristite?"
-#: ../meld/filediff.py:1416
+#: ../meld/filediff.py:1327
#, python-format
msgid ""
"'%s' contains characters not encodable with '%s'\n"
@@ -865,7 +859,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:1475
+#: ../meld/filediff.py:1384
#, python-format
msgid ""
"Reloading will discard changes in:\n"
@@ -925,264 +919,277 @@ msgid "Set label to use instead of file name"
msgstr "PodeÅava oznaku za koriÅÄenje umesto naziva datoteke"
#: ../meld/meldapp.py:171
+msgid "Open a new tab in an already running instance"
+msgstr "Otvara novi jeziÄak u jednom veÄ otvorenom primerku"
+
+#: ../meld/meldapp.py:173
msgid "Automatically compare all differing files on startup"
msgstr "Samostalno poredi sve razlikujuÄe datoteke prilikom pokretanja"
-#: ../meld/meldapp.py:173
+#: ../meld/meldapp.py:175
msgid "Ignored for compatibility"
msgstr "Zanemareno zbog saglasnosti"
-#: ../meld/meldapp.py:176
+#: ../meld/meldapp.py:178
msgid "Set the target file for saving a merge result"
msgstr "PodeÅava ciljnu datoteku za Äuvanje rezultata stapanja"
-#: ../meld/meldapp.py:179
+#: ../meld/meldapp.py:181
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:182
+#: ../meld/meldapp.py:184
#, 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:184 ../meld/meldapp.py:188
+#: ../meld/meldapp.py:186 ../meld/meldapp.py:199
msgid "can't compare more than three directories"
msgstr "ne mogu da poredim viÅe od tri fascikle"
-#: ../meld/melddoc.py:56 ../meld/melddoc.py:57
+#: ../meld/meldapp.py:192
+msgid "D-Bus error; comparisons will open in a new window."
+msgstr "GreÅka D-sabirnice; poreÄenje Äe se otvoriti u novom prozoru."
+
+#. TRANSLATORS: This is the label of a new, currently-unnamed file.
+#: ../meld/meldbuffer.py:83
+msgid "<unnamed>"
+msgstr "<neimenovan>"
+
+#: ../meld/melddoc.py:57 ../meld/melddoc.py:58
msgid "untitled"
msgstr "bezimeni"
-#: ../meld/meldwindow.py:125
+#: ../meld/meldwindow.py:131
msgid "_File"
msgstr "_Datoteka"
-#: ../meld/meldwindow.py:126
+#: ../meld/meldwindow.py:132
msgid "_New..."
msgstr "_Novo..."
-#: ../meld/meldwindow.py:126
+#: ../meld/meldwindow.py:132
msgid "Start a new comparison"
msgstr "ZapoÄnite novo poreÄenje"
-#: ../meld/meldwindow.py:127
+#: ../meld/meldwindow.py:133
msgid "Save the current file"
msgstr "SaÄuvajte trenutnu datoteku"
-#: ../meld/meldwindow.py:129
+#: ../meld/meldwindow.py:135
msgid "Close the current file"
msgstr "Zatvorite trenutnu datoteku"
-#: ../meld/meldwindow.py:130
+#: ../meld/meldwindow.py:136
msgid "Quit the program"
msgstr "Zatvorite program"
-#: ../meld/meldwindow.py:132
+#: ../meld/meldwindow.py:138
msgid "_Edit"
msgstr "_UreÄivanje"
-#: ../meld/meldwindow.py:133
+#: ../meld/meldwindow.py:139
msgid "Undo the last action"
msgstr "Opozovite poslednju radnju"
-#: ../meld/meldwindow.py:134
+#: ../meld/meldwindow.py:140
msgid "Redo the last undone action"
msgstr "Ponovite poslednju opozvanu radnju"
-#: ../meld/meldwindow.py:135
+#: ../meld/meldwindow.py:141
msgid "Cut the selection"
msgstr "Isecite izbor"
-#: ../meld/meldwindow.py:136
+#: ../meld/meldwindow.py:142
msgid "Copy the selection"
msgstr "UmnoÅite izbor"
-#: ../meld/meldwindow.py:137
+#: ../meld/meldwindow.py:143
msgid "Paste the clipboard"
msgstr "Ubacite ostavu"
-#: ../meld/meldwindow.py:138
+#: ../meld/meldwindow.py:144
msgid "Search for text"
msgstr "TraÅite tekst"
-#: ../meld/meldwindow.py:139
+#: ../meld/meldwindow.py:145
msgid "Find Ne_xt"
msgstr "NaÄi s_ledeÄe"
-#: ../meld/meldwindow.py:139
+#: ../meld/meldwindow.py:145
msgid "Search forwards for the same text"
msgstr "TraÅite unapred isti tekst"
-#: ../meld/meldwindow.py:140
+#: ../meld/meldwindow.py:146
msgid "Find _Previous"
msgstr "NaÄi pre_thodno"
-#: ../meld/meldwindow.py:140
+#: ../meld/meldwindow.py:146
msgid "Search backwards for the same text"
msgstr "TraÅite unazad isti tekst"
-#: ../meld/meldwindow.py:141
+#: ../meld/meldwindow.py:147
msgid "Find and replace text"
msgstr "PronaÄite i zamenite tekst"
-#: ../meld/meldwindow.py:142
+#: ../meld/meldwindow.py:148
msgid "Prefere_nces"
-msgstr "_Postavke"
+msgstr "Pos_tavke"
-#: ../meld/meldwindow.py:142
+#: ../meld/meldwindow.py:148
msgid "Configure the application"
msgstr "Podesite program"
-#: ../meld/meldwindow.py:144
+#: ../meld/meldwindow.py:150
msgid "_Changes"
msgstr "_Izmene"
-#: ../meld/meldwindow.py:145
+#: ../meld/meldwindow.py:151
msgid "Next change"
msgstr "SledeÄa izmena"
-#: ../meld/meldwindow.py:145
+#: ../meld/meldwindow.py:151
msgid "Go to the next change"
msgstr "Idite na sledeÄu izmenu"
-#: ../meld/meldwindow.py:146
+#: ../meld/meldwindow.py:152
msgid "Previous change"
msgstr "Prethodna izmena"
-#: ../meld/meldwindow.py:146
+#: ../meld/meldwindow.py:152
msgid "Go to the previous change"
msgstr "Idite na prethodnu izmenu"
-#: ../meld/meldwindow.py:147
+#: ../meld/meldwindow.py:153
msgid "Open externally"
msgstr "Otvori spoljnim"
-#: ../meld/meldwindow.py:147
+#: ../meld/meldwindow.py:153
msgid "Open selected file or directory in the default external application"
msgstr "Otvorite izabranu datoteku ili fasciklu u osnovnom spoljnom programu"
-#: ../meld/meldwindow.py:149
+#: ../meld/meldwindow.py:155
msgid "_View"
msgstr "P_regled"
-#: ../meld/meldwindow.py:150
+#: ../meld/meldwindow.py:156
msgid "File status"
msgstr "Stanje datoteke"
-#: ../meld/meldwindow.py:151
+#: ../meld/meldwindow.py:157
msgid "Version status"
msgstr "Stanje izdanja"
-#: ../meld/meldwindow.py:152
+#: ../meld/meldwindow.py:158
msgid "File filters"
msgstr "Filteri datoteke"
-#: ../meld/meldwindow.py:153
+#: ../meld/meldwindow.py:159
msgid "Stop the current action"
msgstr "Zaustavite trenutnu radnju"
-#: ../meld/meldwindow.py:154
+#: ../meld/meldwindow.py:160
msgid "Refresh the view"
msgstr "OsveÅite pregled"
-#: ../meld/meldwindow.py:155
+#: ../meld/meldwindow.py:161
msgid "Reload"
msgstr "Ponovo uÄitaj"
-#: ../meld/meldwindow.py:155
+#: ../meld/meldwindow.py:161
msgid "Reload the comparison"
msgstr "Ponovo uÄitajte poreÄenje"
-#: ../meld/meldwindow.py:157
+#: ../meld/meldwindow.py:163
msgid "_Tabs"
-msgstr "_JeziÄak"
+msgstr "_JeziÄci"
-#: ../meld/meldwindow.py:158
+#: ../meld/meldwindow.py:164
msgid "_Previous Tab"
msgstr "Pre_thodni jeziÄak"
-#: ../meld/meldwindow.py:158
+#: ../meld/meldwindow.py:164
msgid "Activate previous tab"
-msgstr "Aktivirajte prethodni jeziÄak"
+msgstr "Idite na prethodni list"
-#: ../meld/meldwindow.py:159
+#: ../meld/meldwindow.py:165
msgid "_Next Tab"
msgstr "Sle_deÄi jeziÄak"
-#: ../meld/meldwindow.py:159
+#: ../meld/meldwindow.py:165
msgid "Activate next tab"
-msgstr "Aktivirajte sledeÄi jeziÄak"
+msgstr "Idite na naredni list"
-#: ../meld/meldwindow.py:160
+#: ../meld/meldwindow.py:166
msgid "Move Tab _Left"
-msgstr "Premesti jeziÄak u_levo"
+msgstr "Premesti jeziÄak _levo"
-#: ../meld/meldwindow.py:160
+#: ../meld/meldwindow.py:166
msgid "Move current tab to left"
msgstr "Premestite trenutni jeziÄak na levo"
-#: ../meld/meldwindow.py:161
+#: ../meld/meldwindow.py:167
msgid "Move Tab _Right"
-msgstr "Premesti jeziÄak u_desno"
+msgstr "Premesti jeziÄak _desno"
-#: ../meld/meldwindow.py:161
+#: ../meld/meldwindow.py:167
msgid "Move current tab to right"
msgstr "Premestite trenutni jeziÄak na desno"
-#: ../meld/meldwindow.py:163
+#: ../meld/meldwindow.py:169
msgid "_Help"
-msgstr "Pomo_Ä"
+msgstr "Po_moÄ"
-#: ../meld/meldwindow.py:164
+#: ../meld/meldwindow.py:170
msgid "_Contents"
msgstr "_SadrÅaj"
-#: ../meld/meldwindow.py:164
+#: ../meld/meldwindow.py:170
msgid "Open the Meld manual"
msgstr "Otvorite uputstvo Melda"
-#: ../meld/meldwindow.py:165
+#: ../meld/meldwindow.py:171
msgid "Report _Bug"
msgstr "Prijavi _greÅku"
-#: ../meld/meldwindow.py:165
+#: ../meld/meldwindow.py:171
msgid "Report a bug in Meld"
msgstr "Prijavite greÅku u Meldu"
-#: ../meld/meldwindow.py:166
+#: ../meld/meldwindow.py:172
msgid "About this program"
msgstr "O ovom programu"
-#: ../meld/meldwindow.py:169
+#: ../meld/meldwindow.py:175
msgid "Full Screen"
-msgstr "Ceo ekran"
+msgstr "Preko celog ekrana"
-#: ../meld/meldwindow.py:169
+#: ../meld/meldwindow.py:175
msgid "View the comparison in full screen"
msgstr "Pregledajte poreÄenje preko celog ekrana"
-#: ../meld/meldwindow.py:170
+#: ../meld/meldwindow.py:176
msgid "_Toolbar"
-msgstr "Linija _alata"
+msgstr "_Paleta alata"
-#: ../meld/meldwindow.py:170
+#: ../meld/meldwindow.py:176
msgid "Show or hide the toolbar"
-msgstr "PrikaÅite ili sakrijte liniju alata"
+msgstr "PrikaÅite ili sakrijte paletu alata"
-#: ../meld/meldwindow.py:171
+#: ../meld/meldwindow.py:177
msgid "_Statusbar"
-msgstr "Linija _stanja"
+msgstr "Traka _stanja"
-#: ../meld/meldwindow.py:171
+#: ../meld/meldwindow.py:177
msgid "Show or hide the statusbar"
-msgstr "PrikaÅite ili sakrijte liniju stanja"
+msgstr "PrikaÅite ili sakrijte traku stanja"
-#: ../meld/meldwindow.py:541
+#: ../meld/meldwindow.py:563
msgid "Switch to this tab"
msgstr "Prebacite se na ovaj jeziÄak"
#. exit at first non found directory + file
-#: ../meld/meldwindow.py:639
+#: ../meld/meldwindow.py:664
msgid "Cannot compare a mixture of files and directories.\n"
msgstr "Ne mogu da poredim meÅavinu datoteka i fascikli.\n"
@@ -1208,12 +1215,12 @@ 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:234
+#: ../meld/preferences.py:233
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:236
+#: ../meld/preferences.py:235
msgid ""
"OS-specific metadata\t0\t.DS_Store ._* .Spotlight-V100 .Trashes Thumbs.db "
"Desktop.ini\n"
@@ -1222,48 +1229,48 @@ msgstr ""
"db Desktop.ini\n"
#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:238
+#: ../meld/preferences.py:237
#, 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:240
+#: ../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:242
+#: ../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:244
+#: ../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:246
+#: ../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:248
+#: ../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:250
+#: ../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:252
+#: ../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:254
+#: ../meld/preferences.py:253
msgid "Script comment\t0\t#.*"
msgstr "Komentar skripte\t0\t#.*"
@@ -1277,11 +1284,11 @@ msgstr "Ugradite"
#: ../meld/vcview.py:129
msgid "_Update"
-msgstr "_Dopuni"
+msgstr "_AÅuriraj"
#: ../meld/vcview.py:129
msgid "Update"
-msgstr "Dopunite"
+msgstr "AÅurirajte"
#: ../meld/vcview.py:130
msgid "Add to VC"
@@ -1481,7 +1488,7 @@ msgstr ""
#: ../meld/ui/historyentry.py:293
msgid "_Browse..."
-msgstr "Pre_traÅi..."
+msgstr "_Razgledaj..."
#: ../meld/ui/historyentry.py:301
msgid "Path"
@@ -1505,7 +1512,7 @@ msgstr "Izaberite datoteku"
#: ../meld/ui/notebooklabel.py:60
msgid "Close tab"
-msgstr "Zatvori jeziÄak"
+msgstr "Zatvorite jeziÄak"
#. These are the possible states of files. Be sure to get the colons correct.
#: ../meld/vc/_vc.py:40
@@ -1525,384 +1532,3 @@ msgstr ""
"GreÅka pri pretvaranju u regularni izraz\n"
"Obrazac je bio â%sâ\n"
"GreÅka je bila â%sâ"
-
-#~ msgid "_Search for"
-#~ msgstr "Po_traÅi"
-
-#~ 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"
-
-#~ msgid "Error converting pattern '%s' to regular expression"
-#~ msgstr "GreÅka pri pretvaranju obrasca â%sâ u regularni izraz"
-
-# bug: plural-forms
-#~ msgid ""
-#~ "second,seconds:minute,minutes:hour,hours:day,days:week,weeks:month,months:"
-#~ "year,years"
-#~ msgstr ""
-#~ "sekundu,sekundi:minut,minuta:Äas,Äasa:dan,dana:nedelju,nedelja:mesec,meseci:"
-#~ "godinu,godina"
-
-#~ msgid "The regular expression '%s' was not found."
-#~ msgstr "Regularni izraz â%sâ nije naÄen."
-
-#~ msgid "The text '%s' was not found."
-#~ msgstr "Tekst â%sâ nije naÄen."
-
-#~ msgid ""
-#~ "Could not open '%s' for reading.\n"
-#~ "\n"
-#~ "The error was:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Ne mogu da otvorim â%sâ radi Äitanja.\n"
-#~ "\n"
-#~ "GreÅka beÅe:\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Could not read from '%s'.\n"
-#~ "\n"
-#~ "I tried encodings %s."
-#~ msgstr ""
-#~ "Ne mogu da Äitam iz â%sâ.\n"
-#~ "\n"
-#~ "PokuÅah kodiranja %s."
-
-#~ msgid ""
-#~ "Could not read from '%s'.\n"
-#~ "\n"
-#~ "The error was:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Ne mogu da Äitam iz â%sâ.\n"
-#~ "\n"
-#~ "GreÅka beÅe:\n"
-#~ "%s."
-
-#~ msgid "Meld requires a recent version of pygtk."
-#~ msgstr "Meld zahteva skoro izdanje PiGtk-a."
-
-#~ msgid "pygtk-%s or higher is recommended."
-#~ msgstr "PreporuÄuje se PiGtk %s ili noviji."
-
-#~ msgid "Meld works best with pygtk-%s or higher. (found %s)"
-#~ msgstr "Meld najbolje radi uz PiGtk %s ili noviji. (naÄoh %s)"
-
-#~ msgid ""
-#~ "Due to incompatible API changes some functions may not operate as "
-#~ "expected."
-#~ msgstr ""
-#~ "Zbog nesaglasnih izmena programerske sprege, neke funkcije moÅda neÄe "
-#~ "raditi kako treba."
-
-#~ msgid "Modified File"
-#~ msgstr "Izmenjena datoteka"
-
-#~ msgid "Other Changes"
-#~ msgstr "Ostale izmene"
-
-#~ msgid "Common Ancestor"
-#~ msgstr "ZajedniÄki predak"
-
-#~ msgid "Original Directory"
-#~ msgstr "Izvorni direktorijum"
-
-#~ msgid "Modified Directory"
-#~ msgstr "Izmenjen direktorijum"
-
-#~ msgid ""
-#~ "Meld is a file and directory comparison tool. Usage:\n"
-#~ "\n"
-#~ " meld Start with no windows open\n"
-#~ " meld <dir> Start with CVS browser in 'dir'\n"
-#~ " meld <file> Start with CVS diff of 'file'\n"
-#~ " meld <file> <file> [file] Start with 2 or 3 way file comparison\n"
-#~ " meld <dir> <dir> [dir] Start with 2 or 3 way directory "
-#~ "comparison\n"
-#~ "\n"
-#~ "For more information choose help -> contents.\n"
-#~ "Report bugs at http://bugzilla.gnome.org/buglist.cgi?product=meld\n";
-#~ "stevek gnome org\n"
-#~ msgstr ""
-#~ "Meld je alat za poreÄenje datoteka i direktorijuma. Upotreba:\n"
-#~ "\n"
-#~ " meld Pokreni bez otvorenih prozora\n"
-#~ " meld <dir> Pokreni sa CVS pregledaÄem u âdirâ\n"
-#~ " meld <datoteka> Pokreni CVS razlike za âdatotekaâ\n"
-#~ " meld <datoteka> <datoteka> [datoteka]\n"
-#~ " Pokreni dvo- ili trosmerno poreÄenje "
-#~ "datoteka\n"
-#~ " meld <dir> <dir> [dir] Pokreni dvo- ili trosmerno poreÄenje \n"
-#~ " direktorijuma\n"
-#~ "\n"
-#~ "Za viÅe podataka izaberite pomoÄ -> sadrÅaj.\n"
-#~ "Prijavite greÅke na http://bugzilla.gnome.org/buglist.cgi?product=meld\n";
-#~ "http://mail.gnome.org/mailman/listinfo/meld-list\n";
-
-#~ msgid ""
-#~ "Meld %s\n"
-#~ "Written by Stephen Kennedy <stevek gnome org>"
-#~ msgstr ""
-#~ "Meld %s\n"
-#~ "Napisao Stifen Kenedi (Stephen Kennedy) <stevek gnome org>"
-
-#~ msgid "`%s' is not a directory or file, cannot open cvs view"
-#~ msgstr ""
-#~ "â%sâ ne predstavlja direktorijum ni datoteku, ne mogu da otvorim CVS "
-#~ "pregled"
-
-#~ msgid "folder"
-#~ msgstr "direktorijum"
-
-#~ msgid "*"
-#~ msgstr "*"
-
-#~ msgid "Remove _Locally"
-#~ msgstr "Ukloni u _lokalu"
-
-#~ msgid "Show non-CVS"
-#~ msgstr "PrikaÅi ne-CVS"
-
-#~ msgid "_Commit"
-#~ msgstr "U_gradi"
-
-#~ msgid "_Diff"
-#~ msgstr "_Razlike"
-
-#~ msgid "Copy All _Left"
-#~ msgstr "UmnoÅi sve _levo"
-
-#~ msgid "Copy All _Right"
-#~ msgstr "UmnoÅi sve _desno"
-
-#~ msgid "Edit"
-#~ msgstr "Uredi"
-
-#~ msgid "Match _entire word only"
-#~ msgstr "Poklapanje samo _celih reÄi"
-
-#~ msgid "_Wrap around"
-#~ msgstr "U _krug"
-
-#~ msgid "Diff"
-#~ msgstr "Razlike"
-
-#~ msgid "Hide..."
-#~ msgstr "Sakrij..."
-
-#~ msgid "Left"
-#~ msgstr "Levo"
-
-#~ msgid "Right"
-#~ msgstr "Desno"
-
-# bug: plural-forms
-#~ msgid " spaces."
-#~ msgstr " razmaka."
-
-#~ msgid "(gnome-default-editor)"
-#~ msgstr "(podrazumevani-ureÄivaÄ-gnoma)"
-
-#~ msgid "<b>Drawing Style</b>"
-#~ msgstr "<b>Stil iscrtavanja</b>"
-
-#~ msgid "<b>Edit Menu</b>"
-#~ msgstr "<b>Meni za ureÄivanje</b>"
-
-#~ msgid "<b>Font</b>"
-#~ msgstr "<b>Font</b>"
-
-#~ msgid "<b>Global options</b>"
-#~ msgstr "<b>OpÅte opcije</b>"
-
-#~ msgid "<b>Loading</b>"
-#~ msgstr "<b>UÄitavanje</b>"
-
-#~ msgid "<b>Misc</b>"
-#~ msgstr "<b>Razno</b>"
-
-#~ msgid "<b>Saving</b>"
-#~ msgstr "<b>Äuvanje</b>"
-
-#~ msgid "<b>Toolbar Appearance</b>"
-#~ msgstr "<b>Izgled alatki</b>"
-
-#~ msgid "<b>Update Options</b>"
-#~ msgstr "<b>Opcije dopunjavanja</b>"
-
-#~ msgid "<b>Whitespace</b>"
-#~ msgstr "<b>Beline</b>"
-
-#~ msgid "<span weight=\"bold\" size=\"x-large\">Binary Files</span>"
-#~ msgstr "<span weight=\"bold\" size=\"x-large\">Binarne datoteke</span>"
-
-#~ msgid "<span weight=\"bold\" size=\"x-large\">CVS</span>"
-#~ msgstr "<span weight=\"bold\" size=\"x-large\">CVS</span>"
-
-#~ msgid "<span weight=\"bold\" size=\"x-large\">Diff</span>"
-#~ msgstr "<span weight=\"bold\" size=\"x-large\">Razlike</span>"
-
-#~ msgid "<span weight=\"bold\" size=\"x-large\">Display</span>"
-#~ msgstr "<span weight=\"bold\" size=\"x-large\">Prikaz</span>"
-
-#~ msgid "<span weight=\"bold\" size=\"x-large\">Editor</span>"
-#~ msgstr "<span weight=\"bold\" size=\"x-large\">UreÄivaÄ</span>"
-
-#~ msgid "<span weight=\"bold\" size=\"x-large\">Encoding</span>"
-#~ msgstr "<span weight=\"bold\" size=\"x-large\">Kodiranje</span>"
-
-#~ msgid "<span weight=\"bold\" size=\"x-large\">File Filters</span>"
-#~ msgstr "<span weight=\"bold\" size=\"x-large\">Filteri datoteka</span>"
-
-#~ msgid "<span weight=\"bold\" size=\"x-large\">Text Filters</span>"
-#~ msgstr "<span weight=\"bold\" size=\"x-large\">Filteri teksta</span>"
-
-#~ msgid "Automatically supply missing newline at end of file."
-#~ msgstr "Sam dodaj nedostajuÄi novi-red na kraju datoteke."
-
-#~ msgid ""
-#~ "Binary files do not have text filters applied to them when comparing."
-#~ msgstr "Na binarne datoteke se ne primenjuju filteri teksta pri poreÄenju."
-
-#~ msgid "CVS"
-#~ msgstr "CVS"
-
-#~ msgid "CVS binary"
-#~ msgstr "CVS program"
-
-#~ msgid "CVS view"
-#~ msgstr "CVS pregled"
-
-#~ msgid ""
-#~ "Choose how the central bar of the diff viewer is drawn. You may wish to "
-#~ "choose a simpler mode if you find scrolling is slow."
-#~ msgstr ""
-#~ "Izaberite kako se iscrtava centralna traka prikazivanja razlika. MoÅete "
-#~ "Åeleti da izaberete jednostavniji naÄin ako je klizanje sporo."
-
-#~ msgid "Copyright (C) 2002 Stephen Kennedy"
-#~ msgstr "Sva prava zadrÅana  2002 Stifen Kenedi (Stephen Kennedy)"
-
-#~ msgid "Create missing directories (-d)"
-#~ msgstr "Napravi nedostajuÄe direktorijume (-d)"
-
-#~ msgid "Curved : Filled Curves"
-#~ msgstr "Kriva : ispunjene krive"
-
-#~ msgid "Edit menu popup invokes"
-#~ msgstr "IskaÄuÄi prozor menija za ureÄivanje pokreÄe"
-
-#~ msgid "Gnome Default"
-#~ msgstr "Podrazumevano u Gnomu"
-
-#~ msgid "Icons Only"
-#~ msgstr "Samo slike"
-
-#~ msgid "Ignore .cvsrc (-f)"
-#~ msgstr "Zanemari .cvsrc (-f)"
-
-#~ msgid "Ignore changes in amount of white space"
-#~ msgstr "Zanemari izmene koliÄine belina"
-
-#~ msgid ""
-#~ "Ignore changes in case; consider upper and lower-case letters equivalent"
-#~ msgstr ""
-#~ "Zanemari izmene veliÄine slova; smatraj velika i mala slova jednakim"
-
-#~ msgid "Locate CVS binary : Meld"
-#~ msgstr "PronaÄi CVS program : Meld"
-
-#~ msgid "Prune empty directories (-P)"
-#~ msgstr "ObriÅi prazne direktorijume (-P)"
-
-#~ msgid "Quiet mode (-q)"
-#~ msgstr "Tihi reÅim (-q)"
-
-#~ msgid "Save File 1"
-#~ msgstr "SaÄuvaj 1. datoteku"
-
-#~ msgid "Save File 2"
-#~ msgstr "SaÄuvaj 2. datoteku"
-
-#~ msgid "Save File 3"
-#~ msgstr "SaÄuvaj 3. datoteku"
-
-#~ msgid "Save in UTF-8 encoding"
-#~ msgstr "SaÄuvaj sa UTF-8 kodiranjem"
-
-#~ msgid "Save in the files original encoding"
-#~ msgstr "SaÄuvaj datoteke sa izvornim kodiranjem"
-
-#~ msgid "Simple : Lines only"
-#~ msgstr "Jednostavno : samo linije"
-
-# bug: missing colon ":", s/quadilaterals/quadrilaterals/
-#~ msgid "Solid Filled Quadilaterals"
-#~ msgstr "Ispunjeno : ispunjeni pravougaonici"
-
-#~ msgid "Tabs equivalent to "
-#~ msgstr "Tabulatori su istovetni sa "
-
-#~ msgid "Text Beside Icons"
-#~ msgstr "Tekst pored ikona"
-
-#~ msgid "Text Only"
-#~ msgstr "Samo tekst"
-
-#~ msgid "Text Under Icons"
-#~ msgstr "Tekst ispod ikona"
-
-#~ msgid "Two way directory"
-#~ msgstr "Dvosmerni direktorijum"
-
-#~ msgid "Two way file"
-#~ msgstr "Dvosmerna datoteka"
-
-#~ msgid "Use Compression (-z)"
-#~ msgstr "Koristi saÅimanje (-z)"
-
-#~ msgid "Use GNOME monospace font."
-#~ msgstr "Koristi Gnomov font utvrÄene Åirine."
-
-#~ msgid "Use custom font."
-#~ msgstr "Koristi poseban font."
-
-#~ msgid "Whitespace is significant"
-#~ msgstr "Beline su bitne"
-
-#~ msgid "_Binary Files"
-#~ msgstr "_Binarne datoteke"
-
-#~ msgid "_Logo"
-#~ msgstr "_Logotip"
-
-#~ msgid "_Save"
-#~ msgstr "_SaÄuvaj"
-
-#~ msgid "http://meld.sourceforge.net";
-#~ msgstr "http://meld.sourceforge.net";
-
-#~ msgid "utf8 iso8859"
-#~ msgstr "utf8 iso8859-5 iso8859-2 iso8859"
-
-#~ msgid "window1"
-#~ msgstr "prozor1"
-
-#~ msgid "Recurse"
-#~ msgstr "Rekurzivno"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
