GNOME.org
 

[meld] Updated Serbian translation

commit f7a3eb79346fdfeb6f0fd37c978c1ac9453dcd96
Author: ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ <miroslavnikolic rocketmail com>
Date:   Sat Sep 29 09:37:55 2012 +0200

    Updated Serbian translation

 po/sr.po       |  122 ++++++++++++++++++++++++++++++--------------------------
 po/sr latin po |  122 ++++++++++++++++++++++++++++++--------------------------
 2 files changed, 132 insertions(+), 112 deletions(-)
---
diff --git a/po/sr.po b/po/sr.po
index 7f83c50..667b761 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: meld\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=meld&k";
 "eywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-09-04 20:32+0000\n"
-"PO-Revision-Date: 2012-09-07 10:27+0200\n"
+"POT-Creation-Date: 2012-09-25 20:44+0000\n"
+"PO-Revision-Date: 2012-09-29 09:34+0200\n"
 "Last-Translator: ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ <miroslavnikolic rocketmail com>\n"
 "Language-Team: Serbian <gnom prevod org>\n"
 "Language: sr\n"
@@ -424,7 +424,7 @@ msgstr "ÐÐÐÐÐÐÑÐ ÐÐÑÐÐ"
 msgid "Delete selected"
 msgstr "ÐÐÑÐÑÐ ÐÐÐÐÑÐÐÐ"
 
-#: ../meld/dirdiff.py:233 ../meld/filediff.py:1101
+#: ../meld/dirdiff.py:233 ../meld/filediff.py:1103
 msgid "Hide"
 msgstr "ÐÐÐÑÐÑ"
 
@@ -481,36 +481,36 @@ msgstr "ÐÐÐÐÑÐÑÐ ÐÐÑÐÐÐÐ ÑÐÐÑÐÑÐ"
 msgid "Hide %s"
 msgstr "ÐÐÐÑÐÑ â%sâ"
 
-#: ../meld/dirdiff.py:502 ../meld/dirdiff.py:515 ../meld/vcview.py:329
+#: ../meld/dirdiff.py:502 ../meld/dirdiff.py:521 ../meld/vcview.py:329
 #: ../meld/vcview.py:353
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] ÐÑÐÐÐÐÐÐÐ â%sâ"
 
-#: ../meld/dirdiff.py:614
+#: ../meld/dirdiff.py:620
 #, python-format
 msgid "[%s] Done"
 msgstr "[%s] ÐÐÑÐÐÐ"
 
-#: ../meld/dirdiff.py:618
+#: ../meld/dirdiff.py:624
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "ÐÐÑÐÐ ÑÐ ÐÐ ÐÐÑÐ ÐÑÐÑÐÐÐ ÐÐ ÐÑÐÐÐ ÐÑÐÑÑÐÐÐÐÐÑÐ ÐÐÐ ÑÐÑÑÐÐÐÐ"
 
-#: ../meld/dirdiff.py:619
+#: ../meld/dirdiff.py:625
 msgid "Files with invalid encodings found"
 msgstr "ÐÑÐÐÐÑÐÐÐ ÑÑ ÐÐÑÐÑÐÐÐ ÑÐ ÐÐÐÑÐÑÐÐÐÐÐ ÐÐÐÐÑÐÑÐÐ"
 
 #. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:621
+#: ../meld/dirdiff.py:627
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr "ÐÐÐÐ ÐÐÑÐÑÐÐÐ ÐÐÑÐÑÑ Ñ ÐÐÐÑÐÑÐÐÐÐÐ ÐÐÐÐÑÐÑÑ. ÐÐÐÐÐÐ ÑÑ ÐÐÑÑÐ ÐÐÐ:"
 
-#: ../meld/dirdiff.py:623
+#: ../meld/dirdiff.py:629
 msgid "Files hidden by case insensitive comparison"
 msgstr "ÐÐÑÐÑÐÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑÐÑÐÑÐÐ ÐÐÐÑÐÑÑÐÐÐÐ ÐÐ ÐÐÐÐÑÐÐÑ ÑÐÐÐÐ"
 
 #. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:625
+#: ../meld/dirdiff.py:631
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -518,16 +518,16 @@ msgstr ""
 "ÐÐÐÑÐÐÑÐÐ ÑÑÐ ÐÐÑÐÑÐÑÐ ÐÐÐÐÐÐÑÐÐ ÐÐ ÐÐÐÐÑÐÐÐ ÑÐÐÐÐ ÐÐ ÑÐÑÑÐÐÑ ÐÐÑÐÑÐÐÐ ÐÐÐ "
 "ÑÐ ÐÐÐ ÐÐÑÐÐ. ÐÐÐÐ ÐÐÑÐÑÐÐÐ ÐÐÑÑ ÐÐÐÑÐÐÐ:"
 
