[meld] Updated Serbian translation
- From: Мирослав Николић <mirosnik src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld] Updated Serbian translation
- Date: Wed, 20 Feb 2013 19:40:08 +0000 (UTC)
commit f716c9c71d19c2f4eca1724c04adbbd98ef6c224
Author: Мирослав Николић <miroslavnikolic rocketmail com>
Date: Wed Feb 20 20:41:58 2013 +0100
Updated Serbian translation
po/sr.po | 491 +++++++++++++++++++++++++-------------------------------
po/sr latin po | 491 +++++++++++++++++++++++++-------------------------------
2 files changed, 444 insertions(+), 538 deletions(-)
---
diff --git a/po/sr.po b/po/sr.po
index 79b4b77..094c4e7 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: 2013-01-08 19:43+0000\n"
-"PO-Revision-Date: 2013-01-08 21:03+0200\n"
+"POT-Creation-Date: 2013-02-09 22:18+0000\n"
+"PO-Revision-Date: 2013-02-20 20:39+0200\n"
"Last-Translator: Мирослав Николић <miroslavnikolic rocketmail com>\n"
"Language-Team: Serbian <gnom prevod org>\n"
"Language: sr\n"
@@ -54,7 +54,6 @@ msgid "Active"
msgstr "Активан"
#: ../data/ui/EditableList.ui.h:3
-#| msgid "<unnamed>"
msgid "Column name"
msgstr "Назив колоне"
@@ -83,7 +82,7 @@ msgid "Move _Down"
msgstr "Премести _доле"
#. Create icon and filename CellRenderer
-#: ../data/ui/EditableList.ui.h:10 ../meld/dirdiff.py:303
+#: ../data/ui/EditableList.ui.h:10 ../meld/dirdiff.py:325
#: ../meld/vcview.py:200
msgid "Name"
msgstr "Назив"
@@ -129,7 +128,7 @@ msgstr ""
"ову датотеку и да ипак начините измене, али те измене морају бити сачуване у "
"нову датотеку."
-#: ../data/ui/findbar.ui.h:1 ../meld/meldwindow.py:132
+#: ../data/ui/findbar.ui.h:1 ../meld/meldwindow.py:78
msgid "_Replace"
msgstr "_Замени"
@@ -213,49 +212,6 @@ msgstr ""
"\n"
"Prevod.org — превод на српски језик."
-#: ../data/ui/meldapp.ui.h:10
-msgid "Choose Files"
-msgstr "Изаберите датотеке"
-
-#: ../data/ui/meldapp.ui.h:11
-msgid "_Three Way Compare"
-msgstr "Поређење _три елемента"
-
-#. Refers to version of the file being compared
-#: ../data/ui/meldapp.ui.h:13
-msgid "Mine"
-msgstr "Моја"
-
-#. Refers to version of the file being compared
-#: ../data/ui/meldapp.ui.h:15
-msgid "Original"
-msgstr "Изворна"
-
-#. Refers to version of the file being compared
-#: ../data/ui/meldapp.ui.h:17
-msgid "Other"
-msgstr "Друга"
-
-#: ../data/ui/meldapp.ui.h:18
-msgid "_File Comparison"
-msgstr "Поређење _датотека"
-
-#: ../data/ui/meldapp.ui.h:19
-msgid "_Directory Comparison"
-msgstr "Поређење _фасцикли"
-
-#: ../data/ui/meldapp.ui.h:20
-msgid "Select VC Directory"
-msgstr "Изаберите ЦВ фасциклу"
-
-#: ../data/ui/meldapp.ui.h:21
-msgid "Directory"
-msgstr "Фасцикла"
-
-#: ../data/ui/meldapp.ui.h:22
-msgid "_Version Control Browser"
-msgstr "Прегледник контроле _верзија"
-
#: ../data/ui/patch-dialog.ui.h:1
msgid "Create Patch"
msgstr "Направи исправку"
@@ -349,24 +305,35 @@ msgid "Editor"
msgstr "Уређивач"
#: ../data/ui/preferences.ui.h:17
-#| msgid "Ignore symbolic links"
+#| msgid "Start a new comparison"
+msgid "Shallow comparison"
+msgstr "Површно поређење"
+
+#: ../data/ui/preferences.ui.h:18
+msgid "C_ompare files based only on size and timestamp"
+msgstr "Уп_ореди датотеке само на основу величине и временске ознаке"
+
+#: ../data/ui/preferences.ui.h:19
+msgid "_Timestamp resolution:"
+msgstr "_Резолуција временске ознаке:"
+
+#: ../data/ui/preferences.ui.h:20
msgid "Symbolic links"
msgstr "Симболичке везе"
-#: ../data/ui/preferences.ui.h:18
+#: ../data/ui/preferences.ui.h:21
msgid "Ignore symbolic links"
msgstr "Занемари симболичке везе"
-#: ../data/ui/preferences.ui.h:19
+#: ../data/ui/preferences.ui.h:22
msgid "Visible columns"
msgstr "Приказане колоне"
-#: ../data/ui/preferences.ui.h:20
-#| msgid "_File Comparison"
+#: ../data/ui/preferences.ui.h:23
msgid "Folder comparisons"
msgstr "Поређење фасцикли"
-#: ../data/ui/preferences.ui.h:21
+#: ../data/ui/preferences.ui.h:24
msgid ""
"When performing directory comparisons, you may filter out files and "
"directories by name. Each pattern is a list of shell style wildcards "
@@ -376,11 +343,11 @@ msgstr ""
"према називу. Сваки образац је списак џокера у стилу конзоле раздвојених "
"размаком."
-#: ../data/ui/preferences.ui.h:22
+#: ../data/ui/preferences.ui.h:25
msgid "File Filters"
msgstr "Филтери датотека"
-#: ../data/ui/preferences.ui.h:23
+#: ../data/ui/preferences.ui.h:26
msgid ""
"When performing file comparisons, you may ignore certain types of changes. "
"Each pattern here is a python regular expression which replaces matching "
@@ -393,27 +360,97 @@ msgstr ""
"празним нискама пре извршавања поређења. Ако израз садржи групе, само групе "
"бивају замењене. За више детаља погледајте упутство за кориснике."
-#: ../data/ui/preferences.ui.h:24
+#: ../data/ui/preferences.ui.h:27
msgid "Ignore changes which insert or delete blank lines"
msgstr "Занемари измене које убацују или бришу празне редове"
-#: ../data/ui/preferences.ui.h:25
+#: ../data/ui/preferences.ui.h:28
msgid "Text Filters"
msgstr "Филтери текста"
-#: ../data/ui/preferences.ui.h:26
+#: ../data/ui/preferences.ui.h:29
msgid "Loading"
msgstr "Учитавам"
# bug: what encoding is iso8859? it's a registry of encodings, and encoding is eg. iso8859-5
-#: ../data/ui/preferences.ui.h:27
+#: ../data/ui/preferences.ui.h:30
msgid "When loading, try these codecs in order. (e.g. utf8, iso8859)"
msgstr "При учитавању, пробај ова кодирања редом. (нпр. utf8, iso8859)"
-#: ../data/ui/preferences.ui.h:28
+#: ../data/ui/preferences.ui.h:31
msgid "Encoding"
msgstr "Кодирање"
+#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:604
+#| msgid "Folder comparisons"
+msgid "New comparison"
+msgstr "Ново поређење"
+
+#: ../data/ui/tab-placeholder.ui.h:2
+#| msgid "_File Comparison"
+msgid "File comparison"
+msgstr "Поређење датотека"
+
+#: ../data/ui/tab-placeholder.ui.h:3
+#| msgid "_Directory Comparison"
+msgid "Directory comparison"
+msgstr "Поређење фасцикли"
+
+#: ../data/ui/tab-placeholder.ui.h:4
+#| msgid "_Version Control Browser"
+msgid "Version control view"
+msgstr "Преглед управљања издањима"
+
+#: ../data/ui/tab-placeholder.ui.h:5
+#| msgid "_File Comparison"
+msgid "_3-way comparison"
+msgstr "Упореди _3-елемента"
+
+#: ../data/ui/tab-placeholder.ui.h:6
+#| msgid "Select file"
+msgid "Select Third File"
+msgstr "Изаберите трећу датотеку"
+
+#: ../data/ui/tab-placeholder.ui.h:7
+#| msgid "Select file"
+msgid "Select Second File"
+msgstr "Изаберите другу датотеку"
+
+#: ../data/ui/tab-placeholder.ui.h:8
+#| msgid "Select file"
+msgid "Select First File"
+msgstr "Изаберите прву датотеку"
+
+#: ../data/ui/tab-placeholder.ui.h:9
+#| msgid "Select directory"
+msgid "Select First Folder"
+msgstr "Изаберите прву фасциклу"
+
+#: ../data/ui/tab-placeholder.ui.h:10
+#| msgid "Select directory"
+msgid "Select Second Folder"
+msgstr "Изаберите другу фасциклу"
+
+#: ../data/ui/tab-placeholder.ui.h:11
+#| msgid "Select file"
+msgid "Select Third Folder"
+msgstr "Изаберите трећу фасциклу"
+
+#: ../data/ui/tab-placeholder.ui.h:12
+#| msgid "_Version Control Browser"
+msgid "Select A Version-Controlled Folder"
+msgstr "Изаберите фасциклу управљања издањем"
+
+#: ../data/ui/tab-placeholder.ui.h:13
+#| msgid "_File Comparison"
+msgid "_Blank comparison"
+msgstr "_Празно поређење"
+
+#: ../data/ui/tab-placeholder.ui.h:14
+#| msgid "_Compare"
+msgid "C_ompare"
+msgstr "_Упореди"
+
#: ../data/ui/vcview.ui.h:1
msgid "VC Log"
msgstr "ЦВ дневник"
@@ -430,47 +467,47 @@ msgstr "Претходни дневници"
msgid "Log Message"
msgstr "Порука дневника"
-#: ../meld/dirdiff.py:234 ../meld/vcview.py:160
+#: ../meld/dirdiff.py:255 ../meld/vcview.py:160
msgid "_Compare"
msgstr "_Упореди"
-#: ../meld/dirdiff.py:234 ../meld/vcview.py:160
+#: ../meld/dirdiff.py:255 ../meld/vcview.py:160
msgid "Compare selected"
msgstr "Упореди изабрано"
-#: ../meld/dirdiff.py:235
+#: ../meld/dirdiff.py:256
msgid "Copy _Left"
msgstr "Умножи _лево"
-#: ../meld/dirdiff.py:235
+#: ../meld/dirdiff.py:256
msgid "Copy to left"
msgstr "Умножите лево"
-#: ../meld/dirdiff.py:236
+#: ../meld/dirdiff.py:257
msgid "Copy _Right"
msgstr "Умножи _десно"
-#: ../meld/dirdiff.py:236
+#: ../meld/dirdiff.py:257
msgid "Copy to right"
msgstr "Умножите десно"
-#: ../meld/dirdiff.py:237
+#: ../meld/dirdiff.py:258
msgid "Delete selected"
msgstr "Обриши изабрано"
-#: ../meld/dirdiff.py:238 ../meld/filediff.py:1247
+#: ../meld/dirdiff.py:259 ../meld/filediff.py:1247
msgid "Hide"
msgstr "Сакриј"
-#: ../meld/dirdiff.py:238
+#: ../meld/dirdiff.py:259
msgid "Hide selected"
msgstr "Сакриј изабрано"
-#: ../meld/dirdiff.py:242
+#: ../meld/dirdiff.py:263
msgid "Ignore filename case"
msgstr "Занемари величину слова назива датотеке"
-#: ../meld/dirdiff.py:242
+#: ../meld/dirdiff.py:263
msgid ""
"Consider differently-cased filenames that are otherwise-identical to be the "
"same"
@@ -478,83 +515,88 @@ msgstr ""
"Сматраће истим различите величине слова у називима датотека које су "
"међусобно истоветне"
-#: ../meld/dirdiff.py:243
+#: ../meld/dirdiff.py:264
msgid "Same"
msgstr "Исто"
-#: ../meld/dirdiff.py:243
+#: ../meld/dirdiff.py:264
msgid "Show identical"
msgstr "Прикажи истоветне"
-#: ../meld/dirdiff.py:244
+#: ../meld/dirdiff.py:265
msgid "New"
msgstr "Нови"
-#: ../meld/dirdiff.py:244
+#: ../meld/dirdiff.py:265
msgid "Show new"
msgstr "Прикажи нове"
-#: ../meld/dirdiff.py:245
+#: ../meld/dirdiff.py:266
msgid "Modified"
msgstr "Измењени"
-#: ../meld/dirdiff.py:245 ../meld/vcview.py:172
+#: ../meld/dirdiff.py:266 ../meld/vcview.py:172
msgid "Show modified"
msgstr "Прикажи измењене"
-#: ../meld/dirdiff.py:247
+#: ../meld/dirdiff.py:268
msgid "Filters"
msgstr "Филтери"
-#: ../meld/dirdiff.py:247
+#: ../meld/dirdiff.py:268
msgid "Set active filters"
msgstr "Подесите активне филтере"
#. Create file size CellRenderer
-#: ../meld/dirdiff.py:320
+#: ../meld/dirdiff.py:342
msgid "Size"
msgstr "Величина"
#. Create date-time CellRenderer
-#: ../meld/dirdiff.py:327
+#: ../meld/dirdiff.py:349
msgid "Modification time"
msgstr "Време измене"
-#: ../meld/dirdiff.py:448
+#. Create permissions CellRenderer
+#: ../meld/dirdiff.py:356
+msgid "Permissions"
+msgstr "Овлашћења"
+
+#: ../meld/dirdiff.py:481
#, python-format
msgid "Hide %s"
msgstr "Сакриј „%s“"
-#: ../meld/dirdiff.py:562 ../meld/dirdiff.py:581 ../meld/vcview.py:370
+#: ../meld/dirdiff.py:595 ../meld/dirdiff.py:614 ../meld/vcview.py:370
#: ../meld/vcview.py:394
#, python-format
msgid "[%s] Scanning %s"
msgstr "[%s] прегледам „%s“"
-#: ../meld/dirdiff.py:680
+#: ../meld/dirdiff.py:713
#, python-format
msgid "[%s] Done"
msgstr "[%s] Готово"
-#: ../meld/dirdiff.py:685
+#: ../meld/dirdiff.py:718
msgid "Multiple errors occurred while scanning this folder"
msgstr "Дошло је до више грешака за време претраживања ове фасцикле"
-#: ../meld/dirdiff.py:686
+#: ../meld/dirdiff.py:719
msgid "Files with invalid encodings found"
msgstr "Пронађене су датотеке са неисправним кодирањем"
#. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:688
+#: ../meld/dirdiff.py:721
msgid "Some files were in an incorrect encoding. The names are something like:"
msgstr "Неке датотеке бејаху у неисправном кодирању. Називи су нешто као:"
-#: ../meld/dirdiff.py:690
+#: ../meld/dirdiff.py:723
msgid "Files hidden by case insensitive comparison"
msgstr "Датотеке скривене поређењем неосетљивим на величину слова"
#. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:692
+#: ../meld/dirdiff.py:725
msgid ""
"You are running a case insensitive comparison on a case sensitive "
"filesystem. The following files in this folder are hidden:"
@@ -562,17 +604,17 @@ msgstr ""
"Покренули сте поређење независно од величине слова на систему датотека где "
"је она битна. Неке датотеке нису видљиве:"
-#: ../meld/dirdiff.py:703
+#: ../meld/dirdiff.py:736
#, python-format
msgid "'%s' hidden by '%s'"
msgstr "„%s“ сакривено од стране „%s“"
-#: ../meld/dirdiff.py:728 ../meld/filediff.py:1010 ../meld/filediff.py:1251
+#: ../meld/dirdiff.py:761 ../meld/filediff.py:1010 ../meld/filediff.py:1251
#: ../meld/vcview.py:620 ../meld/vcview.py:662
msgid "Hi_de"
msgstr "_Сакриј"
-#: ../meld/dirdiff.py:760
+#: ../meld/dirdiff.py:793
#, python-format
msgid ""
"'%s' exists.\n"
@@ -581,7 +623,7 @@ msgstr ""
"„%s“ постоји.\n"
"Да преснимим?"
-#: ../meld/dirdiff.py:767
+#: ../meld/dirdiff.py:800
#, python-format
msgid ""
"Error copying '%s' to '%s'\n"
@@ -592,7 +634,7 @@ msgstr ""
"\n"
"%s."
-#: ../meld/dirdiff.py:785 ../meld/vcview.py:594
+#: ../meld/dirdiff.py:818 ../meld/vcview.py:594
#, python-format
msgid ""
"'%s' is a directory.\n"
@@ -601,7 +643,7 @@ msgstr ""
"„%s“ је фасцикла.\n"
"Да уклоним рекурзивно?"
-#: ../meld/dirdiff.py:792 ../meld/vcview.py:599
+#: ../meld/dirdiff.py:825 ../meld/vcview.py:599
#, python-format
msgid ""
"Error removing %s\n"
@@ -612,7 +654,7 @@ msgstr ""
"\n"
"%s."
-#: ../meld/dirdiff.py:892
+#: ../meld/dirdiff.py:925
#, python-format
msgid "%i second"
msgid_plural "%i seconds"
@@ -621,7 +663,7 @@ msgstr[1] "%i секунде"
msgstr[2] "%i секунде"
msgstr[3] "%i секунда"
-#: ../meld/dirdiff.py:893
+#: ../meld/dirdiff.py:926
#, python-format
msgid "%i minute"
msgid_plural "%i minutes"
@@ -630,7 +672,7 @@ msgstr[1] "%i минута"
msgstr[2] "%i минута"
msgstr[3] "%i минут"
-#: ../meld/dirdiff.py:894
+#: ../meld/dirdiff.py:927
#, python-format
msgid "%i hour"
msgid_plural "%i hours"
@@ -639,7 +681,7 @@ msgstr[1] "%i сата"
msgstr[2] "%i сати"
msgstr[3] "%i сат"
-#: ../meld/dirdiff.py:895
+#: ../meld/dirdiff.py:928
#, python-format
msgid "%i day"
msgid_plural "%i days"
@@ -648,7 +690,7 @@ msgstr[1] "%i дана"
msgstr[2] "%i дана"
msgstr[3] "%i дан"
-#: ../meld/dirdiff.py:896
+#: ../meld/dirdiff.py:929
#, python-format
msgid "%i week"
msgid_plural "%i weeks"
@@ -657,7 +699,7 @@ msgstr[1] "%i недеље"
msgstr[2] "%i недеља"
msgstr[3] "%i недеља"
-#: ../meld/dirdiff.py:897
+#: ../meld/dirdiff.py:930
#, python-format
msgid "%i month"
msgid_plural "%i months"
@@ -666,7 +708,7 @@ msgstr[1] "%i месеца"
msgstr[2] "%i месеци"
msgstr[3] "%i месец"
-#: ../meld/dirdiff.py:898
+#: ../meld/dirdiff.py:931
#, python-format
msgid "%i year"
msgid_plural "%i years"
@@ -1007,7 +1049,6 @@ msgid "Load a saved comparison from a Meld comparison file"
msgstr "Учитава сачувано поређење из Мелдове датотеке поређења"
#: ../meld/meldapp.py:135
-#| msgid "Creates a diff tab for up to 3 supplied files or directories."
msgid "Create a diff tab for the supplied files or folders"
msgstr "Прави језичак разлика придодате датотеке или фасцикле"
@@ -1029,7 +1070,6 @@ msgid "D-Bus error; comparisons will open in a new window."
msgstr "Грешка Д-сабирнице; поређење ће се отворити у новом прозору."
#: ../meld/meldapp.py:167
-#| msgid "Error fetching original comparison file"
msgid "Error reading saved comparison file"
msgstr "Грешка читања сачуване датотеке поређења"
@@ -1042,246 +1082,245 @@ msgstr "<неименован>"
msgid "untitled"
msgstr "безимени"
-#: ../meld/meldwindow.py:116
+#: ../meld/meldwindow.py:62
msgid "_File"
msgstr "_Датотека"
-#: ../meld/meldwindow.py:117
-msgid "_New..."
-msgstr "_Ново..."
+#: ../meld/meldwindow.py:63
+#| msgid "_File Comparison"
+msgid "_New comparison"
+msgstr "_Ново поређење"
-#: ../meld/meldwindow.py:117
+#: ../meld/meldwindow.py:63
msgid "Start a new comparison"
msgstr "Започните ново поређење"
-#: ../meld/meldwindow.py:118
+#: ../meld/meldwindow.py:64
msgid "Save the current file"
msgstr "Сачувајте тренутну датотеку"
-#: ../meld/meldwindow.py:120
+#: ../meld/meldwindow.py:66
msgid "Close the current file"
msgstr "Затворите тренутну датотеку"
-#: ../meld/meldwindow.py:121
+#: ../meld/meldwindow.py:67
msgid "Quit the program"
msgstr "Затворите програм"
-#: ../meld/meldwindow.py:123
+#: ../meld/meldwindow.py:69
msgid "_Edit"
msgstr "_Уређивање"
-#: ../meld/meldwindow.py:124
+#: ../meld/meldwindow.py:70
msgid "Undo the last action"
msgstr "Опозовите последњу радњу"
-#: ../meld/meldwindow.py:125
+#: ../meld/meldwindow.py:71
msgid "Redo the last undone action"
msgstr "Поновите последњу опозвану радњу"
-#: ../meld/meldwindow.py:126
+#: ../meld/meldwindow.py:72
msgid "Cut the selection"
msgstr "Исеците избор"
-#: ../meld/meldwindow.py:127
+#: ../meld/meldwindow.py:73
msgid "Copy the selection"
msgstr "Умножите избор"
-#: ../meld/meldwindow.py:128
+#: ../meld/meldwindow.py:74
msgid "Paste the clipboard"
msgstr "Убаците оставу"
-#: ../meld/meldwindow.py:129
+#: ../meld/meldwindow.py:75
msgid "Search for text"
msgstr "Тражите текст"
-#: ../meld/meldwindow.py:130
+#: ../meld/meldwindow.py:76
msgid "Find Ne_xt"
msgstr "Нађи с_ледеће"
-#: ../meld/meldwindow.py:130
+#: ../meld/meldwindow.py:76
msgid "Search forwards for the same text"
msgstr "Тражите унапред исти текст"
-#: ../meld/meldwindow.py:131
+#: ../meld/meldwindow.py:77
msgid "Find _Previous"
msgstr "Нађи пре_тходно"
-#: ../meld/meldwindow.py:131
+#: ../meld/meldwindow.py:77
msgid "Search backwards for the same text"
msgstr "Тражите уназад исти текст"
-#: ../meld/meldwindow.py:132
+#: ../meld/meldwindow.py:78
msgid "Find and replace text"
msgstr "Пронађите и замените текст"
-#: ../meld/meldwindow.py:133
+#: ../meld/meldwindow.py:79
msgid "Prefere_nces"
msgstr "Пос_тавке"
-#: ../meld/meldwindow.py:133
+#: ../meld/meldwindow.py:79
msgid "Configure the application"
msgstr "Подесите програм"
-#: ../meld/meldwindow.py:135
+#: ../meld/meldwindow.py:81
msgid "_Changes"
msgstr "_Измене"
-#: ../meld/meldwindow.py:136
+#: ../meld/meldwindow.py:82
msgid "Next change"
msgstr "Следећа измена"
-#: ../meld/meldwindow.py:136
+#: ../meld/meldwindow.py:82
msgid "Go to the next change"
msgstr "Идите на следећу измену"
-#: ../meld/meldwindow.py:137
+#: ../meld/meldwindow.py:83
msgid "Previous change"
msgstr "Претходна измена"
-#: ../meld/meldwindow.py:137
+#: ../meld/meldwindow.py:83
msgid "Go to the previous change"
msgstr "Идите на претходну измену"
-#: ../meld/meldwindow.py:138
+#: ../meld/meldwindow.py:84
msgid "Open externally"
msgstr "Отвори спољним"
-#: ../meld/meldwindow.py:138
+#: ../meld/meldwindow.py:84
msgid "Open selected file or directory in the default external application"
msgstr "Отворите изабрану датотеку или фасциклу у основном спољном програму"
-#: ../meld/meldwindow.py:140
+#: ../meld/meldwindow.py:86
msgid "_View"
msgstr "П_реглед"
-#: ../meld/meldwindow.py:141
+#: ../meld/meldwindow.py:87
msgid "File status"
msgstr "Стање датотеке"
-#: ../meld/meldwindow.py:142
+#: ../meld/meldwindow.py:88
msgid "Version status"
msgstr "Стање издања"
-#: ../meld/meldwindow.py:143
+#: ../meld/meldwindow.py:89
msgid "File filters"
msgstr "Филтери датотеке"
-#: ../meld/meldwindow.py:144
+#: ../meld/meldwindow.py:90
msgid "Stop the current action"
msgstr "Зауставите тренутну радњу"
-#: ../meld/meldwindow.py:145
+#: ../meld/meldwindow.py:91
msgid "Refresh the view"
msgstr "Освежите преглед"
-#: ../meld/meldwindow.py:146
+#: ../meld/meldwindow.py:92
msgid "Reload"
msgstr "Поново учитај"
-#: ../meld/meldwindow.py:146
+#: ../meld/meldwindow.py:92
msgid "Reload the comparison"
msgstr "Поново учитајте поређење"
-#: ../meld/meldwindow.py:148
+#: ../meld/meldwindow.py:94
msgid "_Tabs"
msgstr "_Језичци"
-#: ../meld/meldwindow.py:149
+#: ../meld/meldwindow.py:95
msgid "_Previous Tab"
msgstr "Пре_тходни језичак"
-#: ../meld/meldwindow.py:149
+#: ../meld/meldwindow.py:95
msgid "Activate previous tab"
msgstr "Идите на претходни лист"
-#: ../meld/meldwindow.py:150
+#: ../meld/meldwindow.py:96
msgid "_Next Tab"
msgstr "Сле_дећи језичак"
-#: ../meld/meldwindow.py:150
+#: ../meld/meldwindow.py:96
msgid "Activate next tab"
msgstr "Идите на наредни лист"
-#: ../meld/meldwindow.py:151
+#: ../meld/meldwindow.py:97
msgid "Move Tab _Left"
msgstr "Премести језичак _лево"
-#: ../meld/meldwindow.py:151
+#: ../meld/meldwindow.py:97
msgid "Move current tab to left"
msgstr "Преместите тренутни језичак на лево"
-#: ../meld/meldwindow.py:152
+#: ../meld/meldwindow.py:98
msgid "Move Tab _Right"
msgstr "Премести језичак _десно"
-#: ../meld/meldwindow.py:152
+#: ../meld/meldwindow.py:98
msgid "Move current tab to right"
msgstr "Преместите тренутни језичак на десно"
-#: ../meld/meldwindow.py:154
+#: ../meld/meldwindow.py:100
msgid "_Help"
msgstr "По_моћ"
-#: ../meld/meldwindow.py:155
+#: ../meld/meldwindow.py:101
msgid "_Contents"
msgstr "_Садржај"
-#: ../meld/meldwindow.py:155
+#: ../meld/meldwindow.py:101
msgid "Open the Meld manual"
msgstr "Отворите упутство Мелда"
-#: ../meld/meldwindow.py:156
+#: ../meld/meldwindow.py:102
msgid "Report _Bug"
msgstr "Пријави _грешку"
-#: ../meld/meldwindow.py:156
+#: ../meld/meldwindow.py:102
msgid "Report a bug in Meld"
msgstr "Пријавите грешку у Мелду"
-#: ../meld/meldwindow.py:157
+#: ../meld/meldwindow.py:103
msgid "About this program"
msgstr "О овом програму"
-#: ../meld/meldwindow.py:160
+#: ../meld/meldwindow.py:106
msgid "Full Screen"
msgstr "Преко целог екрана"
-#: ../meld/meldwindow.py:160
+#: ../meld/meldwindow.py:106
msgid "View the comparison in full screen"
msgstr "Прегледајте поређење преко целог екрана"
-#: ../meld/meldwindow.py:161
+#: ../meld/meldwindow.py:107
msgid "_Toolbar"
msgstr "_Палета алата"
-#: ../meld/meldwindow.py:161
+#: ../meld/meldwindow.py:107
msgid "Show or hide the toolbar"
msgstr "Прикажите или сакријте палету алата"
-#: ../meld/meldwindow.py:162
+#: ../meld/meldwindow.py:108
msgid "_Statusbar"
msgstr "Трака _стања"
-#: ../meld/meldwindow.py:162
+#: ../meld/meldwindow.py:108
msgid "Show or hide the statusbar"
msgstr "Прикажите или сакријте траку стања"
-#: ../meld/meldwindow.py:170
-#| msgid "Open externally"
+#: ../meld/meldwindow.py:116
msgid "Open Recent"
msgstr "Отвори скорашње"
-#: ../meld/meldwindow.py:171
-#| msgid "Select file"
+#: ../meld/meldwindow.py:117
msgid "Open recent files"
msgstr "Отворите скорашње датотеке"
-#: ../meld/meldwindow.py:569
+#: ../meld/meldwindow.py:526
msgid "Switch to this tab"
msgstr "Пребаците се на овај језичак"
#. exit at first non found directory + file
-#: ../meld/meldwindow.py:674
+#: ../meld/meldwindow.py:652
msgid "Cannot compare a mixture of files and directories.\n"
msgstr "Не могу да поредим мешавину датотека и фасцикли.\n"
@@ -1294,25 +1333,25 @@ msgstr "[ништа]"
msgid "Save Patch As..."
msgstr "Сачувај исправку као..."
-#: ../meld/preferences.py:38
+#: ../meld/preferences.py:44
msgid "label"
msgstr "натпис"
-#: ../meld/preferences.py:38
+#: ../meld/preferences.py:44
msgid "pattern"
msgstr "образац"
-#: ../meld/preferences.py:142
+#: ../meld/preferences.py:160
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:263
+#: ../meld/preferences.py:306
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:265
+#: ../meld/preferences.py:308
msgid ""
"OS-specific metadata\t0\t.DS_Store ._* .Spotlight-V100 .Trashes Thumbs.db "
"Desktop.ini\n"
@@ -1321,48 +1360,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:267
+#: ../meld/preferences.py:310
#, 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:269
+#: ../meld/preferences.py:312
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:271
+#: ../meld/preferences.py:314
msgid "Media\t0\t*.{jpg,gif,png,bmp,wav,mp3,ogg,flac,avi,mpg,xcf,xpm}"
msgstr "Медија\t0\t*.{jpg,gif,png,bmp,wav,mp3,ogg,flac,avi,mpg,xcf,xpm}"
#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:273
+#: ../meld/preferences.py:316
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:275
+#: ../meld/preferences.py:318
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:277
+#: ../meld/preferences.py:320
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:279
+#: ../meld/preferences.py:322
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:281
+#: ../meld/preferences.py:324
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:283
+#: ../meld/preferences.py:326
msgid "Script comment\t0\t#.*"
msgstr "Коментар скрипте\t0\t#.*"
@@ -1600,89 +1639,3 @@ msgstr ""
#, python-format
msgid "Mode changed from %s to %s"
msgstr "Режим је измењен из „%s“ у „%s“"
-
-#~ msgid "Save modified files?"
-#~ msgstr "Да сачувам измењене датотеке?"
-
-#~ msgid ""
-#~ "Some files have been modified.\n"
-#~ "Which ones would you like to save?"
-#~ msgstr ""
-#~ "Неке датотеке су измењене.\n"
-#~ "Које желите да сачувате?"
-
-#~ msgid "_Discard Changes"
-#~ msgstr "_Одбаци измене"
-
-#~ msgid "_Save Selected"
-#~ msgstr "_Сачувај изабрано"
-
-#~ msgid ""
-#~ "Reloading will discard changes in:\n"
-#~ "%s\n"
-#~ "\n"
-#~ "You cannot undo this operation."
-#~ msgstr ""
-#~ "Освежавање ће одбацити измене у:\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Ову операцију не можете опозвати."
-
-#~ msgid "Select some files first."
-#~ msgstr "Прво изаберите неке датотеке."
-
-#~ msgid "Add _Binary"
-#~ msgstr "Додај _бинарно"
-
-#~ msgid "Add binary to VC"
-#~ msgstr "Додај бинарно у ЦВ"
-
-#~ msgid ""
-#~ "\n"
-#~ " Invoking 'patch' failed.\n"
-#~ " \n"
-#~ " Maybe you don't have 'GNU patch' installed,\n"
-#~ " or you use an untested version of %s.\n"
-#~ " \n"
-#~ " Please send email bug report to:\n"
-#~ " meld-list gnome org\n"
-#~ " \n"
-#~ " Containing the following information:\n"
-#~ " \n"
-#~ " - meld version: '%s'\n"
-#~ " - source control software type: '%s'\n"
-#~ " - source control software version: 'X.Y.Z'\n"
-#~ " - the output of '%s somefile.txt'\n"
-#~ " - patch command: '%s'\n"
-#~ " (no need to actually run it, just provide\n"
-#~ " the command line) \n"
-#~ " \n"
-#~ " Replace 'X.Y.Z' by the actual version for the\n"
-#~ " source control software you use.\n"
-#~ " "
-#~ msgstr ""
-#~ "\n"
-#~ " Призивање „patch“ није успело.\n"
-#~ " \n"
-#~ " Можда нисте инсталирали „GNU patch“,\n"
-#~ " или користите непроверену верзију „%s“.\n"
-#~ " \n"
-#~ " Молим пошаљите извештај о грешци на:\n"
-#~ " meld-list gnome org\n"
-#~ " \n"
-#~ " Који садржи следеће информације:\n"
-#~ " \n"
-#~ " — верзија мелда: „%s“\n"
-#~ " — врста софтвера контроле извора: „%s“\n"
-#~ " — верзија софтвера контроле извора: „X.Y.Z“\n"
-#~ " — испис „%s некадатотека.txt“\n"
-#~ " — наредба за пач: „%s“\n"
-#~ " (није потребно стварно покретање, само\n"
-#~ " обезбедите линију наредбе) \n"
-#~ " \n"
-#~ " Замените „X.Y.Z“ тренутном верзијом\n"
-#~ " софтвера контроле извора који користите.\n"
-#~ " "
-
-#~ msgid "can't compare more than three directories"
-#~ msgstr "не могу да поредим више од три фасцикле"
diff --git a/po/sr latin po b/po/sr latin po
index cd3dc3a..b4bb1b8 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: 2013-01-08 19:43+0000\n"
-"PO-Revision-Date: 2013-01-08 21:03+0200\n"
+"POT-Creation-Date: 2013-02-09 22:18+0000\n"
+"PO-Revision-Date: 2013-02-20 20:39+0200\n"
"Last-Translator: Miroslav Nikolić <miroslavnikolic rocketmail com>\n"
"Language-Team: Serbian <gnom prevod org>\n"
"Language: sr\n"
@@ -54,7 +54,6 @@ msgid "Active"
msgstr "Aktivan"
#: ../data/ui/EditableList.ui.h:3
-#| msgid "<unnamed>"
msgid "Column name"
msgstr "Naziv kolone"
@@ -83,7 +82,7 @@ msgid "Move _Down"
msgstr "Premesti _dole"
#. Create icon and filename CellRenderer
-#: ../data/ui/EditableList.ui.h:10 ../meld/dirdiff.py:303
+#: ../data/ui/EditableList.ui.h:10 ../meld/dirdiff.py:325
#: ../meld/vcview.py:200
msgid "Name"
msgstr "Naziv"
@@ -129,7 +128,7 @@ msgstr ""
"ovu datoteku i da ipak načinite izmene, ali te izmene moraju biti sačuvane u "
"novu datoteku."
-#: ../data/ui/findbar.ui.h:1 ../meld/meldwindow.py:132
+#: ../data/ui/findbar.ui.h:1 ../meld/meldwindow.py:78
msgid "_Replace"
msgstr "_Zameni"
@@ -213,49 +212,6 @@ msgstr ""
"\n"
"Prevod.org — prevod na srpski jezik."
-#: ../data/ui/meldapp.ui.h:10
-msgid "Choose Files"
-msgstr "Izaberite datoteke"
-
-#: ../data/ui/meldapp.ui.h:11
-msgid "_Three Way Compare"
-msgstr "Poređenje _tri elementa"
-
-#. Refers to version of the file being compared
-#: ../data/ui/meldapp.ui.h:13
-msgid "Mine"
-msgstr "Moja"
-
-#. Refers to version of the file being compared
-#: ../data/ui/meldapp.ui.h:15
-msgid "Original"
-msgstr "Izvorna"
-
-#. Refers to version of the file being compared
-#: ../data/ui/meldapp.ui.h:17
-msgid "Other"
-msgstr "Druga"
-
-#: ../data/ui/meldapp.ui.h:18
-msgid "_File Comparison"
-msgstr "Poređenje _datoteka"
-
-#: ../data/ui/meldapp.ui.h:19
-msgid "_Directory Comparison"
-msgstr "Poređenje _fascikli"
-
-#: ../data/ui/meldapp.ui.h:20
-msgid "Select VC Directory"
-msgstr "Izaberite CV fasciklu"
-
-#: ../data/ui/meldapp.ui.h:21
-msgid "Directory"
-msgstr "Fascikla"
-
-#: ../data/ui/meldapp.ui.h:22
-msgid "_Version Control Browser"
-msgstr "Preglednik kontrole _verzija"
-
#: ../data/ui/patch-dialog.ui.h:1
msgid "Create Patch"
msgstr "Napravi ispravku"
@@ -349,24 +305,35 @@ msgid "Editor"
msgstr "Uređivač"
#: ../data/ui/preferences.ui.h:17
-#| msgid "Ignore symbolic links"
+#| msgid "Start a new comparison"
+msgid "Shallow comparison"
+msgstr "Površno poređenje"
+
+#: ../data/ui/preferences.ui.h:18
+msgid "C_ompare files based only on size and timestamp"
+msgstr "Up_oredi datoteke samo na osnovu veličine i vremenske oznake"
+
+#: ../data/ui/preferences.ui.h:19
+msgid "_Timestamp resolution:"
+msgstr "_Rezolucija vremenske oznake:"
+
+#: ../data/ui/preferences.ui.h:20
msgid "Symbolic links"
msgstr "Simboličke veze"
-#: ../data/ui/preferences.ui.h:18
+#: ../data/ui/preferences.ui.h:21
msgid "Ignore symbolic links"
msgstr "Zanemari simboličke veze"
-#: ../data/ui/preferences.ui.h:19
+#: ../data/ui/preferences.ui.h:22
msgid "Visible columns"
msgstr "Prikazane kolone"
-#: ../data/ui/preferences.ui.h:20
-#| msgid "_File Comparison"
+#: ../data/ui/preferences.ui.h:23
msgid "Folder comparisons"
msgstr "Poređenje fascikli"
-#: ../data/ui/preferences.ui.h:21
+#: ../data/ui/preferences.ui.h:24
msgid ""
"When performing directory comparisons, you may filter out files and "
"directories by name. Each pattern is a list of shell style wildcards "
@@ -376,11 +343,11 @@ msgstr ""
"prema nazivu. Svaki obrazac je spisak džokera u stilu konzole razdvojenih "
"razmakom."
-#: ../data/ui/preferences.ui.h:22
+#: ../data/ui/preferences.ui.h:25
msgid "File Filters"
msgstr "Filteri datoteka"
-#: ../data/ui/preferences.ui.h:23
+#: ../data/ui/preferences.ui.h:26
msgid ""
"When performing file comparisons, you may ignore certain types of changes. "
"Each pattern here is a python regular expression which replaces matching "
@@ -393,27 +360,97 @@ msgstr ""
"praznim niskama pre izvršavanja poređenja. Ako izraz sadrži grupe, samo grupe "
"bivaju zamenjene. Za više detalja pogledajte uputstvo za korisnike."
-#: ../data/ui/preferences.ui.h:24
+#: ../data/ui/preferences.ui.h:27
msgid "Ignore changes which insert or delete blank lines"
msgstr "Zanemari izmene koje ubacuju ili brišu prazne redove"
-#: ../data/ui/preferences.ui.h:25
+#: ../data/ui/preferences.ui.h:28
msgid "Text Filters"
msgstr "Filteri teksta"
-#: ../data/ui/preferences.ui.h:26
+#: ../data/ui/preferences.ui.h:29
msgid "Loading"
msgstr "Učitavam"
# bug: what encoding is iso8859? it's a registry of encodings, and encoding is eg. iso8859-5
-#: ../data/ui/preferences.ui.h:27
+#: ../data/ui/preferences.ui.h:30
msgid "When loading, try these codecs in order. (e.g. utf8, iso8859)"
msgstr "Pri učitavanju, probaj ova kodiranja redom. (npr. utf8, iso8859)"
-#: ../data/ui/preferences.ui.h:28
+#: ../data/ui/preferences.ui.h:31
msgid "Encoding"
msgstr "Kodiranje"
+#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:604
+#| msgid "Folder comparisons"
+msgid "New comparison"
+msgstr "Novo poređenje"
+
+#: ../data/ui/tab-placeholder.ui.h:2
+#| msgid "_File Comparison"
+msgid "File comparison"
+msgstr "Poređenje datoteka"
+
+#: ../data/ui/tab-placeholder.ui.h:3
+#| msgid "_Directory Comparison"
+msgid "Directory comparison"
+msgstr "Poređenje fascikli"
+
+#: ../data/ui/tab-placeholder.ui.h:4
+#| msgid "_Version Control Browser"
+msgid "Version control view"
+msgstr "Pregled upravljanja izdanjima"
+
+#: ../data/ui/tab-placeholder.ui.h:5
+#| msgid "_File Comparison"
+msgid "_3-way comparison"
+msgstr "Uporedi _3-elementa"
+
+#: ../data/ui/tab-placeholder.ui.h:6
+#| msgid "Select file"
+msgid "Select Third File"
+msgstr "Izaberite treću datoteku"
+
+#: ../data/ui/tab-placeholder.ui.h:7
+#| msgid "Select file"
+msgid "Select Second File"
+msgstr "Izaberite drugu datoteku"
+
+#: ../data/ui/tab-placeholder.ui.h:8
+#| msgid "Select file"
+msgid "Select First File"
+msgstr "Izaberite prvu datoteku"
+
+#: ../data/ui/tab-placeholder.ui.h:9
+#| msgid "Select directory"
+msgid "Select First Folder"
+msgstr "Izaberite prvu fasciklu"
+
+#: ../data/ui/tab-placeholder.ui.h:10
+#| msgid "Select directory"
+msgid "Select Second Folder"
+msgstr "Izaberite drugu fasciklu"
+
+#: ../data/ui/tab-placeholder.ui.h:11
+#| msgid "Select file"
+msgid "Select Third Folder"
+msgstr "Izaberite treću fasciklu"
+
+#: ../data/ui/tab-placeholder.ui.h:12
+#| msgid "_Version Control Browser"
+msgid "Select A Version-Controlled Folder"
+msgstr "Izaberite fasciklu upravljanja izdanjem"
+
+#: ../data/ui/tab-placeholder.ui.h:13
+#| msgid "_File Comparison"
+msgid "_Blank comparison"
+msgstr "_Prazno poređenje"
+
+#: ../data/ui/tab-placeholder.ui.h:14
+#| msgid "_Compare"
+msgid "C_ompare"
+msgstr "_Uporedi"
+
#: ../data/ui/vcview.ui.h:1
msgid "VC Log"
msgstr "CV dnevnik"
@@ -430,47 +467,47 @@ msgstr "Prethodni dnevnici"
msgid "Log Message"
msgstr "Poruka dnevnika"
-#: ../meld/dirdiff.py:234 ../meld/vcview.py:160
+#: ../meld/dirdiff.py:255 ../meld/vcview.py:160
msgid "_Compare"
msgstr "_Uporedi"
-#: ../meld/dirdiff.py:234 ../meld/vcview.py:160
+#: ../meld/dirdiff.py:255 ../meld/vcview.py:160
msgid "Compare selected"
msgstr "Uporedi izabrano"
-#: ../meld/dirdiff.py:235
+#: ../meld/dirdiff.py:256
msgid "Copy _Left"
msgstr "Umnoži _levo"
-#: ../meld/dirdiff.py:235
+#: ../meld/dirdiff.py:256
msgid "Copy to left"
msgstr "Umnožite levo"
-#: ../meld/dirdiff.py:236
+#: ../meld/dirdiff.py:257
msgid "Copy _Right"
msgstr "Umnoži _desno"
-#: ../meld/dirdiff.py:236
+#: ../meld/dirdiff.py:257
msgid "Copy to right"
msgstr "Umnožite desno"
-#: ../meld/dirdiff.py:237
+#: ../meld/dirdiff.py:258
msgid "Delete selected"
msgstr "Obriši izabrano"
-#: ../meld/dirdiff.py:238 ../meld/filediff.py:1247
+#: ../meld/dirdiff.py:259 ../meld/filediff.py:1247
msgid "Hide"
msgstr "Sakrij"
-#: ../meld/dirdiff.py:238
+#: ../meld/dirdiff.py:259
msgid "Hide selected"
msgstr "Sakrij izabrano"
-#: ../meld/dirdiff.py:242
+#: ../meld/dirdiff.py:263
msgid "Ignore filename case"
msgstr "Zanemari veličinu slova naziva datoteke"
-#: ../meld/dirdiff.py:242
+#: ../meld/dirdiff.py:263
msgid ""
"Consider differently-cased filenames that are otherwise-identical to be the "
"same"
@@ -478,83 +515,88 @@ msgstr ""
"Smatraće istim različite veličine slova u nazivima datoteka koje su "
"međusobno istovetne"
-#: ../meld/dirdiff.py:243
+#: ../meld/dirdiff.py:264
msgid "Same"
msgstr "Isto"
-#: ../meld/dirdiff.py:243
+#: ../meld/dirdiff.py:264
msgid "Show identical"
msgstr "Prikaži istovetne"
-#: ../meld/dirdiff.py:244
+#: ../meld/dirdiff.py:265
msgid "New"
msgstr "Novi"
-#: ../meld/dirdiff.py:244
+#: ../meld/dirdiff.py:265
msgid "Show new"
msgstr "Prikaži nove"
-#: ../meld/dirdiff.py:245
+#: ../meld/dirdiff.py:266
msgid "Modified"
msgstr "Izmenjeni"
-#: ../meld/dirdiff.py:245 ../meld/vcview.py:172
+#: ../meld/dirdiff.py:266 ../meld/vcview.py:172
msgid "Show modified"
msgstr "Prikaži izmenjene"
-#: ../meld/dirdiff.py:247
+#: ../meld/dirdiff.py:268
msgid "Filters"
msgstr "Filteri"
-#: ../meld/dirdiff.py:247
+#: ../meld/dirdiff.py:268
msgid "Set active filters"
msgstr "Podesite aktivne filtere"
#. Create file size CellRenderer
-#: ../meld/dirdiff.py:320
+#: ../meld/dirdiff.py:342
msgid "Size"
msgstr "Veličina"
#. Create date-time CellRenderer
-#: ../meld/dirdiff.py:327
+#: ../meld/dirdiff.py:349
msgid "Modification time"
msgstr "Vreme izmene"
-#: ../meld/dirdiff.py:448
+#. Create permissions CellRenderer
+#: ../meld/dirdiff.py:356
+msgid "Permissions"
+msgstr "Ovlašćenja"
+
+#: ../meld/dirdiff.py:481
#, python-format
msgid "Hide %s"
msgstr "Sakrij „%s“"
-#: ../meld/dirdiff.py:562 ../meld/dirdiff.py:581 ../meld/vcview.py:370
+#: ../meld/dirdiff.py:595 ../meld/dirdiff.py:614 ../meld/vcview.py:370
#: ../meld/vcview.py:394
#, python-format
msgid "[%s] Scanning %s"
msgstr "[%s] pregledam „%s“"
-#: ../meld/dirdiff.py:680
+#: ../meld/dirdiff.py:713
#, python-format
msgid "[%s] Done"
msgstr "[%s] Gotovo"
-#: ../meld/dirdiff.py:685
+#: ../meld/dirdiff.py:718
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:686
+#: ../meld/dirdiff.py:719
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:688
+#: ../meld/dirdiff.py:721
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:690
+#: ../meld/dirdiff.py:723
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:692
+#: ../meld/dirdiff.py:725
msgid ""
"You are running a case insensitive comparison on a case sensitive "
"filesystem. The following files in this folder are hidden:"
@@ -562,17 +604,17 @@ msgstr ""
"Pokrenuli ste poređenje nezavisno od veličine slova na sistemu datoteka gde "
"je ona bitna. Neke datoteke nisu vidljive:"
-#: ../meld/dirdiff.py:703
+#: ../meld/dirdiff.py:736
#, python-format
msgid "'%s' hidden by '%s'"
msgstr "„%s“ sakriveno od strane „%s“"
-#: ../meld/dirdiff.py:728 ../meld/filediff.py:1010 ../meld/filediff.py:1251
+#: ../meld/dirdiff.py:761 ../meld/filediff.py:1010 ../meld/filediff.py:1251
#: ../meld/vcview.py:620 ../meld/vcview.py:662
msgid "Hi_de"
msgstr "_Sakrij"
-#: ../meld/dirdiff.py:760
+#: ../meld/dirdiff.py:793
#, python-format
msgid ""
"'%s' exists.\n"
@@ -581,7 +623,7 @@ msgstr ""
"„%s“ postoji.\n"
"Da presnimim?"
-#: ../meld/dirdiff.py:767
+#: ../meld/dirdiff.py:800
#, python-format
msgid ""
"Error copying '%s' to '%s'\n"
@@ -592,7 +634,7 @@ msgstr ""
"\n"
"%s."
-#: ../meld/dirdiff.py:785 ../meld/vcview.py:594
+#: ../meld/dirdiff.py:818 ../meld/vcview.py:594
#, python-format
msgid ""
"'%s' is a directory.\n"
@@ -601,7 +643,7 @@ msgstr ""
"„%s“ je fascikla.\n"
"Da uklonim rekurzivno?"
-#: ../meld/dirdiff.py:792 ../meld/vcview.py:599
+#: ../meld/dirdiff.py:825 ../meld/vcview.py:599
#, python-format
msgid ""
"Error removing %s\n"
@@ -612,7 +654,7 @@ msgstr ""
"\n"
"%s."
-#: ../meld/dirdiff.py:892
+#: ../meld/dirdiff.py:925
#, python-format
msgid "%i second"
msgid_plural "%i seconds"
@@ -621,7 +663,7 @@ msgstr[1] "%i sekunde"
msgstr[2] "%i sekunde"
msgstr[3] "%i sekunda"
-#: ../meld/dirdiff.py:893
+#: ../meld/dirdiff.py:926
#, python-format
msgid "%i minute"
msgid_plural "%i minutes"
@@ -630,7 +672,7 @@ msgstr[1] "%i minuta"
msgstr[2] "%i minuta"
msgstr[3] "%i minut"
-#: ../meld/dirdiff.py:894
+#: ../meld/dirdiff.py:927
#, python-format
msgid "%i hour"
msgid_plural "%i hours"
@@ -639,7 +681,7 @@ msgstr[1] "%i sata"
msgstr[2] "%i sati"
msgstr[3] "%i sat"
-#: ../meld/dirdiff.py:895
+#: ../meld/dirdiff.py:928
#, python-format
msgid "%i day"
msgid_plural "%i days"
@@ -648,7 +690,7 @@ msgstr[1] "%i dana"
msgstr[2] "%i dana"
msgstr[3] "%i dan"
-#: ../meld/dirdiff.py:896
+#: ../meld/dirdiff.py:929
#, python-format
msgid "%i week"
msgid_plural "%i weeks"
@@ -657,7 +699,7 @@ msgstr[1] "%i nedelje"
msgstr[2] "%i nedelja"
msgstr[3] "%i nedelja"
-#: ../meld/dirdiff.py:897
+#: ../meld/dirdiff.py:930
#, python-format
msgid "%i month"
msgid_plural "%i months"
@@ -666,7 +708,7 @@ msgstr[1] "%i meseca"
msgstr[2] "%i meseci"
msgstr[3] "%i mesec"
-#: ../meld/dirdiff.py:898
+#: ../meld/dirdiff.py:931
#, python-format
msgid "%i year"
msgid_plural "%i years"
@@ -1007,7 +1049,6 @@ msgid "Load a saved comparison from a Meld comparison file"
msgstr "Učitava sačuvano poređenje iz Meldove datoteke poređenja"
#: ../meld/meldapp.py:135
-#| msgid "Creates a diff tab for up to 3 supplied files or directories."
msgid "Create a diff tab for the supplied files or folders"
msgstr "Pravi jezičak razlika pridodate datoteke ili fascikle"
@@ -1029,7 +1070,6 @@ msgid "D-Bus error; comparisons will open in a new window."
msgstr "Greška D-sabirnice; poređenje će se otvoriti u novom prozoru."
#: ../meld/meldapp.py:167
-#| msgid "Error fetching original comparison file"
msgid "Error reading saved comparison file"
msgstr "Greška čitanja sačuvane datoteke poređenja"
@@ -1042,246 +1082,245 @@ msgstr "<neimenovan>"
msgid "untitled"
msgstr "bezimeni"
-#: ../meld/meldwindow.py:116
+#: ../meld/meldwindow.py:62
msgid "_File"
msgstr "_Datoteka"
-#: ../meld/meldwindow.py:117
-msgid "_New..."
-msgstr "_Novo..."
+#: ../meld/meldwindow.py:63
+#| msgid "_File Comparison"
+msgid "_New comparison"
+msgstr "_Novo poređenje"
-#: ../meld/meldwindow.py:117
+#: ../meld/meldwindow.py:63
msgid "Start a new comparison"
msgstr "Započnite novo poređenje"
-#: ../meld/meldwindow.py:118
+#: ../meld/meldwindow.py:64
msgid "Save the current file"
msgstr "Sačuvajte trenutnu datoteku"
-#: ../meld/meldwindow.py:120
+#: ../meld/meldwindow.py:66
msgid "Close the current file"
msgstr "Zatvorite trenutnu datoteku"
-#: ../meld/meldwindow.py:121
+#: ../meld/meldwindow.py:67
msgid "Quit the program"
msgstr "Zatvorite program"
-#: ../meld/meldwindow.py:123
+#: ../meld/meldwindow.py:69
msgid "_Edit"
msgstr "_Uređivanje"
-#: ../meld/meldwindow.py:124
+#: ../meld/meldwindow.py:70
msgid "Undo the last action"
msgstr "Opozovite poslednju radnju"
-#: ../meld/meldwindow.py:125
+#: ../meld/meldwindow.py:71
msgid "Redo the last undone action"
msgstr "Ponovite poslednju opozvanu radnju"
-#: ../meld/meldwindow.py:126
+#: ../meld/meldwindow.py:72
msgid "Cut the selection"
msgstr "Isecite izbor"
-#: ../meld/meldwindow.py:127
+#: ../meld/meldwindow.py:73
msgid "Copy the selection"
msgstr "Umnožite izbor"
-#: ../meld/meldwindow.py:128
+#: ../meld/meldwindow.py:74
msgid "Paste the clipboard"
msgstr "Ubacite ostavu"
-#: ../meld/meldwindow.py:129
+#: ../meld/meldwindow.py:75
msgid "Search for text"
msgstr "Tražite tekst"
-#: ../meld/meldwindow.py:130
+#: ../meld/meldwindow.py:76
msgid "Find Ne_xt"
msgstr "Nađi s_ledeće"
-#: ../meld/meldwindow.py:130
+#: ../meld/meldwindow.py:76
msgid "Search forwards for the same text"
msgstr "Tražite unapred isti tekst"
-#: ../meld/meldwindow.py:131
+#: ../meld/meldwindow.py:77
msgid "Find _Previous"
msgstr "Nađi pre_thodno"
-#: ../meld/meldwindow.py:131
+#: ../meld/meldwindow.py:77
msgid "Search backwards for the same text"
msgstr "Tražite unazad isti tekst"
-#: ../meld/meldwindow.py:132
+#: ../meld/meldwindow.py:78
msgid "Find and replace text"
msgstr "Pronađite i zamenite tekst"
-#: ../meld/meldwindow.py:133
+#: ../meld/meldwindow.py:79
msgid "Prefere_nces"
msgstr "Pos_tavke"
-#: ../meld/meldwindow.py:133
+#: ../meld/meldwindow.py:79
msgid "Configure the application"
msgstr "Podesite program"
-#: ../meld/meldwindow.py:135
+#: ../meld/meldwindow.py:81
msgid "_Changes"
msgstr "_Izmene"
-#: ../meld/meldwindow.py:136
+#: ../meld/meldwindow.py:82
msgid "Next change"
msgstr "Sledeća izmena"
-#: ../meld/meldwindow.py:136
+#: ../meld/meldwindow.py:82
msgid "Go to the next change"
msgstr "Idite na sledeću izmenu"
-#: ../meld/meldwindow.py:137
+#: ../meld/meldwindow.py:83
msgid "Previous change"
msgstr "Prethodna izmena"
-#: ../meld/meldwindow.py:137
+#: ../meld/meldwindow.py:83
msgid "Go to the previous change"
msgstr "Idite na prethodnu izmenu"
-#: ../meld/meldwindow.py:138
+#: ../meld/meldwindow.py:84
msgid "Open externally"
msgstr "Otvori spoljnim"
-#: ../meld/meldwindow.py:138
+#: ../meld/meldwindow.py:84
msgid "Open selected file or directory in the default external application"
msgstr "Otvorite izabranu datoteku ili fasciklu u osnovnom spoljnom programu"
-#: ../meld/meldwindow.py:140
+#: ../meld/meldwindow.py:86
msgid "_View"
msgstr "P_regled"
-#: ../meld/meldwindow.py:141
+#: ../meld/meldwindow.py:87
msgid "File status"
msgstr "Stanje datoteke"
-#: ../meld/meldwindow.py:142
+#: ../meld/meldwindow.py:88
msgid "Version status"
msgstr "Stanje izdanja"
-#: ../meld/meldwindow.py:143
+#: ../meld/meldwindow.py:89
msgid "File filters"
msgstr "Filteri datoteke"
-#: ../meld/meldwindow.py:144
+#: ../meld/meldwindow.py:90
msgid "Stop the current action"
msgstr "Zaustavite trenutnu radnju"
-#: ../meld/meldwindow.py:145
+#: ../meld/meldwindow.py:91
msgid "Refresh the view"
msgstr "Osvežite pregled"
-#: ../meld/meldwindow.py:146
+#: ../meld/meldwindow.py:92
msgid "Reload"
msgstr "Ponovo učitaj"
-#: ../meld/meldwindow.py:146
+#: ../meld/meldwindow.py:92
msgid "Reload the comparison"
msgstr "Ponovo učitajte poređenje"
-#: ../meld/meldwindow.py:148
+#: ../meld/meldwindow.py:94
msgid "_Tabs"
msgstr "_Jezičci"
-#: ../meld/meldwindow.py:149
+#: ../meld/meldwindow.py:95
msgid "_Previous Tab"
msgstr "Pre_thodni jezičak"
-#: ../meld/meldwindow.py:149
+#: ../meld/meldwindow.py:95
msgid "Activate previous tab"
msgstr "Idite na prethodni list"
-#: ../meld/meldwindow.py:150
+#: ../meld/meldwindow.py:96
msgid "_Next Tab"
msgstr "Sle_deći jezičak"
-#: ../meld/meldwindow.py:150
+#: ../meld/meldwindow.py:96
msgid "Activate next tab"
msgstr "Idite na naredni list"
-#: ../meld/meldwindow.py:151
+#: ../meld/meldwindow.py:97
msgid "Move Tab _Left"
msgstr "Premesti jezičak _levo"
-#: ../meld/meldwindow.py:151
+#: ../meld/meldwindow.py:97
msgid "Move current tab to left"
msgstr "Premestite trenutni jezičak na levo"
-#: ../meld/meldwindow.py:152
+#: ../meld/meldwindow.py:98
msgid "Move Tab _Right"
msgstr "Premesti jezičak _desno"
-#: ../meld/meldwindow.py:152
+#: ../meld/meldwindow.py:98
msgid "Move current tab to right"
msgstr "Premestite trenutni jezičak na desno"
-#: ../meld/meldwindow.py:154
+#: ../meld/meldwindow.py:100
msgid "_Help"
msgstr "Po_moć"
-#: ../meld/meldwindow.py:155
+#: ../meld/meldwindow.py:101
msgid "_Contents"
msgstr "_Sadržaj"
-#: ../meld/meldwindow.py:155
+#: ../meld/meldwindow.py:101
msgid "Open the Meld manual"
msgstr "Otvorite uputstvo Melda"
-#: ../meld/meldwindow.py:156
+#: ../meld/meldwindow.py:102
msgid "Report _Bug"
msgstr "Prijavi _grešku"
-#: ../meld/meldwindow.py:156
+#: ../meld/meldwindow.py:102
msgid "Report a bug in Meld"
msgstr "Prijavite grešku u Meldu"
-#: ../meld/meldwindow.py:157
+#: ../meld/meldwindow.py:103
msgid "About this program"
msgstr "O ovom programu"
-#: ../meld/meldwindow.py:160
+#: ../meld/meldwindow.py:106
msgid "Full Screen"
msgstr "Preko celog ekrana"
-#: ../meld/meldwindow.py:160
+#: ../meld/meldwindow.py:106
msgid "View the comparison in full screen"
msgstr "Pregledajte poređenje preko celog ekrana"
-#: ../meld/meldwindow.py:161
+#: ../meld/meldwindow.py:107
msgid "_Toolbar"
msgstr "_Paleta alata"
-#: ../meld/meldwindow.py:161
+#: ../meld/meldwindow.py:107
msgid "Show or hide the toolbar"
msgstr "Prikažite ili sakrijte paletu alata"
-#: ../meld/meldwindow.py:162
+#: ../meld/meldwindow.py:108
msgid "_Statusbar"
msgstr "Traka _stanja"
-#: ../meld/meldwindow.py:162
+#: ../meld/meldwindow.py:108
msgid "Show or hide the statusbar"
msgstr "Prikažite ili sakrijte traku stanja"
-#: ../meld/meldwindow.py:170
-#| msgid "Open externally"
+#: ../meld/meldwindow.py:116
msgid "Open Recent"
msgstr "Otvori skorašnje"
-#: ../meld/meldwindow.py:171
-#| msgid "Select file"
+#: ../meld/meldwindow.py:117
msgid "Open recent files"
msgstr "Otvorite skorašnje datoteke"
-#: ../meld/meldwindow.py:569
+#: ../meld/meldwindow.py:526
msgid "Switch to this tab"
msgstr "Prebacite se na ovaj jezičak"
#. exit at first non found directory + file
-#: ../meld/meldwindow.py:674
+#: ../meld/meldwindow.py:652
msgid "Cannot compare a mixture of files and directories.\n"
msgstr "Ne mogu da poredim mešavinu datoteka i fascikli.\n"
@@ -1294,25 +1333,25 @@ msgstr "[ništa]"
msgid "Save Patch As..."
msgstr "Sačuvaj ispravku kao..."
-#: ../meld/preferences.py:38
+#: ../meld/preferences.py:44
msgid "label"
msgstr "natpis"
-#: ../meld/preferences.py:38
+#: ../meld/preferences.py:44
msgid "pattern"
msgstr "obrazac"
-#: ../meld/preferences.py:142
+#: ../meld/preferences.py:160
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:263
+#: ../meld/preferences.py:306
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:265
+#: ../meld/preferences.py:308
msgid ""
"OS-specific metadata\t0\t.DS_Store ._* .Spotlight-V100 .Trashes Thumbs.db "
"Desktop.ini\n"
@@ -1321,48 +1360,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:267
+#: ../meld/preferences.py:310
#, 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:269
+#: ../meld/preferences.py:312
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:271
+#: ../meld/preferences.py:314
msgid "Media\t0\t*.{jpg,gif,png,bmp,wav,mp3,ogg,flac,avi,mpg,xcf,xpm}"
msgstr "Medija\t0\t*.{jpg,gif,png,bmp,wav,mp3,ogg,flac,avi,mpg,xcf,xpm}"
#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:273
+#: ../meld/preferences.py:316
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:275
+#: ../meld/preferences.py:318
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:277
+#: ../meld/preferences.py:320
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:279
+#: ../meld/preferences.py:322
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:281
+#: ../meld/preferences.py:324
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:283
+#: ../meld/preferences.py:326
msgid "Script comment\t0\t#.*"
msgstr "Komentar skripte\t0\t#.*"
@@ -1600,89 +1639,3 @@ msgstr ""
#, python-format
msgid "Mode changed from %s to %s"
msgstr "Režim je izmenjen iz „%s“ u „%s“"
-
-#~ msgid "Save modified files?"
-#~ msgstr "Da sačuvam izmenjene datoteke?"
-
-#~ msgid ""
-#~ "Some files have been modified.\n"
-#~ "Which ones would you like to save?"
-#~ msgstr ""
-#~ "Neke datoteke su izmenjene.\n"
-#~ "Koje želite da sačuvate?"
-
-#~ msgid "_Discard Changes"
-#~ msgstr "_Odbaci izmene"
-
-#~ msgid "_Save Selected"
-#~ msgstr "_Sačuvaj izabrano"
-
-#~ msgid ""
-#~ "Reloading will discard changes in:\n"
-#~ "%s\n"
-#~ "\n"
-#~ "You cannot undo this operation."
-#~ msgstr ""
-#~ "Osvežavanje će odbaciti izmene u:\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Ovu operaciju ne možete opozvati."
-
-#~ msgid "Select some files first."
-#~ msgstr "Prvo izaberite neke datoteke."
-
-#~ msgid "Add _Binary"
-#~ msgstr "Dodaj _binarno"
-
-#~ msgid "Add binary to VC"
-#~ msgstr "Dodaj binarno u CV"
-
-#~ msgid ""
-#~ "\n"
-#~ " Invoking 'patch' failed.\n"
-#~ " \n"
-#~ " Maybe you don't have 'GNU patch' installed,\n"
-#~ " or you use an untested version of %s.\n"
-#~ " \n"
-#~ " Please send email bug report to:\n"
-#~ " meld-list gnome org\n"
-#~ " \n"
-#~ " Containing the following information:\n"
-#~ " \n"
-#~ " - meld version: '%s'\n"
-#~ " - source control software type: '%s'\n"
-#~ " - source control software version: 'X.Y.Z'\n"
-#~ " - the output of '%s somefile.txt'\n"
-#~ " - patch command: '%s'\n"
-#~ " (no need to actually run it, just provide\n"
-#~ " the command line) \n"
-#~ " \n"
-#~ " Replace 'X.Y.Z' by the actual version for the\n"
-#~ " source control software you use.\n"
-#~ " "
-#~ msgstr ""
-#~ "\n"
-#~ " Prizivanje „patch“ nije uspelo.\n"
-#~ " \n"
-#~ " Možda niste instalirali „GNU patch“,\n"
-#~ " ili koristite neproverenu verziju „%s“.\n"
-#~ " \n"
-#~ " Molim pošaljite izveštaj o grešci na:\n"
-#~ " meld-list gnome org\n"
-#~ " \n"
-#~ " Koji sadrži sledeće informacije:\n"
-#~ " \n"
-#~ " — verzija melda: „%s“\n"
-#~ " — vrsta softvera kontrole izvora: „%s“\n"
-#~ " — verzija softvera kontrole izvora: „X.Y.Z“\n"
-#~ " — ispis „%s nekadatoteka.txt“\n"
-#~ " — naredba za pač: „%s“\n"
-#~ " (nije potrebno stvarno pokretanje, samo\n"
-#~ " obezbedite liniju naredbe) \n"
-#~ " \n"
-#~ " Zamenite „X.Y.Z“ trenutnom verzijom\n"
-#~ " softvera kontrole izvora koji koristite.\n"
-#~ " "
-
-#~ 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]