-#: ../meld/dirdiff.py:636
+#: ../meld/dirdiff.py:642
 #, python-format
 msgid "'%s' hidden by '%s'"
 msgstr "â%sâ ÑÐÐÑÐÐÐÐÐ ÐÐ ÑÑÑÐÐÐ â%sâ"
 
-#: ../meld/dirdiff.py:661 ../meld/filediff.py:937 ../meld/filediff.py:1105
+#: ../meld/dirdiff.py:667 ../meld/filediff.py:940 ../meld/filediff.py:1107
 msgid "Hi_de"
 msgstr "_ÐÐÐÑÐÑ"
 
-#: ../meld/dirdiff.py:711
+#: ../meld/dirdiff.py:717
 #, python-format
 msgid ""
 "'%s' exists.\n"
@@ -536,7 +536,7 @@ msgstr ""
 "â%sâ ÐÐÑÑÐÑÐ.\n"
 "ÐÐ ÐÑÐÑÐÐÐÐÐ?"
 
-#: ../meld/dirdiff.py:718
+#: ../meld/dirdiff.py:724
 #, python-format
 msgid ""
 "Error copying '%s' to '%s'\n"
@@ -547,7 +547,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/dirdiff.py:736 ../meld/vcview.py:542
+#: ../meld/dirdiff.py:742 ../meld/vcview.py:542
 #, python-format
 msgid ""
 "'%s' is a directory.\n"
@@ -556,7 +556,7 @@ msgstr ""
 "â%sâ ÑÐ ÑÐÑÑÐÐÐÐ.\n"
 "ÐÐ ÑÐÐÐÐÐÐ ÑÐÐÑÑÐÐÐÐÐ?"
 
-#: ../meld/dirdiff.py:743 ../meld/vcview.py:547
+#: ../meld/dirdiff.py:749 ../meld/vcview.py:547
 #, python-format
 msgid ""
 "Error removing %s\n"
@@ -567,7 +567,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/dirdiff.py:826
+#: ../meld/dirdiff.py:832
 #, python-format
 msgid "%i second"
 msgid_plural "%i seconds"
@@ -576,7 +576,7 @@ msgstr[1] "%i ÑÐÐÑÐÐÐ"
 msgstr[2] "%i ÑÐÐÑÐÐÐ"
 msgstr[3] "%i ÑÐÐÑÐÐÐ"
 
-#: ../meld/dirdiff.py:827
+#: ../meld/dirdiff.py:833
 #, python-format
 msgid "%i minute"
 msgid_plural "%i minutes"
@@ -585,7 +585,7 @@ msgstr[1] "%i ÐÐÐÑÑÐ"
 msgstr[2] "%i ÐÐÐÑÑÐ"
 msgstr[3] "%i ÐÐÐÑÑ"
 
-#: ../meld/dirdiff.py:828
+#: ../meld/dirdiff.py:834
 #, python-format
 msgid "%i hour"
 msgid_plural "%i hours"
@@ -594,7 +594,7 @@ msgstr[1] "%i ÑÐÑÐ"
 msgstr[2] "%i ÑÐÑÐ"
 msgstr[3] "%i ÑÐÑ"
 
-#: ../meld/dirdiff.py:829
+#: ../meld/dirdiff.py:835
 #, python-format
 msgid "%i day"
 msgid_plural "%i days"
@@ -603,7 +603,7 @@ msgstr[1] "%i ÐÐÐÐ"
 msgstr[2] "%i ÐÐÐÐ"
 msgstr[3] "%i ÐÐÐ"
 
-#: ../meld/dirdiff.py:830
+#: ../meld/dirdiff.py:836
 #, python-format
 msgid "%i week"
 msgid_plural "%i weeks"
@@ -612,7 +612,7 @@ msgstr[1] "%i ÐÐÐÐÑÐ"
 msgstr[2] "%i ÐÐÐÐÑÐ"
 msgstr[3] "%i ÐÐÐÐÑÐ"
 
-#: ../meld/dirdiff.py:831
+#: ../meld/dirdiff.py:837
 #, python-format
 msgid "%i month"
 msgid_plural "%i months"
@@ -621,7 +621,7 @@ msgstr[1] "%i ÐÐÑÐÑÐ"
 msgstr[2] "%i ÐÐÑÐÑÐ"
 msgstr[3] "%i ÐÐÑÐÑ"
 
-#: ../meld/dirdiff.py:832
+#: ../meld/dirdiff.py:838
 #, python-format
 msgid "%i year"
 msgid_plural "%i years"
@@ -791,42 +791,42 @@ msgstr ""
 "ÐÐÐÑÐÑ â%sâ ÑÐ ÐÐÐÐÐÐÐ ÐÑÐÑ ÑÐÐÐÐÐ Ñ ÐÐÑÐÑÐÑÐ. ÐÐÑÐÑÐÑÐ ÐÐÑÐ ÐÐÑÐ ÑÐÑÐÐ. ÐÐ "
 "ÐÐÑÐ ÐÐÑÐÑÐ ÐÐÐÐÐÐÐÑÑÐ ÐÑÐÑÑÑÐÐÐ ÐÐ ÐÐÑÐÑÐÐÐÐ."
 
-#: ../meld/filediff.py:925
+#: ../meld/filediff.py:928
 #, python-format
 msgid "[%s] Set num panes"
 msgstr "[%s] ÐÐÑÑÐÐÐ ÐÑÐÑ ÐÐÐÑÐ"
 
-#: ../meld/filediff.py:931
+#: ../meld/filediff.py:934
 #, python-format
 msgid "[%s] Opening files"
 msgstr "[%s] ÐÑÐÐÑÐÐ ÐÐÑÐÑÐÐÐ"
 
-#: ../meld/filediff.py:955 ../meld/filediff.py:965 ../meld/filediff.py:978
-#: ../meld/filediff.py:984
+#: ../meld/filediff.py:958 ../meld/filediff.py:968 ../meld/filediff.py:981
+#: ../meld/filediff.py:987
 msgid "Could not read file"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÑÐÑÐÐ ÐÐÑÐÑÐÐÑ"
 
-#: ../meld/filediff.py:956
+#: ../meld/filediff.py:959
 #, python-format
 msgid "[%s] Reading files"
 msgstr "[%s] ÐÐÑÐÐ ÐÐÑÐÑÐÐÐ"
 
-#: ../meld/filediff.py:966
+#: ../meld/filediff.py:969
 #, python-format
 msgid "%s appears to be a binary file."
 msgstr "â%sâ ÐÐÐÐÐÐÐ ÐÐ ÑÐ ÐÐÐÑÑÐÐ ÐÐÑÐÑÐÐÐ."
 
-#: ../meld/filediff.py:979
+#: ../meld/filediff.py:982
 #, python-format
 msgid "%s is not in encodings: %s"
 msgstr "â%sâ ÐÐÑÐ Ñ ÐÐÐÐÑÐÑÐÐÐ: â%sâ"
 
-#: ../meld/filediff.py:1010 ../meld/filemerge.py:67
+#: ../meld/filediff.py:1013
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] ÐÑÐÑÑÐÐÐÐÐ ÑÐÐÐÐÐÐ"
 
-#: ../meld/filediff.py:1092
+#: ../meld/filediff.py:1094
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -834,15 +834,15 @@ msgstr ""
 "ÐÐÑÐÑÑÐÐÐ ÑÑ ÑÐÐÑÐÑÐ ÑÐÐÑÑÐ, Ð ÐÐÐÑ ÐÐÑÑÐÑÐÑÐ Ð ÐÐÐÐÑÐÐÑÐÐÐ ÑÐÐÐÐÐÐ ÐÐÐÐÑÑ "
 "ÐÐÑÐÑÐÐÐ. ÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÑÐÐÐÑÐ ÐÐÑÐÐÑÑÐÑÐÐÐ ÐÐÑÐÑÐÐÐ?"
 
-#: ../meld/filediff.py:1098
+#: ../meld/filediff.py:1100
 msgid "Files are identical"
 msgstr "ÐÐÑÐÑÐÐÐ ÑÑ ÐÑÑÐÐÐÑÐÐ"
 
-#: ../meld/filediff.py:1108
+#: ../meld/filediff.py:1110
 msgid "Show without filters"
 msgstr "ÐÑÐÐÐÐÑÑÐ ÐÐÐ ÑÐÐÑÐÑÐ"
 
-#: ../meld/filediff.py:1298
+#: ../meld/filediff.py:1303
 #, python-format
 msgid ""
 "\"%s\" exists!\n"
@@ -851,7 +851,7 @@ msgstr ""
 "â%sâ ÐÐÑÑÐÑÐ!\n"
 "ÐÐ ÐÑÐÑÐÐÐÐÐ?"
 
-#: ../meld/filediff.py:1311
+#: ../meld/filediff.py:1316
 #, python-format
 msgid ""
 "Error writing to %s\n"
@@ -862,12 +862,12 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/filediff.py:1320
+#: ../meld/filediff.py:1325
 #, python-format
 msgid "Choose a name for buffer %i."
 msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐÐÐÐ ÐÐ %i. ÐÐÑÐÑ."
 
-#: ../meld/filediff.py:1335
+#: ../meld/filediff.py:1340
 #, python-format
 msgid ""
 "This file '%s' contains a mixture of line endings.\n"
@@ -878,7 +878,7 @@ msgstr ""
 "\n"
 "ÐÐÑÐ ÐÐÐÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÑÐÑÑÐÑÐ?"
 
-#: ../meld/filediff.py:1351
+#: ../meld/filediff.py:1356
 #, python-format
 msgid ""
 "'%s' contains characters not encodable with '%s'\n"
@@ -887,7 +887,7 @@ msgstr ""
 "â%sâ ÑÐÐÑÐÐ ÐÐÐÐÐÐÐ ÐÐÑÐ ÑÐ ÐÐ ÐÐÐÑ ÐÐÐÐÑÐÑÐ ÑÐ â%sâ\n"
 "ÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐ ÑÐÑÑÐÐÑÐ ÐÐÐ ÐÐÐ-8?"
 
-#: ../meld/filediff.py:1408
+#: ../meld/filediff.py:1413
 #, python-format
 msgid ""
 "Reloading will discard changes in:\n"
@@ -900,7 +900,7 @@ msgstr ""
 "\n"
 "ÐÐÑ ÐÐÐÑÐÑÐÑÑ ÐÐ ÐÐÐÐÑÐ ÐÐÐÐÐÐÑÐ."
 
-#: ../meld/filemerge.py:82
+#: ../meld/filemerge.py:47
 #, python-format
 msgid "[%s] Merging files"
 msgstr "[%s] ÐÐÑÐÐÐÑÑÑÐÐ ÐÐÑÐÑÐÐÐ"
@@ -962,20 +962,31 @@ msgstr "ÐÐÐÐÐÐÑÐÐÐ ÐÐÐÐ ÑÐÐÐÐÑÐÐÑÑÐ"
 msgid "Set the target file for saving a merge result"
 msgstr "ÐÐÐÐÑÐÐÐ ÑÐÑÐÑ ÐÐÑÐÑÐÐÑ ÐÐ ÑÑÐÐÑÐ ÑÐÐÑÐÑÐÑÐ ÑÑÐÐÐÑÐ"
 
-#: ../meld/meldapp.py:181
+#: ../meld/meldapp.py:180
+#| msgid "Automatically compare all differing files on startup"
+msgid "Automatically merge files"
+msgstr "ÐÐÐÐÑÑÐÐÐÐ ÑÑÐÐÐ ÐÐÑÐÑÐÐÐ"
+
+#: ../meld/meldapp.py:183
 msgid "Creates a diff tab for up to 3 supplied files or directories."
 msgstr "ÐÑÐÐÐ ÑÐÐÐÑÐÐ ÑÐÐÐÐÐÐ ÐÐ ÐÐÑÐÐÑÐ ÐÐ 3 ÐÑÐÐÐÐÐÑÐ ÐÐÑÐÑÐÐÐ ÐÐÐ ÑÐÑÑÐÐÐÐ."
 
-#: ../meld/meldapp.py:184
+#: ../meld/meldapp.py:186
 #, python-format
-msgid "too many arguments (wanted 0-4, got %d)"
-msgstr "ÐÑÐÐÐÑÐ ÐÑÐÑÐÐÐÐÑÐ (ÑÑÐÐÐÐÐ ÑÐ 0-4, ÐÐÐÐÑ %d)"
+#| msgid "too many arguments (wanted 0-4, got %d)"
+msgid "too many arguments (wanted 0-3, got %d)"
+msgstr "ÐÑÐÐÐÑÐ ÐÑÐÑÐÐÐÐÑÐ (ÑÑÐÐÐÐÐ ÑÐ 0-3, ÐÐÐÐÑ %d)"
+
+#: ../meld/meldapp.py:188
+msgid "can't auto-merge less than 3 files"
+msgstr "ÐÐ ÐÐÐÑ ÑÐÐÐÑÑÐÐÐÐ ÐÐ ÑÑÐÐÐÐ ÐÐÑÐ ÐÐ 3 ÐÐÑÐÑÐÐÐ"
 
-#: ../meld/meldapp.py:186 ../meld/meldapp.py:199
-msgid "can't compare more than three directories"
-msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÐÐÐ ÐÐÑÐ ÐÐ ÑÑÐ ÑÐÑÑÐÐÐÐ"
+#: ../meld/meldapp.py:190
+#| msgid "Flatten directories"
+msgid "can't auto-merge directories"
+msgstr "ÐÐ ÐÐÐÑ ÑÐÐÐÑÑÐÐÐÐ ÐÐ ÑÑÐÐÐÐ ÐÐÑÐÐÑÐÑÐÑÑÐÐ"
 
-#: ../meld/meldapp.py:192
+#: ../meld/meldapp.py:196
 msgid "D-Bus error; comparisons will open in a new window."
 msgstr "ÐÑÐÑÐÐ Ð-ÑÐÐÐÑÐÐÑÐ; ÐÐÑÐÑÐÑÐ ÑÐ ÑÐ ÐÑÐÐÑÐÑÐ Ñ ÐÐÐÐÐ ÐÑÐÐÐÑÑ."
 
@@ -1217,7 +1228,7 @@ msgid "Switch to this tab"
 msgstr "ÐÑÐÐÐÑÐÑÐ ÑÐ ÐÐ ÐÐÐÑ ÑÐÐÐÑÐÐ"
 
 #. exit at first non found directory + file
-#: ../meld/meldwindow.py:665
+#: ../meld/meldwindow.py:669
 msgid "Cannot compare a mixture of files and directories.\n"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÐÐÐ ÐÐÑÐÐÐÐÑ ÐÐÑÐÑÐÐÐ Ð ÑÐÑÑÐÐÐÐ.\n"
 
@@ -1264,13 +1275,11 @@ msgstr "ÐÐÐÑÑÐÐÐ ÐÐÑÐÐÑÐ 1\t%s\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
 #: ../meld/preferences.py:234
-#| msgid "Binaries\t1\t*.{pyc,a,obj,o,so,la,lib,dll}\n"
 msgid "Binaries\t1\t*.{pyc,a,obj,o,so,la,lib,dll,exe}\n"
 msgstr "ÐÐÐÑÑÐÐ \t1\t*.{pyc,a,obj,o,so,la,lib,dll,exe}\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
 #: ../meld/preferences.py:236
-#| msgid "Media\t0\t*.{jpg,gif,png,wav,mp3,ogg,xcf,xpm}"
 msgid "Media\t0\t*.{jpg,gif,png,bmp,wav,mp3,ogg,flac,avi,mpg,xcf,xpm}"
 msgstr "ÐÐÐÐÑÐ\t0\t*.{jpg,gif,png,bmp,wav,mp3,ogg,flac,avi,mpg,xcf,xpm}"
 
@@ -1546,14 +1555,12 @@ msgstr "ÐÐÑÐÐÑÐÑÐ ÑÐÐÐÑÐÐ"
 
 #. These are the possible states of files. Be sure to get the colons correct.
 #: ../meld/vc/_vc.py:40
-#| msgid ""
-#| "Ignored:Unversioned:::Error::Newly added:Modified:Conflict:Removed:Missing"
 msgid ""
 "Ignored:Unversioned:::Error::Newly added:Modified:Conflict:Removed:Missing:"
 "Not present"
 msgstr ""
-"ÐÐÐÐÐÐÑÐÐÐ:ÐÐÐÐÑÐÐÐÐÐÑÐÐÐ:::ÐÑÐÑÐÐ::ÐÐÐÐ "
-"ÐÐÐÐÑÐ:ÐÐÐÐÑÐÐÐ:ÐÑÐÐÐ:ÐÐÐÐÑÐÐÐ:ÐÐÐÐÑÑÐÑÑÑÐ:ÐÐÑÐ ÐÑÐÑÑÑÐÐ"
+"ÐÐÐÐÐÐÑÐÐÐ:ÐÐÐÐÑÐÐÐÐÐÑÐÐÐ:::ÐÑÐÑÐÐ::ÐÐÐÐ ÐÐÐÐÑÐ:ÐÐÐÐÑÐÐÐ:ÐÑÐÐÐ:ÐÐÐÐÑÐÐÐ:"
+"ÐÐÐÐÑÑÐÑÑÑÐ:ÐÐÑÐ ÐÑÐÑÑÑÐÐ"
 
 #: ../meld/vc/cvs.py:163
 #, python-format
@@ -1565,3 +1572,6 @@ msgstr ""
 "ÐÑÐÑÐÐ ÐÑÐ ÐÑÐÑÐÐÑÐÑÑ Ñ ÑÐÐÑÐÐÑÐÐ ÐÐÑÐÐ\n"
 "ÐÐÑÐÐÐÑ ÑÐ ÐÐÐ â%sâ\n"
 "ÐÑÐÑÐÐ ÑÐ ÐÐÐÐ â%sâ"
+
+#~ msgid "can't compare more than three directories"
+#~ msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÐÐÐ ÐÐÑÐ ÐÐ ÑÑÐ ÑÐÑÑÐÐÐÐ"
diff --git a/po/sr latin po b/po/sr latin po
index 9138e35..4dc19e8 100644
--- a/po/sr latin po
+++ b/po/sr latin po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: meld\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=meld&k";
 "eywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-09-04 20:32+0000\n"
-"PO-Revision-Date: 2012-09-07 10:27+0200\n"
+"POT-Creation-Date: 2012-09-25 20:44+0000\n"
+"PO-Revision-Date: 2012-09-29 09:34+0200\n"
 "Last-Translator: Miroslav NikoliÄ <miroslavnikolic rocketmail com>\n"
 "Language-Team: Serbian <gnom prevod org>\n"
 "Language: sr\n"
@@ -424,7 +424,7 @@ msgstr "UmnoÅite desno"
 msgid "Delete selected"
 msgstr "ObriÅi izabrano"
 
-#: ../meld/dirdiff.py:233 ../meld/filediff.py:1101
+#: ../meld/dirdiff.py:233 ../meld/filediff.py:1103
 msgid "Hide"
 msgstr "Sakrij"
 
@@ -481,36 +481,36 @@ msgstr "Podesite aktivne filtere"
 msgid "Hide %s"
 msgstr "Sakrij â%sâ"
 
-#: ../meld/dirdiff.py:502 ../meld/dirdiff.py:515 ../meld/vcview.py:329
+#: ../meld/dirdiff.py:502 ../meld/dirdiff.py:521 ../meld/vcview.py:329
 #: ../meld/vcview.py:353
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] pregledam â%sâ"
 
-#: ../meld/dirdiff.py:614
+#: ../meld/dirdiff.py:620
 #, python-format
 msgid "[%s] Done"
 msgstr "[%s] Gotovo"
 
-#: ../meld/dirdiff.py:618
+#: ../meld/dirdiff.py:624
 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:619
+#: ../meld/dirdiff.py:625
 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:621
+#: ../meld/dirdiff.py:627
 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:623
+#: ../meld/dirdiff.py:629
 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:625
+#: ../meld/dirdiff.py:631
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -518,16 +518,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:636
+#: ../meld/dirdiff.py:642
 #, python-format
 msgid "'%s' hidden by '%s'"
 msgstr "â%sâ sakriveno od strane â%sâ"
 
-#: ../meld/dirdiff.py:661 ../meld/filediff.py:937 ../meld/filediff.py:1105
+#: ../meld/dirdiff.py:667 ../meld/filediff.py:940 ../meld/filediff.py:1107
 msgid "Hi_de"
 msgstr "_Sakrij"
 
-#: ../meld/dirdiff.py:711
+#: ../meld/dirdiff.py:717
 #, python-format
 msgid ""
 "'%s' exists.\n"
@@ -536,7 +536,7 @@ msgstr ""
 "â%sâ postoji.\n"
 "Da presnimim?"
 
-#: ../meld/dirdiff.py:718
+#: ../meld/dirdiff.py:724
 #, python-format
 msgid ""
 "Error copying '%s' to '%s'\n"
@@ -547,7 +547,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/dirdiff.py:736 ../meld/vcview.py:542
+#: ../meld/dirdiff.py:742 ../meld/vcview.py:542
 #, python-format
 msgid ""
 "'%s' is a directory.\n"
@@ -556,7 +556,7 @@ msgstr ""
 "â%sâ je fascikla.\n"
 "Da uklonim rekurzivno?"
 
-#: ../meld/dirdiff.py:743 ../meld/vcview.py:547
+#: ../meld/dirdiff.py:749 ../meld/vcview.py:547
 #, python-format
 msgid ""
 "Error removing %s\n"
@@ -567,7 +567,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/dirdiff.py:826
+#: ../meld/dirdiff.py:832
 #, python-format
 msgid "%i second"
 msgid_plural "%i seconds"
@@ -576,7 +576,7 @@ msgstr[1] "%i sekunde"
 msgstr[2] "%i sekunde"
 msgstr[3] "%i sekunda"
 
-#: ../meld/dirdiff.py:827
+#: ../meld/dirdiff.py:833
 #, python-format
 msgid "%i minute"
 msgid_plural "%i minutes"
@@ -585,7 +585,7 @@ msgstr[1] "%i minuta"
 msgstr[2] "%i minuta"
 msgstr[3] "%i minut"
 
-#: ../meld/dirdiff.py:828
+#: ../meld/dirdiff.py:834
 #, python-format
 msgid "%i hour"
 msgid_plural "%i hours"
@@ -594,7 +594,7 @@ msgstr[1] "%i sata"
 msgstr[2] "%i sati"
 msgstr[3] "%i sat"
 
-#: ../meld/dirdiff.py:829
+#: ../meld/dirdiff.py:835
 #, python-format
 msgid "%i day"
 msgid_plural "%i days"
@@ -603,7 +603,7 @@ msgstr[1] "%i dana"
 msgstr[2] "%i dana"
 msgstr[3] "%i dan"
 
-#: ../meld/dirdiff.py:830
+#: ../meld/dirdiff.py:836
 #, python-format
 msgid "%i week"
 msgid_plural "%i weeks"
@@ -612,7 +612,7 @@ msgstr[1] "%i nedelje"
 msgstr[2] "%i nedelja"
 msgstr[3] "%i nedelja"
 
-#: ../meld/dirdiff.py:831
+#: ../meld/dirdiff.py:837
 #, python-format
 msgid "%i month"
 msgid_plural "%i months"
@@ -621,7 +621,7 @@ msgstr[1] "%i meseca"
 msgstr[2] "%i meseci"
 msgstr[3] "%i mesec"
 
-#: ../meld/dirdiff.py:832
+#: ../meld/dirdiff.py:838
 #, python-format
 msgid "%i year"
 msgid_plural "%i years"
@@ -791,42 +791,42 @@ msgstr ""
 "Filter â%sâ je izmenio broj redova u datoteci. PoreÄenje neÄe biti taÄno. Za "
 "viÅe detalja pogledajte priruÄnik za korisnike."
 
-#: ../meld/filediff.py:925
+#: ../meld/filediff.py:928
 #, python-format
 msgid "[%s] Set num panes"
 msgstr "[%s] Postavi broj ploÄa"
 
-#: ../meld/filediff.py:931
+#: ../meld/filediff.py:934
 #, python-format
 msgid "[%s] Opening files"
 msgstr "[%s] Otvaram datoteke"
 
-#: ../meld/filediff.py:955 ../meld/filediff.py:965 ../meld/filediff.py:978
-#: ../meld/filediff.py:984
+#: ../meld/filediff.py:958 ../meld/filediff.py:968 ../meld/filediff.py:981
+#: ../meld/filediff.py:987
 msgid "Could not read file"
 msgstr "Ne mogu da proÄitam datoteku"
 
-#: ../meld/filediff.py:956
+#: ../meld/filediff.py:959
 #, python-format
 msgid "[%s] Reading files"
 msgstr "[%s] Äitam datoteke"
 
-#: ../meld/filediff.py:966
+#: ../meld/filediff.py:969
 #, python-format
 msgid "%s appears to be a binary file."
 msgstr "â%sâ izgleda da je izvrÅna datoteka."
 
-#: ../meld/filediff.py:979
+#: ../meld/filediff.py:982
 #, python-format
 msgid "%s is not in encodings: %s"
 msgstr "â%sâ nije u kodiranjima: â%sâ"
 
-#: ../meld/filediff.py:1010 ../meld/filemerge.py:67
+#: ../meld/filediff.py:1013
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] SraÄunavam razlike"
 
-#: ../meld/filediff.py:1092
+#: ../meld/filediff.py:1094
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -834,15 +834,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:1098
+#: ../meld/filediff.py:1100
 msgid "Files are identical"
 msgstr "Datoteke su istovetne"
 
-#: ../meld/filediff.py:1108
+#: ../meld/filediff.py:1110
 msgid "Show without filters"
 msgstr "Prikazuje bez filtera"
 
-#: ../meld/filediff.py:1298
+#: ../meld/filediff.py:1303
 #, python-format
 msgid ""
 "\"%s\" exists!\n"
@@ -851,7 +851,7 @@ msgstr ""
 "â%sâ postoji!\n"
 "Da presnimim?"
 
-#: ../meld/filediff.py:1311
+#: ../meld/filediff.py:1316
 #, python-format
 msgid ""
 "Error writing to %s\n"
@@ -862,12 +862,12 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/filediff.py:1320
+#: ../meld/filediff.py:1325
 #, python-format
 msgid "Choose a name for buffer %i."
 msgstr "Izaberite naziv za %i. bafer."
 
-#: ../meld/filediff.py:1335
+#: ../meld/filediff.py:1340
 #, python-format
 msgid ""
 "This file '%s' contains a mixture of line endings.\n"
@@ -878,7 +878,7 @@ msgstr ""
 "\n"
 "Koji oblik Åelite da koristite?"
 
-#: ../meld/filediff.py:1351
+#: ../meld/filediff.py:1356
 #, python-format
 msgid ""
 "'%s' contains characters not encodable with '%s'\n"
@@ -887,7 +887,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:1408
+#: ../meld/filediff.py:1413
 #, python-format
 msgid ""
 "Reloading will discard changes in:\n"
@@ -900,7 +900,7 @@ msgstr ""
 "\n"
 "Ovu operaciju ne moÅete opozvati."
 
-#: ../meld/filemerge.py:82
+#: ../meld/filemerge.py:47
 #, python-format
 msgid "[%s] Merging files"
 msgstr "[%s] Objedinjujem datoteke"
@@ -962,20 +962,31 @@ msgstr "Zanemareno zbog saglasnosti"
 msgid "Set the target file for saving a merge result"
 msgstr "PodeÅava ciljnu datoteku za Äuvanje rezultata stapanja"
 
-#: ../meld/meldapp.py:181
+#: ../meld/meldapp.py:180
+#| msgid "Automatically compare all differing files on startup"
+msgid "Automatically merge files"
+msgstr "Samostalno stapa datoteke"
+
+#: ../meld/meldapp.py:183
 msgid "Creates a diff tab for up to 3 supplied files or directories."
 msgstr "Pravi jeziÄak razlika za najviÅe do 3 pridodate datoteke ili fascikle."
 
-#: ../meld/meldapp.py:184
+#: ../meld/meldapp.py:186
 #, python-format
-msgid "too many arguments (wanted 0-4, got %d)"
-msgstr "previÅe argumenata (traÅeno je 0-4, dobih %d)"
+#| msgid "too many arguments (wanted 0-4, got %d)"
+msgid "too many arguments (wanted 0-3, got %d)"
+msgstr "previÅe argumenata (traÅeno je 0-3, dobih %d)"
+
+#: ../meld/meldapp.py:188
+msgid "can't auto-merge less than 3 files"
+msgstr "ne mogu samostalno da stopim manje od 3 datoteke"
 
-#: ../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/meldapp.py:190
+#| msgid "Flatten directories"
+msgid "can't auto-merge directories"
+msgstr "ne mogu samostalno da stopim direktorijume"
 
-#: ../meld/meldapp.py:192
+#: ../meld/meldapp.py:196
 msgid "D-Bus error; comparisons will open in a new window."
 msgstr "GreÅka D-sabirnice; poreÄenje Äe se otvoriti u novom prozoru."
 
@@ -1217,7 +1228,7 @@ msgid "Switch to this tab"
 msgstr "Prebacite se na ovaj jeziÄak"
 
 #. exit at first non found directory + file
-#: ../meld/meldwindow.py:665
+#: ../meld/meldwindow.py:669
 msgid "Cannot compare a mixture of files and directories.\n"
 msgstr "Ne mogu da poredim meÅavinu datoteka i fascikli.\n"
 
@@ -1264,13 +1275,11 @@ msgstr "Kontrola verzija 1\t%s\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
 #: ../meld/preferences.py:234
-#| msgid "Binaries\t1\t*.{pyc,a,obj,o,so,la,lib,dll}\n"
 msgid "Binaries\t1\t*.{pyc,a,obj,o,so,la,lib,dll,exe}\n"
 msgstr "IzvrÅne \t1\t*.{pyc,a,obj,o,so,la,lib,dll,exe}\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
 #: ../meld/preferences.py:236
-#| msgid "Media\t0\t*.{jpg,gif,png,wav,mp3,ogg,xcf,xpm}"
 msgid "Media\t0\t*.{jpg,gif,png,bmp,wav,mp3,ogg,flac,avi,mpg,xcf,xpm}"
 msgstr "Medija\t0\t*.{jpg,gif,png,bmp,wav,mp3,ogg,flac,avi,mpg,xcf,xpm}"
 
@@ -1546,14 +1555,12 @@ msgstr "Zatvorite jeziÄak"
 
 #. These are the possible states of files. Be sure to get the colons correct.
 #: ../meld/vc/_vc.py:40
-#| msgid ""
-#| "Ignored:Unversioned:::Error::Newly added:Modified:Conflict:Removed:Missing"
 msgid ""
 "Ignored:Unversioned:::Error::Newly added:Modified:Conflict:Removed:Missing:"
 "Not present"
 msgstr ""
-"Zanemareno:Neverzionirano:::GreÅka::Novo "
-"dodato:Izmenjeno:Sukob:Uklonjeno:NedostajuÄe:Nije prisutno"
+"Zanemareno:Neverzionirano:::GreÅka::Novo dodato:Izmenjeno:Sukob:Uklonjeno:"
+"NedostajuÄe:Nije prisutno"
 
 #: ../meld/vc/cvs.py:163
 #, python-format
@@ -1565,3 +1572,6 @@ msgstr ""
 "GreÅka pri pretvaranju u regularni izraz\n"
 "Obrazac je bio â%sâ\n"
 "GreÅka je bila â%sâ"
+
+#~ msgid "can't compare more than three directories"
+#~ msgstr "ne mogu da poredim viÅe od tri fascikle"
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]