We are currently indexing your data, so search results may be incomplete until we finish.
Merge with stable
by
Changes to 56 files · Browse files at ef03e49a435d Showing diff from parent 8d156068184d 8e77d7c8efed Diff from another changeset...
-
.hgtags
-
ReleaseProcedure.txt
-
doc/source/conf.py
-
i18n/tortoisehg/ca.po
-
i18n/tortoisehg/cs.po
-
i18n/tortoisehg/da.po
-
i18n/tortoisehg/de.po
-
i18n/tortoisehg/en_AU.po
-
i18n/tortoisehg/en_GB.po
-
i18n/tortoisehg/es.po
-
i18n/tortoisehg/et.po
-
i18n/tortoisehg/fa.po
-
i18n/tortoisehg/fr.po
-
i18n/tortoisehg/he.po
-
i18n/tortoisehg/hr.po
-
i18n/tortoisehg/hu.po
-
i18n/tortoisehg/it.po
-
i18n/tortoisehg/ja.po
-
i18n/tortoisehg/ko.po
-
i18n/tortoisehg/nb.po
-
i18n/tortoisehg/nl.po
-
i18n/tortoisehg/nn.po
-
i18n/tortoisehg/oc.po
-
i18n/tortoisehg/pl.po
-
i18n/tortoisehg/pt.po
-
i18n/tortoisehg/pt_BR.po
-
i18n/tortoisehg/ru.po
-
i18n/tortoisehg/sr.po
-
i18n/tortoisehg/sv.po
-
i18n/tortoisehg/tr.po
-
i18n/tortoisehg/uk.po
-
i18n/tortoisehg/zh_CN.po
-
i18n/tortoisehg/zh_TW.po
-
tortoisehg/hgqt/commit.py
-
tortoisehg/hgqt/filedata.py
-
tortoisehg/hgqt/filedialogs.py
-
tortoisehg/hgqt/fileview.py
-
tortoisehg/hgqt/guess.py
-
tortoisehg/hgqt/qtlib.py
-
tortoisehg/hgqt/repofilter.py
-
tortoisehg/hgqt/repomodel.py
-
tortoisehg/hgqt/reporegistry.py
-
tortoisehg/hgqt/repowidget.py
-
tortoisehg/hgqt/run.py
-
tortoisehg/hgqt/rupdate.py
-
tortoisehg/hgqt/settings.py
-
tortoisehg/hgqt/shelve.py
-
tortoisehg/hgqt/status.py
-
tortoisehg/hgqt/sync.py
-
tortoisehg/hgqt/thgrepo.py
-
tortoisehg/hgqt/wctxactions.py
-
tortoisehg/util/hgversion.py
-
tortoisehg/util/paths.py
-
win32/wix/guids.wxi
-
win32/wix/help.wxs
-
win32/wix/templates.wxs
|
@@ -56,3 +56,4 @@ d5cd872f61fde0c1d1b279af4f3b90ff6ade3161 2.0.3
26a8187ef879c83c2055044fa2080a640145d542 2.0.4
f2165388e6870c643636a0a74f1ebd1d008bdf3e 2.0.5
+2a970d5e40fe4f757347464d820218809d58251b 2.1
|
||
|
@@ -2,9 +2,9 @@
* hg status -ar --rev 1.6:tip # find new files that WiX needs to know about
* Pull latest translations from Launchpad
+* update url in qtlib.openhelpcontents() (major release only)
* set revision number in doc/source/conf.py
* tag stable branch of repository, push
-* update url in qtlib.openhelpcontents() (major release only)
* build pdf hgbook, check into thg-winbuild (major release only)
* build release installer
* commit extension versions, tag, push thg-winbuild
|
||
|
@@ -49,9 +49,9 @@ # built documents.
#
# The short X.Y version.
-version = '2.0'
+version = '2.1'
# The full version, including alpha/beta/rc tags.
-release = '2.0.5'
+release = '2.1.0'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
|
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
|
|
@@ -7,141 +7,78 @@ msgstr ""
"Project-Id-Version: tortoisehg\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-05-26 13:34-0300\n"
-"PO-Revision-Date: 2011-03-31 07:13+0000\n"
-"Last-Translator: banza <Unknown>\n"
+"POT-Creation-Date: 2011-07-01 16:15-0300\n"
+"PO-Revision-Date: 2011-06-04 21:34+0000\n"
+"Last-Translator: kosha <Unknown>\n"
"Language-Team: Ukrainian <uk@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2011-06-02 01:01+0000\n"
-"X-Generator: Launchpad (build 13144)\n"
-
-#: TortoiseHgOverlayServer.py:50
+"X-Launchpad-Export-Date: 2011-07-01 19:37+0000\n"
+"X-Generator: Launchpad (build 13333)\n"
+
+#: TortoiseHgOverlayServer.py:51
msgid "TortoiseHg Overlay Icon Server"
msgstr "Сервер позначок TortoiseHg"
-#: TortoiseHgOverlayServer.py:161
+#: TortoiseHgOverlayServer.py:162
msgid "Exit"
-msgstr "Вихід"
-
-#: tortoisehg/hgqt/about.py:34 tortoisehg/hgqt/workbench.py:300
-#: tortoisehg/hgtk/gdialog.py:505
+msgstr "Вийти"
+
+#: tortoisehg/hgqt/about.py:31 tortoisehg/hgtk/gdialog.py:505
msgid "About"
-msgstr "Про програму"
-
-#: tortoisehg/hgqt/about.py:59
+msgstr "Про програму..."
+
+#: tortoisehg/hgqt/about.py:56
msgid "Copyright 2008-2011 Steve Borho and others"
msgstr "Авторське право 2008-2011 Стів Борхо(Steve Borho) та інші"
-#: tortoisehg/hgqt/about.py:64 tortoisehg/hgtk/about.py:42
+#: tortoisehg/hgqt/about.py:61 tortoisehg/hgtk/about.py:42
msgid "Several icons are courtesy of the TortoiseSVN project"
msgstr "Деякі значки запозичені з проекту TortoiseSVN"
-#: tortoisehg/hgqt/about.py:74
+#: tortoisehg/hgqt/about.py:71
msgid "You can visit our site here"
-msgstr "Ви можете відвідати наш сайт тут"
-
-#: tortoisehg/hgqt/about.py:83
+msgstr "Відвідайте наш сайт"
+
+#: tortoisehg/hgqt/about.py:80
msgid "&License"
msgstr "&Ліцензійна угода"
-#: tortoisehg/hgqt/about.py:89 tortoisehg/hgqt/archive.py:108
+#: tortoisehg/hgqt/about.py:86 tortoisehg/hgqt/archive.py:108
#: tortoisehg/hgqt/hgemail_ui.py:273 tortoisehg/hgqt/hginit.py:58
#: tortoisehg/hgqt/license.py:45 tortoisehg/hgqt/postreview_ui.py:179
#: tortoisehg/hgqt/rename.py:103
msgid "&Close"
msgstr "&Закрити"
-#: tortoisehg/hgqt/about.py:109
+#: tortoisehg/hgqt/about.py:106
#, python-format
msgid "version %s"
msgstr "версія %s"
-#: tortoisehg/hgqt/about.py:110
+#: tortoisehg/hgqt/about.py:107
#, python-format
msgid "with Mercurial-%s, Python-%s, PyQt-%s, Qt-%s"
msgstr "разом Mercurial-%s, Python-%s, PyQt-%s, Qt-%s"
-#: tortoisehg/hgqt/about.py:159 tortoisehg/hgtk/about.py:70
+#: tortoisehg/hgqt/about.py:156 tortoisehg/hgtk/about.py:70
msgid "A new version of TortoiseHg is ready for download!"
-msgstr "Нова версія TortoiseHg вже готова до завантаження!"
-
-#: tortoisehg/hgqt/annotate.py:112
-msgid "Search in original revision"
-msgstr ""
-
-#: tortoisehg/hgqt/annotate.py:114
-msgid "Search in working revision"
-msgstr "Пошук у робочій ревізії"
-
-#: tortoisehg/hgqt/annotate.py:116
-msgid "Search in current annotation"
-msgstr "Пошук у поточній анотації"
-
-#: tortoisehg/hgqt/annotate.py:117
-msgid "Search in history"
-msgstr "Пошук у історії"
-
-#: tortoisehg/hgqt/annotate.py:128
-msgid "Annotate originating revision"
-msgstr "Коментувати ревізію, що відбувається"
-
-#: tortoisehg/hgqt/annotate.py:129
-msgid "View originating revision"
-msgstr "Подивитись ревізію, що відбувається"
-
-#: tortoisehg/hgqt/annotate.py:141
-#, python-format
-msgid "Annotate parent revision %d"
-msgstr ""
-
-#: tortoisehg/hgqt/annotate.py:143
-#, python-format
-msgid "View parent revision %d"
-msgstr ""
-
-#: tortoisehg/hgqt/annotate.py:181
-msgid "Unable to annotate"
-msgstr "Коментарі заборонені"
-
-#: tortoisehg/hgqt/annotate.py:182
-#, python-format
-msgid "%s is not found in revision %d"
-msgstr ""
-
-#: tortoisehg/hgqt/annotate.py:191 tortoisehg/hgqt/annotate.py:197
-#: tortoisehg/hgqt/fileview.py:534 tortoisehg/hgqt/fileview.py:746
-msgid "File or diffs not displayed: "
-msgstr ""
-
-#: tortoisehg/hgqt/annotate.py:198 tortoisehg/hgqt/fileview.py:548
-#: tortoisehg/hgqt/fileview.py:747 tortoisehg/hgtk/chunks.py:73
-msgid "File is larger than the specified max size.\n"
-msgstr "Файл перевищує максимально дозволений розмір.\n"
-
-#: tortoisehg/hgqt/annotate.py:204 tortoisehg/hgqt/fileview.py:553
-#: tortoisehg/hgtk/chunks.py:85
-msgid "File is binary.\n"
-msgstr "Бінарний файл.\n"
-
-#: tortoisehg/hgqt/annotate.py:396
-#, python-format
-msgid "Annotate %s@%d"
-msgstr ""
+msgstr "Нова версія TortoiseHg готова до завантаження!"
#: tortoisehg/hgqt/archive.py:20 tortoisehg/hgtk/archive.py:18
msgid "= Working Directory Parent ="
msgstr "= Попередній робочий каталог ="
-#: tortoisehg/hgqt/archive.py:40 tortoisehg/hgqt/bookmark.py:50
-#: tortoisehg/hgqt/csinfo.py:105 tortoisehg/hgqt/csinfo.py:106
-#: tortoisehg/hgqt/cslist.py:87 tortoisehg/hgqt/merge.py:579
-#: tortoisehg/hgqt/tag.py:49 tortoisehg/hgtk/bookmark.py:75
-#: tortoisehg/hgtk/csinfo.py:211 tortoisehg/hgtk/csinfo.py:212
-#: tortoisehg/hgtk/cslist.py:142 tortoisehg/hgtk/tagadd.py:66
+#: tortoisehg/hgqt/archive.py:40 tortoisehg/hgqt/backout.py:366
+#: tortoisehg/hgqt/bookmark.py:50 tortoisehg/hgqt/csinfo.py:105
+#: tortoisehg/hgqt/csinfo.py:106 tortoisehg/hgqt/cslist.py:86
+#: tortoisehg/hgqt/merge.py:446 tortoisehg/hgqt/tag.py:49
+#: tortoisehg/hgtk/bookmark.py:75 tortoisehg/hgtk/csinfo.py:211
+#: tortoisehg/hgtk/csinfo.py:212 tortoisehg/hgtk/cslist.py:142
+#: tortoisehg/hgtk/tagadd.py:66
msgid "Revision:"
msgstr "Ревізія:"
@@ -150,21 +87,22 @@msgstr "Можлива тільки зміна/створення файлів в цій ревізії"
#: tortoisehg/hgqt/archive.py:47 tortoisehg/hgqt/grep.py:69
-#: tortoisehg/hgqt/sync.py:1410
+#: tortoisehg/hgqt/sync.py:1443
msgid "Recurse into subrepositories"
-msgstr ""
+msgstr "Підсховища обробляти рекурсивно"
#: tortoisehg/hgqt/archive.py:54 tortoisehg/hgqt/hginit.py:34
#: tortoisehg/hgtk/archive.py:72 tortoisehg/hgtk/clone.py:106
msgid "Destination path:"
-msgstr "Шлях призначення:"
-
-#: tortoisehg/hgqt/archive.py:58 tortoisehg/hgqt/clone.py:58
-#: tortoisehg/hgqt/clone.py:69 tortoisehg/hgqt/hginit.py:37
-#: tortoisehg/hgqt/rename.py:68 tortoisehg/hgqt/rename.py:72
-#: tortoisehg/hgqt/thgimport.py:53 tortoisehg/hgtk/archive.py:69
-#: tortoisehg/hgtk/clone.py:70 tortoisehg/hgtk/hginit.py:55
-#: tortoisehg/hgtk/thgconfig.py:394 tortoisehg/hgtk/thgimport.py:63
+msgstr "Шлях отримання:"
+
+#: tortoisehg/hgqt/archive.py:58 tortoisehg/hgqt/clone.py:59
+#: tortoisehg/hgqt/clone.py:70 tortoisehg/hgqt/clone.py:138
+#: tortoisehg/hgqt/hginit.py:37 tortoisehg/hgqt/rename.py:68
+#: tortoisehg/hgqt/rename.py:72 tortoisehg/hgqt/thgimport.py:53
+#: tortoisehg/hgtk/archive.py:69 tortoisehg/hgtk/clone.py:70
+#: tortoisehg/hgtk/hginit.py:55 tortoisehg/hgtk/thgconfig.py:394
+#: tortoisehg/hgtk/thgimport.py:63
msgid "Browse..."
msgstr "Огляд..."
@@ -175,19 +113,19 @@#: tortoisehg/hgqt/archive.py:69 tortoisehg/hgqt/archive.py:242
#: tortoisehg/hgtk/archive.py:75
msgid "Directory of files"
-msgstr "Каталог файлів"
+msgstr "Каталог з файлами"
#: tortoisehg/hgqt/archive.py:70 tortoisehg/hgtk/archive.py:83
msgid "Uncompressed tar archive"
-msgstr "Архівувати за допомогою tar без стискання"
+msgstr "Архів tar, без стискання"
#: tortoisehg/hgqt/archive.py:71 tortoisehg/hgtk/archive.py:84
msgid "Tar archive compressed using bzip2"
-msgstr "Стиснути tar архів за допомогою bzip2?"
+msgstr "Архів tar, стиснутий bzip2?"
#: tortoisehg/hgqt/archive.py:72 tortoisehg/hgtk/archive.py:85
msgid "Tar archive compressed using gzip"
-msgstr "Tar архів стиснутий з використанням gzip"
+msgstr "Архів tar стиснутий gzip"
#: tortoisehg/hgqt/archive.py:73 tortoisehg/hgtk/archive.py:86
msgid "Uncompressed zip archive"
@@ -195,16 +133,16 @@
#: tortoisehg/hgqt/archive.py:74 tortoisehg/hgtk/archive.py:87
msgid "Zip archive compressed using deflate"
-msgstr "Архів zip стиснуто використовуючи deflate"
-
-#: tortoisehg/hgqt/archive.py:84 tortoisehg/hgqt/hginit.py:67
-#: tortoisehg/hgqt/rename.py:82
+msgstr "Архів zip стиснутий deflate"
+
+#: tortoisehg/hgqt/archive.py:84 tortoisehg/hgqt/clone.py:157
+#: tortoisehg/hgqt/hginit.py:67 tortoisehg/hgqt/rename.py:82
msgid "Hg command:"
msgstr "Команда Hg:"
#: tortoisehg/hgqt/archive.py:88 tortoisehg/hgqt/rename.py:87
msgid "Always show output"
-msgstr ""
+msgstr "Завжди показувати виведення"
#: tortoisehg/hgqt/archive.py:106
msgid "&Archive"
@@ -214,31 +152,30 @@msgid "&Detail"
msgstr "&Докладно"
-#: tortoisehg/hgqt/archive.py:114 tortoisehg/hgqt/commit.py:513
-#: tortoisehg/hgqt/commit.py:521 tortoisehg/hgqt/commit.py:548
-#: tortoisehg/hgqt/commit.py:561 tortoisehg/hgqt/compress.py:150
-#: tortoisehg/hgqt/merge.py:64 tortoisehg/hgqt/merge.py:174
-#: tortoisehg/hgqt/merge.py:368 tortoisehg/hgqt/merge.py:402
-#: tortoisehg/hgqt/merge.py:466 tortoisehg/hgqt/rebase.py:231
-#: tortoisehg/hgqt/rebase.py:252 tortoisehg/hgqt/rename.py:108
-#: tortoisehg/hgqt/repotreeitem.py:292 tortoisehg/hgqt/resolve.py:356
-#: tortoisehg/hgqt/settings.py:673 tortoisehg/hgqt/settings.py:771
-#: tortoisehg/hgqt/wctxactions.py:234 tortoisehg/hgqt/wctxactions.py:247
-#: tortoisehg/hgqt/wctxactions.py:302 tortoisehg/hgtk/shellconf.py:28
-#: tortoisehg/hgtk/thgshelve.py:163
+#: tortoisehg/hgqt/archive.py:114 tortoisehg/hgqt/backout.py:248
+#: tortoisehg/hgqt/commit.py:496 tortoisehg/hgqt/commit.py:504
+#: tortoisehg/hgqt/commit.py:833 tortoisehg/hgqt/commit.py:846
+#: tortoisehg/hgqt/compress.py:150 tortoisehg/hgqt/merge.py:100
+#: tortoisehg/hgqt/merge.py:235 tortoisehg/hgqt/merge.py:311
+#: tortoisehg/hgqt/rebase.py:231 tortoisehg/hgqt/rebase.py:252
+#: tortoisehg/hgqt/rename.py:108 tortoisehg/hgqt/reporegistry.py:604
+#: tortoisehg/hgqt/resolve.py:356 tortoisehg/hgqt/settings.py:779
+#: tortoisehg/hgqt/settings.py:892 tortoisehg/hgqt/wctxactions.py:229
+#: tortoisehg/hgqt/wctxactions.py:242 tortoisehg/hgqt/wctxactions.py:297
+#: tortoisehg/hgtk/shellconf.py:28 tortoisehg/hgtk/thgshelve.py:163
msgid "Cancel"
-msgstr "Відмова"
+msgstr "Скасувати"
#: tortoisehg/hgqt/archive.py:168 tortoisehg/hgtk/archive.py:29
#, python-format
msgid "Archive - %s"
-msgstr "Архів - %s"
+msgstr "Архівування - %s"
#: tortoisehg/hgqt/archive.py:193 tortoisehg/hgqt/hginit.py:106
#: tortoisehg/hgqt/rename.py:202 tortoisehg/hgtk/archive.py:195
#: tortoisehg/hgtk/clone.py:107 tortoisehg/hgtk/hginit.py:95
msgid "Select Destination Folder"
-msgstr "Виберіть теку призначення"
+msgstr "Виберіть теку отримання"
#: tortoisehg/hgqt/archive.py:198
msgid "Open File"
@@ -262,19 +199,19 @@
#: tortoisehg/hgqt/archive.py:316 tortoisehg/hgqt/archive.py:334
msgid "Duplicate Name"
-msgstr "Повторення назви"
+msgstr "Повтор назви"
#: tortoisehg/hgqt/archive.py:317
#, python-format
msgid "The destination \"%s\" already exists as a file!"
-msgstr "Призначення \"%s\" вже існує у вигляді файлу!"
+msgstr "Отримувач \"%s\" вже існує у вигляді файлу!"
#: tortoisehg/hgqt/archive.py:321 tortoisehg/hgqt/archive.py:328
#: tortoisehg/hgtk/archive.py:213 tortoisehg/hgtk/archive.py:219
#: tortoisehg/hgtk/gtklib.py:594 tortoisehg/hgtk/thgconfig.py:574
#: tortoisehg/hgtk/thgconfig.py:1077
msgid "Confirm Overwrite"
-msgstr "Підтвердіть перезапис"
+msgstr "Підтвердження перезапису"
#: tortoisehg/hgqt/archive.py:322
#, python-format
@@ -301,98 +238,206 @@#: tortoisehg/hgqt/archive.py:335
#, python-format
msgid "The destination \"%s\" already exists as a folder!"
-msgstr "Призначення \"%s\" вже існує як тека!"
-
-#: tortoisehg/hgqt/backout.py:35
-msgid "Target changeset"
-msgstr "Об'єкт набору змін"
-
-#: tortoisehg/hgqt/backout.py:43 tortoisehg/hgtk/backout.py:52
-msgid "Backout commit message"
-msgstr "Відновити повідомлення фіксації"
-
-#: tortoisehg/hgqt/backout.py:47 tortoisehg/hgtk/backout.py:41
+msgstr "Отримувач \"%s\" вже існує як тека!"
+
+#: tortoisehg/hgqt/backout.py:28
+#, python-format
+msgid "Backout - %s"
+msgstr ""
+
+#: tortoisehg/hgqt/backout.py:98
+msgid "Prepare to backout"
+msgstr ""
+
+#: tortoisehg/hgqt/backout.py:99
+msgid "Verify backout revision and ensure your working directory is clean."
+msgstr ""
+
+#: tortoisehg/hgqt/backout.py:108 tortoisehg/hgqt/backout.py:120
+msgid "Unable to backout"
+msgstr ""
+
+#: tortoisehg/hgqt/backout.py:109
+msgid "Backout revision not found"
+msgstr ""
+
+#: tortoisehg/hgqt/backout.py:113
+msgid "Backing out a parent revision is a single step operation"
+msgstr ""
+
+#: tortoisehg/hgqt/backout.py:121
+msgid "Cannot backout change on a different branch"
+msgstr ""
+
+#: tortoisehg/hgqt/backout.py:127
+msgid "Backout revision"
+msgstr ""
+
+#: tortoisehg/hgqt/backout.py:137
+msgid "Not a head, backout will create a new head!"
+msgstr ""
+
+#: tortoisehg/hgqt/backout.py:143
+msgid "Current local revision"
+msgstr ""
+
+#: tortoisehg/hgqt/backout.py:150 tortoisehg/hgqt/merge.py:154
+msgid "Working directory status"
+msgstr ""
+
+#: tortoisehg/hgqt/backout.py:158 tortoisehg/hgqt/compress.py:69
+#: tortoisehg/hgqt/merge.py:162 tortoisehg/hgqt/rebase.py:110
+msgid "Checking..."
+msgstr "Перевіряємо..."
+
+#: tortoisehg/hgqt/backout.py:166
+msgid ""
+"Before backout, you must <a href=\"commit\"><b>commit</b></a>, <a "
+"href=\"shelve\"><b>shelve</b></a> to patch, or <a "
+"href=\"discard\"><b>discard</b></a> changes."
+msgstr ""
+
+#: tortoisehg/hgqt/backout.py:177 tortoisehg/hgqt/merge.py:215
+#: tortoisehg/hgqt/rebase.py:73 tortoisehg/hgqt/sync.py:987
+#: tortoisehg/hgqt/update.py:97
+msgid "Automatically resolve merge conflicts where possible"
+msgstr ""
+
+#: tortoisehg/hgqt/backout.py:223 tortoisehg/hgqt/merge.py:285
+msgid "<b>Uncommitted local changes are detected</b>"
+msgstr ""
+
+#: tortoisehg/hgqt/backout.py:227 tortoisehg/hgtk/recovery.py:52
+msgid "Clean"
+msgstr "Чиста"
+
+#: tortoisehg/hgqt/backout.py:247 tortoisehg/hgqt/compress.py:149
+#: tortoisehg/hgqt/merge.py:234 tortoisehg/hgqt/merge.py:310
+#: tortoisehg/hgqt/rebase.py:230 tortoisehg/hgqt/settings.py:892
+#: tortoisehg/hgqt/update.py:248 tortoisehg/hgtk/thgconfig.py:775
+#: tortoisehg/hgtk/update.py:233
+msgid "&Discard"
+msgstr "&Відкинути"
+
+#: tortoisehg/hgqt/backout.py:249 tortoisehg/hgqt/compress.py:151
+#: tortoisehg/hgqt/merge.py:312 tortoisehg/hgqt/rebase.py:232
+msgid "Confirm Discard"
+msgstr "Підтвердіть відмову"
+
+#: tortoisehg/hgqt/backout.py:250 tortoisehg/hgqt/compress.py:152
+#: tortoisehg/hgqt/merge.py:313 tortoisehg/hgqt/rebase.py:233
+msgid "Discard outstanding changes to working directory?"
+msgstr "Відмовитись від змін у робочому каталозі?"
+
+#: tortoisehg/hgqt/backout.py:275
+msgid "Backing out, then merging..."
+msgstr ""
+
+#: tortoisehg/hgqt/backout.py:276 tortoisehg/hgqt/merge.py:341
+msgid "All conflicting files will be marked unresolved."
+msgstr ""
+
+#: tortoisehg/hgqt/backout.py:289
+msgid ""
+"Automatically advance to next page when backout and merge are complete."
+msgstr ""
+
+#: tortoisehg/hgqt/backout.py:318 tortoisehg/hgqt/merge.py:394
+#, python-format
+msgid ""
+"%d files have <b>merge conflicts</b> that must be <a "
+"href=\"resolve\"><b>resolved</b></a>"
+msgstr ""
+
+#: tortoisehg/hgqt/backout.py:323 tortoisehg/hgqt/merge.py:404
+msgid "No merge conflicts, ready to commit"
+msgstr "Конфлікти об'єднання відсутні, можна фіксувати"
+
+#: tortoisehg/hgqt/backout.py:358
+msgid "Commit backout and merge results"
+msgstr ""
+
+#: tortoisehg/hgqt/backout.py:368 tortoisehg/hgqt/merge.py:448
+#: tortoisehg/hgtk/commit.py:236 tortoisehg/hgtk/history.py:66
+#: tortoisehg/hgtk/history.py:481 tortoisehg/hgtk/history.py:1223
+msgid "Parents"
+msgstr "Попередники"
+
+#: tortoisehg/hgqt/backout.py:372 tortoisehg/hgqt/merge.py:452
+#: tortoisehg/hgqt/repomodel.py:586 tortoisehg/hgqt/repomodel.py:588
+#: tortoisehg/hgqt/shelve.py:24 tortoisehg/hgqt/thgimport.py:87
+msgid "Working Directory"
+msgstr "Робочий каталог"
+
+#: tortoisehg/hgqt/backout.py:412 tortoisehg/hgqt/merge.py:489
+msgid "Working Directory (merged)"
+msgstr ""
+
+#: tortoisehg/hgqt/backout.py:420 tortoisehg/hgqt/merge.py:497
+msgid "Commit message"
+msgstr ""
+
+#: tortoisehg/hgqt/backout.py:444 tortoisehg/hgqt/merge.py:521
+msgid "Skip final confirmation page, close after commit."
+msgstr ""
+
+#: tortoisehg/hgqt/backout.py:453 tortoisehg/hgqt/backout.py:482
+#: tortoisehg/hgtk/backout.py:41
msgid "Backed out changeset: "
msgstr "Відновлений набір змін: "
-#: tortoisehg/hgqt/backout.py:59 tortoisehg/hgqt/clone.py:95
-#: tortoisehg/hgqt/commit.py:221 tortoisehg/hgqt/merge.py:318
-#: tortoisehg/hgqt/mq.py:53 tortoisehg/hgqt/postreview_ui.py:170
-#: tortoisehg/hgqt/rebase.py:57 tortoisehg/hgqt/sync.py:137
-#: tortoisehg/hgqt/tag.py:64 tortoisehg/hgtk/hgemail.py:64
-msgid "Options"
-msgstr "Опції"
-
-#: tortoisehg/hgqt/backout.py:66 tortoisehg/hgtk/backout.py:82
+#: tortoisehg/hgqt/backout.py:456 tortoisehg/hgqt/commit.py:715
+#: tortoisehg/hgqt/mq.py:824 tortoisehg/hgtk/backout.py:139
+#: tortoisehg/hgtk/commit.py:580
+msgid "Confirm Discard Message"
+msgstr "Підтвердіть відмову від повідомлення"
+
+#: tortoisehg/hgqt/backout.py:457 tortoisehg/hgtk/backout.py:140
+msgid "Discard current backout message?"
+msgstr "Відмовитись від поточних зворотніх повідомлень?"
+
+#: tortoisehg/hgqt/backout.py:466 tortoisehg/hgtk/backout.py:82
msgid "Use English backout message"
msgstr "Використовувати повідомлення англійською мовою"
-#: tortoisehg/hgqt/backout.py:72 tortoisehg/hgtk/backout.py:90
-msgid "Commit backout before merging with current working parent"
-msgstr ""
-
-#: tortoisehg/hgqt/backout.py:79 tortoisehg/hgqt/merge.py:335
-#: tortoisehg/hgqt/rebase.py:73 tortoisehg/hgqt/sync.py:959
-#: tortoisehg/hgqt/update.py:97
-msgid "Automatically resolve merge conflicts where possible"
-msgstr ""
-
-#: tortoisehg/hgqt/backout.py:111
-msgid "&Backout"
-msgstr "&Повернути"
-
-#: tortoisehg/hgqt/backout.py:114 tortoisehg/hgqt/clone.py:159
-#: tortoisehg/hgqt/cmdui.py:752 tortoisehg/hgqt/thgimport.py:117
-#: tortoisehg/hgqt/thgstrip.py:110 tortoisehg/hgqt/update.py:138
-msgid "Detail"
-msgstr "Подробиці"
-
-#: tortoisehg/hgqt/backout.py:126
-#, python-format
-msgid "Backout '%s' - %s"
-msgstr "Повернути '%s' - %s"
-
-#: tortoisehg/hgqt/backout.py:145 tortoisehg/hgqt/commit.py:405
-#: tortoisehg/hgqt/mq.py:470 tortoisehg/hgtk/backout.py:139
-#: tortoisehg/hgtk/commit.py:581
-msgid "Confirm Discard Message"
-msgstr "Підтвердіть відмову від повідомлення"
-
-#: tortoisehg/hgqt/backout.py:146 tortoisehg/hgtk/backout.py:140
-msgid "Discard current backout message?"
-msgstr "Відмовитись від поточних повідомленнь відновлення?"
-
-#: tortoisehg/hgqt/backout.py:234 tortoisehg/hgqt/commit.py:907
-#: tortoisehg/hgqt/compress.py:122 tortoisehg/hgqt/repowidget.py:233
-msgctxt "action button"
-msgid "Commit"
-msgstr ""
-
-#: tortoisehg/hgqt/backout.py:250
-msgid ""
-"Backout generated merge <b>conflicts</b> that must be <a "
-"href=\"resolve\"><b>resolved</b></a>"
-msgstr ""
-
-#: tortoisehg/hgqt/backout.py:256
-msgid ""
-"You may commit the backed out changes after <a "
-"href=\"status\"><b>verifying</b></a> them"
-msgstr ""
+#: tortoisehg/hgqt/backout.py:511
+msgid "Backing out and committing..."
+msgstr ""
+
+#: tortoisehg/hgqt/backout.py:512
+msgid "Please wait while making backout."
+msgstr ""
+
+#: tortoisehg/hgqt/backout.py:518 tortoisehg/hgqt/merge.py:572
+msgid "Committing..."
+msgstr "Фіксуємо..."
+
+#: tortoisehg/hgqt/backout.py:519 tortoisehg/hgqt/merge.py:573
+msgid "Please wait while committing merged files."
+msgstr ""
+
+#: tortoisehg/hgqt/backout.py:544 tortoisehg/hgqt/cmdui.py:307
+#: tortoisehg/hgqt/merge.py:601 tortoisehg/hgtk/p4pending.py:101
+msgid "Finished"
+msgstr "Завершено"
+
+#: tortoisehg/hgqt/backout.py:548
+msgid "Backout changeset"
+msgstr "Повернути набір змін"
#: tortoisehg/hgqt/bisect.py:22
#, python-format
msgid "Bisect - %s"
-msgstr "Розрізати - %s"
+msgstr "Розрізати навпіл - %s"
#: tortoisehg/hgqt/bisect.py:34
msgid "Known good revision:"
msgstr "Відома добра редакція:"
#: tortoisehg/hgqt/bisect.py:38 tortoisehg/hgqt/bisect.py:48
-#: tortoisehg/hgqt/repowidget.py:102 tortoisehg/hgtk/history.py:1875
+#: tortoisehg/hgqt/repowidget.py:410 tortoisehg/hgtk/history.py:1875
msgid "Accept"
-msgstr "Прийняти"
+msgstr "Застосувати"
#: tortoisehg/hgqt/bisect.py:43
msgid "Known bad revision:"
@@ -404,7 +449,7 @@
#: tortoisehg/hgqt/bisect.py:61
msgid "Revision is Bad"
-msgstr ""
+msgstr "Погана ревізія"
#: tortoisehg/hgqt/bisect.py:63
msgid "Skip this Revision"
@@ -426,17 +471,17 @@
#: tortoisehg/hgqt/bisect.py:93 tortoisehg/hgqt/grep.py:65
msgid "Revision"
-msgstr ""
+msgstr "Ревізія"
#: tortoisehg/hgqt/bisect.py:94
msgid "Test this revision and report findings. (good/bad/skip)"
msgstr ""
#: tortoisehg/hgqt/bisect.py:114 tortoisehg/hgqt/bisect.py:135
-#: tortoisehg/hgqt/commit.py:578 tortoisehg/hgqt/commit.py:835
-#: tortoisehg/hgqt/commit.py:855 tortoisehg/hgqt/hgignore.py:245
-#: tortoisehg/hgqt/hginit.py:179 tortoisehg/hgqt/status.py:400
-#: tortoisehg/hgqt/wctxactions.py:121
+#: tortoisehg/hgqt/commit.py:863 tortoisehg/hgqt/commit.py:1129
+#: tortoisehg/hgqt/commit.py:1149 tortoisehg/hgqt/hgignore.py:254
+#: tortoisehg/hgqt/hginit.py:179 tortoisehg/hgqt/status.py:445
+#: tortoisehg/hgqt/wctxactions.py:169
#, python-format
msgid "%s (hint: %s)"
msgstr "%s (натяк: %s)"
@@ -449,24 +494,24 @@msgid "New Name:"
msgstr "Нова назва:"
-#: tortoisehg/hgqt/bookmark.py:67 tortoisehg/hgqt/commit.py:548
-#: tortoisehg/hgqt/tag.py:98 tortoisehg/hgqt/wctxactions.py:53
-#: tortoisehg/hgqt/wctxactions.py:59
+#: tortoisehg/hgqt/bookmark.py:67 tortoisehg/hgqt/commit.py:833
+#: tortoisehg/hgqt/tag.py:98 tortoisehg/hgqt/wctxactions.py:48
+#: tortoisehg/hgqt/wctxactions.py:54
msgid "&Add"
msgstr "&Додати"
#: tortoisehg/hgqt/bookmark.py:68
msgid "Re&name"
-msgstr ""
-
-#: tortoisehg/hgqt/bookmark.py:69 tortoisehg/hgqt/commit.py:561
+msgstr "Змінити назву"
+
+#: tortoisehg/hgqt/bookmark.py:69 tortoisehg/hgqt/commit.py:846
#: tortoisehg/hgqt/tag.py:99
msgid "&Remove"
msgstr "&Видалити"
#: tortoisehg/hgqt/bookmark.py:70
msgid "&Move"
-msgstr ""
+msgstr "Перемістити"
#: tortoisehg/hgqt/bookmark.py:92 tortoisehg/hgtk/bookmark.py:34
#, python-format
@@ -486,7 +531,7 @@#: tortoisehg/hgqt/bookmark.py:176
#, python-format
msgid "Bookmark named \"%s\" does not exist"
-msgstr ""
+msgstr "Назва закладки \"%s\" неіснує"
#: tortoisehg/hgqt/bookmark.py:181
#, python-format
@@ -514,25 +559,25 @@msgid "%s - branch operation"
msgstr ""
-#: tortoisehg/hgqt/branchop.py:29 tortoisehg/hgtk/commit.py:48
+#: tortoisehg/hgqt/branchop.py:29 tortoisehg/hgtk/commit.py:47
msgid "Select branch of merge commit"
msgstr "Оберіть гілку з якою зробити об'єднання"
-#: tortoisehg/hgqt/branchop.py:41 tortoisehg/hgtk/commit.py:77
+#: tortoisehg/hgqt/branchop.py:41 tortoisehg/hgtk/commit.py:76
msgid "Changes take effect on next commit"
msgstr "Зміни вступлять у силу після наступної фіксації"
-#: tortoisehg/hgqt/branchop.py:46 tortoisehg/hgtk/commit.py:60
+#: tortoisehg/hgqt/branchop.py:46 tortoisehg/hgtk/commit.py:59
msgid "No branch changes"
msgstr "Немає змін у гілці"
-#: tortoisehg/hgqt/branchop.py:47 tortoisehg/hgtk/commit.py:62
+#: tortoisehg/hgqt/branchop.py:47 tortoisehg/hgtk/commit.py:61
msgid "Open a new named branch"
msgstr "Відкрити нову гілку з назвою"
#: tortoisehg/hgqt/branchop.py:48
msgid "Close current branch"
-msgstr ""
+msgstr "Закрити поточну гілку"
#: tortoisehg/hgqt/bugreport.py:26
#, python-format
@@ -542,7 +587,7 @@#: tortoisehg/hgqt/bugreport.py:44 tortoisehg/hgqt/qscilib.py:181
#: tortoisehg/hgqt/rename.py:164
msgid "Copy"
-msgstr ""
+msgstr "Скопіювати"
#: tortoisehg/hgqt/bugreport.py:45
msgid "Quit"
@@ -565,9 +610,9 @@msgstr "Помилка під час запису у файл"
#: tortoisehg/hgqt/bugreport.py:123 tortoisehg/hgqt/qqueue.py:342
-#: tortoisehg/hgqt/qreorder.py:225
+#: tortoisehg/hgqt/qreorder.py:228
msgid "TortoiseHg Error"
-msgstr "TortoiseHg Error"
+msgstr "Помилка TortoiseHg"
#: tortoisehg/hgqt/bugreport.py:145
msgid ""
@@ -577,154 +622,212 @@"Якщо у Вас виникли проблеми, <a href=\"#bugreport\">please file a bug "
"report</a>."
-#: tortoisehg/hgqt/chunks.py:123
+#: tortoisehg/hgqt/chunks.py:89 tortoisehg/hgqt/grep.py:547
+#: tortoisehg/hgqt/manifestdialog.py:195 tortoisehg/hgqt/revdetails.py:229
+#: tortoisehg/util/menuthg.py:76
+msgid "Visual Diff"
+msgstr "Наочне порівняння"
+
+#: tortoisehg/hgqt/chunks.py:90 tortoisehg/hgqt/manifestdialog.py:196
+#: tortoisehg/hgqt/revdetails.py:230
+msgid "View file changes in external diff tool"
+msgstr ""
+
+#: tortoisehg/hgqt/chunks.py:91 tortoisehg/hgqt/manifestdialog.py:202
+#: tortoisehg/hgqt/revdetails.py:238
+msgid "Edit Local"
+msgstr "Правити локальну копію"
+
+#: tortoisehg/hgqt/chunks.py:92 tortoisehg/hgqt/manifestdialog.py:203
+#: tortoisehg/hgqt/revdetails.py:239
+msgid "Edit current file in working copy"
+msgstr "Правити поточний файл у робочій копії"
+
+#: tortoisehg/hgqt/chunks.py:93 tortoisehg/hgqt/manifestdialog.py:204
+#: tortoisehg/hgqt/revdetails.py:240
+msgid "Revert to Revision"
+msgstr "Повернути до ревізії"
+
+#: tortoisehg/hgqt/chunks.py:94 tortoisehg/hgqt/manifestdialog.py:205
+#: tortoisehg/hgqt/revdetails.py:241
+msgid "Revert file(s) to contents at this revision"
+msgstr ""
+
+#: tortoisehg/hgqt/chunks.py:190
msgid "Patch failed to apply"
-msgstr ""
-
-#: tortoisehg/hgqt/chunks.py:130 tortoisehg/hgqt/mq.py:268
+msgstr "Латка не прийнята"
+
+#: tortoisehg/hgqt/chunks.py:196 tortoisehg/hgqt/mq.py:247
+#: tortoisehg/hgqt/mq.py:752
msgid "Manually resolve rejected chunks?"
msgstr ""
-#: tortoisehg/hgqt/chunks.py:132
+#: tortoisehg/hgqt/chunks.py:198
msgid "Edit patched file and rejects?"
msgstr ""
-#: tortoisehg/hgqt/chunks.py:166
+#: tortoisehg/hgqt/chunks.py:232
msgid "No deletable chunks"
-msgstr ""
-
-#: tortoisehg/hgqt/chunks.py:170
+msgstr "Шматків для видалення не має"
+
+#: tortoisehg/hgqt/chunks.py:236
msgid "No chunks remain"
-msgstr ""
-
-#: tortoisehg/hgqt/chunks.py:171
+msgstr "Шматків більше не залишилось"
+
+#: tortoisehg/hgqt/chunks.py:237
msgid "Remove all file changes?"
msgstr "Видалити всі файли змін?"
-#: tortoisehg/hgqt/chunks.py:204
+#: tortoisehg/hgqt/chunks.py:270
msgid "file has been deleted, refresh"
msgstr "файл був видалений, оновлення"
-#: tortoisehg/hgqt/chunks.py:207
+#: tortoisehg/hgqt/chunks.py:273
msgid "file has been modified, refresh"
-msgstr ""
-
-#: tortoisehg/hgqt/chunks.py:241
+msgstr "файл був видалений, оновіть стан"
+
+#: tortoisehg/hgqt/chunks.py:307
msgid "Unable to merge chunks"
-msgstr ""
-
-#: tortoisehg/hgqt/chunks.py:242
+msgstr "Не вдалось об'єднати шматки"
+
+#: tortoisehg/hgqt/chunks.py:308
msgid "Add or remove patches must be merged in the working directory"
msgstr ""
-#: tortoisehg/hgqt/chunks.py:451 tortoisehg/hgqt/status.py:139
+#: tortoisehg/hgqt/chunks.py:521
msgctxt "files"
msgid "All"
-msgstr ""
-
-#: tortoisehg/hgqt/chunks.py:455 tortoisehg/hgqt/status.py:143
+msgstr "Всі"
+
+#: tortoisehg/hgqt/chunks.py:525
msgctxt "files"
msgid "None"
-msgstr ""
-
-#: tortoisehg/hgqt/chunks.py:511
+msgstr "Немає"
+
+#: tortoisehg/hgqt/chunks.py:581
#, python-format
msgid "Chunks selected: %d / %d"
-msgstr ""
-
-#: tortoisehg/hgqt/clone.py:61 tortoisehg/hgqt/rename.py:64
+msgstr "Орані шматки: %d / %d"
+
+#: tortoisehg/hgqt/clone.py:62 tortoisehg/hgqt/rename.py:64
#: tortoisehg/hgqt/thgimport.py:62 tortoisehg/hgtk/thgimport.py:82
msgid "Source:"
-msgstr "Основа:"
-
-#: tortoisehg/hgqt/clone.py:72 tortoisehg/hgqt/rename.py:69
+msgstr "Оригінал:"
+
+#: tortoisehg/hgqt/clone.py:73 tortoisehg/hgqt/rename.py:69
#: tortoisehg/hgtk/hginit.py:58
msgid "Destination:"
-msgstr "Розташування:"
-
-#: tortoisehg/hgqt/clone.py:117 tortoisehg/hgtk/clone.py:127
+msgstr "Призначення:"
+
+#: tortoisehg/hgqt/clone.py:96 tortoisehg/hgqt/commit.py:233
+#: tortoisehg/hgqt/merge.py:202 tortoisehg/hgqt/mq.py:624
+#: tortoisehg/hgqt/postreview_ui.py:170 tortoisehg/hgqt/rebase.py:57
+#: tortoisehg/hgqt/sync.py:145 tortoisehg/hgqt/tag.py:64
+#: tortoisehg/hgtk/hgemail.py:64
+msgid "Options"
+msgstr "Параметри"
+
+#: tortoisehg/hgqt/clone.py:127 tortoisehg/hgtk/clone.py:127
msgid "Clone to revision:"
msgstr "Клонувати до ревізії:"
-#: tortoisehg/hgqt/clone.py:120 tortoisehg/hgtk/clone.py:141
+#: tortoisehg/hgqt/clone.py:130 tortoisehg/hgtk/clone.py:141
msgid "Do not update the new working directory"
msgstr "Не можливо оновити новий робочий каталог"
-#: tortoisehg/hgqt/clone.py:121 tortoisehg/hgtk/clone.py:142
+#: tortoisehg/hgqt/clone.py:131 tortoisehg/hgtk/clone.py:142
msgid "Use pull protocol to copy metadata"
msgstr "Копіювати метаданні"
-#: tortoisehg/hgqt/clone.py:122 tortoisehg/hgtk/clone.py:143
+#: tortoisehg/hgqt/clone.py:132 tortoisehg/hgtk/clone.py:143
msgid "Use uncompressed transfer"
msgstr "Не стискати під час передачі"
-#: tortoisehg/hgqt/clone.py:123
+#: tortoisehg/hgqt/clone.py:138
msgid "Include patch queue"
-msgstr ""
-
-#: tortoisehg/hgqt/clone.py:129 tortoisehg/hgtk/clone.py:149
+msgstr "Включаючи чергу латок"
+
+#: tortoisehg/hgqt/clone.py:141 tortoisehg/hgtk/clone.py:149
#: tortoisehg/hgtk/history.py:467 tortoisehg/hgtk/synch.py:179
msgid "Use proxy server"
msgstr "Використовувати проксі-сервер"
-#: tortoisehg/hgqt/clone.py:135 tortoisehg/hgqt/sync.py:1426
+#: tortoisehg/hgqt/clone.py:147
+msgid "Do not verify host certificate"
+msgstr "Не можливо перевірити сертифікат вузла"
+
+#: tortoisehg/hgqt/clone.py:151 tortoisehg/hgqt/sync.py:1459
#: tortoisehg/hgtk/clone.py:159 tortoisehg/hgtk/synch.py:202
msgid "Remote command:"
msgstr "Зовнішня команда:"
-#: tortoisehg/hgqt/clone.py:138
+#: tortoisehg/hgqt/clone.py:154
msgid "Start revision:"
-msgstr ""
-
-#: tortoisehg/hgqt/clone.py:156
+msgstr "Початкова ревізія:"
+
+#: tortoisehg/hgqt/clone.py:180
msgid "&Clone"
-msgstr "&Двійник"
-
-#: tortoisehg/hgqt/clone.py:169
+msgstr "&Клонувати"
+
+#: tortoisehg/hgqt/clone.py:183 tortoisehg/hgqt/cmdui.py:752
+#: tortoisehg/hgqt/thgimport.py:117 tortoisehg/hgqt/thgstrip.py:113
+#: tortoisehg/hgqt/update.py:138
+msgid "Detail"
+msgstr "Деталізація"
+
+#: tortoisehg/hgqt/clone.py:193
#, python-format
msgid "Clone - %s"
-msgstr "Двійник - %s"
-
-#: tortoisehg/hgqt/clone.py:229 tortoisehg/hgqt/clone.py:257
-#: tortoisehg/hgqt/clone.py:264 tortoisehg/hgqt/clone.py:314
+msgstr "Клонувати - %s"
+
+#: tortoisehg/hgqt/clone.py:320 tortoisehg/hgqt/clone.py:344
+#: tortoisehg/hgqt/clone.py:351 tortoisehg/hgqt/clone.py:376
#: tortoisehg/hgtk/clone.py:37
msgid "TortoiseHg Clone"
-msgstr "TortoiseHg Клон"
-
-#: tortoisehg/hgqt/clone.py:230
+msgstr "Клонування TortoiseHg"
+
+#: tortoisehg/hgqt/clone.py:321
msgid "Error creating destination folder"
-msgstr ""
-
-#: tortoisehg/hgqt/clone.py:231
+msgstr "Помилка створення теки отримувача"
+
+#: tortoisehg/hgqt/clone.py:322
msgid "Please specify a different path."
-msgstr ""
-
-#: tortoisehg/hgqt/clone.py:258 tortoisehg/hgtk/clone.py:288
+msgstr "Будь-ласка, оберіть інший шлях."
+
+#: tortoisehg/hgqt/clone.py:345 tortoisehg/hgtk/clone.py:288
msgid "Source path is empty"
-msgstr "Шлях до основи порожній"
-
-#: tortoisehg/hgqt/clone.py:259
+msgstr "Шлях до оригіналу порожній"
+
+#: tortoisehg/hgqt/clone.py:346
msgid "Please enter a valid source path."
-msgstr ""
-
-#: tortoisehg/hgqt/clone.py:265 tortoisehg/hgtk/clone.py:294
+msgstr "Вкажіть правильний шлях до оригіналу."
+
+#: tortoisehg/hgqt/clone.py:352 tortoisehg/hgtk/clone.py:294
msgid "Source and destination are the same"
-msgstr "Основа та призначення збігаються"
-
-#: tortoisehg/hgqt/clone.py:266
+msgstr "Оригінал та отримувач співпадають"
+
+#: tortoisehg/hgqt/clone.py:353
msgid "Please specify different paths."
-msgstr ""
-
-#: tortoisehg/hgqt/clone.py:315
+msgstr "Будь-ласка, оберіть інший шлях."
+
+#: tortoisehg/hgqt/clone.py:377
msgid "Please enter a new destination path."
-msgstr ""
-
-#: tortoisehg/hgqt/clone.py:335
+msgstr "Вкажіть новий шлях отримувача."
+
+#: tortoisehg/hgqt/clone.py:400
msgid "Select source repository"
-msgstr ""
-
-#: tortoisehg/hgqt/clone.py:344
+msgstr "Оберіть оригінал сховище"
+
+#: tortoisehg/hgqt/clone.py:410
msgid "Select destination repository"
+msgstr "Оберіть сховище отримувач"
+
+#: tortoisehg/hgqt/clone.py:420
+msgid "Select patch folder"
+msgstr "Оберіть теку для латок"
+
+#: tortoisehg/hgqt/clone.py:428
+msgid "The selected patch folder is not under the source repository."
msgstr ""
#: tortoisehg/hgqt/cmdui.py:227 tortoisehg/hgqt/thread.py:369
@@ -757,11 +860,6 @@msgid "Terminated"
msgstr "Перервано"
-#: tortoisehg/hgqt/cmdui.py:307 tortoisehg/hgqt/merge.py:762
-#: tortoisehg/hgtk/p4pending.py:101
-msgid "Finished"
-msgstr "Закінчено"
-
#: tortoisehg/hgqt/cmdui.py:533
msgid "failed to run command\n"
msgstr ""
@@ -778,15 +876,15 @@#: tortoisehg/hgqt/cmdui.py:607
#, python-format
msgid "no matches found: %s"
-msgstr ""
+msgstr "збігів не знайдено: %s"
#: tortoisehg/hgqt/cmdui.py:761
msgid "TortoiseHg Command Dialog"
msgstr ""
-#: tortoisehg/hgqt/cmdui.py:781 tortoisehg/hgqt/merge.py:65
+#: tortoisehg/hgqt/cmdui.py:781 tortoisehg/hgqt/merge.py:101
#: tortoisehg/hgqt/rebase.py:253 tortoisehg/hgqt/resolve.py:357
-#: tortoisehg/hgqt/settings.py:670 tortoisehg/hgtk/commit.py:323
+#: tortoisehg/hgqt/settings.py:776 tortoisehg/hgtk/commit.py:322
#: tortoisehg/hgtk/merge.py:196 tortoisehg/hgtk/thgconfig.py:846
msgid "Confirm Exit"
msgstr "Підтвердіть вихід"
@@ -801,214 +899,270 @@msgid "TortoiseHg"
msgstr "TortoiseHg"
-#: tortoisehg/hgqt/commit.py:81
+#: tortoisehg/hgqt/commit.py:82
msgid "Paste &Filenames"
msgstr ""
-#: tortoisehg/hgqt/commit.py:83
+#: tortoisehg/hgqt/commit.py:84
msgid "App&ly Format"
msgstr ""
-#: tortoisehg/hgqt/commit.py:84
+#: tortoisehg/hgqt/commit.py:85
msgid "C&onfigure Format"
msgstr ""
-#: tortoisehg/hgqt/commit.py:179
+#: tortoisehg/hgqt/commit.py:196
msgctxt "window title"
msgid "Commit"
msgstr ""
-#: tortoisehg/hgqt/commit.py:207
+#: tortoisehg/hgqt/commit.py:216
msgid "Commit Dialog Toolbar"
msgstr ""
-#: tortoisehg/hgqt/commit.py:211
-msgid "Copy message"
-msgstr ""
-
-#: tortoisehg/hgqt/commit.py:213
-msgid "Copy one of the recent commit messages"
-msgstr ""
-
-#: tortoisehg/hgqt/commit.py:217 tortoisehg/hgqt/commit.py:341
+#: tortoisehg/hgqt/commit.py:219 tortoisehg/hgqt/commit.py:633
msgid "Branch: "
msgstr "Гілка: "
-#: tortoisehg/hgqt/commit.py:223 tortoisehg/hgqt/grep.py:54
+#: tortoisehg/hgqt/commit.py:227
+msgid "Copy message"
+msgstr ""
+
+#: tortoisehg/hgqt/commit.py:229
+msgid "Copy one of the recent commit messages"
+msgstr ""
+
+#: tortoisehg/hgqt/commit.py:243 tortoisehg/hgqt/commit.py:581
+#: tortoisehg/hgqt/settings.py:240
+msgid "Issue Tracker"
+msgstr ""
+
+#: tortoisehg/hgqt/commit.py:244
+#, python-format
+msgid "Failed to load issue tracker '%s': %s"
+msgstr ""
+
+#: tortoisehg/hgqt/commit.py:254 tortoisehg/hgqt/grep.py:54
#: tortoisehg/hgqt/serve_ui.py:87 tortoisehg/hgtk/datamine.py:54
#: tortoisehg/hgtk/hgcmd.py:46 tortoisehg/hgtk/history.py:448
#: tortoisehg/hgtk/recovery.py:48 tortoisehg/hgtk/serve.py:65
#: tortoisehg/hgtk/synch.py:53
msgid "Stop"
-msgstr "Зупинка"
-
-#: tortoisehg/hgqt/commit.py:343
+msgstr "Зупинити"
+
+#: tortoisehg/hgqt/commit.py:356
+msgid "Commit changes"
+msgstr ""
+
+#: tortoisehg/hgqt/commit.py:356 tortoisehg/hgtk/commit.py:653
+#: tortoisehg/hgtk/commit.py:950 tortoisehg/hgtk/commit.py:1014
+#: tortoisehg/hgtk/commit.py:1263 tortoisehg/hgtk/gdialog.py:485
+#: tortoisehg/hgtk/history.py:279 tortoisehg/hgtk/merge.py:136
+#: tortoisehg/hgtk/thgconfig.py:89
+msgid "Commit"
+msgstr "Зафіксувати"
+
+#: tortoisehg/hgqt/commit.py:357
+msgid "Create a new patch"
+msgstr ""
+
+#: tortoisehg/hgqt/commit.py:357 tortoisehg/hgqt/mq.py:977
+#: tortoisehg/hgtk/commit.py:657
+msgid "QNew"
+msgstr "Швидкі новини"
+
+#: tortoisehg/hgqt/commit.py:358
+msgid "Refresh current patch"
+msgstr ""
+
+#: tortoisehg/hgqt/commit.py:358 tortoisehg/hgqt/mq.py:607
+#: tortoisehg/hgqt/mq.py:986 tortoisehg/hgtk/commit.py:660
+msgid "QRefresh"
+msgstr "Швидке оновлення"
+
+#: tortoisehg/hgqt/commit.py:489 tortoisehg/hgtk/commit.py:1185
+msgid "Confirm Branch Change"
+msgstr "Підтвердіть зміну гілки"
+
+#: tortoisehg/hgqt/commit.py:490
+#, python-format
+msgid "Named branch \"%s\" already exists, last used in revision %d\n"
+msgstr ""
+
+#: tortoisehg/hgqt/commit.py:494
+msgid "Restart &Branch"
+msgstr ""
+
+#: tortoisehg/hgqt/commit.py:495 tortoisehg/hgqt/commit.py:503
+msgid "&Commit to current branch"
+msgstr ""
+
+#: tortoisehg/hgqt/commit.py:498 tortoisehg/hgtk/commit.py:1194
+msgid "Confirm New Branch"
+msgstr "Підтвердіть створення нової гілки"
+
+#: tortoisehg/hgqt/commit.py:499
+#, python-format
+msgid "Create new named branch \"%s\" with this commit?\n"
+msgstr ""
+
+#: tortoisehg/hgqt/commit.py:502
+msgid "Create &Branch"
+msgstr ""
+
+#: tortoisehg/hgqt/commit.py:533
+msgctxt "start progress"
+msgid "MQ Action"
+msgstr ""
+
+#: tortoisehg/hgqt/commit.py:635
msgid "Close Branch: "
-msgstr ""
-
-#: tortoisehg/hgqt/commit.py:345
+msgstr "Закрити гілку: "
+
+#: tortoisehg/hgqt/commit.py:637
msgid "New Branch: "
-msgstr ""
-
-#: tortoisehg/hgqt/commit.py:367
+msgstr "Нова гілка: "
+
+#: tortoisehg/hgqt/commit.py:649 tortoisehg/hgqt/revpanel.py:24
+#: tortoisehg/hgqt/update.py:82 tortoisehg/hgtk/changeset.py:581
+#: tortoisehg/hgtk/update.py:90
+msgid "Parent:"
+msgstr "Попередник:"
+
+#: tortoisehg/hgqt/commit.py:650
+msgid "Patch name:"
+msgstr ""
+
+#: tortoisehg/hgqt/commit.py:677
#, python-format
msgid "Rollback commit to revision %d"
msgstr ""
-#: tortoisehg/hgqt/commit.py:376
+#: tortoisehg/hgqt/commit.py:686
msgid "Confirm Undo"
-msgstr ""
-
-#: tortoisehg/hgqt/commit.py:406 tortoisehg/hgqt/mq.py:471
-#: tortoisehg/hgtk/commit.py:582
+msgstr "Підтвердіть відміну"
+
+#: tortoisehg/hgqt/commit.py:716 tortoisehg/hgqt/mq.py:825
+#: tortoisehg/hgtk/commit.py:581
msgid "Discard current commit message?"
msgstr "Відхилити поточне повідомлення про фіксацію?"
-#: tortoisehg/hgqt/commit.py:484 tortoisehg/hgtk/commit.py:935
-#: tortoisehg/hgtk/commit.py:1079 tortoisehg/hgtk/commit.py:1098
+#: tortoisehg/hgqt/commit.py:794 tortoisehg/hgtk/commit.py:934
+#: tortoisehg/hgtk/commit.py:1078 tortoisehg/hgtk/commit.py:1097
msgid "Nothing Commited"
msgstr "Нічого вчиняти"
-#: tortoisehg/hgqt/commit.py:485 tortoisehg/hgtk/commit.py:1080
+#: tortoisehg/hgqt/commit.py:795 tortoisehg/hgtk/commit.py:1079
#: tortoisehg/hgtk/tagadd.py:225
msgid "Please enter commit message"
msgstr "Будь-ласка, введіть повідомлення фіксації"
-#: tortoisehg/hgqt/commit.py:506 tortoisehg/hgtk/commit.py:1186
-msgid "Confirm Branch Change"
-msgstr "Підтвердіть зміну гілки"
-
-#: tortoisehg/hgqt/commit.py:507
-#, python-format
-msgid "Named branch \"%s\" already exists, last used in revision %d\n"
-msgstr ""
-
-#: tortoisehg/hgqt/commit.py:511
-msgid "Restart &Branch"
-msgstr ""
-
-#: tortoisehg/hgqt/commit.py:512 tortoisehg/hgqt/commit.py:520
-msgid "&Commit to current branch"
-msgstr ""
-
-#: tortoisehg/hgqt/commit.py:515 tortoisehg/hgtk/commit.py:1195
-msgid "Confirm New Branch"
-msgstr "Підтвердіть створення нової гілки"
-
-#: tortoisehg/hgqt/commit.py:516
-#, python-format
-msgid "Create new named branch \"%s\" with this commit?\n"
-msgstr ""
-
-#: tortoisehg/hgqt/commit.py:519
-msgid "Create &Branch"
-msgstr ""
-
-#: tortoisehg/hgqt/commit.py:530
+#: tortoisehg/hgqt/commit.py:815
msgid "No files checked"
msgstr ""
-#: tortoisehg/hgqt/commit.py:531
+#: tortoisehg/hgqt/commit.py:816
msgid "No modified files checkmarked for commit"
msgstr ""
-#: tortoisehg/hgqt/commit.py:546
+#: tortoisehg/hgqt/commit.py:831
msgid "Confirm Add"
msgstr ""
-#: tortoisehg/hgqt/commit.py:547
+#: tortoisehg/hgqt/commit.py:832
msgid "Add selected untracked files?"
msgstr ""
-#: tortoisehg/hgqt/commit.py:559
+#: tortoisehg/hgqt/commit.py:844
msgid "Confirm Remove"
msgstr ""
-#: tortoisehg/hgqt/commit.py:560
+#: tortoisehg/hgqt/commit.py:845
msgid "Remove selected deleted files?"
msgstr ""
-#: tortoisehg/hgqt/commit.py:603
+#: tortoisehg/hgqt/commit.py:886
msgctxt "start progress"
msgid "Commit"
msgstr ""
-#: tortoisehg/hgqt/commit.py:609
-msgctxt "stop progress"
-msgid "Commit"
-msgstr ""
-
-#: tortoisehg/hgqt/commit.py:626
+#: tortoisehg/hgqt/commit.py:920
#, python-format
msgid "%s - commit options"
msgstr ""
-#: tortoisehg/hgqt/commit.py:633
+#: tortoisehg/hgqt/commit.py:927
msgid "Set username:"
msgstr ""
-#: tortoisehg/hgqt/commit.py:660 tortoisehg/hgqt/commit.py:707
-#: tortoisehg/hgqt/commit.py:730
+#: tortoisehg/hgqt/commit.py:954 tortoisehg/hgqt/commit.py:1001
+#: tortoisehg/hgqt/commit.py:1024
msgid "Save in Repo"
msgstr ""
-#: tortoisehg/hgqt/commit.py:665
+#: tortoisehg/hgqt/commit.py:959
msgid "Save Global"
msgstr ""
-#: tortoisehg/hgqt/commit.py:677
+#: tortoisehg/hgqt/commit.py:971
msgid "Set Date:"
msgstr ""
-#: tortoisehg/hgqt/commit.py:681 tortoisehg/hgtk/history.py:1589
+#: tortoisehg/hgqt/commit.py:975 tortoisehg/hgtk/history.py:1589
#: tortoisehg/hgtk/synch.py:148 tortoisehg/hgtk/update.py:128
msgid "Update"
-msgstr "Оновлення"
-
-#: tortoisehg/hgqt/commit.py:700
+msgstr "Оновити"
+
+#: tortoisehg/hgqt/commit.py:994
msgid "Push After Commit:"
msgstr ""
-#: tortoisehg/hgqt/commit.py:723
+#: tortoisehg/hgqt/commit.py:1017
msgid "Auto Includes:"
msgstr ""
-#: tortoisehg/hgqt/commit.py:762
+#: tortoisehg/hgqt/commit.py:1056
msgid "Unable to save username"
msgstr ""
-#: tortoisehg/hgqt/commit.py:763 tortoisehg/hgqt/commit.py:786
-#: tortoisehg/hgqt/commit.py:809 tortoisehg/hgqt/sync.py:901
-#: tortoisehg/hgqt/sync.py:999 tortoisehg/hgqt/sync.py:1069
-#: tortoisehg/hgqt/sync.py:1233
+#: tortoisehg/hgqt/commit.py:1057 tortoisehg/hgqt/commit.py:1080
+#: tortoisehg/hgqt/commit.py:1103 tortoisehg/hgqt/sync.py:929
+#: tortoisehg/hgqt/sync.py:1027 tortoisehg/hgqt/sync.py:1097
+#: tortoisehg/hgqt/sync.py:1265
msgid "Iniparse must be installed."
msgstr ""
-#: tortoisehg/hgqt/commit.py:778 tortoisehg/hgqt/commit.py:801
-#: tortoisehg/hgqt/commit.py:824 tortoisehg/hgqt/settings.py:977
-#: tortoisehg/hgqt/sync.py:911 tortoisehg/hgqt/sync.py:1010
-#: tortoisehg/hgqt/sync.py:1087 tortoisehg/hgqt/sync.py:1271
+#: tortoisehg/hgqt/commit.py:1072 tortoisehg/hgqt/commit.py:1095
+#: tortoisehg/hgqt/commit.py:1118 tortoisehg/hgqt/settings.py:1107
+#: tortoisehg/hgqt/sync.py:939 tortoisehg/hgqt/sync.py:1038
+#: tortoisehg/hgqt/sync.py:1115 tortoisehg/hgqt/sync.py:1304
#: tortoisehg/hgtk/thgconfig.py:1654
msgid "Unable to write configuration file"
msgstr "Не можливо записати файл налаштувань"
-#: tortoisehg/hgqt/commit.py:785
+#: tortoisehg/hgqt/commit.py:1079
msgid "Unable to save after commit push"
msgstr ""
-#: tortoisehg/hgqt/commit.py:808
+#: tortoisehg/hgqt/commit.py:1102
msgid "Unable to save auto include list"
msgstr ""
-#: tortoisehg/hgqt/commit.py:839
+#: tortoisehg/hgqt/commit.py:1133
msgid "Invalid date format"
msgstr ""
-#: tortoisehg/hgqt/commit.py:859
+#: tortoisehg/hgqt/commit.py:1153
msgid "No username configured"
msgstr ""
-#: tortoisehg/hgqt/commit.py:920
+#: tortoisehg/hgqt/commit.py:1201 tortoisehg/hgqt/compress.py:122
+#: tortoisehg/hgqt/repowidget.py:324
+msgctxt "action button"
+msgid "Commit"
+msgstr "Зафіксувати"
+
+#: tortoisehg/hgqt/commit.py:1214
#, python-format
msgid "%s - commit"
msgstr ""
@@ -1019,21 +1173,16 @@
#: tortoisehg/hgqt/compress.py:45
msgid "Onto destination"
-msgstr ""
+msgstr "На отримання"
#: tortoisehg/hgqt/compress.py:63
msgid "Compress"
-msgstr ""
-
-#: tortoisehg/hgqt/compress.py:69 tortoisehg/hgqt/merge.py:269
-#: tortoisehg/hgqt/rebase.py:110
-msgid "Checking..."
-msgstr ""
+msgstr "Стискати"
#: tortoisehg/hgqt/compress.py:75
#, python-format
msgid "Compress - %s"
-msgstr ""
+msgstr "Стискати - %s"
#: tortoisehg/hgqt/compress.py:99
msgid ""
@@ -1043,7 +1192,7 @@
#: tortoisehg/hgqt/compress.py:104
msgid "You may continue the compress"
-msgstr ""
+msgstr "Ви можете продовжувати стискати"
#: tortoisehg/hgqt/compress.py:121
msgid "Changes have been moved, you must now commit"
@@ -1053,24 +1202,6 @@msgid "Compress is complete, old history untouched"
msgstr ""
-#: tortoisehg/hgqt/compress.py:149 tortoisehg/hgqt/merge.py:367
-#: tortoisehg/hgqt/merge.py:401 tortoisehg/hgqt/merge.py:465
-#: tortoisehg/hgqt/rebase.py:230 tortoisehg/hgqt/settings.py:771
-#: tortoisehg/hgqt/update.py:248 tortoisehg/hgtk/thgconfig.py:775
-#: tortoisehg/hgtk/update.py:233
-msgid "&Discard"
-msgstr "&Відкинути"
-
-#: tortoisehg/hgqt/compress.py:151 tortoisehg/hgqt/merge.py:467
-#: tortoisehg/hgqt/rebase.py:232
-msgid "Confirm Discard"
-msgstr ""
-
-#: tortoisehg/hgqt/compress.py:152 tortoisehg/hgqt/merge.py:468
-#: tortoisehg/hgqt/rebase.py:233
-msgid "Discard outstanding changes to working directory?"
-msgstr ""
-
#: tortoisehg/hgqt/csinfo.py:48 tortoisehg/hgtk/csinfo.py:49
msgid "must be specified repository"
msgstr "потрібно вказати сховище"
@@ -1111,7 +1242,7 @@#: tortoisehg/hgqt/csinfo.py:110 tortoisehg/hgqt/csinfo.py:111
#: tortoisehg/hgtk/csinfo.py:215 tortoisehg/hgtk/csinfo.py:216
msgid "Tags:"
-msgstr "Мітки:"
+msgstr "Ярлик:"
#: tortoisehg/hgqt/csinfo.py:111 tortoisehg/hgtk/csinfo.py:216
msgid "Transplant:"
@@ -1125,7 +1256,7 @@msgid "Subversion:"
msgstr "Subversion:"
-#: tortoisehg/hgqt/cslist.py:48 tortoisehg/hgqt/cslist.py:131
+#: tortoisehg/hgqt/cslist.py:48 tortoisehg/hgqt/cslist.py:130
#: tortoisehg/hgtk/cslist.py:384
msgid "No items to display"
msgstr "Елементи для показу"
@@ -1134,12 +1265,13 @@msgid "Use compact view"
msgstr "Використовувати стислий огляд"
-#: tortoisehg/hgqt/cslist.py:88 tortoisehg/hgqt/revpanel.py:26
-#: tortoisehg/hgtk/changeset.py:585 tortoisehg/hgtk/cslist.py:143
+#: tortoisehg/hgqt/cslist.py:87 tortoisehg/hgqt/revpanel.py:21
+#: tortoisehg/hgqt/revpanel.py:28 tortoisehg/hgtk/changeset.py:585
+#: tortoisehg/hgtk/cslist.py:143
msgid "Patch:"
msgstr "Латка:"
-#: tortoisehg/hgqt/cslist.py:134 tortoisehg/hgtk/cslist.py:409
+#: tortoisehg/hgqt/cslist.py:133 tortoisehg/hgtk/cslist.py:409
#, python-format
msgid "Displaying %(count)d of %(total)d items"
msgstr "Відображати %(count)d з %(total)d елементів"
@@ -1148,285 +1280,319 @@msgid "Output Log"
msgstr ""
-#: tortoisehg/hgqt/filedialogs.py:194 tortoisehg/hgqt/workbench.py:304
-msgid "Back"
-msgstr ""
-
-#: tortoisehg/hgqt/filedialogs.py:196 tortoisehg/hgqt/workbench.py:307
-msgid "Forward"
-msgstr ""
-
-#: tortoisehg/hgqt/filedialogs.py:377
-msgid "Next diff"
-msgstr ""
-
-#: tortoisehg/hgqt/filedialogs.py:381
-msgid "Previous diff"
-msgstr ""
-
-#: tortoisehg/hgqt/filelistview.py:212 tortoisehg/hgqt/manifestdialog.py:285
-#, python-format
-msgid "Hg file log viewer - %s"
-msgstr ""
-
-#: tortoisehg/hgqt/filelistview.py:226
-msgid "Cannot open subrepository"
-msgstr ""
-
-#: tortoisehg/hgqt/filelistview.py:227
-msgid "The selected subrepository does not exist in the working directory"
-msgstr ""
-
-#: tortoisehg/hgqt/filelistview.py:241
-msgid "Show All"
-msgstr ""
-
-#: tortoisehg/hgqt/filelistview.py:243
-msgid "Toggle display of all files and the direction they were merged"
-msgstr ""
-
-#: tortoisehg/hgqt/filelistview.py:246
-msgid "Other"
-msgstr ""
-
-#: tortoisehg/hgqt/filelistview.py:248
-msgid "Toggle display of diffs to second (other) parent"
-msgstr ""
-
-#: tortoisehg/hgqt/filelistview.py:255 tortoisehg/hgqt/manifestdialog.py:197
-msgid "File history"
-msgstr ""
-
-#: tortoisehg/hgqt/filelistview.py:256 tortoisehg/hgqt/manifestdialog.py:198
-msgid "Show the history of the selected file"
-msgstr ""
-
-#: tortoisehg/hgqt/filelistview.py:257 tortoisehg/hgqt/manifestdialog.py:199
-msgid "Compare file revisions"
-msgstr ""
-
-#: tortoisehg/hgqt/filelistview.py:258 tortoisehg/hgqt/manifestdialog.py:200
-msgid "Compare revisions of the selected file"
-msgstr ""
-
-#: tortoisehg/hgqt/filelistview.py:259 tortoisehg/hgqt/grep.py:547
-#: tortoisehg/hgqt/manifestdialog.py:201 tortoisehg/util/menuthg.py:76
-msgid "Visual Diff"
-msgstr "Наочна різниця"
-
-#: tortoisehg/hgqt/filelistview.py:260 tortoisehg/hgqt/manifestdialog.py:202
-msgid "View file changes in external diff tool"
-msgstr ""
-
-#: tortoisehg/hgqt/filelistview.py:261 tortoisehg/hgqt/manifestdialog.py:203
-msgid "Visual Diff to Local"
-msgstr ""
-
-#: tortoisehg/hgqt/filelistview.py:262 tortoisehg/hgqt/manifestdialog.py:204
-msgid "View changes to current in external diff tool"
-msgstr ""
-
-#: tortoisehg/hgqt/filelistview.py:264 tortoisehg/hgqt/manifestdialog.py:206
-msgid "View at Revision"
-msgstr ""
-
-#: tortoisehg/hgqt/filelistview.py:265 tortoisehg/hgqt/manifestdialog.py:207
-msgid "View file as it appeared at this revision"
-msgstr ""
-
-#: tortoisehg/hgqt/filelistview.py:266 tortoisehg/hgqt/manifestdialog.py:208
-msgid "Edit Local"
-msgstr ""
-
-#: tortoisehg/hgqt/filelistview.py:267 tortoisehg/hgqt/manifestdialog.py:209
-msgid "Edit current file in working copy"
-msgstr ""
-
-#: tortoisehg/hgqt/filelistview.py:268 tortoisehg/hgqt/manifestdialog.py:210
-msgid "Revert to Revision"
-msgstr ""
-
-#: tortoisehg/hgqt/filelistview.py:269 tortoisehg/hgqt/manifestdialog.py:211
-msgid "Revert file(s) to contents at this revision"
-msgstr ""
-
-#: tortoisehg/hgqt/filelistview.py:271
-msgid "Open subrepository"
-msgstr ""
-
-#: tortoisehg/hgqt/filelistview.py:272
-msgid "Open the selected subrepository"
-msgstr ""
-
-#: tortoisehg/hgqt/filerevmodel.py:41
-msgctxt "column header"
-msgid "Filename"
-msgstr ""
-
-#: tortoisehg/hgqt/fileview.py:71
-msgid "Diff Toolbar"
-msgstr ""
-
-#: tortoisehg/hgqt/fileview.py:143
-msgid "View change as unified diff output"
-msgstr ""
-
-#: tortoisehg/hgqt/fileview.py:147
-msgid "View change in context of file"
-msgstr ""
-
-#: tortoisehg/hgqt/fileview.py:151
-msgid "View change in context, annotate with revision number"
-msgstr ""
-
-#: tortoisehg/hgqt/fileview.py:164
-msgid "Next diff (alt+down)"
-msgstr ""
-
-#: tortoisehg/hgqt/fileview.py:168
-msgid "Previous diff (alt+up)"
-msgstr ""
-
-#: tortoisehg/hgqt/fileview.py:176
-msgid "Toggle display of text search bar"
-msgstr ""
-
-#: tortoisehg/hgqt/fileview.py:181
-msgid "Open shelve tool"
-msgstr ""
-
-#: tortoisehg/hgqt/fileview.py:582 tortoisehg/hgqt/fileview.py:791
+#: tortoisehg/hgqt/filedata.py:31
+msgid "File or diffs not displayed: "
+msgstr ""
+
+#: tortoisehg/hgqt/filedata.py:45
+#, python-format
+msgid ""
+"File is larger than the specified max size.\n"
+"maxdiff = %s KB"
+msgstr ""
+
+#: tortoisehg/hgqt/filedata.py:51 tortoisehg/hgtk/chunks.py:85
+msgid "File is binary.\n"
+msgstr "Бінарний файл.\n"
+
+#: tortoisehg/hgqt/filedata.py:82 tortoisehg/hgqt/filedata.py:340
#, python-format
msgid "exec mode has been <font color='red'>%s</font>"
msgstr ""
-#: tortoisehg/hgqt/fileview.py:583 tortoisehg/hgqt/fileview.py:787
+#: tortoisehg/hgqt/filedata.py:83 tortoisehg/hgqt/filedata.py:336
msgid "set"
msgstr ""
-#: tortoisehg/hgqt/fileview.py:583 tortoisehg/hgqt/fileview.py:789
+#: tortoisehg/hgqt/filedata.py:83 tortoisehg/hgqt/filedata.py:338
msgid "unset"
msgstr ""
-#: tortoisehg/hgqt/fileview.py:586 tortoisehg/hgqt/fileview.py:597
+#: tortoisehg/hgqt/filedata.py:86 tortoisehg/hgqt/filedata.py:106
msgid " <i>(is a symlink)</i>"
msgstr ""
-#: tortoisehg/hgqt/fileview.py:625
+#: tortoisehg/hgqt/filedata.py:135
+#, python-format
+msgid ""
+"[WARNING] Invalid subrepo revision ID:\n"
+"\t%s\n"
+"\n"
+msgstr ""
+
+#: tortoisehg/hgqt/filedata.py:155
msgid "Subrepo created and set to initial revision."
msgstr ""
-#: tortoisehg/hgqt/fileview.py:629
+#: tortoisehg/hgqt/filedata.py:159
msgid "Subrepo initialized to revision:"
msgstr ""
-#: tortoisehg/hgqt/fileview.py:632
+#: tortoisehg/hgqt/filedata.py:162
msgid "Subrepo removed from repository."
msgstr ""
-#: tortoisehg/hgqt/fileview.py:637
+#: tortoisehg/hgqt/filedata.py:166
+msgid "Subrepo was not changed."
+msgstr ""
+
+#: tortoisehg/hgqt/filedata.py:167
+msgid "Subrepo state is:"
+msgstr ""
+
+#: tortoisehg/hgqt/filedata.py:169 tortoisehg/hgqt/filedata.py:179
+#: tortoisehg/hgqt/filedata.py:184 tortoisehg/hgqt/filedata.py:188
+#: tortoisehg/hgqt/filedata.py:194
+#, python-format
+msgid "changeset: %s"
+msgstr "набір змін: %s"
+
+#: tortoisehg/hgqt/filedata.py:176
msgid "Revision has changed to:"
msgstr ""
-#: tortoisehg/hgqt/fileview.py:639 tortoisehg/hgqt/fileview.py:646
-#: tortoisehg/hgqt/fileview.py:650 tortoisehg/hgqt/fileview.py:656
-#, python-format
-msgid "changeset: %s"
-msgstr ""
-
-#: tortoisehg/hgqt/fileview.py:647 tortoisehg/hgqt/hgemail_ui.py:247
+#: tortoisehg/hgqt/filedata.py:185 tortoisehg/hgqt/hgemail_ui.py:247
#: tortoisehg/hgtk/hgemail.py:86
msgid "From:"
msgstr "Від:"
-#: tortoisehg/hgqt/fileview.py:651
+#: tortoisehg/hgqt/filedata.py:189
msgid "Subrepository not found in the working directory."
msgstr ""
-#: tortoisehg/hgqt/fileview.py:653 tortoisehg/hgqt/fileview.py:659
+#: tortoisehg/hgqt/filedata.py:191 tortoisehg/hgqt/filedata.py:197
msgid "Further subrepository revision information cannot be retrieved."
msgstr ""
-#: tortoisehg/hgqt/fileview.py:657
+#: tortoisehg/hgqt/filedata.py:195
msgid "Subrepository is either damaged or missing some revisions"
msgstr ""
-#: tortoisehg/hgqt/fileview.py:661
+#: tortoisehg/hgqt/filedata.py:199
msgid ""
"You may need to open the missing subrepository and manually\n"
"pull the missing revisions from its source repository."
msgstr ""
-#: tortoisehg/hgqt/fileview.py:672
+#: tortoisehg/hgqt/filedata.py:208 tortoisehg/hgqt/settings.py:418
msgid "Initial revision"
msgstr ""
-#: tortoisehg/hgqt/fileview.py:692
+#: tortoisehg/hgqt/filedata.py:228
msgid "Not a Mercurial subrepo, not previewable"
msgstr ""
-#: tortoisehg/hgqt/fileview.py:707
+#: tortoisehg/hgqt/filedata.py:243
msgid "File Status:"
msgstr ""
-#: tortoisehg/hgqt/fileview.py:728
+#: tortoisehg/hgqt/filedata.py:268
msgid "(is a changed sub-repository)"
msgstr ""
-#: tortoisehg/hgqt/fileview.py:729
+#: tortoisehg/hgqt/filedata.py:269
+msgid "(is an unchanged sub-repository)"
+msgstr ""
+
+#: tortoisehg/hgqt/filedata.py:270
msgid "(is a dirty sub-repository)"
msgstr ""
-#: tortoisehg/hgqt/fileview.py:730
+#: tortoisehg/hgqt/filedata.py:271
msgid "(is a new sub-repository)"
msgstr ""
-#: tortoisehg/hgqt/fileview.py:731
+#: tortoisehg/hgqt/filedata.py:272
msgid "(is a removed sub-repository)"
msgstr ""
-#: tortoisehg/hgqt/fileview.py:732
+#: tortoisehg/hgqt/filedata.py:273
msgid "(is a changed and dirty sub-repository)"
msgstr ""
-#: tortoisehg/hgqt/fileview.py:733
+#: tortoisehg/hgqt/filedata.py:274
msgid "(is a new and dirty sub-repository)"
msgstr ""
-#: tortoisehg/hgqt/fileview.py:737
+#: tortoisehg/hgqt/filedata.py:278
#, python-format
msgid " <a href=\"subrepo:%s\">open...</a>"
msgstr ""
-#: tortoisehg/hgqt/fileview.py:740
+#: tortoisehg/hgqt/filedata.py:281
#, python-format
msgid "Error previewing subrepo: %s"
msgstr ""
-#: tortoisehg/hgqt/fileview.py:760
+#: tortoisehg/hgqt/filedata.py:288
+#, python-format
+msgid ""
+"File or diffs not displayed: File is larger than the specified max size.\n"
+"maxdiff = %s KB"
+msgstr ""
+
+#: tortoisehg/hgqt/filedata.py:303
msgid " <i>(was deleted)</i>"
msgstr ""
-#: tortoisehg/hgqt/fileview.py:762
+#: tortoisehg/hgqt/filedata.py:305
msgid " <i>(was added, now missing)</i>"
msgstr ""
-#: tortoisehg/hgqt/fileview.py:775
+#: tortoisehg/hgqt/filedata.py:311
msgid " <i>(is unversioned)</i>"
msgstr ""
-#: tortoisehg/hgqt/fileview.py:797 tortoisehg/hgqt/fileview.py:807
+#: tortoisehg/hgqt/filedata.py:329 tortoisehg/hgqt/filedata.py:346
+#: tortoisehg/hgqt/filedata.py:356
msgid " <i>(was added)</i>"
msgstr ""
-#: tortoisehg/hgqt/fileview.py:802
+#: tortoisehg/hgqt/filedata.py:351
#, python-format
msgid " <i>(renamed from %s)</i>"
msgstr ""
+#: tortoisehg/hgqt/filedialogs.py:124
+msgid "File History Log Columns"
+msgstr ""
+
+#: tortoisehg/hgqt/filedialogs.py:166 tortoisehg/hgqt/workbench.py:342
+msgid "Back"
+msgstr "Назад"
+
+#: tortoisehg/hgqt/filedialogs.py:168 tortoisehg/hgqt/workbench.py:345
+msgid "Forward"
+msgstr "Вперед"
+
+#: tortoisehg/hgqt/filedialogs.py:196 tortoisehg/hgqt/filedialogs.py:672
+#: tortoisehg/hgqt/repowidget.py:1137 tortoisehg/hgqt/repowidget.py:1402
+msgid "Visual diff..."
+msgstr "Наочне порівнювання..."
+
+#: tortoisehg/hgqt/filedialogs.py:199 tortoisehg/hgqt/filedialogs.py:675
+#: tortoisehg/hgqt/repowidget.py:1139
+msgid "Diff to local..."
+msgstr "Порівнювання з локальною копією"
+
+#: tortoisehg/hgqt/filedialogs.py:203 tortoisehg/hgqt/filedialogs.py:679
+msgid "Visual diff file..."
+msgstr "Наочне порівнювання файлу..."
+
+#: tortoisehg/hgqt/filedialogs.py:206 tortoisehg/hgqt/filedialogs.py:682
+msgid "Diff file to local..."
+msgstr "Різниця з локальним файлом"
+
+#: tortoisehg/hgqt/filedialogs.py:210 tortoisehg/hgqt/filedialogs.py:686
+msgid "View at revision..."
+msgstr ""
+
+#: tortoisehg/hgqt/filedialogs.py:213 tortoisehg/hgqt/filedialogs.py:689
+msgid "Edit local"
+msgstr ""
+
+#: tortoisehg/hgqt/filedialogs.py:216 tortoisehg/hgqt/filedialogs.py:692
+msgid "Revert to revision..."
+msgstr ""
+
+#: tortoisehg/hgqt/filedialogs.py:363
+msgid "File Differences Log Columns"
+msgstr ""
+
+#: tortoisehg/hgqt/filedialogs.py:471
+msgid "Next diff"
+msgstr ""
+
+#: tortoisehg/hgqt/filedialogs.py:476
+msgid "Previous diff"
+msgstr ""
+
+#: tortoisehg/hgqt/filerevmodel.py:23
+msgctxt "column header"
+msgid "Filename"
+msgstr ""
+
+#: tortoisehg/hgqt/fileview.py:58
+msgid "Diff Toolbar"
+msgstr ""
+
+#: tortoisehg/hgqt/fileview.py:129
+msgid "View change as unified diff output"
+msgstr ""
+
+#: tortoisehg/hgqt/fileview.py:134
+msgid "View change in context of file"
+msgstr "Перегляд змін в контексті файлу"
+
+#: tortoisehg/hgqt/fileview.py:139
+msgid "annotate with revision numbers"
+msgstr ""
+
+#: tortoisehg/hgqt/fileview.py:152
+msgid "Next diff (alt+down)"
+msgstr "Наступна відмінність (alt+down)"
+
+#: tortoisehg/hgqt/fileview.py:156
+msgid "Previous diff (alt+up)"
+msgstr "Попередня відмінність (alt+up)"
+
+#: tortoisehg/hgqt/fileview.py:165
+msgid "Show changes from first parent"
+msgstr "Показати відмінність від першого попередника"
+
+#: tortoisehg/hgqt/fileview.py:169
+msgid "Show changes from second parent"
+msgstr "Показати зміни від другого попередника"
+
+#: tortoisehg/hgqt/fileview.py:177
+msgid "Toggle display of text search bar"
+msgstr ""
+
+#: tortoisehg/hgqt/fileview.py:182
+msgid "Open shelve tool"
+msgstr ""
+
+#: tortoisehg/hgqt/fileview.py:562
+msgid "Search in current file"
+msgstr "Пошук в поточному файлі"
+
+#: tortoisehg/hgqt/fileview.py:563 tortoisehg/hgqt/fileview.py:586
+msgid "Search in history"
+msgstr "Пошук у журналі"
+
+#: tortoisehg/hgqt/fileview.py:581
+msgid "Search in original revision"
+msgstr "Пошук в вихідній ревізії"
+
+#: tortoisehg/hgqt/fileview.py:583
+msgid "Search in working revision"
+msgstr "Пошук у робочій ревізії"
+
+#: tortoisehg/hgqt/fileview.py:585
+msgid "Search in current annotation"
+msgstr "Пошук серед поточних коментарів"
+
+#: tortoisehg/hgqt/fileview.py:605
+msgid "Annotate originating revision"
+msgstr "Коментувати ревізію, що відбувається"
+
+#: tortoisehg/hgqt/fileview.py:606
+msgid "View originating revision"
+msgstr "Подивитись ревізію, що відбувається"
+
+#: tortoisehg/hgqt/fileview.py:618
+#, python-format
+msgid "Annotate parent revision %d"
+msgstr ""
+
+#: tortoisehg/hgqt/fileview.py:620
+#, python-format
+msgid "View parent revision %d"
+msgstr ""
+
#: tortoisehg/hgqt/grep.py:43
msgid "### regular expression search pattern ###"
-msgstr ""
+msgstr "### регулярний вираз для пошуку ###"
#: tortoisehg/hgqt/grep.py:45 tortoisehg/hgqt/qscilib.py:329
#: tortoisehg/hgtk/datamine.py:311 tortoisehg/hgtk/hgignore.py:60
@@ -1445,15 +1611,15 @@
#: tortoisehg/hgqt/grep.py:64
msgid "Working Copy"
-msgstr ""
+msgstr "Робоча копія"
#: tortoisehg/hgqt/grep.py:66
msgid "All History"
-msgstr ""
+msgstr "Весь журнал"
#: tortoisehg/hgqt/grep.py:67
msgid "Report only the first match per file"
-msgstr ""
+msgstr "Видавати тільки перше співпадіння у файлі"
#: tortoisehg/hgqt/grep.py:68 tortoisehg/hgtk/datamine.py:329
msgid "Follow copies and renames"
@@ -1478,90 +1644,92 @@"Comma separated list of inclusion file patterns. By default, the entire "
"repository is searched."
msgstr ""
+"Перелік масок файлі, відокремлений комами, які включаються. По промовчуванню "
+"пошук проходить у всьому сховищі."
#: tortoisehg/hgqt/grep.py:180
msgid "TortoiseHg Search"
-msgstr ""
+msgstr "Пошук TortoiseHg"
#: tortoisehg/hgqt/grep.py:206
#, python-format
msgid "\"%s\" removed from search history"
-msgstr ""
+msgstr "\"%s\" виключено з журналу"
#: tortoisehg/hgqt/grep.py:214
#, python-format
msgid "\"%s\" removed from path history"
-msgstr ""
+msgstr "\"%s\" виключено з шляхів"
#: tortoisehg/hgqt/grep.py:284
#, python-format
msgid "grep: invalid match pattern: %s\n"
-msgstr ""
+msgstr "grep: помилковий шаблон: %s\n"
#: tortoisehg/hgqt/grep.py:312
#, python-format
msgid "grep: %s\n"
-msgstr ""
+msgstr "grep: %s\n"
#: tortoisehg/hgqt/grep.py:355 tortoisehg/hgqt/revset.py:385
#, python-format
msgid "%d matches found"
-msgstr ""
+msgstr "%d знайдено збігів"
#: tortoisehg/hgqt/grep.py:357 tortoisehg/hgqt/revset.py:387
msgid "No matches found"
-msgstr ""
+msgstr "Збіжностей не знайдено"
#: tortoisehg/hgqt/grep.py:415 tortoisehg/hgqt/grep.py:428
#: tortoisehg/hgqt/grep.py:468
msgid "Searching"
-msgstr ""
+msgstr "Пошук"
#: tortoisehg/hgqt/grep.py:415
msgid "history"
-msgstr ""
+msgstr "журнал"
#: tortoisehg/hgqt/grep.py:427
msgid "Interrupted"
-msgstr ""
+msgstr "Перерваний"
#: tortoisehg/hgqt/grep.py:469
msgid "files"
-msgstr ""
+msgstr "файли"
#: tortoisehg/hgqt/grep.py:482
#, python-format
msgid "Skipping %s, unable to read"
-msgstr ""
+msgstr "Неможливо прочитати, пропущений %s"
#: tortoisehg/hgqt/grep.py:545
msgid "View file"
-msgstr ""
+msgstr "Переглянути файл"
#: tortoisehg/hgqt/grep.py:546
msgid "View Changeset"
-msgstr ""
+msgstr "Переглянути набір змін"
#: tortoisehg/hgqt/grep.py:548
msgid "Annotate file"
-msgstr ""
-
-#: tortoisehg/hgqt/grep.py:698 tortoisehg/hgtk/datamine.py:364
+msgstr "Опис файлу"
+
+#: tortoisehg/hgqt/grep.py:702 tortoisehg/hgtk/datamine.py:364
#: tortoisehg/hgtk/datamine.py:654
msgid "File"
msgstr "Файл"
-#: tortoisehg/hgqt/grep.py:698 tortoisehg/hgtk/datamine.py:652
+#: tortoisehg/hgqt/grep.py:702 tortoisehg/hgtk/datamine.py:652
msgid "Line"
msgstr "Рядок"
-#: tortoisehg/hgqt/grep.py:698 tortoisehg/hgtk/datamine.py:363
+#: tortoisehg/hgqt/grep.py:702 tortoisehg/hgtk/datamine.py:363
#: tortoisehg/hgtk/datamine.py:653 tortoisehg/hgtk/logview/treeview.py:441
msgid "Rev"
-msgstr "Рев."
-
-#: tortoisehg/hgqt/grep.py:698 tortoisehg/hgqt/settings.py:451
-#: tortoisehg/hgqt/settings.py:564 tortoisehg/hgqt/settings.py:609
+msgstr "Рев"
+
+#: tortoisehg/hgqt/grep.py:702 tortoisehg/hgqt/settings.py:550
+#: tortoisehg/hgqt/settings.py:670 tortoisehg/hgqt/settings.py:715
#: tortoisehg/hgtk/datamine.py:142 tortoisehg/hgtk/datamine.py:655
#: tortoisehg/hgtk/history.py:101 tortoisehg/hgtk/history.py:502
#: tortoisehg/hgtk/history.py:695 tortoisehg/hgtk/logview/treeview.py:512
@@ -1569,106 +1737,110 @@msgid "User"
msgstr "Користувач"
-#: tortoisehg/hgqt/grep.py:699
+#: tortoisehg/hgqt/grep.py:703
msgid "Match Text"
-msgstr ""
+msgstr "Текст, що співпадає"
#: tortoisehg/hgqt/guess.py:35 tortoisehg/hgtk/guess.py:40
#, python-format
msgid "Detect Copies/Renames in %s"
msgstr "Виявлено копії/зміни назви у %s"
-#: tortoisehg/hgqt/guess.py:59
+#: tortoisehg/hgqt/guess.py:61
msgid "<b>Unrevisioned Files</b>"
-msgstr ""
-
-#: tortoisehg/hgqt/guess.py:74
+msgstr "<b>Файли, які не входять до ревізії</b>"
+
+#: tortoisehg/hgqt/guess.py:65 tortoisehg/hgqt/status.py:95
+msgid "Refresh file list"
+msgstr ""
+
+#: tortoisehg/hgqt/guess.py:83
#, python-format
msgid "Min Similarity: %d%%"
-msgstr ""
-
-#: tortoisehg/hgqt/guess.py:83
+msgstr "Мінімальне співпадіння: %d%%"
+
+#: tortoisehg/hgqt/guess.py:92
msgid "Only consider deleted files"
-msgstr ""
-
-#: tortoisehg/hgqt/guess.py:84
+msgstr "Розглядати тільки видалені файли"
+
+#: tortoisehg/hgqt/guess.py:93
msgid "Uncheck to consider all revisioned files for copy sources"
msgstr ""
-#: tortoisehg/hgqt/guess.py:87 tortoisehg/hgtk/guess.py:108
+#: tortoisehg/hgqt/guess.py:96 tortoisehg/hgtk/guess.py:108
msgid "Find Renames"
msgstr "Знайти зміну назви"
-#: tortoisehg/hgqt/guess.py:88
+#: tortoisehg/hgqt/guess.py:97
msgid "Find copy and/or rename sources"
-msgstr ""
-
-#: tortoisehg/hgqt/guess.py:96
+msgstr "Знайти копію та/або змінену назву оригіналу"
+
+#: tortoisehg/hgqt/guess.py:105
msgid "<b>Candidate Matches</b>"
-msgstr ""
-
-#: tortoisehg/hgqt/guess.py:106 tortoisehg/hgqt/guess.py:119
+msgstr "<b>Найкраще співпадання</b>"
+
+#: tortoisehg/hgqt/guess.py:115 tortoisehg/hgqt/guess.py:128
msgid "Accept All Matches"
msgstr ""
-#: tortoisehg/hgqt/guess.py:117
+#: tortoisehg/hgqt/guess.py:126
msgid "Accept Selected Matches"
-msgstr ""
-
-#: tortoisehg/hgqt/guess.py:132
+msgstr "Прийняти обрані збіги"
+
+#: tortoisehg/hgqt/guess.py:141
msgid "<b>Differences from Source to Dest</b>"
-msgstr ""
-
-#: tortoisehg/hgqt/guess.py:177
+msgstr "<b>Відмінності між оригіналом та отримувачем</b>"
+
+#: tortoisehg/hgqt/guess.py:186
msgid "Search already in progress"
-msgstr ""
-
-#: tortoisehg/hgqt/guess.py:178
+msgstr "Виконується пошук"
+
+#: tortoisehg/hgqt/guess.py:187
msgid "Cannot start a new search"
-msgstr ""
-
-#: tortoisehg/hgqt/guess.py:188
+msgstr "Неможу почати новий пошук"
+
+#: tortoisehg/hgqt/guess.py:197
msgid "No files to find"
msgstr ""
-#: tortoisehg/hgqt/guess.py:189
+#: tortoisehg/hgqt/guess.py:198
msgid "There are no files that may have been renamed"
msgstr ""
-#: tortoisehg/hgqt/guess.py:231
+#: tortoisehg/hgqt/guess.py:240
msgid "Multiple sources chosen"
msgstr ""
-#: tortoisehg/hgqt/guess.py:232
+#: tortoisehg/hgqt/guess.py:241
#, python-format
msgid ""
"You have multiple renames selected for destination file:\n"
"%s. Aborting!"
msgstr ""
-#: tortoisehg/hgqt/guess.py:259
+#: tortoisehg/hgqt/guess.py:268
#, python-format
msgid ""
"%s and %s have identical contents\n"
"\n"
msgstr ""
-#: tortoisehg/hgqt/guess.py:293 tortoisehg/hgtk/datamine.py:656
+#: tortoisehg/hgqt/guess.py:302 tortoisehg/hgtk/datamine.py:656
#: tortoisehg/hgtk/guess.py:145
msgid "Source"
-msgstr "Основа"
-
-#: tortoisehg/hgqt/guess.py:293 tortoisehg/hgtk/guess.py:152
+msgstr "Оригінал"
+
+#: tortoisehg/hgqt/guess.py:302 tortoisehg/hgtk/guess.py:152
msgid "Dest"
-msgstr "Наступник"
-
-#: tortoisehg/hgqt/guess.py:293
+msgstr "Отримувач"
+
+#: tortoisehg/hgqt/guess.py:302
msgid "% Match"
-msgstr ""
+msgstr "% Співпадіння"
#: tortoisehg/hgqt/hgemail.py:264
msgid "Sending Email"
-msgstr ""
+msgstr "Надсилання Email"
#: tortoisehg/hgqt/hgemail.py:444
msgid "use only one form to specify the revision"
@@ -1676,9 +1848,9 @@
#: tortoisehg/hgqt/hgemail.py:454
msgid "Failed to open Email dialog"
-msgstr ""
-
-#: tortoisehg/hgqt/hgemail_ui.py:244 tortoisehg/hgqt/settings.py:457
+msgstr "Не вдалося відкрити діалог Email"
+
+#: tortoisehg/hgqt/hgemail_ui.py:244 tortoisehg/hgqt/settings.py:556
#: tortoisehg/hgtk/synch.py:78 tortoisehg/hgtk/thgconfig.py:238
msgid "Email"
msgstr "Електронна пошта"
@@ -1698,11 +1870,12 @@#: tortoisehg/hgqt/hgemail_ui.py:249 tortoisehg/hgtk/hgemail.py:92
msgid "Message identifier to reply to, for threading"
msgstr ""
-"Ідентифікатор нотатки відповіді використати для створення теми обговорення"
+"Ідентифікатор нотатки відповіді, використовується для створення теми "
+"обговорення"
#: tortoisehg/hgqt/hgemail_ui.py:250
msgid "Flag:"
-msgstr ""
+msgstr "Флаг:"
#: tortoisehg/hgqt/hgemail_ui.py:251 tortoisehg/hgtk/hgemail.py:101
msgid ""
@@ -1711,8 +1884,8 @@"metadata."
msgstr ""
"Латки Hg (котрі створені командою експорту) сумісні з більшістю програм. "
-"Вони включають в себе заголовок, який містить найбільш важливий набір змін "
-"метаданих."
+"Вони включають в себе заголовок, який містить метадані найбільш важливого "
+"набору змін."
#: tortoisehg/hgqt/hgemail_ui.py:252 tortoisehg/hgtk/hgemail.py:98
msgid "Send changesets as Hg patches"
@@ -1792,13 +1965,13 @@"subject prefix."
msgstr ""
"Опис серії латок надіслано у первинному зведенні разом [Латка 0 of N] з "
-"темою. Вона повинна описувати вплив цілого ряду виправлень. При відправці у "
-"зв'язці, ці поля утворюють тему повідомлення і тіло. Ознаки, розділені "
-"комами список міток, який вставлений у заголовок повідомлення."
+"темою. Вона повинна описувати вплив цілого ряду виправлень. При відправці у "
+"зв'язці, ці поля утворюють тему повідомлення і тіло. Ознаками є перелік "
+"ярликів, відокремлений комами, які вставлений у заголовок повідомлення."
#: tortoisehg/hgqt/hgemail_ui.py:266
msgid "Write patch series (bundle) description"
-msgstr ""
+msgstr "Написати опис серії латок (пакунок)"
#: tortoisehg/hgqt/hgemail_ui.py:267 tortoisehg/hgtk/hgemail.py:151
msgid "Subject:"
@@ -1806,9 +1979,9 @@
#: tortoisehg/hgqt/hgemail_ui.py:268 tortoisehg/hgqt/postreview_ui.py:174
msgid "Changesets"
-msgstr ""
-
-#: tortoisehg/hgqt/hgemail_ui.py:269 tortoisehg/hgqt/wctxactions.py:47
+msgstr "Набір змін"
+
+#: tortoisehg/hgqt/hgemail_ui.py:269 tortoisehg/hgqt/wctxactions.py:43
#: tortoisehg/hgqt/webconf.py:256 tortoisehg/hgqt/webconf_ui.py:79
#: tortoisehg/hgtk/status.py:1243
msgid "Edit"
@@ -1816,15 +1989,15 @@
#: tortoisehg/hgqt/hgemail_ui.py:270
msgid "Preview"
-msgstr ""
+msgstr "Попередній перегляд"
#: tortoisehg/hgqt/hgemail_ui.py:271 tortoisehg/hgqt/postreview_ui.py:175
msgid "&Settings"
-msgstr ""
+msgstr "&Налаштування"
#: tortoisehg/hgqt/hgemail_ui.py:272
msgid "Send &Email"
-msgstr ""
+msgstr "Надіслати &Email"
#: tortoisehg/hgqt/hgignore.py:36 tortoisehg/hgtk/hgignore.py:34
#, python-format
@@ -1837,7 +2010,7 @@
#: tortoisehg/hgqt/hgignore.py:46
msgid "Regexp"
-msgstr ""
+msgstr "Регулярний вираз"
#: tortoisehg/hgqt/hgignore.py:53 tortoisehg/hgqt/qqueue.py:91
#: tortoisehg/hgqt/quickop.py:20 tortoisehg/hgqt/tag.py:186
@@ -1849,44 +2022,48 @@msgstr "Додати"
#: tortoisehg/hgqt/hgignore.py:72 tortoisehg/hgqt/resolve.py:128
-#: tortoisehg/hgqt/settings.py:720 tortoisehg/hgtk/hgignore.py:77
+#: tortoisehg/hgqt/settings.py:826 tortoisehg/hgtk/hgignore.py:77
#: tortoisehg/hgtk/thgconfig.py:676
msgid "Edit File"
msgstr "Редагувати файл"
#: tortoisehg/hgqt/hgignore.py:85
msgid "<b>Ignore Filter</b>"
-msgstr ""
+msgstr "<b>Ігнорувати фільтр</b>"
#: tortoisehg/hgqt/hgignore.py:93
msgid "<b>Untracked Files</b>"
msgstr ""
-#: tortoisehg/hgqt/hgignore.py:104
-msgid "Backspace or Del to remove a row"
-msgstr ""
-
-#: tortoisehg/hgqt/hgignore.py:148
+#: tortoisehg/hgqt/hgignore.py:106
+msgid "Backspace or Del to remove row(s)"
+msgstr ""
+
+#: tortoisehg/hgqt/hgignore.py:150
msgid "Add ignore filter..."
-msgstr ""
-
-#: tortoisehg/hgqt/hgignore.py:160
+msgstr "Додавання фільтру ігнорування..."
+
+#: tortoisehg/hgqt/hgignore.py:167
+msgid "selected files"
+msgstr "обрані файли"
+
+#: tortoisehg/hgqt/hgignore.py:168
msgid "Ignore "
-msgstr ""
-
-#: tortoisehg/hgqt/hgignore.py:207 tortoisehg/hgtk/hgignore.py:197
+msgstr "Незважати "
+
+#: tortoisehg/hgqt/hgignore.py:217 tortoisehg/hgtk/hgignore.py:197
msgid "Invalid glob expression"
msgstr "Помилкове вираження для маски"
-#: tortoisehg/hgqt/hgignore.py:217 tortoisehg/hgtk/hgignore.py:213
+#: tortoisehg/hgqt/hgignore.py:227 tortoisehg/hgtk/hgignore.py:213
msgid "Invalid regexp expression"
msgstr "Помилковий регулярний вираз"
-#: tortoisehg/hgqt/hgignore.py:241 tortoisehg/hgqt/hgignore.py:248
+#: tortoisehg/hgqt/hgignore.py:250 tortoisehg/hgqt/hgignore.py:257
msgid "Unable to read repository status"
-msgstr ""
-
-#: tortoisehg/hgqt/hgignore.py:275 tortoisehg/hgtk/hgignore.py:261
+msgstr "Не можливо прочитати стан сховища"
+
+#: tortoisehg/hgqt/hgignore.py:287 tortoisehg/hgtk/hgignore.py:261
msgid "Unable to write .hgignore file"
msgstr "Не можливо записати до файлу .hgignore"
@@ -1896,7 +2073,7 @@
#: tortoisehg/hgqt/hginit.py:47
msgid "Make repo compatible with Mercurial <1.7"
-msgstr ""
+msgstr "Створити сховище сумісне з Mercurial <1.7"
#: tortoisehg/hgqt/hginit.py:49
msgid "Show in Workbench after init"
@@ -1909,17 +2086,17 @@#: tortoisehg/hgqt/hginit.py:85 tortoisehg/hgqt/hginit.py:146
#: tortoisehg/hgqt/hginit.py:210 tortoisehg/hgqt/hginit.py:216
msgid "Init"
-msgstr ""
+msgstr "Ініціалізація"
#: tortoisehg/hgqt/hginit.py:127 tortoisehg/hgqt/hginit.py:159
#: tortoisehg/hgqt/hginit.py:173 tortoisehg/hgqt/hginit.py:183
#: tortoisehg/hgqt/hginit.py:188
msgid "Error executing init"
-msgstr ""
+msgstr "Помилка ініціалізації"
#: tortoisehg/hgqt/hginit.py:128 tortoisehg/hgtk/hginit.py:106
msgid "Destination path is empty"
-msgstr "Шлях призначення порожній"
+msgstr "Шлях отримувача порожній"
#: tortoisehg/hgqt/hginit.py:129 tortoisehg/hgtk/hginit.py:107
msgid "Please enter the directory path"
@@ -1942,7 +2119,7 @@#: tortoisehg/hgqt/hginit.py:160
#, python-format
msgid "Cannot create folder %s"
-msgstr ""
+msgstr "Не можливо створити теку %s"
#: tortoisehg/hgqt/hginit.py:174 tortoisehg/hgtk/hginit.py:121
msgid "Unable to create new repository"
@@ -1956,130 +2133,196 @@#: tortoisehg/hgqt/hginit.py:211 tortoisehg/hgqt/hginit.py:217
#, python-format
msgid "<p>Repository successfully created at</p><p>%s</p>"
-msgstr ""
+msgstr "<p>Сховище успішно створене у</p><p>%s</p>"
#: tortoisehg/hgqt/hginit.py:212
#, python-format
msgid "<p>But could not run Workbench for it.</p><p>%s</p>"
msgstr ""
+#: tortoisehg/hgqt/hgrcutil.py:28
+msgid "Unable to create a config file"
+msgstr "Не мжливо створити файл налаштувань"
+
+#: tortoisehg/hgqt/hgrcutil.py:29
+msgid "Insufficient access rights."
+msgstr ""
+
#: tortoisehg/hgqt/htmldelegate.py:60
#, python-format
msgid "?? Error: %s ??"
-msgstr ""
+msgstr "?? Помилка: %s ??"
#: tortoisehg/hgqt/license.py:29
msgid "License"
-msgstr ""
-
-#: tortoisehg/hgqt/logcolumns.py:22
-msgid "Workbench Log Columns"
-msgstr ""
-
-#: tortoisehg/hgqt/logcolumns.py:66
+msgstr "Ліцензійна угода"
+
+#: tortoisehg/hgqt/logcolumns.py:75
msgid "Drag to change order"
msgstr ""
-#: tortoisehg/hgqt/manifestdialog.py:61
+#: tortoisehg/hgqt/logcolumns.py:100 tortoisehg/hgqt/settings.py:412
+#: tortoisehg/hgqt/workbench.py:673 tortoisehg/util/menuthg.py:46
+msgid "Workbench"
+msgstr ""
+
+#: tortoisehg/hgqt/manifestdialog.py:56
#, python-format
msgid "Manifest %s@%s"
-msgstr ""
-
-#: tortoisehg/hgqt/manifestdialog.py:180 tortoisehg/hgtk/thgmq.py:862
+msgstr "Виявлено %s@%s"
+
+#: tortoisehg/hgqt/manifestdialog.py:186 tortoisehg/hgtk/thgmq.py:862
msgid "Status"
msgstr "Стан"
-#: tortoisehg/hgqt/manifestdialog.py:183 tortoisehg/hgtk/status.py:1251
-msgid "Annotate"
-msgstr "Примітка"
-
-#: tortoisehg/hgqt/merge.py:36
+#: tortoisehg/hgqt/manifestdialog.py:191 tortoisehg/hgqt/revdetails.py:225
+msgid "File history"
+msgstr "Файл журналу"
+
+#: tortoisehg/hgqt/manifestdialog.py:192 tortoisehg/hgqt/revdetails.py:226
+msgid "Show the history of the selected file"
+msgstr "Показати історію для обраного файлу"
+
+#: tortoisehg/hgqt/manifestdialog.py:193 tortoisehg/hgqt/revdetails.py:227
+msgid "Compare file revisions"
+msgstr "Порівняти файли у ревізії"
+
+#: tortoisehg/hgqt/manifestdialog.py:194 tortoisehg/hgqt/revdetails.py:228
+msgid "Compare revisions of the selected file"
+msgstr "Порівняти ревізії для обраних файлів"
+
+#: tortoisehg/hgqt/manifestdialog.py:197 tortoisehg/hgqt/revdetails.py:231
+msgid "Visual Diff to Local"
+msgstr "Наочне порівнювання до локального"
+
+#: tortoisehg/hgqt/manifestdialog.py:198 tortoisehg/hgqt/revdetails.py:232
+msgid "View changes to current in external diff tool"
+msgstr ""
+
+#: tortoisehg/hgqt/manifestdialog.py:200 tortoisehg/hgqt/revdetails.py:234
+msgid "View at Revision"
+msgstr "Переглянути ревізію"
+
+#: tortoisehg/hgqt/manifestdialog.py:201 tortoisehg/hgqt/revdetails.py:235
+msgid "View file as it appeared at this revision"
+msgstr ""
+
+#: tortoisehg/hgqt/manifestdialog.py:207 tortoisehg/hgqt/revdetails.py:243
+msgid "Open subrepository"
+msgstr "Відкрити підсховище"
+
+#: tortoisehg/hgqt/manifestdialog.py:208 tortoisehg/hgqt/revdetails.py:244
+#: tortoisehg/hgqt/revdetails.py:247
+msgid "Open the selected subrepository"
+msgstr "Відкрити обране підсховище"
+
+#: tortoisehg/hgqt/manifestdialog.py:210 tortoisehg/hgqt/revdetails.py:246
+msgid "Explore subrepository"
+msgstr "Дослідити підсховище"
+
+#: tortoisehg/hgqt/manifestdialog.py:212
+msgid "Open the selected subrepository in a file browser"
+msgstr ""
+
+#: tortoisehg/hgqt/manifestdialog.py:214 tortoisehg/hgqt/revdetails.py:249
+msgid "Open terminal in subrepository"
+msgstr ""
+
+#: tortoisehg/hgqt/manifestdialog.py:216 tortoisehg/hgqt/revdetails.py:251
+msgid "Open a shell terminal in the selected subrepository root"
+msgstr ""
+
+#: tortoisehg/hgqt/manifestdialog.py:288 tortoisehg/hgqt/revdetails.py:388
+#, python-format
+msgid "Hg file log viewer - %s"
+msgstr "Перегляд файлу журналу Hg - %s"
+
+#: tortoisehg/hgqt/manifestdialog.py:301 tortoisehg/hgqt/revdetails.py:402
+msgid "Cannot open subrepository"
+msgstr "Неможливо відкрити підсховище"
+
+#: tortoisehg/hgqt/manifestdialog.py:302 tortoisehg/hgqt/revdetails.py:403
+msgid "The selected subrepository does not exist on the working directory"
+msgstr "Обране підсховище не існує у робочому каталозі"
+
+#: tortoisehg/hgqt/merge.py:31
#, python-format
msgid "Merge - %s"
-msgstr ""
-
-#: tortoisehg/hgqt/merge.py:60
+msgstr "Об'єднання - %s"
+
+#: tortoisehg/hgqt/merge.py:96
msgid "Do you want to exit?"
-msgstr ""
-
-#: tortoisehg/hgqt/merge.py:61
+msgstr "Ви хочете вийти?"
+
+#: tortoisehg/hgqt/merge.py:97
msgid "To finish merging, you need to commit the working directory."
msgstr ""
-#: tortoisehg/hgqt/merge.py:63 tortoisehg/hgqt/rebase.py:251
+#: tortoisehg/hgqt/merge.py:99 tortoisehg/hgqt/rebase.py:251
msgid "&Exit"
-msgstr ""
-
-#: tortoisehg/hgqt/merge.py:230 tortoisehg/hgqt/repomodel.py:544
-#: tortoisehg/hgqt/revpanel.py:156 tortoisehg/hgtk/merge.py:73
+msgstr "&Вийти"
+
+#: tortoisehg/hgqt/merge.py:118
+msgid "Prepare to merge"
+msgstr "Підготовка до об'єднання"
+
+#: tortoisehg/hgqt/merge.py:119
+msgid "Verify merge targets and ensure your working directory is clean."
+msgstr ""
+
+#: tortoisehg/hgqt/merge.py:128 tortoisehg/hgqt/repomodel.py:592
+#: tortoisehg/hgqt/revpanel.py:158 tortoisehg/hgtk/merge.py:73
msgid "Not a head revision!"
-msgstr "Це не головна ревізія!"
-
-#: tortoisehg/hgqt/merge.py:237
+msgstr "Це не вершина ревізії!"
+
+#: tortoisehg/hgqt/merge.py:135
msgid "Merge from (other revision)"
msgstr ""
-#: tortoisehg/hgqt/merge.py:245 tortoisehg/hgtk/merge.py:47
-#: tortoisehg/hgtk/merge.py:60
+#: tortoisehg/hgqt/merge.py:140 tortoisehg/hgqt/merge.py:648
+#: tortoisehg/hgtk/merge.py:47 tortoisehg/hgtk/merge.py:60
msgid "Unable to merge"
msgstr "Неможливо об'єднати"
-#: tortoisehg/hgqt/merge.py:246
+#: tortoisehg/hgqt/merge.py:141 tortoisehg/hgqt/merge.py:649
msgid "Merge revision not specified or not found"
msgstr ""
-#: tortoisehg/hgqt/merge.py:251
+#: tortoisehg/hgqt/merge.py:147
msgid "Merge to (working directory)"
msgstr ""
-#: tortoisehg/hgqt/merge.py:260
-msgid "Working directory status"
-msgstr ""
-
-#: tortoisehg/hgqt/merge.py:276
-msgid "<a href=\"view\">View changes...</a>"
-msgstr ""
-
-#: tortoisehg/hgqt/merge.py:282
+#: tortoisehg/hgqt/merge.py:170
msgid ""
"The working directory is already <b>merged</b>. <a "
"href=\"skip\"><b>Continue</b></a> or <a href=\"discard\"><b>discard</b></a> "
"existing merge."
msgstr ""
-#: tortoisehg/hgqt/merge.py:291
+#: tortoisehg/hgqt/merge.py:179
msgid ""
"Before merging, you must <a href=\"commit\"><b>commit</b></a>, <a "
"href=\"shelve\"><b>shelve</b></a> to patch, or <a "
"href=\"discard\"><b>discard</b></a> changes."
msgstr ""
-#: tortoisehg/hgqt/merge.py:304
+#: tortoisehg/hgqt/merge.py:191
msgid "Or use:"
-msgstr ""
-
-#: tortoisehg/hgqt/merge.py:307
+msgstr "або скористатися:"
+
+#: tortoisehg/hgqt/merge.py:194
msgid "Force a merge with outstanding changes (-f/--force)"
msgstr ""
-#: tortoisehg/hgqt/merge.py:328 tortoisehg/hgtk/merge.py:118
+#: tortoisehg/hgqt/merge.py:208 tortoisehg/hgtk/merge.py:118
msgid "Discard all changes from merge target (other) revision"
msgstr "Відхилити всі зміни для злиття об'єкту (інше) ревізії"
-#: tortoisehg/hgqt/merge.py:348 tortoisehg/hgqt/update.py:252
-#: tortoisehg/hgtk/update.py:237
-msgid "&Merge"
-msgstr "&Об’єднати"
-
-#: tortoisehg/hgqt/merge.py:352
-msgid "Merge another revision to the working directory"
-msgstr ""
-
-#: tortoisehg/hgqt/merge.py:369 tortoisehg/hgtk/merge.py:215
+#: tortoisehg/hgqt/merge.py:236 tortoisehg/hgtk/merge.py:215
msgid "Confirm Discard Changes"
-msgstr ""
-
-#: tortoisehg/hgqt/merge.py:370 tortoisehg/hgtk/merge.py:216
+msgstr "Підтвердіть відмову від змін"
+
+#: tortoisehg/hgqt/merge.py:237 tortoisehg/hgtk/merge.py:216
#, python-format
msgid ""
"The changes from revision %s and all unmerged parents will be discarded.\n"
@@ -2087,259 +2330,208 @@"Are you sure this is what you want to do?"
msgstr ""
-#: tortoisehg/hgqt/merge.py:380
-msgid "Merging..."
-msgstr ""
-
-#: tortoisehg/hgqt/merge.py:381
-msgid "All conflicting files will be marked unresolved."
-msgstr ""
-
-#: tortoisehg/hgqt/merge.py:398
-msgid "Cancel merge and discard changes?"
-msgstr ""
-
-#: tortoisehg/hgqt/merge.py:400
-msgid "Discard local changes and restart merge?"
-msgstr ""
-
-#: tortoisehg/hgqt/merge.py:403
-msgid "Confirm Clean Up"
-msgstr ""
-
-#: tortoisehg/hgqt/merge.py:406
-msgid "Canceling merge...\n"
-msgstr ""
-
-#: tortoisehg/hgqt/merge.py:407
-msgid "(Please close any running merge tools)\n"
-msgstr ""
-
-#: tortoisehg/hgqt/merge.py:427
-msgid "Merge failed"
-msgstr ""
-
-#: tortoisehg/hgqt/merge.py:427
-msgid "Returning to first page"
-msgstr ""
-
-#: tortoisehg/hgqt/merge.py:483
-msgid "Rename Patch"
-msgstr ""
-
-#: tortoisehg/hgqt/merge.py:484
-msgid "Input a new patch name:"
-msgstr ""
-
-#: tortoisehg/hgqt/merge.py:492
-#, python-format
-msgid ""
-"The patch <b>%(old)s</b> is renamed to <b>%(new)s</b>. <a "
-"href=\"rename:%(new)s\"><b>Rename</b></a> again?"
-msgstr ""
-
-#: tortoisehg/hgqt/merge.py:547
-msgid "<b>Uncommitted local changes are detected</b>"
-msgstr ""
-
-#: tortoisehg/hgqt/merge.py:552
+#: tortoisehg/hgqt/merge.py:290
msgctxt "working dir state"
msgid "Clean"
-msgstr ""
-
-#: tortoisehg/hgqt/merge.py:581 tortoisehg/hgtk/commit.py:237
-#: tortoisehg/hgtk/history.py:66 tortoisehg/hgtk/history.py:481
-#: tortoisehg/hgtk/history.py:1223
-msgid "Parents"
-msgstr "Попередники"
-
-#: tortoisehg/hgqt/merge.py:585 tortoisehg/hgqt/repomodel.py:538
-#: tortoisehg/hgqt/repomodel.py:540 tortoisehg/hgqt/shelve.py:24
-#: tortoisehg/hgqt/thgimport.py:87
-msgid "Working Directory"
-msgstr ""
-
-#: tortoisehg/hgqt/merge.py:623
-msgid "Working Directory (merged)"
-msgstr ""
-
-#: tortoisehg/hgqt/merge.py:632
-msgid "Commit message"
-msgstr ""
-
-#: tortoisehg/hgqt/merge.py:642 tortoisehg/hgtk/commit.py:823
-msgid "Merge "
-msgstr "Об'єднання "
-
-#: tortoisehg/hgqt/merge.py:646
+msgstr "Чиста"
+
+#: tortoisehg/hgqt/merge.py:340
+msgid "Merging..."
+msgstr "Об'єднання..."
+
+#: tortoisehg/hgqt/merge.py:354
+msgid "Automatically advance to next page when merge is complete."
+msgstr ""
+
+#: tortoisehg/hgqt/merge.py:399
+#, python-format
+msgid ""
+"%d files were modified on both branches and must be <a "
+"href=\"resolve\"><b>resolved</b></a>"
+msgstr ""
+
+#: tortoisehg/hgqt/merge.py:438
+msgid "Commit merge results"
+msgstr "Фіксувати результати об'єднання"
+
+#: tortoisehg/hgqt/merge.py:539 tortoisehg/hgtk/merge.py:135
+msgid "Merge"
+msgstr "Об’єднати"
+
+#: tortoisehg/hgqt/merge.py:543
#, python-format
msgid "Merge with %s"
-msgstr ""
-
-#: tortoisehg/hgqt/merge.py:672 tortoisehg/hgqt/workbench.py:244
-msgid "&Commit"
-msgstr ""
-
-#: tortoisehg/hgqt/merge.py:678 tortoisehg/hgqt/qscilib.py:174
-#: tortoisehg/hgtk/merge.py:137
-msgid "Undo"
-msgstr "Повернути"
-
-#: tortoisehg/hgqt/merge.py:688
-msgid "Commit merged files"
-msgstr ""
-
-#: tortoisehg/hgqt/merge.py:692
-msgid "Committing..."
-msgstr ""
-
-#: tortoisehg/hgqt/merge.py:693
-msgid "Please wait while committing merged files."
-msgstr ""
-
-#: tortoisehg/hgqt/merge.py:718
-msgid ""
-"There were <b>merge conflicts</b> that must be <a "
-"href=\"resolve\"><b>resolved</b></a>"
-msgstr ""
-
-#: tortoisehg/hgqt/merge.py:723
-msgid "No merge conflicts, ready to commit"
-msgstr ""
-
-#: tortoisehg/hgqt/merge.py:778
+msgstr "Об'єднати разом з %s"
+
+#: tortoisehg/hgqt/merge.py:606
msgid "Merge changeset"
-msgstr ""
-
-#: tortoisehg/hgqt/mq.py:86 tortoisehg/hgtk/thgmq.py:125
+msgstr "Об'єднати набори змін"
+
+#: tortoisehg/hgqt/mq.py:36
+msgid "### patch name ###"
+msgstr "### назва латки ###"
+
+#: tortoisehg/hgqt/mq.py:58
+msgid "Patch Name Required"
+msgstr ""
+
+#: tortoisehg/hgqt/mq.py:59
+msgid "You must enter a patch name"
+msgstr "Ви повинні ввести назву латки"
+
+#: tortoisehg/hgqt/mq.py:98 tortoisehg/hgtk/commit.py:226
+#: tortoisehg/hgtk/commit.py:308 tortoisehg/hgtk/history.py:258
+#: tortoisehg/hgtk/history.py:368 tortoisehg/hgtk/thgimport.py:111
+msgid "Patch Queue"
+msgstr "Черга латок"
+
+#: tortoisehg/hgqt/mq.py:114
+msgctxt "MQ QPush"
+msgid "Push all"
+msgstr ""
+
+#: tortoisehg/hgqt/mq.py:115 tortoisehg/hgtk/thgmq.py:125
msgid "Apply all patches"
msgstr "Прийняти всі латки"
-#: tortoisehg/hgqt/mq.py:89
+#: tortoisehg/hgqt/mq.py:117
+msgctxt "MQ QPush"
+msgid "Push"
+msgstr ""
+
+#: tortoisehg/hgqt/mq.py:118
msgid "Apply one patch"
-msgstr ""
-
-#: tortoisehg/hgqt/mq.py:92
+msgstr "Прийняти одну латку"
+
+#: tortoisehg/hgqt/mq.py:120
+msgid "Guards"
+msgstr "Захист"
+
+#: tortoisehg/hgqt/mq.py:121
msgid "Configure guards for selected patch"
-msgstr ""
-
-#: tortoisehg/hgqt/mq.py:95
-msgid "Apply selected patch next (change queue order)"
-msgstr ""
-
-#: tortoisehg/hgqt/mq.py:98
+msgstr "Налаштувати захист для обраних латок"
+
+#: tortoisehg/hgqt/mq.py:123 tortoisehg/hgqt/mq.py:124
+msgid "Reorder patches"
+msgstr ""
+
+#: tortoisehg/hgqt/mq.py:126 tortoisehg/hgqt/qqueue.py:97
+#: tortoisehg/hgqt/qscilib.py:185 tortoisehg/hgqt/shelve.py:68
+#: tortoisehg/hgqt/shelve.py:97
+msgid "Delete"
+msgstr "Видалити"
+
+#: tortoisehg/hgqt/mq.py:127
msgid "Delete selected patches"
-msgstr ""
-
-#: tortoisehg/hgqt/mq.py:101
+msgstr "Видалити обрані латки"
+
+#: tortoisehg/hgqt/mq.py:129
+msgid "Pop"
+msgstr "Вставити"
+
+#: tortoisehg/hgqt/mq.py:130
msgid "Unapply one patch"
msgstr ""
-#: tortoisehg/hgqt/mq.py:104 tortoisehg/hgtk/thgmq.py:110
+#: tortoisehg/hgqt/mq.py:132
+msgid "Pop all"
+msgstr "Вставити все"
+
+#: tortoisehg/hgqt/mq.py:133 tortoisehg/hgtk/thgmq.py:110
msgid "Unapply all patches"
msgstr "Відхилити всі латки"
-#: tortoisehg/hgqt/mq.py:138
+#: tortoisehg/hgqt/mq.py:134
+msgid "Patch Queue Actions Toolbar"
+msgstr ""
+
+#: tortoisehg/hgqt/mq.py:248 tortoisehg/hgqt/mq.py:753
+#, python-format
+msgid "%s had rejected chunks, edit patched file together with rejects?"
+msgstr ""
+
+#: tortoisehg/hgqt/mq.py:338 tortoisehg/hgqt/mq.py:787
+#: tortoisehg/hgqt/repowidget.py:1334
+msgid ""
+"<p>ATTENTION!<br>Guard or comment found.<br>Reordering patches will destroy "
+"them.<br><br>Continue?</p>"
+msgstr ""
+
+#: tortoisehg/hgqt/mq.py:359
+msgid "Configure guards"
+msgstr "Налаштування захисту"
+
+#: tortoisehg/hgqt/mq.py:360
+#, python-format
+msgid "Input new guards for %s:"
+msgstr ""
+
+#: tortoisehg/hgqt/mq.py:370
+msgid "Guards must begin with \"+\" or \"-\""
+msgstr ""
+
+#: tortoisehg/hgqt/mq.py:512
+msgid "no guards"
+msgstr "без захисту"
+
+#: tortoisehg/hgqt/mq.py:551 tortoisehg/hgqt/mq.py:1017
+#, python-format
+msgid "Guards: %d/%d"
+msgstr "Захист: %d/%d"
+
+#: tortoisehg/hgqt/mq.py:613
+msgid "Queues"
+msgstr ""
+
+#: tortoisehg/hgqt/mq.py:652
msgid "New Patch"
-msgstr ""
-
-#: tortoisehg/hgqt/mq.py:159
-msgid "Manage queues"
-msgstr ""
-
-#: tortoisehg/hgqt/mq.py:162 tortoisehg/hgqt/mq.py:695
-#: tortoisehg/hgtk/commit.py:661
-msgid "QRefresh"
-msgstr "Швидке оновлення"
-
-#: tortoisehg/hgqt/mq.py:201
-msgid "### patch name ###"
-msgstr ""
-
-#: tortoisehg/hgqt/mq.py:207
+msgstr "Нові латки"
+
+#: tortoisehg/hgqt/mq.py:706
msgid "TortoiseHg Patch Queue"
msgstr ""
-#: tortoisehg/hgqt/mq.py:269
-#, python-format
-msgid "%s had rejected chunks, edit patched file together with rejects?"
-msgstr ""
-
-#: tortoisehg/hgqt/mq.py:360
-msgid "Configure guards"
-msgstr ""
-
-#: tortoisehg/hgqt/mq.py:361
-#, python-format
-msgid "Input new guards for %s:"
-msgstr ""
-
-#: tortoisehg/hgqt/mq.py:371
-msgid "Guards must begin with \"+\" or \"-\""
-msgstr ""
-
-#: tortoisehg/hgqt/mq.py:497
-msgid "Patch Name Required"
-msgstr ""
-
-#: tortoisehg/hgqt/mq.py:498
-msgid "You must enter a patch name"
-msgstr ""
-
-#: tortoisehg/hgqt/mq.py:621
-msgid "no guards"
-msgstr ""
-
-#: tortoisehg/hgqt/mq.py:649
+#: tortoisehg/hgqt/mq.py:949
msgid "QCommit"
-msgstr ""
-
-#: tortoisehg/hgqt/mq.py:651
+msgstr "Швидка фіксація"
+
+#: tortoisehg/hgqt/mq.py:951
msgid "Create MQ repo"
msgstr ""
-#: tortoisehg/hgqt/mq.py:685 tortoisehg/hgtk/commit.py:658
-msgid "QNew"
-msgstr "Швидкі новини"
-
-#: tortoisehg/hgqt/mq.py:782
-#, python-format
-msgid "Guards: %d/%d"
-msgstr ""
-
-#: tortoisehg/hgqt/mq.py:880
+#: tortoisehg/hgqt/mq.py:1116
msgid "Patch commit messages..."
msgstr ""
-#: tortoisehg/hgqt/mq.py:900
+#: tortoisehg/hgqt/mq.py:1136
msgid "MQ options"
msgstr ""
-#: tortoisehg/hgqt/mq.py:906
+#: tortoisehg/hgqt/mq.py:1142
msgid "Force use of git extended diff format (--git)"
msgstr ""
-#: tortoisehg/hgqt/mq.py:910
+#: tortoisehg/hgqt/mq.py:1146
msgid "Force push or pop (--force)"
msgstr ""
-#: tortoisehg/hgqt/mq.py:914
+#: tortoisehg/hgqt/mq.py:1150
msgid "Apply patch to its recorded parent (--exact)"
msgstr ""
-#: tortoisehg/hgqt/mq.py:918
+#: tortoisehg/hgqt/mq.py:1154
msgid "Update date field with current date (--currentdate)"
msgstr ""
-#: tortoisehg/hgqt/mq.py:922
+#: tortoisehg/hgqt/mq.py:1158
msgid "Specify an explicit date:"
msgstr ""
-#: tortoisehg/hgqt/mq.py:925
+#: tortoisehg/hgqt/mq.py:1161
msgid "Update author field with current user (--currentuser)"
msgstr ""
-#: tortoisehg/hgqt/mq.py:929
+#: tortoisehg/hgqt/mq.py:1165
msgid "Specify an explicit author:"
msgstr ""
@@ -2358,75 +2550,84 @@
#: tortoisehg/hgqt/pathedit.py:23
msgid "Edit Repository URL"
-msgstr ""
-
-#: tortoisehg/hgqt/pbranch.py:52
+msgstr "Редагувати URL сховища"
+
+#: tortoisehg/hgqt/pbranch.py:57
msgid "Patch Branch Toolbar"
msgstr ""
-#: tortoisehg/hgqt/pbranch.py:59 tortoisehg/hgtk/thgpbranch.py:100
+#: tortoisehg/hgqt/pbranch.py:64 tortoisehg/hgtk/thgpbranch.py:100
msgid "Merge all pending dependencies"
msgstr "Об'єднати всі невирішені залежності"
-#: tortoisehg/hgqt/pbranch.py:65 tortoisehg/hgtk/thgpbranch.py:105
+#: tortoisehg/hgqt/pbranch.py:70 tortoisehg/hgtk/thgpbranch.py:105
msgid "Backout current patch branch"
msgstr "Відновити поточні латки гілки"
-#: tortoisehg/hgqt/pbranch.py:71 tortoisehg/hgtk/thgpbranch.py:111
+#: tortoisehg/hgqt/pbranch.py:76 tortoisehg/hgtk/thgpbranch.py:111
msgid "Backport part of a changeset to a dependency"
msgstr "Backport part of a changeset to a dependency"
-#: tortoisehg/hgqt/pbranch.py:77 tortoisehg/hgtk/thgpbranch.py:116
+#: tortoisehg/hgqt/pbranch.py:82 tortoisehg/hgtk/thgpbranch.py:116
msgid "Start a new patch branch"
msgstr "Створити нову латку гілки"
-#: tortoisehg/hgqt/pbranch.py:83 tortoisehg/hgtk/thgpbranch.py:121
+#: tortoisehg/hgqt/pbranch.py:88 tortoisehg/hgtk/thgpbranch.py:121
msgid "Edit patch dependency graph"
msgstr "Змінити латку залежності граф"
-#: tortoisehg/hgqt/pbranch.py:262
+#: tortoisehg/hgqt/pbranch.py:299
msgid "will be closed"
-msgstr ""
-
-#: tortoisehg/hgqt/pbranch.py:264 tortoisehg/hgtk/thgpbranch.py:375
+msgstr "буде закрито"
+
+#: tortoisehg/hgqt/pbranch.py:301 tortoisehg/hgtk/thgpbranch.py:375
#, python-format
msgid "needs merge of %i heads\n"
-msgstr "потрібно об'єднання %i головою\n"
-
-#: tortoisehg/hgqt/pbranch.py:267 tortoisehg/hgtk/thgpbranch.py:378
+msgstr "потрібно об'єднання %i вершиною\n"
+
+#: tortoisehg/hgqt/pbranch.py:304 tortoisehg/hgtk/thgpbranch.py:378
#, python-format
msgid "needs merge with %s (through %s)\n"
msgstr "потрібне об'єднання з %s (включаючи %s)\n"
-#: tortoisehg/hgqt/pbranch.py:270 tortoisehg/hgtk/thgpbranch.py:381
+#: tortoisehg/hgqt/pbranch.py:307 tortoisehg/hgtk/thgpbranch.py:381
#, python-format
msgid "needs merge with %s\n"
msgstr "потрібне об'єднання з %s\n"
-#: tortoisehg/hgqt/pbranch.py:272 tortoisehg/hgtk/thgpbranch.py:383
+#: tortoisehg/hgqt/pbranch.py:309 tortoisehg/hgtk/thgpbranch.py:383
#, python-format
msgid "needs update of diff base to tip of %s\n"
msgstr "потрібно оновити з різниці базової до вершини %s\n"
-#: tortoisehg/hgqt/pbranch.py:298 tortoisehg/hgqt/qqueue.py:254
+#: tortoisehg/hgqt/pbranch.py:347 tortoisehg/hgqt/qqueue.py:254
#: tortoisehg/hgqt/qqueue.py:272 tortoisehg/hgqt/thread.py:223
#: tortoisehg/hgqt/thread.py:243 tortoisehg/hgtk/dialog.py:34
msgid "TortoiseHg Prompt"
msgstr "Підказка від TortoiseHg"
-#: tortoisehg/hgqt/pbranch.py:299 tortoisehg/hgtk/thgpbranch.py:432
+#: tortoisehg/hgqt/pbranch.py:348 tortoisehg/hgtk/thgpbranch.py:432
msgid "New Patch Name"
msgstr "Назва нової латки"
-#: tortoisehg/hgqt/pbranch.py:392
+#: tortoisehg/hgqt/pbranch.py:480
msgid "&Goto (update workdir)"
msgstr ""
-#: tortoisehg/hgqt/pbranch.py:450
+#: tortoisehg/hgqt/pbranch.py:482 tortoisehg/hgqt/update.py:252
+#: tortoisehg/hgtk/update.py:237
+msgid "&Merge"
+msgstr "&Об’єднати"
+
+#: tortoisehg/hgqt/pbranch.py:500
+msgid "No patch branch selected"
+msgstr ""
+
+#: tortoisehg/hgqt/pbranch.py:551
msgid "No editor found"
-msgstr ""
-
-#: tortoisehg/hgqt/pbranch.py:451
+msgstr "Редактора не знайдено"
+
+#: tortoisehg/hgqt/pbranch.py:552
msgid ""
"Mercurial was unable to find an editor. Please configure Mercurial to use an "
"editor installed on your system."
@@ -2452,16 +2653,16 @@#: tortoisehg/hgqt/postreview.py:110 tortoisehg/hgqt/postreview.py:126
#: tortoisehg/hgqt/postreview.py:343 tortoisehg/hgqt/postreview.py:366
#: tortoisehg/hgqt/postreview.py:378 tortoisehg/hgqt/postreview_ui.py:163
-#: tortoisehg/hgqt/settings.py:560
+#: tortoisehg/hgqt/settings.py:666
msgid "Review Board"
msgstr ""
#: tortoisehg/hgqt/postreview.py:111
msgid "Password:"
-msgstr ""
+msgstr "Пароль:"
#: tortoisehg/hgqt/postreview.py:127 tortoisehg/hgqt/postreview.py:379
-#: tortoisehg/hgqt/rename.py:43 tortoisehg/hgtk/commit.py:1108
+#: tortoisehg/hgqt/rename.py:43 tortoisehg/hgtk/commit.py:1107
msgid "Error"
msgstr "Помилка"
@@ -2485,7 +2686,7 @@
#: tortoisehg/hgqt/postreview_ui.py:164
msgid "Repository ID:"
-msgstr ""
+msgstr "ID сховища:"
#: tortoisehg/hgqt/postreview_ui.py:166
msgid "Post Review"
@@ -2517,7 +2718,7 @@
#: tortoisehg/hgqt/postreview_ui.py:176
msgid "%p%"
-msgstr ""
+msgstr "%p%"
#: tortoisehg/hgqt/postreview_ui.py:177
msgid "Connecting to Review Board..."
@@ -2529,7 +2730,7 @@
#: tortoisehg/hgqt/purge.py:32
msgid "No unknown files found"
-msgstr ""
+msgstr "Знайдені невідомі файли"
#: tortoisehg/hgqt/purge.py:38
msgid "No ignored files found"
@@ -2537,11 +2738,11 @@
#: tortoisehg/hgqt/purge.py:44
msgid "No trash files found"
-msgstr ""
+msgstr "Файлів у смітнику не знайдено"
#: tortoisehg/hgqt/purge.py:50
msgid "Delete empty folders"
-msgstr ""
+msgstr "видалити порожні теки"
#: tortoisehg/hgqt/purge.py:53
msgid "Preserve files beginning with .hg"
@@ -2550,15 +2751,15 @@#: tortoisehg/hgqt/purge.py:70
#, python-format
msgid "%s - purge"
-msgstr ""
+msgstr "%s - чищення"
#: tortoisehg/hgqt/purge.py:75 tortoisehg/hgqt/purge.py:107
msgid "Checking"
-msgstr ""
+msgstr "Перевірка"
#: tortoisehg/hgqt/purge.py:111
msgid "Ready to purge."
-msgstr ""
+msgstr "Готовий до чищення"
#: tortoisehg/hgqt/purge.py:115
#, python-format
@@ -2583,7 +2784,7 @@
#: tortoisehg/hgqt/purge.py:151
msgid "Confirm file deletions"
-msgstr ""
+msgstr "Підтвердження видалення файлу"
#: tortoisehg/hgqt/purge.py:152
msgid "Are you sure you want to delete these files and/or folders?"
@@ -2591,7 +2792,7 @@
#: tortoisehg/hgqt/purge.py:159
msgid "Deletion failures"
-msgstr ""
+msgstr "Видалення зі збоєм"
#: tortoisehg/hgqt/purge.py:160
#, python-format
@@ -2605,17 +2806,17 @@#: tortoisehg/hgqt/purge.py:237
#, python-format
msgid "Deleted %d files"
-msgstr ""
+msgstr "Видалення %d файлів"
#: tortoisehg/hgqt/purge.py:247
#, python-format
msgid "Deleted %d files and %d folders"
-msgstr ""
+msgstr "Вилучено %d файлів та %d тек"
#: tortoisehg/hgqt/qdelete.py:24
#, python-format
msgid "Patch remove - %s"
-msgstr ""
+msgstr "Видалення латки - %s"
#: tortoisehg/hgqt/qdelete.py:33
msgid "Remove patches from queue?"
@@ -2644,42 +2845,37 @@
#: tortoisehg/hgqt/qqueue.py:49 tortoisehg/hgqt/qreorder.py:41
msgid "Repository:"
-msgstr ""
+msgstr "Сховище:"
#: tortoisehg/hgqt/qqueue.py:68
msgid "Patch queues:"
msgstr ""
-#: tortoisehg/hgqt/qqueue.py:85 tortoisehg/hgqt/settings.py:723
+#: tortoisehg/hgqt/qqueue.py:85 tortoisehg/hgqt/settings.py:829
#: tortoisehg/hgtk/thgconfig.py:680
msgid "Reload"
msgstr "Перезавантажити"
#: tortoisehg/hgqt/qqueue.py:88
msgid "Activate"
-msgstr ""
+msgstr "Активація"
#: tortoisehg/hgqt/qqueue.py:94 tortoisehg/hgqt/rename.py:168
-#: tortoisehg/hgqt/reporegistry.py:98 tortoisehg/hgtk/bookmark.py:49
+#: tortoisehg/hgqt/reporegistry.py:373 tortoisehg/hgtk/bookmark.py:49
msgid "Rename"
msgstr "Змінити назву"
-#: tortoisehg/hgqt/qqueue.py:97 tortoisehg/hgqt/qscilib.py:185
-#: tortoisehg/hgqt/shelve.py:68 tortoisehg/hgqt/shelve.py:97
-msgid "Delete"
-msgstr ""
-
#: tortoisehg/hgqt/qqueue.py:100
msgid "Purge"
-msgstr ""
+msgstr "Чищення"
#: tortoisehg/hgqt/qqueue.py:107
msgid "Patches:"
-msgstr ""
+msgstr "Латки:"
#: tortoisehg/hgqt/qqueue.py:116
msgid "QQueue"
-msgstr ""
+msgstr "Швидкий запит"
#: tortoisehg/hgqt/qqueue.py:246
msgid "Confirm patch queue switch"
@@ -2710,7 +2906,7 @@
#: tortoisehg/hgqt/qqueue.py:304
msgid "Confirm patch queue purge"
-msgstr ""
+msgstr "Підтвердіть чистку черги латок"
#: tortoisehg/hgqt/qqueue.py:305
#, python-format
@@ -2719,46 +2915,46 @@"purge patch queue '%s' ?</p>"
msgstr ""
-#: tortoisehg/hgqt/qqueue.py:343 tortoisehg/hgqt/qreorder.py:226
+#: tortoisehg/hgqt/qqueue.py:343 tortoisehg/hgqt/qreorder.py:229
msgid "Please enable the MQ extension first."
msgstr ""
#: tortoisehg/hgqt/qrename.py:25
#, python-format
msgid "Patch rename - %s"
-msgstr ""
+msgstr "Зміна назви латки - %s"
#: tortoisehg/hgqt/qrename.py:36
#, python-format
msgid "Rename patch <b>%s</b> to:"
msgstr ""
-#: tortoisehg/hgqt/qrename.py:84
+#: tortoisehg/hgqt/qrename.py:90
msgid "Could not rename existing patchfile"
msgstr ""
-#: tortoisehg/hgqt/qrename.py:94
+#: tortoisehg/hgqt/qrename.py:100
msgid "Could not delete existing patchfile"
msgstr ""
-#: tortoisehg/hgqt/qrename.py:110
+#: tortoisehg/hgqt/qrename.py:116
msgid "QRename - Check patchname"
msgstr ""
-#: tortoisehg/hgqt/qrename.py:119
+#: tortoisehg/hgqt/qrename.py:125
#, python-format
msgid "Patch name <b>%s</b> already exists:"
msgstr ""
-#: tortoisehg/hgqt/qrename.py:124
+#: tortoisehg/hgqt/qrename.py:130
msgid "Add .OLD extension to existing patchfile"
msgstr ""
-#: tortoisehg/hgqt/qrename.py:126
+#: tortoisehg/hgqt/qrename.py:132
msgid "Overwrite existing patchfile"
msgstr ""
-#: tortoisehg/hgqt/qrename.py:128
+#: tortoisehg/hgqt/qrename.py:134
msgid "Go back and change new patchname"
msgstr ""
@@ -2776,27 +2972,31 @@
#: tortoisehg/hgqt/qreorder.py:119
msgid "Rename patch"
-msgstr ""
+msgstr "Зміна назви латки"
+
+#: tortoisehg/hgqt/qscilib.py:174 tortoisehg/hgtk/merge.py:137
+msgid "Undo"
+msgstr "Повернути"
#: tortoisehg/hgqt/qscilib.py:176
msgid "Redo"
-msgstr ""
+msgstr "Переробити"
#: tortoisehg/hgqt/qscilib.py:179
msgid "Cut"
-msgstr ""
+msgstr "Вирізати"
#: tortoisehg/hgqt/qscilib.py:184
msgid "Paste"
-msgstr ""
+msgstr "Вставити"
#: tortoisehg/hgqt/qscilib.py:189
msgid "Select All"
-msgstr ""
+msgstr "Вибрати все"
#: tortoisehg/hgqt/qscilib.py:193
msgid "Wrap"
-msgstr ""
+msgstr "Обгортка"
#: tortoisehg/hgqt/qscilib.py:194
msgctxt "wrap mode"
@@ -2805,23 +3005,23 @@
#: tortoisehg/hgqt/qscilib.py:195
msgid "Word"
-msgstr ""
+msgstr "Слово"
#: tortoisehg/hgqt/qscilib.py:196
msgid "Character"
-msgstr ""
+msgstr "Літера"
#: tortoisehg/hgqt/qscilib.py:203
msgid "Whitespace"
-msgstr ""
+msgstr "Пробіл"
#: tortoisehg/hgqt/qscilib.py:204 tortoisehg/hgqt/qscilib.py:214
msgid "Visible"
-msgstr ""
+msgstr "Видимий"
#: tortoisehg/hgqt/qscilib.py:205 tortoisehg/hgqt/qscilib.py:215
msgid "Invisible"
-msgstr ""
+msgstr "Невидимий"
#: tortoisehg/hgqt/qscilib.py:206
msgid "AfterIndent"
@@ -2833,7 +3033,7 @@
#: tortoisehg/hgqt/qscilib.py:327
msgid "### regular expression ###"
-msgstr ""
+msgstr "### регулярний вираз ###"
#: tortoisehg/hgqt/qscilib.py:330 tortoisehg/hgtk/datamine.py:319
msgid "Regular expression search pattern"
@@ -2845,31 +3045,49 @@
#: tortoisehg/hgqt/qscilib.py:515
msgid "Unable to read/write config file"
-msgstr ""
-
-#: tortoisehg/hgqt/qtlib.py:79
-msgid "Unable to create a config file"
-msgstr ""
-
-#: tortoisehg/hgqt/qtlib.py:80
-msgid "Insufficient access rights."
-msgstr ""
-
-#: tortoisehg/hgqt/qtlib.py:810
+msgstr "Не можливо прочитати/записати файл налаштувань"
+
+#: tortoisehg/hgqt/qtlib.py:118 tortoisehg/hgtk/gdialog.py:682
+#: tortoisehg/hgtk/gtklib.py:406
+msgid "No visual editor configured"
+msgstr "Не налаштований візуальний редактор"
+
+#: tortoisehg/hgqt/qtlib.py:119 tortoisehg/hgtk/gdialog.py:683
+#: tortoisehg/hgtk/gtklib.py:407
+msgid "Please configure a visual editor."
+msgstr "Будь ласка, налаштуйте візуальний редактор"
+
+#: tortoisehg/hgqt/qtlib.py:131
+msgid "Editor launch failure"
+msgstr ""
+
+#: tortoisehg/hgqt/qtlib.py:148
+msgid "No shell configured"
+msgstr ""
+
+#: tortoisehg/hgqt/qtlib.py:149
+msgid "A terminal shell must be configured"
+msgstr ""
+
+#: tortoisehg/hgqt/qtlib.py:804
+msgid "Show Log"
+msgstr "Показати журнал"
+
+#: tortoisehg/hgqt/qtlib.py:955
msgid "Please enter a username"
-msgstr ""
-
-#: tortoisehg/hgqt/qtlib.py:811
+msgstr "Введіть ім'я користувача"
+
+#: tortoisehg/hgqt/qtlib.py:956
msgid "You must identify yourself to Mercurial"
msgstr ""
#: tortoisehg/hgqt/quickbar.py:30
msgid "Goto"
-msgstr ""
+msgstr "Перехід"
#: tortoisehg/hgqt/quickbar.py:36
msgid "Go"
-msgstr ""
+msgstr "Перейти"
#: tortoisehg/hgqt/quickop.py:20
msgid "Checkmark files to add"
@@ -2896,7 +3114,7 @@msgid "Checkmark files to remove"
msgstr ""
-#: tortoisehg/hgqt/quickop.py:23 tortoisehg/hgqt/sync.py:496
+#: tortoisehg/hgqt/quickop.py:23 tortoisehg/hgqt/sync.py:512
#: tortoisehg/hgqt/webconf_ui.py:80 tortoisehg/hgtk/bookmark.py:47
#: tortoisehg/hgtk/quickop.py:22 tortoisehg/hgtk/tagadd.py:40
msgid "Remove"
@@ -2905,7 +3123,7 @@#: tortoisehg/hgqt/quickop.py:44
#, python-format
msgid "%s - hg %s"
-msgstr ""
+msgstr "%s - hg %s"
#: tortoisehg/hgqt/quickop.py:78 tortoisehg/hgtk/quickop.py:133
msgid "Do not save backup files (*.orig)"
@@ -2925,7 +3143,7 @@
#: tortoisehg/hgqt/rebase.py:48
msgid "To rebase destination"
-msgstr ""
+msgstr "Зміна бази отримувача"
#: tortoisehg/hgqt/rebase.py:60
msgid "Keep original changesets"
@@ -2950,7 +3168,7 @@msgstr "Змінити базу"
#: tortoisehg/hgqt/rebase.py:98 tortoisehg/hgqt/rebase.py:265
-#: tortoisehg/hgqt/repowidget.py:1233 tortoisehg/hgqt/repowidget.py:1257
+#: tortoisehg/hgqt/repowidget.py:1442 tortoisehg/hgqt/repowidget.py:1466
#: tortoisehg/hgtk/gdialog.py:863
msgid "Abort"
msgstr "Перервати"
@@ -2958,7 +3176,7 @@#: tortoisehg/hgqt/rebase.py:118
#, python-format
msgid "Rebase - %s"
-msgstr ""
+msgstr "Зміна бази - %s"
#: tortoisehg/hgqt/rebase.py:142
msgid ""
@@ -2972,11 +3190,11 @@
#: tortoisehg/hgqt/rebase.py:189
msgid "Rebase is complete"
-msgstr ""
+msgstr "База змінена"
#: tortoisehg/hgqt/rebase.py:191
msgid "Rebase aborted"
-msgstr ""
+msgstr "Зміна бази перервано"
#: tortoisehg/hgqt/rebase.py:201
msgid ""
@@ -2994,7 +3212,7 @@
#: tortoisehg/hgqt/rebase.py:262
msgid "Rebase already in progress"
-msgstr ""
+msgstr "Зміна бази в процесі"
#: tortoisehg/hgqt/rebase.py:263
msgid "Resuming rebase already in progress"
@@ -3029,8 +3247,8 @@msgid "This appears to be a binary file"
msgstr ""
-#: tortoisehg/hgqt/rejects.py:199 tortoisehg/hgtk/commit.py:1352
-#: tortoisehg/hgtk/commit.py:1357
+#: tortoisehg/hgqt/rejects.py:199 tortoisehg/hgtk/commit.py:1351
+#: tortoisehg/hgtk/commit.py:1356
msgid "Warning"
msgstr "Попередження"
@@ -3054,7 +3272,7 @@
#: tortoisehg/hgqt/rejects.py:280
msgid "Filename required"
-msgstr ""
+msgstr "Потребує назви файла"
#: tortoisehg/hgqt/rejects.py:281
msgid "You must provide the path to a file"
@@ -3067,49 +3285,49 @@
#: tortoisehg/hgqt/rename.py:73
msgid "Copy source -> destination"
-msgstr ""
+msgstr "Копіювання оригінал -> отримувач"
#: tortoisehg/hgqt/rename.py:163
#, python-format
msgid "Copy - %s"
-msgstr ""
+msgstr "Копіювати - %s"
#: tortoisehg/hgqt/rename.py:165
msgid "Copy Error"
-msgstr ""
+msgstr "Помилка копіювання"
#: tortoisehg/hgqt/rename.py:167
#, python-format
msgid "Rename - %s"
-msgstr ""
+msgstr "Змінити назву - %s"
#: tortoisehg/hgqt/rename.py:169
msgid "Rename Error"
-msgstr ""
+msgstr "Помилка зміни назви"
#: tortoisehg/hgqt/rename.py:194
msgid "Select Source File"
-msgstr ""
+msgstr "Обрати файл оригіналу"
#: tortoisehg/hgqt/rename.py:196 tortoisehg/hgtk/clone.py:91
msgid "Select Source Folder"
-msgstr "Оберіть теку основи"
+msgstr "Обрати теку оригіналу"
#: tortoisehg/hgqt/rename.py:200 tortoisehg/hgtk/archive.py:201
msgid "Select Destination File"
-msgstr "Виберіть файл призначення"
+msgstr "Обрати файл отримувач"
#: tortoisehg/hgqt/rename.py:254
msgid "Source does not exists."
-msgstr ""
+msgstr "Оригінал не існує"
#: tortoisehg/hgqt/rename.py:259
msgid "The source must be within the repository tree."
-msgstr ""
+msgstr "Оригінал повинний бути всередині дерева сховища."
#: tortoisehg/hgqt/rename.py:264
msgid "The destination must be within the repository tree."
-msgstr ""
+msgstr "Отримувач повинен бути всередині дерева сховища."
#: tortoisehg/hgqt/rename.py:268
msgid "Please give a destination that differs from the source"
@@ -3117,11 +3335,11 @@
#: tortoisehg/hgqt/rename.py:272
msgid "Destination file already exists."
-msgstr ""
+msgstr "Файл отримувач вже існує"
#: tortoisehg/hgqt/rename.py:273
msgid "Are you sure you want to overwrite it ?"
-msgstr ""
+msgstr "Ви впевнені що хочете перезаписати це ?"
#: tortoisehg/hgqt/rename.py:286
msgid "Cannot do a pure casefolding copy on Windows"
@@ -3162,7 +3380,7 @@
#: tortoisehg/hgqt/repofilter.py:92
msgid "filter"
-msgstr ""
+msgstr "фільтр"
#: tortoisehg/hgqt/repofilter.py:94
msgid "Toggle filtering of non-matched changesets"
@@ -3178,312 +3396,464 @@msgstr ""
#: tortoisehg/hgqt/repofilter.py:209
+msgid "Display only active branches"
+msgstr ""
+
+#: tortoisehg/hgqt/repofilter.py:212
msgid "Display closed branches"
-msgstr ""
-
-#: tortoisehg/hgqt/repofilter.py:212
+msgstr "Показати закриті гілки"
+
+#: tortoisehg/hgqt/repofilter.py:215
msgid "Include all ancestors"
msgstr ""
-#: tortoisehg/hgqt/repomodel.py:39
+#: tortoisehg/hgqt/repomodel.py:42
msgctxt "column header"
msgid "Graph"
-msgstr ""
-
-#: tortoisehg/hgqt/repomodel.py:40
+msgstr "Граф"
+
+#: tortoisehg/hgqt/repomodel.py:43
msgctxt "column header"
msgid "Rev"
-msgstr ""
-
-#: tortoisehg/hgqt/repomodel.py:41
+msgstr "Ревізія"
+
+#: tortoisehg/hgqt/repomodel.py:44
msgctxt "column header"
msgid "Branch"
-msgstr ""
-
-#: tortoisehg/hgqt/repomodel.py:42
+msgstr "Гілка"
+
+#: tortoisehg/hgqt/repomodel.py:45
msgctxt "column header"
msgid "Description"
-msgstr ""
-
-#: tortoisehg/hgqt/repomodel.py:43
+msgstr "Опис"
+
+#: tortoisehg/hgqt/repomodel.py:46
msgctxt "column header"
msgid "Author"
-msgstr ""
-
-#: tortoisehg/hgqt/repomodel.py:44
+msgstr "Автор"
+
+#: tortoisehg/hgqt/repomodel.py:47
msgctxt "column header"
msgid "Tags"
-msgstr ""
-
-#: tortoisehg/hgqt/repomodel.py:45
+msgstr "Ярлики"
+
+#: tortoisehg/hgqt/repomodel.py:48
msgctxt "column header"
msgid "Node"
-msgstr ""
-
-#: tortoisehg/hgqt/repomodel.py:46
+msgstr "Вузлова точка"
+
+#: tortoisehg/hgqt/repomodel.py:49
msgctxt "column header"
msgid "Age"
-msgstr ""
-
-#: tortoisehg/hgqt/repomodel.py:47
+msgstr "Вік"
+
+#: tortoisehg/hgqt/repomodel.py:50
msgctxt "column header"
msgid "Local Time"
-msgstr ""
-
-#: tortoisehg/hgqt/repomodel.py:48
+msgstr "Поточний час"
+
+#: tortoisehg/hgqt/repomodel.py:51
msgctxt "column header"
msgid "UTC Time"
-msgstr ""
-
-#: tortoisehg/hgqt/repomodel.py:49
+msgstr "Всесвітній час"
+
+#: tortoisehg/hgqt/repomodel.py:52
msgctxt "column header"
msgid "Changes"
-msgstr ""
-
-#: tortoisehg/hgqt/repomodel.py:203
+msgstr "Зміни"
+
+#: tortoisehg/hgqt/repomodel.py:206
#, python-format
msgid "filling (%d)"
msgstr ""
-#: tortoisehg/hgqt/repomodel.py:531
+#: tortoisehg/hgqt/repomodel.py:579
msgid "Mercurial User"
-msgstr ""
-
-#: tortoisehg/hgqt/reporegistry.py:92 tortoisehg/hgqt/webconf_ui.py:76
+msgstr "Користувач Mercurial"
+
+#: tortoisehg/hgqt/reporegistry.py:177 tortoisehg/hgqt/reporegistry.py:585
+#, python-format
+msgid "Unsupported repository type (%s)"
+msgstr "Не підтримуваний тип сховища (%s)"
+
+#: tortoisehg/hgqt/reporegistry.py:178 tortoisehg/hgqt/reporegistry.py:586
+msgid "Cannot open non mercurial repositories or subrepositories"
+msgstr "Не можу відкрити не mercurial сховище або підсховище"
+
+#: tortoisehg/hgqt/reporegistry.py:220
+msgid "Repository Registry"
+msgstr ""
+
+#: tortoisehg/hgqt/reporegistry.py:365
+msgid "Refresh repository list"
+msgstr ""
+
+#: tortoisehg/hgqt/reporegistry.py:366
+msgid "Refresh the Repository Registry list"
+msgstr ""
+
+#: tortoisehg/hgqt/reporegistry.py:367 tortoisehg/hgqt/webconf_ui.py:76
msgid "Open"
-msgstr ""
-
-#: tortoisehg/hgqt/reporegistry.py:93
+msgstr "Відкрити"
+
+#: tortoisehg/hgqt/reporegistry.py:368
msgid "Open the repository in a new tab"
msgstr ""
-#: tortoisehg/hgqt/reporegistry.py:94
+#: tortoisehg/hgqt/reporegistry.py:369
msgid "Open All"
-msgstr ""
-
-#: tortoisehg/hgqt/reporegistry.py:95
+msgstr "Відкрити все"
+
+#: tortoisehg/hgqt/reporegistry.py:370
msgid "Open all repositories in new tabs"
msgstr ""
-#: tortoisehg/hgqt/reporegistry.py:96 tortoisehg/hgqt/reporegistry.py:163
+#: tortoisehg/hgqt/reporegistry.py:371 tortoisehg/hgqt/reporegistry.py:597
msgid "New Group"
-msgstr ""
-
-#: tortoisehg/hgqt/reporegistry.py:97
+msgstr "Нова група"
+
+#: tortoisehg/hgqt/reporegistry.py:372
msgid "Create a new group"
-msgstr ""
-
-#: tortoisehg/hgqt/reporegistry.py:99
+msgstr "Створити нову групу"
+
+#: tortoisehg/hgqt/reporegistry.py:374
msgid "Rename the entry"
msgstr ""
-#: tortoisehg/hgqt/reporegistry.py:100
+#: tortoisehg/hgqt/reporegistry.py:375
msgid "Settings..."
-msgstr ""
-
-#: tortoisehg/hgqt/reporegistry.py:101
+msgstr "Налаштування..."
+
+#: tortoisehg/hgqt/reporegistry.py:376
msgid "View the repository's settings"
msgstr ""
-#: tortoisehg/hgqt/reporegistry.py:102
+#: tortoisehg/hgqt/reporegistry.py:377
msgid "Remove from registry"
msgstr ""
-#: tortoisehg/hgqt/reporegistry.py:103
+#: tortoisehg/hgqt/reporegistry.py:378
msgid ""
"Remove the node and all its subnodes. Repositories are not deleted from disk."
msgstr ""
-#: tortoisehg/hgqt/reporegistry.py:106 tortoisehg/util/menuthg.py:25
+#: tortoisehg/hgqt/reporegistry.py:381 tortoisehg/util/menuthg.py:25
msgid "Clone..."
msgstr "Клонувати..."
-#: tortoisehg/hgqt/reporegistry.py:107
+#: tortoisehg/hgqt/reporegistry.py:382
msgid "Clone Repository"
-msgstr ""
-
-#: tortoisehg/hgqt/reporegistry.py:108 tortoisehg/hgqt/sync.py:494
-#: tortoisehg/hgqt/workbench.py:292
+msgstr "Клонувати сховище"
+
+#: tortoisehg/hgqt/reporegistry.py:383 tortoisehg/hgqt/sync.py:510
+#: tortoisehg/hgqt/workbench.py:328
msgid "Explore"
-msgstr ""
-
-#: tortoisehg/hgqt/reporegistry.py:109
-msgid "Open the repository in Windows Explorer"
-msgstr ""
-
-#: tortoisehg/hgqt/reporegistry.py:110 tortoisehg/hgqt/sync.py:495
-#: tortoisehg/hgqt/workbench.py:295
+msgstr "Провідник"
+
+#: tortoisehg/hgqt/reporegistry.py:384
+msgid "Open the repository in a file browser"
+msgstr ""
+
+#: tortoisehg/hgqt/reporegistry.py:385 tortoisehg/hgqt/sync.py:511
+#: tortoisehg/hgqt/workbench.py:331
msgid "Terminal"
-msgstr ""
-
-#: tortoisehg/hgqt/reporegistry.py:111
-msgid "Open a shell terminal in repository root"
-msgstr ""
-
-#: tortoisehg/hgqt/reporegistry.py:112
+msgstr "Термінал"
+
+#: tortoisehg/hgqt/reporegistry.py:386
+msgid "Open a shell terminal in the repository root"
+msgstr ""
+
+#: tortoisehg/hgqt/reporegistry.py:387
msgid "Add repository..."
-msgstr ""
-
-#: tortoisehg/hgqt/reporegistry.py:113
+msgstr "Додавання сховища..."
+
+#: tortoisehg/hgqt/reporegistry.py:388
msgid "Add a repository to this group"
-msgstr ""
-
-#: tortoisehg/hgqt/reporegistry.py:223
-msgid "Repository Registry"
-msgstr ""
-
-#: tortoisehg/hgqt/repotreeitem.py:236
-#, python-format
-msgid "Local Repository %s"
-msgstr ""
-
-#: tortoisehg/hgqt/repotreeitem.py:291 tortoisehg/hgqt/wctxactions.py:302
+msgstr "Додати сховище до групи"
+
+#: tortoisehg/hgqt/reporegistry.py:389
+msgid "Add a subrepository..."
+msgstr ""
+
+#: tortoisehg/hgqt/reporegistry.py:390
+msgid "Convert an existing repository into a subrepository"
+msgstr ""
+
+#: tortoisehg/hgqt/reporegistry.py:392 tortoisehg/hgqt/wctxactions.py:44
+msgid "Copy path"
+msgstr ""
+
+#: tortoisehg/hgqt/reporegistry.py:393
+msgid "Copy the root path of the repository to the clipboard"
+msgstr ""
+
+#: tortoisehg/hgqt/reporegistry.py:449
+msgid "Select repository directory to add"
+msgstr ""
+
+#: tortoisehg/hgqt/reporegistry.py:460 tortoisehg/hgqt/reporegistry.py:508
+#: tortoisehg/hgqt/reporegistry.py:524 tortoisehg/hgqt/reporegistry.py:549
+#: tortoisehg/hgqt/reporegistry.py:555
+msgid "Failed to add repository"
+msgstr "Помилка при додаванні сховища"
+
+#: tortoisehg/hgqt/reporegistry.py:461 tortoisehg/hgqt/workbench.py:761
+#, python-format
+msgid "%s is not a valid repository"
+msgstr ""
+
+#: tortoisehg/hgqt/reporegistry.py:467
+msgid "Select an existing repository to add as a subrepo"
+msgstr ""
+
+#: tortoisehg/hgqt/reporegistry.py:485
+msgid "Cannot open repository"
+msgstr ""
+
+#: tortoisehg/hgqt/reporegistry.py:486
+#, python-format
+msgid "The selected repository:<br><br>%s<br><br>cannot be open!"
+msgstr ""
+
+#: tortoisehg/hgqt/reporegistry.py:491
+msgid "Subrepository already exists"
+msgstr ""
+
+#: tortoisehg/hgqt/reporegistry.py:492
+#, python-format
+msgid ""
+"The selected repository:<br><br>%s<br><br>is already a subrepository "
+"of:<br><br>%s<br><br>as: \"%s\""
+msgstr ""
+
+#: tortoisehg/hgqt/reporegistry.py:509
+#, python-format
+msgid "Cannot open the .hgsub file in:<br><br>%s"
+msgstr ""
+
+#: tortoisehg/hgqt/reporegistry.py:525
+#, python-format
+msgid "The .hgsub file already contains the line:<br><br>%s"
+msgstr ""
+
+#: tortoisehg/hgqt/reporegistry.py:540
+msgid "Subrepo added to .hgsub file"
+msgstr ""
+
+#: tortoisehg/hgqt/reporegistry.py:541
+#, python-format
+msgid ""
+"The selected subrepo:<br><br><i>%s</i><br><br>has been added to the .hgsub "
+"file.<br><br>Remember that in order to finish adding the subrepo<br><i>you "
+"must still commit</i> the .hgsub file changes."
+msgstr ""
+
+#: tortoisehg/hgqt/reporegistry.py:550
+#, python-format
+msgid "Cannot update the .hgsub file in:<br><br>%s"
+msgstr ""
+
+#: tortoisehg/hgqt/reporegistry.py:556
+#, python-format
+msgid "\"%s\" is not a valid repository inside \"%s\""
+msgstr ""
+
+#: tortoisehg/hgqt/reporegistry.py:603 tortoisehg/hgqt/wctxactions.py:297
msgid "&Delete"
-msgstr ""
-
-#: tortoisehg/hgqt/repotreeitem.py:294 tortoisehg/hgtk/thgmq.py:372
+msgstr "&Видалення"
+
+#: tortoisehg/hgqt/reporegistry.py:605 tortoisehg/hgtk/thgmq.py:372
#: tortoisehg/hgtk/thgmq.py:376 tortoisehg/hgtk/thgshelve.py:224
msgid "Confirm Delete"
-msgstr "Підтвердіть вилучення"
-
-#: tortoisehg/hgqt/repotreeitem.py:295
+msgstr "Підтвердити вилучення"
+
+#: tortoisehg/hgqt/reporegistry.py:606
#, python-format
msgid "Delete Group '%s' and all its entries?"
-msgstr ""
-
-#: tortoisehg/hgqt/repotreeitem.py:311
+msgstr "Видалити групу '%s' а також всі її елементи?"
+
+#: tortoisehg/hgqt/repotreeitem.py:246
+#, python-format
+msgid "Local Repository %s"
+msgstr ""
+
+#: tortoisehg/hgqt/repotreeitem.py:308
+msgid "Unable to update repository name"
+msgstr ""
+
+#: tortoisehg/hgqt/repotreeitem.py:309
+#, python-format
+msgid "An error occurred while updating the repository hgrc file (%s)"
+msgstr ""
+
+#: tortoisehg/hgqt/repotreeitem.py:485
msgid "default"
-msgstr ""
-
-#: tortoisehg/hgqt/repotreemodel.py:143 tortoisehg/hgqt/resolve.py:399
-#: tortoisehg/hgqt/sync.py:208 tortoisehg/hgqt/webconf.py:266
+msgstr "за промовчанням"
+
+#: tortoisehg/hgqt/repotreemodel.py:163 tortoisehg/hgqt/resolve.py:399
+#: tortoisehg/hgqt/sync.py:220 tortoisehg/hgqt/webconf.py:266
msgid "Path"
-msgstr ""
-
-#: tortoisehg/hgqt/repotreemodel.py:209
-msgid "Select repository directory to add"
-msgstr ""
-
-#: tortoisehg/hgqt/repotreemodel.py:222
-msgid "Failed to add repository"
-msgstr ""
-
-#: tortoisehg/hgqt/repotreemodel.py:223 tortoisehg/hgqt/workbench.py:600
-#, python-format
-msgid "%s is not a valid repository"
-msgstr ""
-
-#: tortoisehg/hgqt/repoview.py:197
+msgstr "Латка"
+
+#: tortoisehg/hgqt/repotreemodel.py:273
+msgid "Could not get subrepository list"
+msgstr ""
+
+#: tortoisehg/hgqt/repotreemodel.py:274
+#, python-format
+msgid ""
+"It was not possible to get the subrepository list for the repository "
+"in:<br><br><i>%s</i>"
+msgstr ""
+
+#: tortoisehg/hgqt/repotreemodel.py:277
+msgid "Could not open some subrepositories"
+msgstr ""
+
+#: tortoisehg/hgqt/repotreemodel.py:278
+#, python-format
+msgid ""
+"It was not possible to fully load the subrepository list for the repository "
+"in:<br><br><i>%s</i><br><br>The following subrepositories may be missing, "
+"broken or on an inconsistent state and cannot be accessed:<br><br><i>%s</i>"
+msgstr ""
+
+#: tortoisehg/hgqt/repoview.py:95
+msgid "Choose log columns..."
+msgstr ""
+
+#: tortoisehg/hgqt/repoview.py:240
#, python-format
msgid "Goto ancestor of %s and %s"
msgstr ""
-#: tortoisehg/hgqt/repoview.py:233
+#: tortoisehg/hgqt/repoview.py:276
#, python-format
msgid "Can't find revision '%s'"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:104
+#: tortoisehg/hgqt/repowidget.py:170
+msgid "Workbench Log Columns"
+msgstr ""
+
+#: tortoisehg/hgqt/repowidget.py:204
+msgctxt "tab tooltip"
+msgid "Revision details"
+msgstr "Деталі ревізії"
+
+#: tortoisehg/hgqt/repowidget.py:209
+msgctxt "tab tooltip"
+msgid "Commit"
+msgstr "Фіксувати"
+
+#: tortoisehg/hgqt/repowidget.py:214
+msgctxt "tab tooltip"
+msgid "MQ Patch"
+msgstr ""
+
+#: tortoisehg/hgqt/repowidget.py:222
+msgctxt "tab tooltip"
+msgid "Synchronize"
+msgstr "Синхронізація"
+
+#: tortoisehg/hgqt/repowidget.py:227
+msgctxt "tab tooltip"
+msgid "Manifest"
+msgstr ""
+
+#: tortoisehg/hgqt/repowidget.py:232
+msgctxt "tab tooltip"
+msgid "Search"
+msgstr "Пошук"
+
+#: tortoisehg/hgqt/repowidget.py:237
+msgctxt "tab tooltip"
+msgid "Patch Branch"
+msgstr ""
+
+#: tortoisehg/hgqt/repowidget.py:250
+#, python-format
+msgid "%s <incoming>"
+msgstr ""
+
+#: tortoisehg/hgqt/repowidget.py:408
+msgid "Found incoming changesets"
+msgstr ""
+
+#: tortoisehg/hgqt/repowidget.py:411
msgid "Pull incoming changesets into your repository"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:107 tortoisehg/hgtk/history.py:1881
+#: tortoisehg/hgqt/repowidget.py:413 tortoisehg/hgtk/history.py:1881
msgid "Reject"
msgstr "Відхилити"
-#: tortoisehg/hgqt/repowidget.py:108
+#: tortoisehg/hgqt/repowidget.py:414
msgid "Reject incoming changesets"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:159
-msgctxt "tab tooltip"
-msgid "Revision details"
-msgstr ""
-
-#: tortoisehg/hgqt/repowidget.py:163
-msgctxt "tab tooltip"
-msgid "Commit"
-msgstr ""
-
-#: tortoisehg/hgqt/repowidget.py:167
-msgctxt "tab tooltip"
-msgid "Synchronize"
-msgstr ""
-
-#: tortoisehg/hgqt/repowidget.py:171
-msgctxt "tab tooltip"
-msgid "Manifest"
-msgstr ""
-
-#: tortoisehg/hgqt/repowidget.py:175
-msgctxt "tab tooltip"
-msgid "Search"
-msgstr ""
-
-#: tortoisehg/hgqt/repowidget.py:180
-msgctxt "tab tooltip"
-msgid "Patch Queue"
-msgstr ""
-
-#: tortoisehg/hgqt/repowidget.py:188
-msgctxt "tab tooltip"
-msgid "Patch Branch"
-msgstr ""
-
-#: tortoisehg/hgqt/repowidget.py:201
-#, python-format
-msgid "%s <incoming>"
-msgstr ""
-
-#: tortoisehg/hgqt/repowidget.py:508
+#: tortoisehg/hgqt/repowidget.py:502 tortoisehg/hgqt/sync.py:889
+#: tortoisehg/hgtk/history.py:2021
+#, python-format
+msgid "%d outgoing changesets"
+msgstr "%d вихідні набори змін"
+
+#: tortoisehg/hgqt/repowidget.py:504 tortoisehg/hgqt/repowidget.py:1126
+#: tortoisehg/hgqt/workbench.py:371 tortoisehg/hgtk/history.py:444
+#: tortoisehg/hgtk/history.py:2069 tortoisehg/hgtk/synch.py:73
+msgid "Push"
+msgstr "Відправити"
+
+#: tortoisehg/hgqt/repowidget.py:631
#, python-format
msgid "%s - verify repository"
-msgstr ""
-
-#: tortoisehg/hgqt/repowidget.py:515
+msgstr "%s - перевірка сховища"
+
+#: tortoisehg/hgqt/repowidget.py:638
#, python-format
msgid "%s - recover repository"
-msgstr ""
-
-#: tortoisehg/hgqt/repowidget.py:531
+msgstr "відновити сховище - %s"
+
+#: tortoisehg/hgqt/repowidget.py:654
msgid "No transaction available"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:532
+#: tortoisehg/hgqt/repowidget.py:655
msgid "There is no rollback transaction available"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:535 tortoisehg/hgtk/commit.py:1035
+#: tortoisehg/hgqt/repowidget.py:658 tortoisehg/hgtk/commit.py:1034
msgid "Undo last commit?"
-msgstr "Відмовитись від останнього повідомлення?"
-
-#: tortoisehg/hgqt/repowidget.py:536
+msgstr "Відмовитись від останньої фіксації?"
+
+#: tortoisehg/hgqt/repowidget.py:659
#, python-format
msgid "Undo most recent commit (%d), preserving file changes?"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:540
+#: tortoisehg/hgqt/repowidget.py:663
msgid "Undo last transaction?"
-msgstr ""
-
-#: tortoisehg/hgqt/repowidget.py:541
+msgstr "Відмінити останню транзакцію?"
+
+#: tortoisehg/hgqt/repowidget.py:664
#, python-format
msgid "Rollback to revision %d (undo %s)?"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:547 tortoisehg/hgqt/run.py:473
+#: tortoisehg/hgqt/repowidget.py:670 tortoisehg/hgqt/repowidget.py:1231
+#: tortoisehg/hgqt/run.py:489
msgid "Repository Error"
-msgstr ""
-
-#: tortoisehg/hgqt/repowidget.py:548
+msgstr "Помилка сховища"
+
+#: tortoisehg/hgqt/repowidget.py:671
msgid "Unable to determine working copy revision\n"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:552
+#: tortoisehg/hgqt/repowidget.py:675
msgid "Remove current working revision?"
-msgstr ""
-
-#: tortoisehg/hgqt/repowidget.py:553
+msgstr "Видалити поточну робочу ревізію?"
+
+#: tortoisehg/hgqt/repowidget.py:676
#, python-format
msgid ""
"Your current working revision (%d) will be removed by this rollback, leaving "
@@ -3491,205 +3861,235 @@" Continue?"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:674
+#: tortoisehg/hgqt/repowidget.py:820
msgid "Repository stripped, incoming preview cleared"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:679
+#: tortoisehg/hgqt/repowidget.py:825
msgid "Repository stripped, revision set cleared"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:795
+#: tortoisehg/hgqt/repowidget.py:950
msgid "Commit tab cannot exit"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:799
+#: tortoisehg/hgqt/repowidget.py:954
msgid "Sync tab cannot exit"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:803
+#: tortoisehg/hgqt/repowidget.py:959
msgid "MQ tab cannot exit"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:807
+#: tortoisehg/hgqt/repowidget.py:963
msgid "Search tab cannot exit"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:810
+#: tortoisehg/hgqt/repowidget.py:966
msgid "Repository command still running"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:968 tortoisehg/util/menuthg.py:58
+#: tortoisehg/hgqt/repowidget.py:1127
+msgid "Push all"
+msgstr "Відправити все"
+
+#: tortoisehg/hgqt/repowidget.py:1129
+msgid "Push to here"
+msgstr "Віддати сюди"
+
+#: tortoisehg/hgqt/repowidget.py:1131
+msgid "Push selected branch"
+msgstr ""
+
+#: tortoisehg/hgqt/repowidget.py:1134 tortoisehg/util/menuthg.py:58
msgid "Update..."
msgstr "Оновлення..."
-#: tortoisehg/hgqt/repowidget.py:971 tortoisehg/hgqt/repowidget.py:1195
-msgid "Visual diff..."
-msgstr ""
-
-#: tortoisehg/hgqt/repowidget.py:973
-msgid "Diff to local..."
-msgstr ""
-
-#: tortoisehg/hgqt/repowidget.py:975
+#: tortoisehg/hgqt/repowidget.py:1141
msgid "Browse at rev..."
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:978
+#: tortoisehg/hgqt/repowidget.py:1144
msgid "Merge with local..."
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:981
+#: tortoisehg/hgqt/repowidget.py:1147
msgid "Tag..."
-msgstr ""
-
-#: tortoisehg/hgqt/repowidget.py:983
+msgstr "Розмітка..."
+
+#: tortoisehg/hgqt/repowidget.py:1149
msgid "Bookmark..."
-msgstr ""
-
-#: tortoisehg/hgqt/repowidget.py:986 tortoisehg/hgtk/history.py:1290
+msgstr "Встановлення закладок..."
+
+#: tortoisehg/hgqt/repowidget.py:1152 tortoisehg/hgtk/history.py:1290
msgid "Backout..."
msgstr "Відновлення..."
-#: tortoisehg/hgqt/repowidget.py:990 tortoisehg/hgtk/history.py:1293
+#: tortoisehg/hgqt/repowidget.py:1156 tortoisehg/hgtk/history.py:1293
msgid "Export"
msgstr "Експортувати"
-#: tortoisehg/hgqt/repowidget.py:991
+#: tortoisehg/hgqt/repowidget.py:1157
msgid "Export patch..."
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:993
+#: tortoisehg/hgqt/repowidget.py:1159
msgid "Email patch..."
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:995
+#: tortoisehg/hgqt/repowidget.py:1161
msgid "Archive..."
-msgstr ""
-
-#: tortoisehg/hgqt/repowidget.py:997 tortoisehg/hgqt/wctxactions.py:46
+msgstr "Архівування..."
+
+#: tortoisehg/hgqt/repowidget.py:1163
+msgid "Bundle rev to tip..."
+msgstr ""
+
+#: tortoisehg/hgqt/repowidget.py:1165 tortoisehg/hgqt/wctxactions.py:42
msgid "Copy patch"
-msgstr ""
-
-#: tortoisehg/hgqt/repowidget.py:1001
+msgstr "Копія латки"
+
+#: tortoisehg/hgqt/repowidget.py:1169
msgid "Copy hash"
-msgstr ""
-
-#: tortoisehg/hgqt/repowidget.py:1005
+msgstr "Копія хешу"
+
+#: tortoisehg/hgqt/repowidget.py:1173
msgid "Transplant to local"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1009
+#: tortoisehg/hgqt/repowidget.py:1177
msgid "Modify history"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1010 tortoisehg/hgqt/repowidget.py:1149
-msgid "QGoto"
-msgstr ""
-
-#: tortoisehg/hgqt/repowidget.py:1012
+#: tortoisehg/hgqt/repowidget.py:1178
+msgid "Unapply patch (QGoto parent)"
+msgstr ""
+
+#: tortoisehg/hgqt/repowidget.py:1180
msgid "Import to MQ"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1014
+#: tortoisehg/hgqt/repowidget.py:1182
msgid "Finish patch"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1017
+#: tortoisehg/hgqt/repowidget.py:1184 tortoisehg/hgqt/repowidget.py:1360
+msgid "Rename patch..."
+msgstr ""
+
+#: tortoisehg/hgqt/repowidget.py:1187
msgid "Rebase..."
-msgstr ""
-
-#: tortoisehg/hgqt/repowidget.py:1020
+msgstr "Змінювання бази..."
+
+#: tortoisehg/hgqt/repowidget.py:1190
msgid "Strip..."
-msgstr ""
-
-#: tortoisehg/hgqt/repowidget.py:1023
+msgstr "Нарізка..."
+
+#: tortoisehg/hgqt/repowidget.py:1193
msgid "Post to Review Board..."
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1078
+#: tortoisehg/hgqt/repowidget.py:1196
+msgid "Remote Update..."
+msgstr ""
+
+#: tortoisehg/hgqt/repowidget.py:1221
+msgid "Write diff file"
+msgstr ""
+
+#: tortoisehg/hgqt/repowidget.py:1232
+msgid "Unable to write diff file"
+msgstr ""
+
+#: tortoisehg/hgqt/repowidget.py:1276
msgid "Unable to compress history"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1079
+#: tortoisehg/hgqt/repowidget.py:1277
msgid "Selected changeset pair not related"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1087
+#: tortoisehg/hgqt/repowidget.py:1285
msgid "Visual Diff..."
-msgstr ""
-
-#: tortoisehg/hgqt/repowidget.py:1088 tortoisehg/hgqt/repowidget.py:1170
+msgstr "Наочне порівнювання..."
+
+#: tortoisehg/hgqt/repowidget.py:1286
+msgid "Export Diff..."
+msgstr ""
+
+#: tortoisehg/hgqt/repowidget.py:1288 tortoisehg/hgqt/repowidget.py:1377
msgid "Export Selected..."
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1089 tortoisehg/hgqt/repowidget.py:1171
+#: tortoisehg/hgqt/repowidget.py:1289 tortoisehg/hgqt/repowidget.py:1378
msgid "Email Selected..."
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1090
+#: tortoisehg/hgqt/repowidget.py:1291
msgid "Export DAG Range..."
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1091
+#: tortoisehg/hgqt/repowidget.py:1292
msgid "Email DAG Range..."
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1092
+#: tortoisehg/hgqt/repowidget.py:1293
+msgid "Bundle DAG Range..."
+msgstr ""
+
+#: tortoisehg/hgqt/repowidget.py:1295
msgid "Bisect - Good, Bad..."
-msgstr ""
-
-#: tortoisehg/hgqt/repowidget.py:1093
+msgstr "Розрізати навпіл - Добре, Погано"
+
+#: tortoisehg/hgqt/repowidget.py:1296
msgid "Bisect - Bad, Good..."
-msgstr ""
-
-#: tortoisehg/hgqt/repowidget.py:1094
+msgstr "Розрізати навпіл - Погане, Добре"
+
+#: tortoisehg/hgqt/repowidget.py:1297
msgid "Compress History..."
-msgstr ""
-
-#: tortoisehg/hgqt/repowidget.py:1103 tortoisehg/hgqt/repowidget.py:1180
+msgstr "Стискання журналу..."
+
+#: tortoisehg/hgqt/repowidget.py:1309 tortoisehg/hgqt/repowidget.py:1387
msgid "Transplant Selected to local"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1109 tortoisehg/hgqt/repowidget.py:1186
+#: tortoisehg/hgqt/repowidget.py:1315 tortoisehg/hgqt/repowidget.py:1393
msgid "Post Selected to Review Board..."
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1128
-msgid ""
-"<p>ATTENTION!<br>Guard or comment found.<br>Reordering patches will destroy "
-"them.<br><br>Continue?</p>"
-msgstr ""
-
-#: tortoisehg/hgqt/repowidget.py:1150
+#: tortoisehg/hgqt/repowidget.py:1355
+msgid "Apply patch (QGoto)"
+msgstr ""
+
+#: tortoisehg/hgqt/repowidget.py:1356
msgid "QPush --move"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1151
+#: tortoisehg/hgqt/repowidget.py:1357
msgid "Fold patches..."
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1152
+#: tortoisehg/hgqt/repowidget.py:1358
msgid "Delete patches..."
-msgstr ""
-
-#: tortoisehg/hgqt/repowidget.py:1153
+msgstr "Видалення латок..."
+
+#: tortoisehg/hgqt/repowidget.py:1359
msgid "Reorder patches..."
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1194
+#: tortoisehg/hgqt/repowidget.py:1401
msgid "Pull to here..."
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1207
+#: tortoisehg/hgqt/repowidget.py:1416
msgid "Export patch"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1224
+#: tortoisehg/hgqt/repowidget.py:1433
msgid "Cannot export revision"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1225
+#: tortoisehg/hgqt/repowidget.py:1434
#, python-format
msgid ""
"Cannot export revision %s into the file named:\n"
@@ -3697,20 +4097,20 @@"%s\n"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1227
+#: tortoisehg/hgqt/repowidget.py:1436
msgid "There is already an existing folder with that same name."
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1233 tortoisehg/hgqt/repowidget.py:1253
+#: tortoisehg/hgqt/repowidget.py:1442 tortoisehg/hgqt/repowidget.py:1462
#: tortoisehg/hgtk/thgshelve.py:161
msgid "Replace"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1233 tortoisehg/hgtk/thgshelve.py:162
+#: tortoisehg/hgqt/repowidget.py:1442 tortoisehg/hgtk/thgshelve.py:162
msgid "Append"
msgstr "Додати"
-#: tortoisehg/hgqt/repowidget.py:1236
+#: tortoisehg/hgqt/repowidget.py:1445
#, python-format
msgid ""
"There are existing patch files for %d revisions (%s) in the selected "
@@ -3718,42 +4118,46 @@"\n"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1243
+#: tortoisehg/hgqt/repowidget.py:1452
msgid "What do you want to do?\n"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1244
+#: tortoisehg/hgqt/repowidget.py:1453
msgid "Replace the existing patch files.\n"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1245
+#: tortoisehg/hgqt/repowidget.py:1454
msgid "Append the changes to the existing patch files.\n"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1246
+#: tortoisehg/hgqt/repowidget.py:1455
msgid "Abort the export operation.\n"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1248
+#: tortoisehg/hgqt/repowidget.py:1457
msgid "Patch files already exist"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1391
+#: tortoisehg/hgqt/repowidget.py:1579
+msgid "Write bundle"
+msgstr ""
+
+#: tortoisehg/hgqt/repowidget.py:1651
msgid "Cannot import selected revision"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1392
+#: tortoisehg/hgqt/repowidget.py:1652
#, python-format
msgid ""
"The selected revision (rev #%d) cannot be imported because it is not a "
"descendant of qparent (rev #%d)"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1464
+#: tortoisehg/hgqt/repowidget.py:1750
msgid "Unable to start"
-msgstr ""
-
-#: tortoisehg/hgqt/repowidget.py:1465
+msgstr "Старт неможливий"
+
+#: tortoisehg/hgqt/repowidget.py:1751
msgid "Previous command is still running"
msgstr ""
@@ -3816,7 +4220,7 @@
#: tortoisehg/hgqt/resolve.py:114
msgid "Resolved conflicts"
-msgstr ""
+msgstr "Розв'язати конфлікти"
#: tortoisehg/hgqt/resolve.py:129
msgid "Edit resolved file"
@@ -3824,7 +4228,7 @@
#: tortoisehg/hgqt/resolve.py:131
msgid "3-Way Diff"
-msgstr ""
+msgstr "Стороння порівнялка"
#: tortoisehg/hgqt/resolve.py:132
msgid "Visual three-way diff"
@@ -3860,7 +4264,7 @@
#: tortoisehg/hgqt/resolve.py:162
msgid "Command output"
-msgstr ""
+msgstr "Командний рядок"
#: tortoisehg/hgqt/resolve.py:247
msgid "Unable to show subrepository files"
@@ -3878,7 +4282,7 @@
#: tortoisehg/hgqt/resolve.py:344
msgid "All conflicts are resolved."
-msgstr ""
+msgstr "Всі конфлікти розв'язано."
#: tortoisehg/hgqt/resolve.py:346
msgid "There are no conflicting file merges."
@@ -3892,13 +4296,13 @@msgid "Unresolved conflicts remain. Are you sure?"
msgstr ""
-#: tortoisehg/hgqt/resolve.py:355 tortoisehg/hgqt/workbench.py:203
+#: tortoisehg/hgqt/resolve.py:355 tortoisehg/hgqt/workbench.py:219
msgid "E&xit"
-msgstr ""
+msgstr "Вихід"
#: tortoisehg/hgqt/resolve.py:399
msgid "Ext"
-msgstr ""
+msgstr "Зовн."
#: tortoisehg/hgqt/resolve.py:399 tortoisehg/hgqt/thgimport.py:85
#: tortoisehg/hgtk/thgimport.py:110
@@ -3909,56 +4313,80 @@msgid "<default>"
msgstr ""
-#: tortoisehg/hgqt/revdetails.py:90
+#: tortoisehg/hgqt/revdetails.py:95
msgid "File List Toolbar"
msgstr ""
-#: tortoisehg/hgqt/revdetails.py:188
+#: tortoisehg/hgqt/revdetails.py:195
msgid "Update to this revision"
msgstr ""
+#: tortoisehg/hgqt/revdetails.py:198
+msgid "Show All"
+msgstr "Показати все"
+
+#: tortoisehg/hgqt/revdetails.py:200
+msgid "Toggle display of all files and the direction they were merged"
+msgstr ""
+
+#: tortoisehg/hgqt/revdetails.py:236
+msgid "Save at Revision"
+msgstr ""
+
+#: tortoisehg/hgqt/revdetails.py:237
+msgid "Save file as it appeared at this revision"
+msgstr ""
+
+#: tortoisehg/hgqt/revdetails.py:346 tortoisehg/hgtk/changeset.py:958
+msgid "Save file to"
+msgstr "Зберегти файл як"
+
+#: tortoisehg/hgqt/revdetails.py:359 tortoisehg/hgtk/changeset.py:969
+msgid "Unable to save file"
+msgstr "Неможливо зберегти файл"
+
#: tortoisehg/hgqt/revert.py:22
#, python-format
msgid "Revert - %s"
-msgstr ""
-
-#: tortoisehg/hgqt/revert.py:32
+msgstr "Повернути - %s"
+
+#: tortoisehg/hgqt/revert.py:33
#, python-format
msgid "<b>Revert %s to its contents at revision %d?</b>"
msgstr ""
-#: tortoisehg/hgqt/revert.py:36
+#: tortoisehg/hgqt/revert.py:37
+#, python-format
+msgid "<b>Revert %d files to their contents at revision %d?</b>"
+msgstr ""
+
+#: tortoisehg/hgqt/revert.py:43
msgid "Revert all files to this revision"
msgstr ""
-#: tortoisehg/hgqt/revert.py:51 tortoisehg/hgqt/wctxactions.py:244
+#: tortoisehg/hgqt/revert.py:58 tortoisehg/hgqt/wctxactions.py:239
#: tortoisehg/hgtk/statusact.py:146
msgid "Confirm Revert"
msgstr "Підтвердіть повернення"
-#: tortoisehg/hgqt/revert.py:52
+#: tortoisehg/hgqt/revert.py:59
msgid ""
"Reverting all files will discard changes and leave affected files in a "
"modified state.<br><br>Are you sure you want to use revert?<br><br>(use "
"update to checkout another revision)"
msgstr ""
-#: tortoisehg/hgqt/revpanel.py:20 tortoisehg/hgtk/changeset.py:579
+#: tortoisehg/hgqt/revpanel.py:22 tortoisehg/hgtk/changeset.py:579
msgid "Changeset:"
msgstr "Набір змін:"
-#: tortoisehg/hgqt/revpanel.py:22 tortoisehg/hgqt/update.py:82
-#: tortoisehg/hgtk/changeset.py:581 tortoisehg/hgtk/update.py:90
-msgid "Parent:"
-msgstr "Попередник:"
-
-#: tortoisehg/hgqt/revpanel.py:24 tortoisehg/hgtk/changeset.py:583
+#: tortoisehg/hgqt/revpanel.py:26 tortoisehg/hgtk/changeset.py:583
msgid "Child:"
msgstr "Нащадок:"
-#: tortoisehg/hgqt/revpanel.py:161
+#: tortoisehg/hgqt/revpanel.py:163
msgid "Head is closed!"
-msgstr ""
+msgstr "Вершина недоступна!"
#: tortoisehg/hgqt/revset.py:28
msgid "Changesets where username contains string."
@@ -3981,15 +4409,15 @@
#: tortoisehg/hgqt/revset.py:38
msgid "The named bookmark or all bookmarks."
-msgstr ""
+msgstr "Назва закладки або всіх закладок"
#: tortoisehg/hgqt/revset.py:40
msgid "The named tag or all tags."
-msgstr ""
+msgstr "Назва мітки або всіх міток."
#: tortoisehg/hgqt/revset.py:42
msgid "Changeset is tagged."
-msgstr ""
+msgstr "Набору змін співставлений ярлик."
#: tortoisehg/hgqt/revset.py:44
msgid "Changeset is a named branch head."
@@ -4001,7 +4429,7 @@
#: tortoisehg/hgqt/revset.py:48
msgid "Changeset is closed."
-msgstr ""
+msgstr "Набір змін закритий."
#: tortoisehg/hgqt/revset.py:50
msgid ""
@@ -4022,19 +4450,19 @@
#: tortoisehg/hgqt/revset.py:62
msgid "Changesets which modify files matched by pattern."
-msgstr ""
+msgstr "Набір змін, що змінить файли відповідно до шаблону."
#: tortoisehg/hgqt/revset.py:64
msgid "Changesets which add files matched by pattern."
-msgstr ""
+msgstr "Набір змін, що додадуть файли відповідно до шаблону."
#: tortoisehg/hgqt/revset.py:66
msgid "Changesets which remove files matched by pattern."
-msgstr ""
+msgstr "Набір змін, що видалять файли відповідно до шаблону."
#: tortoisehg/hgqt/revset.py:68
msgid "Changesets containing files matched by pattern."
-msgstr ""
+msgstr "Набір змін містить файли відповідно до шаблону."
#: tortoisehg/hgqt/revset.py:73
msgid "All changesets belonging to the branches of changesets in set."
@@ -4110,7 +4538,7 @@
#: tortoisehg/hgqt/revset.py:134
msgid "all revisions converted from subversion"
-msgstr ""
+msgstr "всі ревізії конвертовані для subversion"
#: tortoisehg/hgqt/revset.py:136
msgid "changeset which represents converted svn revision"
@@ -4122,15 +4550,15 @@
#: tortoisehg/hgqt/revset.py:159
msgid "File pattern sets"
-msgstr ""
+msgstr "Набір файлів шаблонів"
#: tortoisehg/hgqt/revset.py:171
msgid "Set Ancestry"
-msgstr ""
+msgstr "Встановити походження"
#: tortoisehg/hgqt/revset.py:183
msgid "Set Logic"
-msgstr ""
+msgstr "Встановити логіку"
#: tortoisehg/hgqt/revset.py:210
msgid ""
@@ -4140,29 +4568,36 @@
#: tortoisehg/hgqt/revset.py:221
msgid "Searching..."
-msgstr ""
+msgstr "Шукаю..."
#: tortoisehg/hgqt/revset.py:222 tortoisehg/hgqt/revset.py:234
msgid "Running"
-msgstr "Працює"
+msgstr "Виконую"
#: tortoisehg/hgqt/revset.py:222
msgid "query"
-msgstr ""
+msgstr "запит"
#: tortoisehg/hgqt/revset.py:372
msgid "found revision"
-msgstr ""
+msgstr "занйдено ревізію"
#: tortoisehg/hgqt/revset.py:395
msgid "Parse Error: "
msgstr ""
-#: tortoisehg/hgqt/revset.py:397
+#: tortoisehg/hgqt/revset.py:399
msgid "Invalid query: "
-msgstr ""
-
-#: tortoisehg/hgqt/run.py:59 tortoisehg/hgtk/hgtk.py:78
+msgstr "Помилка запиту: "
+
+#: tortoisehg/hgqt/run.py:58 tortoisehg/hgqt/run.py:377
+#, python-format
+msgid ""
+"Error string \"%(arg0)s\" at %(arg1)s<br>Please <a "
+"href=\"#edit:%(arg1)s\">edit</a> your config"
+msgstr ""
+
+#: tortoisehg/hgqt/run.py:76 tortoisehg/hgtk/hgtk.py:78
msgid ""
"\n"
"Caught keyboard interrupt, aborting.\n"
@@ -4170,54 +4605,54 @@"\n"
"Отримано переривання з клавіатури, переревання.\n"
-#: tortoisehg/hgqt/run.py:128 tortoisehg/hgtk/hgtk.py:128
+#: tortoisehg/hgqt/run.py:136 tortoisehg/hgtk/hgtk.py:128
#, python-format
msgid "can not read file \"%s\". Ignored.\n"
msgstr "не можу прочитати файл \"%s\". Незважати.\n"
-#: tortoisehg/hgqt/run.py:233
-#, python-format
-msgid "thg %s: %s\n"
-msgstr ""
-
-#: tortoisehg/hgqt/run.py:236
-#, python-format
-msgid "thg: %s\n"
-msgstr ""
-
-#: tortoisehg/hgqt/run.py:239
+#: tortoisehg/hgqt/run.py:240
#, python-format
msgid ""
"thg: command '%s' is ambiguous:\n"
" %s\n"
msgstr ""
-#: tortoisehg/hgqt/run.py:242
+#: tortoisehg/hgqt/run.py:243
#, python-format
msgid "thg: unknown command '%s'\n"
-msgstr ""
-
-#: tortoisehg/hgqt/run.py:245 tortoisehg/hgqt/thread.py:320
+msgstr "thg: невідома команда '%s'\n"
+
+#: tortoisehg/hgqt/run.py:247
+#, python-format
+msgid "thg %s: %s\n"
+msgstr "thg %s: %s\n"
+
+#: tortoisehg/hgqt/run.py:250
+#, python-format
+msgid "thg: %s\n"
+msgstr "thg: %s\n"
+
+#: tortoisehg/hgqt/run.py:253 tortoisehg/hgqt/thread.py:320
#: tortoisehg/hgqt/thread.py:330 tortoisehg/hgtk/hgtk.py:219
#, python-format
msgid "abort: %s!\n"
msgstr "перервати: %s!\n"
-#: tortoisehg/hgqt/run.py:296 tortoisehg/hgtk/hgtk.py:267
+#: tortoisehg/hgqt/run.py:304 tortoisehg/hgtk/hgtk.py:267
#: tortoisehg/hgtk/hgtk.py:466
msgid "There is no Mercurial repository here (.hg not found)"
msgstr "Це не Mercurial сховище (.hg не знайдено)"
-#: tortoisehg/hgqt/run.py:308 tortoisehg/hgtk/hgtk.py:279
+#: tortoisehg/hgqt/run.py:316 tortoisehg/hgtk/hgtk.py:279
msgid "invalid arguments"
msgstr "помилковий аргумент"
-#: tortoisehg/hgqt/run.py:314 tortoisehg/hgtk/hgtk.py:285
+#: tortoisehg/hgqt/run.py:322 tortoisehg/hgtk/hgtk.py:285
#, python-format
msgid "unrecognized profiling format '%s' - Ignored\n"
msgstr "unrecognized profiling format '%s' - Незважати\n"
-#: tortoisehg/hgqt/run.py:330 tortoisehg/hgtk/hgtk.py:301
+#: tortoisehg/hgqt/run.py:338 tortoisehg/hgtk/hgtk.py:301
msgid ""
"lsprof not available - install from "
"http://codespeak.net/svn/user/arigo/hack/misc/lsprof/"
@@ -4225,60 +4660,68 @@"lsprof недоступний - встановити з "
"http://codespeak.net/svn/user/arigo/hack/misc/lsprof/"
-#: tortoisehg/hgqt/run.py:367
+#: tortoisehg/hgqt/run.py:375 tortoisehg/hgqt/run.py:376
msgid "Try refreshing your repository."
msgstr ""
-#: tortoisehg/hgqt/run.py:368
-#, python-format
-msgid ""
-"Error string \"%(arg0)s\" at %(arg1)s<br>Please <a "
-"href=\"#edit:%(arg1)s\">edit</a> your config"
-msgstr ""
-
-#: tortoisehg/hgqt/run.py:370
-#, python-format
-msgid ""
-"Configuration Error: \"%(arg0)s\", please <a href=\"#fix:%(arg0)s\">fix</a> "
-"your config"
-msgstr ""
-
-#: tortoisehg/hgqt/run.py:428
+#: tortoisehg/hgqt/run.py:379
+#, python-format
+msgid ""
+"Configuration Error: \"%(arg0)s\",<br>Please <a "
+"href=\"#fix:%(arg0)s\">fix</a> your config"
+msgstr ""
+
+#: tortoisehg/hgqt/run.py:381
+#, python-format
+msgid "Operation aborted:<br><br>%(arg0)s."
+msgstr ""
+
+#: tortoisehg/hgqt/run.py:382
+msgid "Repository is locked"
+msgstr "Сховище заблоковане"
+
+#: tortoisehg/hgqt/run.py:437
+msgid "hint:"
+msgstr "натяк:"
+
+#: tortoisehg/hgqt/run.py:444
msgid "Keyboard interrupt"
msgstr ""
-#: tortoisehg/hgqt/run.py:429
+#: tortoisehg/hgqt/run.py:445
msgid "Close this application?"
-msgstr ""
-
-#: tortoisehg/hgqt/run.py:703
+msgstr "Закрити цю програму?"
+
+#: tortoisehg/hgqt/run.py:724
msgid "annotate requires a single filename\n"
msgstr ""
-#: tortoisehg/hgqt/run.py:760 tortoisehg/hgtk/hgtk.py:546
+#: tortoisehg/hgqt/run.py:781 tortoisehg/hgtk/hgtk.py:546
msgid "global options:"
msgstr "загальні параметри:"
-#: tortoisehg/hgqt/run.py:762
+#: tortoisehg/hgqt/run.py:783
msgid "use \"thg help\" for the full list of commands"
-msgstr ""
-
-#: tortoisehg/hgqt/run.py:766
+msgstr "використовуйте \"thg help\" для отримання всього переліку команд"
+
+#: tortoisehg/hgqt/run.py:787
msgid ""
"use \"thg help\" for the full list of commands or \"thg -v\" for details"
msgstr ""
-
-#: tortoisehg/hgqt/run.py:769
+"використовуйте \"thg help\" для отримання всього переліку команд або \"thg -"
+"v\" для конкретизації"
+
+#: tortoisehg/hgqt/run.py:790
#, python-format
msgid "use \"thg -v help%s\" to show aliases and global options"
msgstr ""
-#: tortoisehg/hgqt/run.py:772
+#: tortoisehg/hgqt/run.py:793
#, python-format
msgid "use \"thg -v help %s\" to show global options"
-msgstr ""
-
-#: tortoisehg/hgqt/run.py:784 tortoisehg/hgqt/run.py:893
+msgstr "використовуйте \"thg -v help %s\" для показу глобальних параметрів"
+
+#: tortoisehg/hgqt/run.py:805 tortoisehg/hgqt/run.py:914
#: tortoisehg/hgtk/hgtk.py:570 tortoisehg/hgtk/hgtk.py:679
msgid ""
"list of commands:\n"
@@ -4287,7 +4730,7 @@"перелік команд:\n"
"\n"
-#: tortoisehg/hgqt/run.py:792 tortoisehg/hgtk/hgtk.py:578
+#: tortoisehg/hgqt/run.py:813 tortoisehg/hgtk/hgtk.py:578
#, python-format
msgid ""
"\n"
@@ -4296,24 +4739,24 @@"\n"
"псевдонім: %s\n"
-#: tortoisehg/hgqt/run.py:797 tortoisehg/hgqt/run.py:829
-#: tortoisehg/hgqt/run.py:862 tortoisehg/hgtk/hgtk.py:615
+#: tortoisehg/hgqt/run.py:818 tortoisehg/hgqt/run.py:850
+#: tortoisehg/hgqt/run.py:883 tortoisehg/hgtk/hgtk.py:615
msgid "(no help text available)"
msgstr "(довідка не доступна)"
-#: tortoisehg/hgqt/run.py:805 tortoisehg/hgtk/hgtk.py:591
+#: tortoisehg/hgqt/run.py:826 tortoisehg/hgtk/hgtk.py:591
msgid "options:\n"
-msgstr "налаштування:\n"
-
-#: tortoisehg/hgqt/run.py:834 tortoisehg/hgtk/hgtk.py:620
+msgstr "параметри:\n"
+
+#: tortoisehg/hgqt/run.py:855 tortoisehg/hgtk/hgtk.py:620
msgid "no commands defined\n"
msgstr "команди невизначені\n"
-#: tortoisehg/hgqt/run.py:886
+#: tortoisehg/hgqt/run.py:907
msgid "Thg - TortoiseHg's GUI tools for Mercurial SCM (Hg)\n"
-msgstr ""
-
-#: tortoisehg/hgqt/run.py:891 tortoisehg/hgtk/hgtk.py:677
+msgstr "Thg - TortoiseHg's графічний інструмент для Mercurial SCM (Hg)\n"
+
+#: tortoisehg/hgqt/run.py:912 tortoisehg/hgtk/hgtk.py:677
msgid ""
"basic commands:\n"
"\n"
@@ -4321,418 +4764,438 @@"основні команди:\n"
"\n"
-#: tortoisehg/hgqt/run.py:907 tortoisehg/hgtk/hgtk.py:693
+#: tortoisehg/hgqt/run.py:928 tortoisehg/hgtk/hgtk.py:693
#, python-format
msgid " (default: %s)"
msgstr " (за замовчуванням: %s)"
-#: tortoisehg/hgqt/run.py:924 tortoisehg/hgtk/hgtk.py:710
+#: tortoisehg/hgqt/run.py:945 tortoisehg/hgtk/hgtk.py:710
#, python-format
msgid "TortoiseHg Dialogs (version %s), Mercurial (version %s)\n"
msgstr "TortoiseHg діалоги (версія %s), Mercurial (версія %s)\n"
-#: tortoisehg/hgqt/run.py:953 tortoisehg/hgtk/hgtk.py:744
+#: tortoisehg/hgqt/run.py:974 tortoisehg/hgtk/hgtk.py:744
msgid "repository root directory or symbolic path name"
msgstr "назва каталогу у корені сховища або символічного посилання"
-#: tortoisehg/hgqt/run.py:954 tortoisehg/hgtk/hgtk.py:745
+#: tortoisehg/hgqt/run.py:975 tortoisehg/hgtk/hgtk.py:745
msgid "enable additional output"
-msgstr "увімкнути додатковий вихід"
-
-#: tortoisehg/hgqt/run.py:955 tortoisehg/hgtk/hgtk.py:746
+msgstr "увімкнути детальне виведення"
+
+#: tortoisehg/hgqt/run.py:976 tortoisehg/hgtk/hgtk.py:746
msgid "suppress output"
msgstr "заборонити вихід"
-#: tortoisehg/hgqt/run.py:956 tortoisehg/hgtk/hgtk.py:747
+#: tortoisehg/hgqt/run.py:977 tortoisehg/hgtk/hgtk.py:747
msgid "display help and exit"
msgstr "показати довідку та вийти"
-#: tortoisehg/hgqt/run.py:957 tortoisehg/hgtk/hgtk.py:748
+#: tortoisehg/hgqt/run.py:978 tortoisehg/hgtk/hgtk.py:748
msgid "start debugger"
-msgstr "початок відлагодження"
-
-#: tortoisehg/hgqt/run.py:958 tortoisehg/hgtk/hgtk.py:749
+msgstr "початок зневадження"
+
+#: tortoisehg/hgqt/run.py:979 tortoisehg/hgtk/hgtk.py:749
msgid "print command execution profile"
msgstr "друк команд профілю"
-#: tortoisehg/hgqt/run.py:959 tortoisehg/hgtk/hgtk.py:750
+#: tortoisehg/hgqt/run.py:980 tortoisehg/hgtk/hgtk.py:750
msgid "do not fork GUI process"
msgstr "не розгалужувати графічний процес"
-#: tortoisehg/hgqt/run.py:960 tortoisehg/hgtk/hgtk.py:751
+#: tortoisehg/hgqt/run.py:981 tortoisehg/hgtk/hgtk.py:751
msgid "always fork GUI process"
msgstr "завжди розгалужувати графічний процес"
-#: tortoisehg/hgqt/run.py:961 tortoisehg/hgtk/hgtk.py:752
+#: tortoisehg/hgqt/run.py:982 tortoisehg/hgtk/hgtk.py:752
msgid "read file list from file"
msgstr "читати перелік файлів з файлу"
-#: tortoisehg/hgqt/run.py:962
+#: tortoisehg/hgqt/run.py:983
msgid "read file list from file encoding utf-8"
msgstr ""
-#: tortoisehg/hgqt/run.py:966
+#: tortoisehg/hgqt/run.py:987
msgid "thg about"
-msgstr ""
-
-#: tortoisehg/hgqt/run.py:967
+msgstr "thg about"
+
+#: tortoisehg/hgqt/run.py:988
msgid "thg add [FILE]..."
-msgstr ""
-
-#: tortoisehg/hgqt/run.py:969
+msgstr "thg add [ФАЙЛ]..."
+
+#: tortoisehg/hgqt/run.py:990
msgid "revision to annotate"
msgstr ""
-#: tortoisehg/hgqt/run.py:970 tortoisehg/hgqt/run.py:1023
+#: tortoisehg/hgqt/run.py:991 tortoisehg/hgqt/run.py:1044
msgid "open to line"
msgstr ""
-#: tortoisehg/hgqt/run.py:971 tortoisehg/hgqt/run.py:1024
+#: tortoisehg/hgqt/run.py:992 tortoisehg/hgqt/run.py:1045
msgid "initial search pattern"
-msgstr ""
-
-#: tortoisehg/hgqt/run.py:972
+msgstr "початковий шаблон пошуку"
+
+#: tortoisehg/hgqt/run.py:993
msgid "thg annotate"
-msgstr ""
-
-#: tortoisehg/hgqt/run.py:974
+msgstr "thg annotate"
+
+#: tortoisehg/hgqt/run.py:995
msgid "revision to archive"
-msgstr ""
-
-#: tortoisehg/hgqt/run.py:975
+msgstr "перегляд в архіві"
+
+#: tortoisehg/hgqt/run.py:996
msgid "thg archive"
-msgstr ""
-
-#: tortoisehg/hgqt/run.py:978
+msgstr "thg archive"
+
+#: tortoisehg/hgqt/run.py:999
msgid "merge with old dirstate parent after backout"
msgstr ""
-#: tortoisehg/hgqt/run.py:979
+#: tortoisehg/hgqt/run.py:1000
msgid "parent to choose when backing out merge"
msgstr ""
-#: tortoisehg/hgqt/run.py:980
+#: tortoisehg/hgqt/run.py:1001
msgid "revision to backout"
msgstr ""
-#: tortoisehg/hgqt/run.py:981
+#: tortoisehg/hgqt/run.py:1002
msgid "thg backout [OPTION]... [[-r] REV]"
-msgstr ""
-
-#: tortoisehg/hgqt/run.py:982
+msgstr "thg backout [ПАРАМЕТРИ]... [[-r] РЕВІЗІЯ]"
+
+#: tortoisehg/hgqt/run.py:1003
msgid "thg bisect"
-msgstr ""
-
-#: tortoisehg/hgqt/run.py:986
+msgstr "thg bisect"
+
+#: tortoisehg/hgqt/run.py:1007
msgid "the clone will include an empty working copy (only a repository)"
msgstr ""
-#: tortoisehg/hgqt/run.py:989
+#: tortoisehg/hgqt/run.py:1010
msgid "revision, tag or branch to check out"
msgstr ""
-#: tortoisehg/hgqt/run.py:990
+#: tortoisehg/hgqt/run.py:1011
msgid "include the specified changeset"
msgstr ""
-#: tortoisehg/hgqt/run.py:992
+#: tortoisehg/hgqt/run.py:1013
msgid "clone only the specified branch"
msgstr ""
-#: tortoisehg/hgqt/run.py:993
+#: tortoisehg/hgqt/run.py:1014
msgid "use pull protocol to copy metadata"
msgstr "використовувати протокол отримання для копіювання метаданих"
-#: tortoisehg/hgqt/run.py:995
+#: tortoisehg/hgqt/run.py:1016
msgid "use uncompressed transfer (fast over LAN)"
-msgstr ""
-
-#: tortoisehg/hgqt/run.py:996
+msgstr "використовувати передачу без стиснення (fast over LAN)"
+
+#: tortoisehg/hgqt/run.py:1017
msgid "thg clone [OPTION]... SOURCE [DEST]"
-msgstr ""
-
-#: tortoisehg/hgqt/run.py:998 tortoisehg/hgtk/hgtk.py:760
+msgstr "thg clone [ПАРАМЕТРИ]... ОРИГІНАЛ [ПРИЗНАЧЕННЯ]"
+
+#: tortoisehg/hgqt/run.py:1019 tortoisehg/hgtk/hgtk.py:760
msgid "record user as committer"
msgstr "запам'ятати користувача з правами дописувача"
-#: tortoisehg/hgqt/run.py:999 tortoisehg/hgtk/hgtk.py:761
+#: tortoisehg/hgqt/run.py:1020 tortoisehg/hgtk/hgtk.py:761
msgid "record datecode as commit date"
msgstr "записувати дату коду, як дату фіксації"
-#: tortoisehg/hgqt/run.py:1000
+#: tortoisehg/hgqt/run.py:1021
msgid "thg commit [OPTIONS] [FILE]..."
-msgstr ""
-
-#: tortoisehg/hgqt/run.py:1001
+msgstr "thg commit [ПАРАМЕТРИ] [ФАЙЛ]..."
+
+#: tortoisehg/hgqt/run.py:1022
msgid "thg drag_move SOURCE... DEST"
-msgstr ""
-
-#: tortoisehg/hgqt/run.py:1002
+msgstr "thg drag_move ОРИГІНАЛ... ПРИЗНАЧЕННЯ"
+
+#: tortoisehg/hgqt/run.py:1023
msgid "thg drag_copy SOURCE... DEST"
-msgstr ""
-
-#: tortoisehg/hgqt/run.py:1004
+msgstr "thg drag_copy ОРИГІНАЛ... ПРИЗНАЧЕННЯ"
+
+#: tortoisehg/hgqt/run.py:1025
msgid "ignore case during search"
msgstr ""
-#: tortoisehg/hgqt/run.py:1005
+#: tortoisehg/hgqt/run.py:1026
msgid "thg grep"
-msgstr ""
-
-#: tortoisehg/hgqt/run.py:1006
+msgstr "thg grep"
+
+#: tortoisehg/hgqt/run.py:1027
msgid "thg guess"
-msgstr ""
-
-#: tortoisehg/hgqt/run.py:1007
+msgstr "thg guess"
+
+#: tortoisehg/hgqt/run.py:1028
msgid "thg hgignore [FILE]"
-msgstr ""
-
-#: tortoisehg/hgqt/run.py:1009 tortoisehg/hgtk/hgtk.py:826
+msgstr "thg hgignore [ФАЙЛ]"
+
+#: tortoisehg/hgqt/run.py:1030 tortoisehg/hgtk/hgtk.py:826
msgid "import to the patch queue (MQ)"
msgstr "завантажити для виправлення черги (MQ)"
-#: tortoisehg/hgqt/run.py:1010
+#: tortoisehg/hgqt/run.py:1031
msgid "thg import [OPTION] [SOURCE]..."
-msgstr ""
-
-#: tortoisehg/hgqt/run.py:1011
+msgstr "thg import [ПАРАМЕТРИ] [ОРИГІНАЛ]..."
+
+#: tortoisehg/hgqt/run.py:1032
msgid "thg init [DEST]"
-msgstr ""
-
-#: tortoisehg/hgqt/run.py:1014
+msgstr "thg init [ОТРИМУВАЧ]"
+
+#: tortoisehg/hgqt/run.py:1035
msgid "a revision to send"
msgstr ""
-#: tortoisehg/hgqt/run.py:1015
+#: tortoisehg/hgqt/run.py:1036
msgid "thg email [REVS]"
-msgstr ""
-
-#: tortoisehg/hgqt/run.py:1018 tortoisehg/hgtk/hgtk.py:767
+msgstr "thg email [REVS]"
+
+#: tortoisehg/hgqt/run.py:1039 tortoisehg/hgtk/hgtk.py:767
msgid "limit number of changes displayed"
msgstr "обмеження на кількість змін, що відображаються"
-#: tortoisehg/hgqt/run.py:1019
+#: tortoisehg/hgqt/run.py:1040
msgid "thg log [OPTIONS] [FILE]"
-msgstr ""
-
-#: tortoisehg/hgqt/run.py:1022
+msgstr "thg log [ПАРАМЕТРИ] [ФАЙЛ]"
+
+#: tortoisehg/hgqt/run.py:1043
msgid "revision to display"
msgstr ""
-#: tortoisehg/hgqt/run.py:1025
+#: tortoisehg/hgqt/run.py:1046
msgid "thg manifest [-r REV] [FILE]"
-msgstr ""
-
-#: tortoisehg/hgqt/run.py:1028
+msgstr "thg manifest [-r РЕВІЗІЯ] [ФАЙЛ]"
+
+#: tortoisehg/hgqt/run.py:1049
msgid "revision to merge"
msgstr ""
-#: tortoisehg/hgqt/run.py:1029
+#: tortoisehg/hgqt/run.py:1050
msgid "thg merge [[-r] REV]"
-msgstr ""
-
-#: tortoisehg/hgqt/run.py:1030
+msgstr "thg merge [[-r] РЕВІЗІЯ]"
+
+#: tortoisehg/hgqt/run.py:1051
msgid "thg remove [FILE]..."
-msgstr ""
-
-#: tortoisehg/hgqt/run.py:1031
+msgstr "thg remove [ФАЙЛ]..."
+
+#: tortoisehg/hgqt/run.py:1052
msgid "thg mq"
-msgstr ""
-
-#: tortoisehg/hgqt/run.py:1032
+msgstr "thg mq"
+
+#: tortoisehg/hgqt/run.py:1053
msgid "thg resolve"
-msgstr ""
-
-#: tortoisehg/hgqt/run.py:1033
+msgstr "thg resolve"
+
+#: tortoisehg/hgqt/run.py:1054
msgid "thg revert [FILE]..."
-msgstr ""
-
-#: tortoisehg/hgqt/run.py:1034
+msgstr "thg revert [ФАЙЛ]..."
+
+#: tortoisehg/hgqt/run.py:1055
msgid "thg forget [FILE]..."
-msgstr ""
-
-#: tortoisehg/hgqt/run.py:1035
+msgstr "thg forget [ФАЙЛ]..."
+
+#: tortoisehg/hgqt/run.py:1056
msgid "thg rename SOURCE [DEST]..."
-msgstr ""
-
-#: tortoisehg/hgqt/run.py:1039 tortoisehg/hgtk/hgtk.py:792
+msgstr "thg rename ОРИГІНАЛ [ОТРИМУВАЧ]..."
+
+#: tortoisehg/hgqt/run.py:1060 tortoisehg/hgtk/hgtk.py:792
#: tortoisehg/hgtk/serve.py:367
msgid "name of the hgweb config file (serve more than one repository)"
msgstr "назва hgweb файлу налаштувань (serve більше ніж одне сховище)"
-#: tortoisehg/hgqt/run.py:1041 tortoisehg/hgtk/hgtk.py:794
+#: tortoisehg/hgqt/run.py:1062 tortoisehg/hgtk/hgtk.py:794
msgid "name of the hgweb config file (DEPRECATED)"
msgstr "назва hgweb файлу налаштувань (DEPRECATED)"
-#: tortoisehg/hgqt/run.py:1042
+#: tortoisehg/hgqt/run.py:1063
msgid "thg serve [--web-conf FILE]"
-msgstr ""
-
-#: tortoisehg/hgqt/run.py:1043
+msgstr "thg serve [--web-conf ФАЙЛ]"
+
+#: tortoisehg/hgqt/run.py:1064
msgid "thg sync"
-msgstr ""
-
-#: tortoisehg/hgqt/run.py:1045
+msgstr "thg sync"
+
+#: tortoisehg/hgqt/run.py:1066
msgid "show files without changes"
-msgstr ""
-
-#: tortoisehg/hgqt/run.py:1046
+msgstr "показати файли без змін"
+
+#: tortoisehg/hgqt/run.py:1067
msgid "show ignored files"
msgstr ""
-#: tortoisehg/hgqt/run.py:1047
+#: tortoisehg/hgqt/run.py:1068
msgid "thg status [OPTIONS] [FILE]"
-msgstr ""
-
-#: tortoisehg/hgqt/run.py:1049 tortoisehg/hgqt/run.py:1080
+msgstr "thg status [ПАРАМЕТРИ] [ФАЙЛ]"
+
+#: tortoisehg/hgqt/run.py:1070 tortoisehg/hgqt/run.py:1101
msgid "discard uncommitted changes (no backup)"
msgstr ""
-#: tortoisehg/hgqt/run.py:1050
+#: tortoisehg/hgqt/run.py:1071
msgid "do not back up stripped revisions"
msgstr ""
-#: tortoisehg/hgqt/run.py:1051
+#: tortoisehg/hgqt/run.py:1072
msgid "revision to strip"
msgstr ""
-#: tortoisehg/hgqt/run.py:1052
+#: tortoisehg/hgqt/run.py:1073
msgid "thg strip [-f] [-n] [[-r] REV]"
-msgstr ""
-
-#: tortoisehg/hgqt/run.py:1054
+msgstr "thg strip [-f] [-n] [[-r] РЕВІЗІЯ]"
+
+#: tortoisehg/hgqt/run.py:1075
msgid "keep original changesets"
-msgstr ""
-
-#: tortoisehg/hgqt/run.py:1055
+msgstr "зберегти оригінальний набір змін"
+
+#: tortoisehg/hgqt/run.py:1076
msgid "keep original branch names"
-msgstr ""
-
-#: tortoisehg/hgqt/run.py:1056
+msgstr "зберегти оригінальну назву гілки"
+
+#: tortoisehg/hgqt/run.py:1077
msgid "force detaching of source from its original branch"
msgstr ""
-#: tortoisehg/hgqt/run.py:1059
+#: tortoisehg/hgqt/run.py:1080
msgid "rebase from the specified changeset"
msgstr ""
-#: tortoisehg/hgqt/run.py:1061
+#: tortoisehg/hgqt/run.py:1082
msgid "rebase onto the specified changeset"
msgstr ""
-#: tortoisehg/hgqt/run.py:1062
+#: tortoisehg/hgqt/run.py:1083
msgid "thg rebase -s REV -d REV [--keep] [--detach]"
-msgstr ""
-
-#: tortoisehg/hgqt/run.py:1065
+msgstr "thg rebase -s РЕВІЗІЯ -d РЕВІЗІЯ [--keep] [--detach]"
+
+#: tortoisehg/hgqt/run.py:1086
msgid "replace existing tag"
-msgstr ""
-
-#: tortoisehg/hgqt/run.py:1066
+msgstr "замінити існуючий ярлик"
+
+#: tortoisehg/hgqt/run.py:1087
msgid "make the tag local"
-msgstr ""
-
-#: tortoisehg/hgqt/run.py:1067
+msgstr "створити локальний ярлик"
+
+#: tortoisehg/hgqt/run.py:1088
msgid "revision to tag"
-msgstr ""
-
-#: tortoisehg/hgqt/run.py:1068
+msgstr "ревізія для ярлика"
+
+#: tortoisehg/hgqt/run.py:1089
msgid "remove a tag"
-msgstr ""
-
-#: tortoisehg/hgqt/run.py:1069
+msgstr "видалити ярлик"
+
+#: tortoisehg/hgqt/run.py:1090
msgid "use <text> as commit message"
msgstr ""
-#: tortoisehg/hgqt/run.py:1070
+#: tortoisehg/hgqt/run.py:1091
msgid "thg tag [-f] [-l] [-m TEXT] [-r REV] [NAME]"
-msgstr ""
-
-#: tortoisehg/hgqt/run.py:1071
+msgstr "thg tag [-f] [-l] [-m ТЕКСТ] [-r РЕВІЗІЯ] [НАЗВА]"
+
+#: tortoisehg/hgqt/run.py:1092
msgid "thg shelve"
-msgstr ""
-
-#: tortoisehg/hgqt/run.py:1072
+msgstr "thg shelve"
+
+#: tortoisehg/hgqt/run.py:1093
msgid "thg rejects [FILE]"
-msgstr ""
-
-#: tortoisehg/hgqt/run.py:1073
+msgstr "thg rejects [ФАЙЛ]"
+
+#: tortoisehg/hgqt/run.py:1094
msgid "thg test"
-msgstr ""
-
-#: tortoisehg/hgqt/run.py:1074
+msgstr "thg test"
+
+#: tortoisehg/hgqt/run.py:1095
msgid "thg help [COMMAND]"
-msgstr ""
-
-#: tortoisehg/hgqt/run.py:1075
+msgstr "thg help [КОМАНДА]"
+
+#: tortoisehg/hgqt/run.py:1096
msgid "thg purge"
-msgstr ""
-
-#: tortoisehg/hgqt/run.py:1076
+msgstr "thg purge"
+
+#: tortoisehg/hgqt/run.py:1097
msgid "thg qreorder"
-msgstr ""
-
-#: tortoisehg/hgqt/run.py:1077
+msgstr "thg qreorder"
+
+#: tortoisehg/hgqt/run.py:1098
msgid "thg qqueue"
-msgstr ""
-
-#: tortoisehg/hgqt/run.py:1081 tortoisehg/hgtk/hgtk.py:805
+msgstr "thg qqueue"
+
+#: tortoisehg/hgqt/run.py:1102 tortoisehg/hgtk/hgtk.py:805
#: tortoisehg/hgtk/hgtk.py:820
msgid "revision to update"
msgstr "ревізія для оновлення"
-#: tortoisehg/hgqt/run.py:1082
+#: tortoisehg/hgqt/run.py:1103
msgid "thg update [-C] [[-r] REV]"
-msgstr ""
-
-#: tortoisehg/hgqt/run.py:1084 tortoisehg/hgqt/run.py:1087
+msgstr "thg update [-C] [[-r] РЕВІЗІЯ]"
+
+#: tortoisehg/hgqt/run.py:1105 tortoisehg/hgqt/run.py:1108
#: tortoisehg/hgtk/hgtk.py:779 tortoisehg/hgtk/hgtk.py:782
msgid "field to give initial focus"
msgstr "області, першочергової уваги"
-#: tortoisehg/hgqt/run.py:1085
+#: tortoisehg/hgqt/run.py:1106
msgid "thg userconfig"
-msgstr ""
-
-#: tortoisehg/hgqt/run.py:1088
+msgstr "thg userconfig"
+
+#: tortoisehg/hgqt/run.py:1109
msgid "thg repoconfig"
-msgstr ""
-
-#: tortoisehg/hgqt/run.py:1090 tortoisehg/hgtk/hgtk.py:808
+msgstr "thg repoconfig"
+
+#: tortoisehg/hgqt/run.py:1111 tortoisehg/hgtk/hgtk.py:808
msgid "changeset to view in diff tool"
msgstr "набір змін для перегляду у програмі для порівнянь"
-#: tortoisehg/hgqt/run.py:1091 tortoisehg/hgtk/hgtk.py:809
+#: tortoisehg/hgqt/run.py:1112 tortoisehg/hgtk/hgtk.py:809
msgid "revisions to view in diff tool"
msgstr "ревізії для перегляду у програмі для порівнянь"
-#: tortoisehg/hgqt/run.py:1092 tortoisehg/hgtk/hgtk.py:810
+#: tortoisehg/hgqt/run.py:1113 tortoisehg/hgtk/hgtk.py:810
msgid "bundle file to preview"
msgstr "зв'язка файлів для попереднього перегляду"
-#: tortoisehg/hgqt/run.py:1093 tortoisehg/hgtk/hgtk.py:811
+#: tortoisehg/hgqt/run.py:1114 tortoisehg/hgtk/hgtk.py:811
msgid "launch visual diff tool"
-msgstr "запустити візуальний інструмент для порівняння"
-
-#: tortoisehg/hgqt/run.py:1095 tortoisehg/hgtk/hgtk.py:813
+msgstr "запустити інструмент наочного порівнювання"
+
+#: tortoisehg/hgqt/run.py:1116 tortoisehg/hgtk/hgtk.py:813
msgid "print license"
msgstr "друкувати ліцензію"
-#: tortoisehg/hgqt/run.py:1096
+#: tortoisehg/hgqt/run.py:1117
msgid "thg version [OPTION]"
-msgstr ""
-
-#: tortoisehg/hgqt/run.py:1101
+msgstr "thg version [ПАРАМЕТРИ]"
+
+#: tortoisehg/hgqt/run.py:1122
msgid "thg shellconfig"
+msgstr "thg shellconfig"
+
+#: tortoisehg/hgqt/rupdate.py:57
+msgid "Location:"
+msgstr "Розташування:"
+
+#: tortoisehg/hgqt/rupdate.py:61
+msgid "Discard remote changes, no backup (-C/--clean)"
+msgstr ""
+
+#: tortoisehg/hgqt/rupdate.py:63
+msgid "Perform a push before updating (-p/--push)"
+msgstr ""
+
+#: tortoisehg/hgqt/rupdate.py:65
+msgid "Allow pushing new branches (--new-branch)"
+msgstr ""
+
+#: tortoisehg/hgqt/rupdate.py:67
+msgid "Force push to remote location (-f/--force)"
msgstr ""
#: tortoisehg/hgqt/serve.py:40
msgid "Log"
-msgstr ""
+msgstr "Журнал"
#: tortoisehg/hgqt/serve.py:47
msgid "Repositories"
-msgstr ""
+msgstr "Сховища"
#: tortoisehg/hgqt/serve.py:68
#, python-format
@@ -4741,7 +5204,7 @@
#: tortoisehg/hgqt/serve.py:70
msgid "Stopped"
-msgstr ""
+msgstr "Зупинено"
#: tortoisehg/hgqt/serve_ui.py:83 tortoisehg/hgtk/gdialog.py:491
#: tortoisehg/hgtk/history.py:288
@@ -4750,17 +5213,17 @@
#: tortoisehg/hgqt/serve_ui.py:84
msgid "Port:"
-msgstr ""
+msgstr "Порт:"
#: tortoisehg/hgqt/serve_ui.py:85
msgid "Status:"
-msgstr ""
+msgstr "Стан:"
#: tortoisehg/hgqt/serve_ui.py:86 tortoisehg/hgtk/serve.py:61
msgid "Start"
msgstr "Почати"
-#: tortoisehg/hgqt/serve_ui.py:88 tortoisehg/hgqt/settings.py:662
+#: tortoisehg/hgqt/serve_ui.py:88 tortoisehg/hgqt/settings.py:768
#: tortoisehg/hgtk/gdialog.py:497
msgid "Settings"
msgstr "Налаштування"
@@ -4769,19 +5232,24 @@msgid "<unspecified>"
msgstr "<невказано>"
-#: tortoisehg/hgqt/settings.py:263 tortoisehg/hgtk/thgconfig.py:43
+#: tortoisehg/hgqt/settings.py:241
+#, python-format
+msgid "Failed to load issue tracker: '%s': %s. "
+msgstr ""
+
+#: tortoisehg/hgqt/settings.py:349 tortoisehg/hgtk/thgconfig.py:43
msgid "UI Language"
-msgstr ""
-
-#: tortoisehg/hgqt/settings.py:265 tortoisehg/hgtk/thgconfig.py:44
+msgstr "Мова інтерфейсу"
+
+#: tortoisehg/hgqt/settings.py:351 tortoisehg/hgtk/thgconfig.py:44
msgid "Specify your preferred user interface language (restart needed)"
msgstr ""
-#: tortoisehg/hgqt/settings.py:267 tortoisehg/hgtk/thgconfig.py:45
+#: tortoisehg/hgqt/settings.py:353 tortoisehg/hgtk/thgconfig.py:45
msgid "Three-way Merge Tool"
msgstr "Зовнішній інструмент для об'єднання"
-#: tortoisehg/hgqt/settings.py:269
+#: tortoisehg/hgqt/settings.py:355
msgid ""
"Graphical merge program for resolving merge conflicts. If left unspecified, "
"Mercurial will use the first applicable tool it finds on your system or use "
@@ -4791,11 +5259,11 @@"manual merging"
msgstr ""
-#: tortoisehg/hgqt/settings.py:275 tortoisehg/hgtk/thgconfig.py:52
+#: tortoisehg/hgqt/settings.py:361 tortoisehg/hgtk/thgconfig.py:52
msgid "Visual Diff Tool"
-msgstr "Інструмент наочного порівняння"
-
-#: tortoisehg/hgqt/settings.py:277 tortoisehg/hgtk/thgconfig.py:53
+msgstr "Інструмент наочного порівнювання"
+
+#: tortoisehg/hgqt/settings.py:363 tortoisehg/hgtk/thgconfig.py:53
msgid ""
"Specify visual diff tool, as described in the [merge-tools] section of your "
"Mercurial configuration files. If left unspecified, TortoiseHg will use the "
@@ -4806,11 +5274,11 @@"буде використовувати такий самий редактор, як і для об'єднання. В іншому "
"випадку, буде використано перший ліпший знайдений редактор."
-#: tortoisehg/hgqt/settings.py:281 tortoisehg/hgtk/thgconfig.py:57
+#: tortoisehg/hgqt/settings.py:367 tortoisehg/hgtk/thgconfig.py:57
msgid "Visual Editor"
msgstr "Візуальний редактор"
-#: tortoisehg/hgqt/settings.py:282
+#: tortoisehg/hgqt/settings.py:368
#, python-format
msgid ""
"Specify the visual editor used to view files. Format:<br>myeditor -flags "
@@ -4818,51 +5286,54 @@"href=\"%s\">OpenAtLine</a>"
msgstr ""
-#: tortoisehg/hgqt/settings.py:286
+#: tortoisehg/hgqt/settings.py:372
msgid "Shell"
msgstr ""
-#: tortoisehg/hgqt/settings.py:287
-msgid "Specify your preferred terminal shell application"
-msgstr ""
-
-#: tortoisehg/hgqt/settings.py:288
+#: tortoisehg/hgqt/settings.py:373
+#, python-format
+msgid ""
+"Specify the command to launch your preferred terminal shell application. If "
+"the value includes the string %(reponame)s, the name of the repository will "
+"be substituted in place of %(reponame)s. (restart needed)<br>Default, "
+"Windows: cmd.exe /K title %(reponame)s<br>Default, OS X: not set<br>Default, "
+"other: xterm -T \"%(reponame)s\""
+msgstr ""
+
+#: tortoisehg/hgqt/settings.py:381
msgid "Immediate Operations"
msgstr ""
-#: tortoisehg/hgqt/settings.py:289
+#: tortoisehg/hgqt/settings.py:382
msgid ""
"Space separated list of shell operations you would like to be performed "
"immediately, without user interaction. Commands are \"add remove revert "
"forget\". Default: None (leave blank)"
msgstr ""
-#: tortoisehg/hgqt/settings.py:293
-msgid "Poll Frequency"
-msgstr ""
-
-#: tortoisehg/hgqt/settings.py:294
-msgid ""
-"The period (in milliseconds) between modification time polling of key "
-"repository files, looking for changes. Values under 100ms are ignored. "
-"Default: 500"
-msgstr ""
-
-#: tortoisehg/hgqt/settings.py:297 tortoisehg/hgtk/thgconfig.py:63
+#: tortoisehg/hgqt/settings.py:386 tortoisehg/hgtk/thgconfig.py:63
msgid "Tab Width"
msgstr "Крок табуляції"
-#: tortoisehg/hgqt/settings.py:298
+#: tortoisehg/hgqt/settings.py:387
msgid ""
"Specify the number of spaces that tabs expand to in various TortoiseHg "
"windows. Default: 0, Not expanded"
msgstr ""
-#: tortoisehg/hgqt/settings.py:301 tortoisehg/hgtk/thgconfig.py:67
+#: tortoisehg/hgqt/settings.py:390
+msgid "Force Repo Tab"
+msgstr ""
+
+#: tortoisehg/hgqt/settings.py:391
+msgid "Always show repo tabs, even for a single repo. Default: False"
+msgstr ""
+
+#: tortoisehg/hgqt/settings.py:392 tortoisehg/hgtk/thgconfig.py:67
msgid "Max Diff Size"
msgstr "Максимальний обсяг відмінностей"
-#: tortoisehg/hgqt/settings.py:302
+#: tortoisehg/hgqt/settings.py:393
msgid ""
"The maximum size file (in KB) that TortoiseHg will show changes for in the "
"changelog, status, and commit windows. A value of zero implies no limit. "
@@ -4872,33 +5343,21 @@"відмінності у вікнах журналу змін, статуса та фіксації. Нульове значення "
"означає - без обмежень. За замовчуванням: 1024 (1МБ)"
-#: tortoisehg/hgqt/settings.py:305 tortoisehg/hgtk/thgconfig.py:75
-msgid "Capture stderr"
-msgstr "Захоплення stderr"
-
-#: tortoisehg/hgqt/settings.py:306 tortoisehg/hgtk/thgconfig.py:76
-msgid ""
-"Redirect stderr to a buffer which is parsed at the end of the process for "
-"runtime errors. Default: True"
-msgstr ""
-"Перенаправляти stderr до буферу для розбору його помилок виконання в кінці "
-"процесу. За замовчуванням: Так"
-
-#: tortoisehg/hgqt/settings.py:308
+#: tortoisehg/hgqt/settings.py:396
msgid "Fork GUI"
-msgstr ""
-
-#: tortoisehg/hgqt/settings.py:309
+msgstr "Відгалуження GUI"
+
+#: tortoisehg/hgqt/settings.py:397
msgid ""
"When running from the command line, fork a background process to run "
"graphical dialogs. Default: True"
msgstr ""
-#: tortoisehg/hgqt/settings.py:311 tortoisehg/hgtk/thgconfig.py:81
+#: tortoisehg/hgqt/settings.py:399 tortoisehg/hgtk/thgconfig.py:81
msgid "Full Path Title"
-msgstr "Повний шлях до файлу"
-
-#: tortoisehg/hgqt/settings.py:312
+msgstr "Повний шлях"
+
+#: tortoisehg/hgqt/settings.py:400
msgid ""
"Show a full directory path of the repository in the dialog title instead of "
"just the root directory name. Default: False"
@@ -4906,11 +5365,11 @@"Показати повний шлях до каталогу сховища в заголовок діалогу, а не просто "
"ім'я кореневого каталогу. За замовчуванням: Ні"
-#: tortoisehg/hgqt/settings.py:314
+#: tortoisehg/hgqt/settings.py:402
msgid "Auto-resolve merges"
msgstr ""
-#: tortoisehg/hgqt/settings.py:315
+#: tortoisehg/hgqt/settings.py:403
msgid ""
"Indicates whether TortoiseHg should attempt to automatically resolve changes "
"from both sides to the same file, and only report merge conflicts when this "
@@ -4920,15 +5379,28 @@"to review and resolve changes manually. Default: False."
msgstr ""
-#: tortoisehg/hgqt/settings.py:324 tortoisehg/util/menuthg.py:46
-msgid "Workbench"
-msgstr ""
-
-#: tortoisehg/hgqt/settings.py:325 tortoisehg/hgtk/thgconfig.py:130
+#: tortoisehg/hgqt/settings.py:413
+msgid "Default widget"
+msgstr ""
+
+#: tortoisehg/hgqt/settings.py:415
+msgid ""
+"Select the initial widget that will be shown when opening a repository. "
+"Default: revdetails"
+msgstr ""
+
+#: tortoisehg/hgqt/settings.py:420
+msgid ""
+"Select the initial revision that will be selected when opening a repository. "
+" You can select the \"current\" (i.e. the working directory parent), the "
+"current \"tip\" or the working directory (\"workingdir\"). Default: current"
+msgstr ""
+
+#: tortoisehg/hgqt/settings.py:424 tortoisehg/hgtk/thgconfig.py:130
msgid "Author Coloring"
msgstr "Підсвітка змін автора, окремим кольором"
-#: tortoisehg/hgqt/settings.py:326 tortoisehg/hgtk/thgconfig.py:131
+#: tortoisehg/hgqt/settings.py:425 tortoisehg/hgtk/thgconfig.py:131
msgid ""
"Color changesets by author name. If not enabled, the changes are colored "
"green for merge, red for non-trivial parents, black for normal. Default: "
@@ -4938,21 +5410,21 @@"підсвічуються зеленим для об'єднання, червоним для не звичайних "
"попередників, чорним для нормальних. За замовчуванням: False"
-#: tortoisehg/hgqt/settings.py:330
+#: tortoisehg/hgqt/settings.py:429
msgid "Task Tabs"
-msgstr ""
-
-#: tortoisehg/hgqt/settings.py:332
+msgstr "Панель задач"
+
+#: tortoisehg/hgqt/settings.py:431
msgid ""
"Show tabs along the side of the bottom half of each repo widget allowing one "
"to switch task tabs without using the toolbar. Default: off"
msgstr ""
-#: tortoisehg/hgqt/settings.py:335 tortoisehg/hgtk/thgconfig.py:135
+#: tortoisehg/hgqt/settings.py:434 tortoisehg/hgtk/thgconfig.py:135
msgid "Long Summary"
msgstr "Повний звіт"
-#: tortoisehg/hgqt/settings.py:336 tortoisehg/hgtk/thgconfig.py:136
+#: tortoisehg/hgqt/settings.py:435 tortoisehg/hgtk/thgconfig.py:136
msgid ""
"If true, concatenate multiple lines of changeset summary until they reach 80 "
"characters. Default: False"
@@ -4960,11 +5432,11 @@"Якщо Так, тоді багаторядкові зведення наборів змін будуть об'єднані у одну "
"до 80 символів. За замовчуванням: False"
-#: tortoisehg/hgqt/settings.py:339 tortoisehg/hgtk/thgconfig.py:139
+#: tortoisehg/hgqt/settings.py:438 tortoisehg/hgtk/thgconfig.py:139
msgid "Log Batch Size"
msgstr "Розмір пакунку журналу"
-#: tortoisehg/hgqt/settings.py:340 tortoisehg/hgtk/thgconfig.py:140
+#: tortoisehg/hgqt/settings.py:439 tortoisehg/hgtk/thgconfig.py:140
msgid ""
"The number of revisions to read and display in the changelog viewer in a "
"single batch. Default: 500"
@@ -4972,21 +5444,21 @@"Кількість ревізій, які зчитуються та відображаються за один раз в журналі "
"змін. За замовчуванням: 500"
-#: tortoisehg/hgqt/settings.py:343 tortoisehg/hgtk/thgconfig.py:143
+#: tortoisehg/hgqt/settings.py:442 tortoisehg/hgtk/thgconfig.py:143
msgid "Dead Branches"
msgstr "Мертві гілки"
-#: tortoisehg/hgqt/settings.py:344 tortoisehg/hgtk/thgconfig.py:144
+#: tortoisehg/hgqt/settings.py:443 tortoisehg/hgtk/thgconfig.py:144
msgid ""
"Comma separated list of branch names that should be ignored when building a "
"list of branch names for a repository. Default: None (leave blank)"
msgstr ""
-#: tortoisehg/hgqt/settings.py:347 tortoisehg/hgtk/thgconfig.py:147
+#: tortoisehg/hgqt/settings.py:446 tortoisehg/hgtk/thgconfig.py:147
msgid "Branch Colors"
msgstr "Кольори гілок"
-#: tortoisehg/hgqt/settings.py:348
+#: tortoisehg/hgqt/settings.py:447
msgid ""
"Space separated list of branch names and colors of the form branch:#XXXXXX. "
"Spaces and colons in the branch name must be escaped using a backslash (\\). "
@@ -4995,22 +5467,22 @@"blank)"
msgstr ""
-#: tortoisehg/hgqt/settings.py:354 tortoisehg/hgtk/thgconfig.py:154
+#: tortoisehg/hgqt/settings.py:453 tortoisehg/hgtk/thgconfig.py:154
msgid "Hide Tags"
-msgstr "Сховати мітки"
-
-#: tortoisehg/hgqt/settings.py:355
+msgstr "Сховати ярлик"
+
+#: tortoisehg/hgqt/settings.py:454
msgid ""
"Space separated list of tags that will not be shown.Useful example: Specify "
"\"qbase qparent qtip\" to hide the standard tags inserted by the Mercurial "
"Queues Extension. Default: None (leave blank)"
msgstr ""
-#: tortoisehg/hgqt/settings.py:359 tortoisehg/hgtk/thgconfig.py:172
+#: tortoisehg/hgqt/settings.py:458 tortoisehg/hgtk/thgconfig.py:172
msgid "After Pull Operation"
msgstr "Після операції отримання"
-#: tortoisehg/hgqt/settings.py:361
+#: tortoisehg/hgqt/settings.py:460
msgid ""
"Operation which is performed directly after a successful pull. update "
"equates to pull --update, fetch equates to the fetch extension, rebase "
@@ -5020,149 +5492,149 @@"pull --update, fetch рівнозначна fetch extension, rebase рівнозначна pull --"
"rebase. За замовчуванням: none"
-#: tortoisehg/hgqt/settings.py:366
+#: tortoisehg/hgqt/settings.py:465
msgctxt "config item"
msgid "Commit"
-msgstr ""
-
-#: tortoisehg/hgqt/settings.py:367 tortoisehg/hgqt/sync.py:1186
+msgstr "Фіксація"
+
+#: tortoisehg/hgqt/settings.py:466 tortoisehg/hgqt/sync.py:1218
#: tortoisehg/hgtk/thgconfig.py:90
msgid "Username"
msgstr "Користувач"
-#: tortoisehg/hgqt/settings.py:368
-msgid ""
-"Name associated with commits. The common format is<br>\"Full Name "
-"<email@example.com>\""
-msgstr ""
-
-#: tortoisehg/hgqt/settings.py:370 tortoisehg/hgtk/thgconfig.py:92
+#: tortoisehg/hgqt/settings.py:467
+msgid ""
+"Name associated with commits. The common format is:<br>Full Name "
+"<email@example.com>"
+msgstr ""
+
+#: tortoisehg/hgqt/settings.py:469 tortoisehg/hgtk/thgconfig.py:92
msgid "Summary Line Length"
msgstr "Загальна довжина рядка"
-#: tortoisehg/hgqt/settings.py:371
+#: tortoisehg/hgqt/settings.py:470
msgid ""
"Suggested length of commit message lines. A red vertical line will mark this "
"length. CTRL-E will reflow the current paragraph to the specified line "
"length. Default: 80"
msgstr ""
-#: tortoisehg/hgqt/settings.py:374 tortoisehg/hgtk/thgconfig.py:103
+#: tortoisehg/hgqt/settings.py:473 tortoisehg/hgtk/thgconfig.py:103
msgid "Close After Commit"
msgstr "Закрити після фіксації"
-#: tortoisehg/hgqt/settings.py:375
+#: tortoisehg/hgqt/settings.py:474
msgid "Close the commit tool after every successful commit. Default: False"
msgstr ""
"Закривати програму фіксації після кожного успішного використання. За "
"замовчуванням: False"
-#: tortoisehg/hgqt/settings.py:377 tortoisehg/hgtk/thgconfig.py:106
+#: tortoisehg/hgqt/settings.py:476 tortoisehg/hgtk/thgconfig.py:106
msgid "Push After Commit"
msgstr "Надіслати після фіксації"
-#: tortoisehg/hgqt/settings.py:379
+#: tortoisehg/hgqt/settings.py:478
msgid ""
"Attempt to push to specified URL or alias after each successful commit. "
"Default: No push"
msgstr ""
-#: tortoisehg/hgqt/settings.py:381 tortoisehg/hgtk/thgconfig.py:109
+#: tortoisehg/hgqt/settings.py:480 tortoisehg/hgtk/thgconfig.py:109
msgid "Auto Commit List"
msgstr "Перелік автоматичних фіксацій"
-#: tortoisehg/hgqt/settings.py:382 tortoisehg/hgtk/thgconfig.py:110
+#: tortoisehg/hgqt/settings.py:481 tortoisehg/hgtk/thgconfig.py:110
msgid ""
"Comma separated list of files that are automatically included in every "
"commit. Intended for use only as a repository setting. Default: None (leave "
"blank)"
msgstr ""
-#: tortoisehg/hgqt/settings.py:385 tortoisehg/hgtk/thgconfig.py:113
+#: tortoisehg/hgqt/settings.py:484 tortoisehg/hgtk/thgconfig.py:113
msgid "Auto Exclude List"
msgstr "Перелік автоматичних виключень"
-#: tortoisehg/hgqt/settings.py:386
+#: tortoisehg/hgqt/settings.py:485
msgid ""
"Comma separated list of files that are automatically unchecked when the "
"status, and commit dialogs are opened. Default: None (leave blank)"
msgstr ""
-#: tortoisehg/hgqt/settings.py:389 tortoisehg/hgtk/thgconfig.py:117
+#: tortoisehg/hgqt/settings.py:488 tortoisehg/hgtk/thgconfig.py:117
msgid "English Messages"
msgstr "Повідомлення англійською"
-#: tortoisehg/hgqt/settings.py:390 tortoisehg/hgtk/thgconfig.py:118
+#: tortoisehg/hgqt/settings.py:489 tortoisehg/hgtk/thgconfig.py:118
msgid ""
"Generate English commit messages even if LANGUAGE or LANG environment "
"variables are set to a non-English language. This setting is used by the "
"Merge, Tag and Backout dialogs. Default: False"
msgstr ""
-#: tortoisehg/hgqt/settings.py:396 tortoisehg/hgtk/thgconfig.py:179
+#: tortoisehg/hgqt/settings.py:495 tortoisehg/hgtk/thgconfig.py:179
#: tortoisehg/util/menuthg.py:55
msgid "Web Server"
msgstr "Web-сервер"
-#: tortoisehg/hgqt/settings.py:397 tortoisehg/hgtk/thgconfig.py:180
+#: tortoisehg/hgqt/settings.py:496 tortoisehg/hgtk/thgconfig.py:180
#: tortoisehg/hgtk/thgpbranch.py:210
msgid "Name"
msgstr "Назва"
-#: tortoisehg/hgqt/settings.py:398
+#: tortoisehg/hgqt/settings.py:497
msgid ""
"Repository name to use in the web interface, and by TortoiseHg as a "
"shorthand name. Default is the working directory."
msgstr ""
-#: tortoisehg/hgqt/settings.py:400 tortoisehg/hgtk/thgconfig.py:183
+#: tortoisehg/hgqt/settings.py:499 tortoisehg/hgtk/thgconfig.py:183
#: tortoisehg/hgtk/thgconfig.py:745
msgid "Description"
msgstr "Опис"
-#: tortoisehg/hgqt/settings.py:401 tortoisehg/hgtk/thgconfig.py:184
+#: tortoisehg/hgqt/settings.py:500 tortoisehg/hgtk/thgconfig.py:184
msgid "Textual description of the repository's purpose or contents."
msgstr "Опис призначення або вмісту сховища"
-#: tortoisehg/hgqt/settings.py:403 tortoisehg/hgtk/thgconfig.py:186
+#: tortoisehg/hgqt/settings.py:502 tortoisehg/hgtk/thgconfig.py:186
msgid "Contact"
msgstr "Контакти"
-#: tortoisehg/hgqt/settings.py:404 tortoisehg/hgtk/thgconfig.py:187
+#: tortoisehg/hgqt/settings.py:503 tortoisehg/hgtk/thgconfig.py:187
msgid "Name or email address of the person in charge of the repository."
msgstr "Ім'я або електронна пошта особи, яка відповідальна за сховище"
-#: tortoisehg/hgqt/settings.py:406 tortoisehg/hgtk/thgconfig.py:189
+#: tortoisehg/hgqt/settings.py:505 tortoisehg/hgtk/thgconfig.py:189
msgid "Style"
msgstr "Стиль"
-#: tortoisehg/hgqt/settings.py:408 tortoisehg/hgtk/thgconfig.py:191
+#: tortoisehg/hgqt/settings.py:507 tortoisehg/hgtk/thgconfig.py:191
msgid "Which template map style to use"
msgstr "Який взірець зовнішнього вигляду використовувати"
-#: tortoisehg/hgqt/settings.py:409 tortoisehg/hgtk/thgconfig.py:192
+#: tortoisehg/hgqt/settings.py:508 tortoisehg/hgtk/thgconfig.py:192
msgid "Archive Formats"
msgstr "Формати архівів"
-#: tortoisehg/hgqt/settings.py:411 tortoisehg/hgtk/thgconfig.py:193
+#: tortoisehg/hgqt/settings.py:510 tortoisehg/hgtk/thgconfig.py:193
msgid "Comma separated list of archive formats allowed for downloading"
msgstr ""
"Перелік форматів архівів дозволений для отримання, відокремлений комами"
-#: tortoisehg/hgqt/settings.py:413 tortoisehg/hgqt/sync.py:197
+#: tortoisehg/hgqt/settings.py:512 tortoisehg/hgqt/sync.py:210
#: tortoisehg/hgtk/thgconfig.py:195 tortoisehg/hgtk/thgconfig.py:368
msgid "Port"
msgstr "Порт"
-#: tortoisehg/hgqt/settings.py:413 tortoisehg/hgtk/thgconfig.py:195
+#: tortoisehg/hgqt/settings.py:512 tortoisehg/hgtk/thgconfig.py:195
msgid "Port to listen on"
msgstr "Номер порт, який прослуховувати"
-#: tortoisehg/hgqt/settings.py:414 tortoisehg/hgtk/thgconfig.py:196
+#: tortoisehg/hgqt/settings.py:513 tortoisehg/hgtk/thgconfig.py:196
msgid "Push Requires SSL"
msgstr "Відправка вимагає SSL"
-#: tortoisehg/hgqt/settings.py:415 tortoisehg/hgtk/thgconfig.py:197
+#: tortoisehg/hgqt/settings.py:514 tortoisehg/hgtk/thgconfig.py:197
msgid ""
"Whether to require that inbound pushes be transported over SSL to prevent "
"password sniffing."
@@ -5170,11 +5642,11 @@"Для відправляння файлів необхідно використовувати шифрування, для уникнення "
"втрати паролю."
-#: tortoisehg/hgqt/settings.py:417 tortoisehg/hgtk/thgconfig.py:199
+#: tortoisehg/hgqt/settings.py:516 tortoisehg/hgtk/thgconfig.py:199
msgid "Stripes"
msgstr "Смуги"
-#: tortoisehg/hgqt/settings.py:418 tortoisehg/hgtk/thgconfig.py:200
+#: tortoisehg/hgqt/settings.py:517 tortoisehg/hgtk/thgconfig.py:200
msgid ""
"How many lines a \"zebra stripe\" should span in multiline output. Default "
"is 1; set to 0 to disable."
@@ -5182,27 +5654,27 @@"Через скількі рядків повинні з'являтися \\\"смуги зебри\\\" при "
"багаторядковому виводі. За замовчуванням 1; 0 для відключення."
-#: tortoisehg/hgqt/settings.py:420 tortoisehg/hgtk/thgconfig.py:202
+#: tortoisehg/hgqt/settings.py:519 tortoisehg/hgtk/thgconfig.py:202
msgid "Max Files"
msgstr "Максимум файлів"
-#: tortoisehg/hgqt/settings.py:421
+#: tortoisehg/hgqt/settings.py:520
msgid "Maximum number of files to list per changeset. Default: 10"
msgstr ""
-#: tortoisehg/hgqt/settings.py:422 tortoisehg/hgtk/thgconfig.py:204
+#: tortoisehg/hgqt/settings.py:521 tortoisehg/hgtk/thgconfig.py:204
msgid "Max Changes"
msgstr "Максимум змін"
-#: tortoisehg/hgqt/settings.py:423
+#: tortoisehg/hgqt/settings.py:522
msgid "Maximum number of changes to list on the changelog. Default: 10"
msgstr ""
-#: tortoisehg/hgqt/settings.py:425 tortoisehg/hgtk/thgconfig.py:206
+#: tortoisehg/hgqt/settings.py:524 tortoisehg/hgtk/thgconfig.py:206
msgid "Allow Push"
msgstr "Дозволено відправляти"
-#: tortoisehg/hgqt/settings.py:426 tortoisehg/hgtk/thgconfig.py:207
+#: tortoisehg/hgqt/settings.py:525 tortoisehg/hgtk/thgconfig.py:207
msgid ""
"Whether to allow pushing to the repository. If empty or not set, push is not "
"allowed. If the special value \"*\", any remote user can push, including "
@@ -5218,11 +5690,11 @@"цьому переліку (відокремлено пробілами або \\\",\\\"). Зміст переліку "
"дозволів на відправку розглядається після переліку заборон на відправку."
-#: tortoisehg/hgqt/settings.py:433 tortoisehg/hgtk/thgconfig.py:214
+#: tortoisehg/hgqt/settings.py:532 tortoisehg/hgtk/thgconfig.py:214
msgid "Deny Push"
msgstr "Заборонено відправляти"
-#: tortoisehg/hgqt/settings.py:434 tortoisehg/hgtk/thgconfig.py:215
+#: tortoisehg/hgqt/settings.py:533 tortoisehg/hgtk/thgconfig.py:215
msgid ""
"Whether to deny pushing to the repository. If empty or not set, push is not "
"denied. If the special value \"*\", all remote users are denied push. "
@@ -5238,94 +5710,95 @@"\"). Зміст переліку заборон відправляти розглядається до переліку дозволів "
"на відправлення."
-#: tortoisehg/hgqt/settings.py:440 tortoisehg/hgtk/thgconfig.py:221
+#: tortoisehg/hgqt/settings.py:539 tortoisehg/hgtk/thgconfig.py:221
msgid "Encoding"
msgstr "Кодування"
-#: tortoisehg/hgqt/settings.py:441 tortoisehg/hgtk/thgconfig.py:222
+#: tortoisehg/hgqt/settings.py:540 tortoisehg/hgtk/thgconfig.py:222
msgid "Character encoding name"
-msgstr "Назва кодування"
-
-#: tortoisehg/hgqt/settings.py:444 tortoisehg/hgtk/thgconfig.py:225
+msgstr "Система кодування"
+
+#: tortoisehg/hgqt/settings.py:543 tortoisehg/hgtk/thgconfig.py:225
msgid "Proxy"
msgstr "Проксі-сервер"
-#: tortoisehg/hgqt/settings.py:445 tortoisehg/hgtk/thgconfig.py:226
+#: tortoisehg/hgqt/settings.py:544 tortoisehg/hgtk/thgconfig.py:226
#: tortoisehg/hgtk/thgconfig.py:369
msgid "Host"
msgstr "Вузол"
-#: tortoisehg/hgqt/settings.py:446 tortoisehg/hgtk/thgconfig.py:227
+#: tortoisehg/hgqt/settings.py:545 tortoisehg/hgtk/thgconfig.py:227
msgid ""
"Host name and (optional) port of proxy server, for example \"myproxy:8000\""
msgstr ""
"Назва вузла та (необов'язково) порта проксі сервера, для прикладу "
"\"мій_проксі:8000\""
-#: tortoisehg/hgqt/settings.py:448 tortoisehg/hgtk/thgconfig.py:229
+#: tortoisehg/hgqt/settings.py:547 tortoisehg/hgtk/thgconfig.py:229
msgid "Bypass List"
msgstr "Перелік виключень"
-#: tortoisehg/hgqt/settings.py:449 tortoisehg/hgtk/thgconfig.py:230
+#: tortoisehg/hgqt/settings.py:548 tortoisehg/hgtk/thgconfig.py:230
msgid ""
"Optional. Comma-separated list of host names that should bypass the proxy"
msgstr "Необов'язково. Перелік вузлів, через кому, яким не потрібен проксі"
-#: tortoisehg/hgqt/settings.py:452 tortoisehg/hgtk/thgconfig.py:233
+#: tortoisehg/hgqt/settings.py:551 tortoisehg/hgtk/thgconfig.py:233
msgid "Optional. User name to authenticate with at the proxy server"
msgstr "Необов'язково. Ім'я користувача для регістрації на проксі сервері"
-#: tortoisehg/hgqt/settings.py:453 tortoisehg/hgqt/settings.py:566
-#: tortoisehg/hgqt/sync.py:1194 tortoisehg/hgtk/thgconfig.py:234
+#: tortoisehg/hgqt/settings.py:552 tortoisehg/hgqt/settings.py:672
+#: tortoisehg/hgqt/sync.py:1226 tortoisehg/hgtk/thgconfig.py:234
#: tortoisehg/hgtk/thgconfig.py:370
msgid "Password"
msgstr "Пароль"
-#: tortoisehg/hgqt/settings.py:454 tortoisehg/hgtk/thgconfig.py:235
+#: tortoisehg/hgqt/settings.py:553 tortoisehg/hgtk/thgconfig.py:235
msgid "Optional. Password to authenticate with at the proxy server"
msgstr "Необов'язково. Пароль для регістрації на проксі сервері"
-#: tortoisehg/hgqt/settings.py:458 tortoisehg/hgtk/thgconfig.py:239
+#: tortoisehg/hgqt/settings.py:557 tortoisehg/hgtk/thgconfig.py:239
msgid "From"
msgstr "Від"
-#: tortoisehg/hgqt/settings.py:459 tortoisehg/hgtk/thgconfig.py:240
+#: tortoisehg/hgqt/settings.py:558 tortoisehg/hgtk/thgconfig.py:240
msgid "Email address to use in the \"From\" header and for the SMTP envelope"
msgstr ""
"Адреса електронної пошти, яка буде відображатись у заголовку \"Від\" SMTP "
"повідомлень"
-#: tortoisehg/hgqt/settings.py:461 tortoisehg/hgtk/thgconfig.py:242
+#: tortoisehg/hgqt/settings.py:560 tortoisehg/hgtk/thgconfig.py:242
msgid "To"
-msgstr "To"
-
-#: tortoisehg/hgqt/settings.py:462 tortoisehg/hgtk/thgconfig.py:243
+msgstr "Tакож"
+
+#: tortoisehg/hgqt/settings.py:561 tortoisehg/hgtk/thgconfig.py:243
msgid "Comma-separated list of recipient email addresses"
msgstr "Перелік адрес електронної пошти отримувачів, відокремлений комами"
-#: tortoisehg/hgqt/settings.py:463 tortoisehg/hgtk/thgconfig.py:244
+#: tortoisehg/hgqt/settings.py:562 tortoisehg/hgtk/thgconfig.py:244
msgid "Cc"
msgstr "Копія"
-#: tortoisehg/hgqt/settings.py:464 tortoisehg/hgtk/thgconfig.py:245
+#: tortoisehg/hgqt/settings.py:563 tortoisehg/hgtk/thgconfig.py:245
msgid "Comma-separated list of carbon copy recipient email addresses"
msgstr ""
"Перелік адрес електронної пошти отримувачів копій, відокремлений комами"
-#: tortoisehg/hgqt/settings.py:465 tortoisehg/hgtk/thgconfig.py:246
+#: tortoisehg/hgqt/settings.py:564 tortoisehg/hgtk/thgconfig.py:246
msgid "Bcc"
msgstr "Прихована"
-#: tortoisehg/hgqt/settings.py:466 tortoisehg/hgtk/thgconfig.py:247
+#: tortoisehg/hgqt/settings.py:565 tortoisehg/hgtk/thgconfig.py:247
msgid "Comma-separated list of blind carbon copy recipient email addresses"
msgstr ""
-"Перелік адрес електронної пошти прихованих отримувачів, відокремлений комами"
-
-#: tortoisehg/hgqt/settings.py:468 tortoisehg/hgtk/thgconfig.py:249
+"Перелік адрес електронної пошти для прихованих отримувачів, відокремлені "
+"комами"
+
+#: tortoisehg/hgqt/settings.py:567 tortoisehg/hgtk/thgconfig.py:249
msgid "method"
-msgstr "Метод"
-
-#: tortoisehg/hgqt/settings.py:469 tortoisehg/hgtk/thgconfig.py:250
+msgstr "метод"
+
+#: tortoisehg/hgqt/settings.py:568 tortoisehg/hgtk/thgconfig.py:250
msgid ""
"Optional. Method to use to send email messages. If value is \"smtp\" "
"(default), use SMTP (configured below). Otherwise, use as name of program "
@@ -5342,64 +5815,64 @@"\"sendmail\" або \"/usr/sbin/sendmail\" та використовувати sendmail для "
"передачі повідомлень."
-#: tortoisehg/hgqt/settings.py:475 tortoisehg/hgtk/thgconfig.py:256
+#: tortoisehg/hgqt/settings.py:574 tortoisehg/hgtk/thgconfig.py:256
msgid "SMTP Host"
msgstr "SMTP вузол"
-#: tortoisehg/hgqt/settings.py:476 tortoisehg/hgtk/thgconfig.py:256
+#: tortoisehg/hgqt/settings.py:575 tortoisehg/hgtk/thgconfig.py:256
msgid "Host name of mail server"
msgstr "Назва вузла сервера електронної пошти"
-#: tortoisehg/hgqt/settings.py:477 tortoisehg/hgtk/thgconfig.py:257
+#: tortoisehg/hgqt/settings.py:576 tortoisehg/hgtk/thgconfig.py:257
msgid "SMTP Port"
msgstr "SMTP порт"
-#: tortoisehg/hgqt/settings.py:478 tortoisehg/hgtk/thgconfig.py:258
+#: tortoisehg/hgqt/settings.py:577 tortoisehg/hgtk/thgconfig.py:258
msgid "Port to connect to on mail server. Default: 25"
msgstr ""
"Порт для з'єднання з сервером електронної пошти. За замовчуванням: 25"
-#: tortoisehg/hgqt/settings.py:480 tortoisehg/hgtk/thgconfig.py:260
+#: tortoisehg/hgqt/settings.py:579 tortoisehg/hgtk/thgconfig.py:260
msgid "SMTP TLS"
msgstr "SMTP TLS"
-#: tortoisehg/hgqt/settings.py:481 tortoisehg/hgtk/thgconfig.py:261
+#: tortoisehg/hgqt/settings.py:580 tortoisehg/hgtk/thgconfig.py:261
msgid "Connect to mail server using TLS. Default: False"
msgstr "З'єднання з email сервером з використанням TLS. За замовчуванням: Ні"
-#: tortoisehg/hgqt/settings.py:483 tortoisehg/hgtk/thgconfig.py:263
+#: tortoisehg/hgqt/settings.py:582 tortoisehg/hgtk/thgconfig.py:263
msgid "SMTP Username"
msgstr "SMTP ім'я користувача"
-#: tortoisehg/hgqt/settings.py:484 tortoisehg/hgtk/thgconfig.py:264
+#: tortoisehg/hgqt/settings.py:583 tortoisehg/hgtk/thgconfig.py:264
msgid "Username to authenticate to mail server with"
msgstr "Ім'я користувача для регістрації на поштовому сервері"
-#: tortoisehg/hgqt/settings.py:485 tortoisehg/hgtk/thgconfig.py:265
+#: tortoisehg/hgqt/settings.py:584 tortoisehg/hgtk/thgconfig.py:265
msgid "SMTP Password"
msgstr "SMTP пароль"
-#: tortoisehg/hgqt/settings.py:486 tortoisehg/hgtk/thgconfig.py:266
+#: tortoisehg/hgqt/settings.py:585 tortoisehg/hgtk/thgconfig.py:266
msgid "Password to authenticate to mail server with"
msgstr "Пароль для регістрації на поштовому сервері"
-#: tortoisehg/hgqt/settings.py:487 tortoisehg/hgtk/thgconfig.py:267
+#: tortoisehg/hgqt/settings.py:586 tortoisehg/hgtk/thgconfig.py:267
msgid "Local Hostname"
msgstr "Назва локального вузла"
-#: tortoisehg/hgqt/settings.py:488 tortoisehg/hgtk/thgconfig.py:268
+#: tortoisehg/hgqt/settings.py:587 tortoisehg/hgtk/thgconfig.py:268
msgid "Hostname the sender can use to identify itself to the mail server."
msgstr "Назва вузла, який використовується відправником, як поштовий сервер"
-#: tortoisehg/hgqt/settings.py:492 tortoisehg/hgtk/thgconfig.py:272
+#: tortoisehg/hgqt/settings.py:591 tortoisehg/hgtk/thgconfig.py:272
msgid "Diff"
msgstr "Утиліта порівняння"
-#: tortoisehg/hgqt/settings.py:494 tortoisehg/hgtk/thgconfig.py:273
+#: tortoisehg/hgqt/settings.py:593 tortoisehg/hgtk/thgconfig.py:273
msgid "Patch EOL"
msgstr "Латка EOL"
-#: tortoisehg/hgqt/settings.py:496 tortoisehg/hgtk/thgconfig.py:274
+#: tortoisehg/hgqt/settings.py:595 tortoisehg/hgtk/thgconfig.py:274
msgid ""
"Normalize file line endings during and after patch to lf or crlf. Strict "
"does no normalization. Auto does per-file detection, and is the recommended "
@@ -5409,21 +5882,21 @@"або crlf. Точний не робить нормалізації. Автоматичний робить нормалізацію "
"для кожного виявленого файлу, і є рекомендованим. За замовчуванням: lf"
-#: tortoisehg/hgqt/settings.py:500 tortoisehg/hgtk/thgconfig.py:278
+#: tortoisehg/hgqt/settings.py:599 tortoisehg/hgtk/thgconfig.py:278
msgid "Git Format"
msgstr "Формат git"
-#: tortoisehg/hgqt/settings.py:501 tortoisehg/hgtk/thgconfig.py:279
+#: tortoisehg/hgqt/settings.py:600 tortoisehg/hgtk/thgconfig.py:279
msgid "Use git extended diff header format. Default: False"
msgstr ""
"Використовувати розширений git формат для заголовку різниць. За "
"замовчуванням: Ні"
-#: tortoisehg/hgqt/settings.py:503
+#: tortoisehg/hgqt/settings.py:602
msgid "MQ Git Format"
-msgstr ""
-
-#: tortoisehg/hgqt/settings.py:505
+msgstr "MQ Git формат"
+
+#: tortoisehg/hgqt/settings.py:604
msgid ""
"If set to 'keep', mq will obey the [diff] section configuration while "
"preserving existing git patches upon qrefresh. If set to 'yes' or 'no', mq "
@@ -5431,115 +5904,115 @@"possibly losing data in the second case."
msgstr ""
-#: tortoisehg/hgqt/settings.py:509 tortoisehg/hgtk/thgconfig.py:281
+#: tortoisehg/hgqt/settings.py:608 tortoisehg/hgtk/thgconfig.py:281
msgid "No Dates"
msgstr "Без дат"
-#: tortoisehg/hgqt/settings.py:510 tortoisehg/hgtk/thgconfig.py:282
+#: tortoisehg/hgqt/settings.py:609 tortoisehg/hgtk/thgconfig.py:282
msgid "Do not include modification dates in diff headers. Default: False"
msgstr "Не включати дату змін до заголовку різниць. За замовчуванням: Ні"
-#: tortoisehg/hgqt/settings.py:512 tortoisehg/hgtk/thgconfig.py:284
+#: tortoisehg/hgqt/settings.py:611 tortoisehg/hgtk/thgconfig.py:284
msgid "Show Function"
msgstr "Відображати функцію"
-#: tortoisehg/hgqt/settings.py:513 tortoisehg/hgtk/thgconfig.py:285
+#: tortoisehg/hgqt/settings.py:612 tortoisehg/hgtk/thgconfig.py:285
msgid "Show which function each change is in. Default: False"
msgstr ""
"Відображати у якій функції знаходиться кожна зміна. За замовчуванням: Ні"
-#: tortoisehg/hgqt/settings.py:515 tortoisehg/hgtk/thgconfig.py:287
+#: tortoisehg/hgqt/settings.py:614 tortoisehg/hgtk/thgconfig.py:287
msgid "Ignore White Space"
msgstr "Ігнорувати пропуски"
-#: tortoisehg/hgqt/settings.py:516 tortoisehg/hgtk/thgconfig.py:288
+#: tortoisehg/hgqt/settings.py:615 tortoisehg/hgtk/thgconfig.py:288
msgid "Ignore white space when comparing lines. Default: False"
msgstr "Ігнорувати пропуски при порівнянні файлів. За замовчуванням: False"
-#: tortoisehg/hgqt/settings.py:518 tortoisehg/hgtk/thgconfig.py:290
+#: tortoisehg/hgqt/settings.py:617 tortoisehg/hgtk/thgconfig.py:290
msgid "Ignore WS Amount"
msgstr "Не зважати на кількість пропусків (пробел)"
-#: tortoisehg/hgqt/settings.py:519 tortoisehg/hgtk/thgconfig.py:291
+#: tortoisehg/hgqt/settings.py:618 tortoisehg/hgtk/thgconfig.py:291
msgid "Ignore changes in the amount of white space. Default: False"
msgstr ""
"Не зважати на зміни у кількості пропусків (пробел). За замовчуванням: False"
-#: tortoisehg/hgqt/settings.py:521 tortoisehg/hgtk/thgconfig.py:293
+#: tortoisehg/hgqt/settings.py:620 tortoisehg/hgtk/thgconfig.py:293
msgid "Ignore Blank Lines"
msgstr "Не враховувати порожніх рядків"
-#: tortoisehg/hgqt/settings.py:522 tortoisehg/hgtk/thgconfig.py:294
+#: tortoisehg/hgqt/settings.py:621 tortoisehg/hgtk/thgconfig.py:294
msgid "Ignore changes whose lines are all blank. Default: False"
msgstr ""
"Не зважати на зміни, які викликані порожніми рядками. За замовчуванням: False"
-#: tortoisehg/hgqt/settings.py:526
+#: tortoisehg/hgqt/settings.py:625
msgid "Fonts"
-msgstr ""
-
-#: tortoisehg/hgqt/settings.py:527
+msgstr "Шрифти"
+
+#: tortoisehg/hgqt/settings.py:626
msgid "Message Font"
msgstr ""
-#: tortoisehg/hgqt/settings.py:528
+#: tortoisehg/hgqt/settings.py:627
msgid "Font used to display commit messages. Default: monospace 10"
msgstr ""
-#: tortoisehg/hgqt/settings.py:530
+#: tortoisehg/hgqt/settings.py:629
msgid "Diff Font"
msgstr ""
-#: tortoisehg/hgqt/settings.py:531
+#: tortoisehg/hgqt/settings.py:630
msgid "Font used to display text differences. Default: monospace 10"
msgstr ""
-#: tortoisehg/hgqt/settings.py:533
+#: tortoisehg/hgqt/settings.py:632
msgid "List Font"
-msgstr ""
-
-#: tortoisehg/hgqt/settings.py:534
+msgstr "Перелік шрифтів"
+
+#: tortoisehg/hgqt/settings.py:633
msgid "Font used to display file lists. Default: sans 9"
msgstr ""
-#: tortoisehg/hgqt/settings.py:536
+#: tortoisehg/hgqt/settings.py:635
msgid "ChangeLog Font"
msgstr ""
-#: tortoisehg/hgqt/settings.py:537
+#: tortoisehg/hgqt/settings.py:636
msgid "Font used to display changelog data. Default: monospace 10"
msgstr ""
-#: tortoisehg/hgqt/settings.py:539
+#: tortoisehg/hgqt/settings.py:638
msgid "Output Font"
msgstr ""
-#: tortoisehg/hgqt/settings.py:540
+#: tortoisehg/hgqt/settings.py:639
msgid "Font used to display output messages. Default: sans 8"
msgstr ""
-#: tortoisehg/hgqt/settings.py:544 tortoisehg/hgqt/settings.py:986
+#: tortoisehg/hgqt/settings.py:643 tortoisehg/hgqt/settings.py:1116
#: tortoisehg/hgtk/thgconfig.py:318
msgid "Extensions"
msgstr "Додатки"
-#: tortoisehg/hgqt/settings.py:547 tortoisehg/hgtk/thgconfig.py:321
+#: tortoisehg/hgqt/settings.py:646 tortoisehg/hgtk/thgconfig.py:321
msgid "Issue Tracking"
msgstr "Issue Tracking"
-#: tortoisehg/hgqt/settings.py:548 tortoisehg/hgtk/thgconfig.py:323
+#: tortoisehg/hgqt/settings.py:647 tortoisehg/hgtk/thgconfig.py:323
msgid "Issue Regex"
msgstr "Issue Regex"
-#: tortoisehg/hgqt/settings.py:549 tortoisehg/hgtk/thgconfig.py:324
+#: tortoisehg/hgqt/settings.py:648 tortoisehg/hgtk/thgconfig.py:324
msgid "Defines the regex to match when picking up issue numbers."
-msgstr "Defines the regex to match when picking up issue numbers."
-
-#: tortoisehg/hgqt/settings.py:550 tortoisehg/hgtk/thgconfig.py:325
+msgstr "Визначає регулярний вираз відповідно до піднятих номерів питаннь."
+
+#: tortoisehg/hgqt/settings.py:649 tortoisehg/hgtk/thgconfig.py:325
msgid "Issue Link"
-msgstr "Issue Link"
-
-#: tortoisehg/hgqt/settings.py:551 tortoisehg/hgtk/thgconfig.py:326
+msgstr "запит посилання"
+
+#: tortoisehg/hgqt/settings.py:650 tortoisehg/hgtk/thgconfig.py:326
msgid ""
"Defines the command to run when an issue number is recognized. You may "
"include groups in issue.regex, and corresponding {n} tokens in issue.link "
@@ -5548,119 +6021,137 @@"tokensare found in issue.link, the entire matched string is appended instead."
msgstr ""
-#: tortoisehg/hgqt/settings.py:561
+#: tortoisehg/hgqt/settings.py:657
+msgid "Issue Tracker Plugin"
+msgstr ""
+
+#: tortoisehg/hgqt/settings.py:659
+msgid ""
+"Configures a COM IBugTraqProvider or IBugTrackProvider2 issue tracking "
+"plugin."
+msgstr ""
+
+#: tortoisehg/hgqt/settings.py:661
+msgid "Configure Issue Tracker"
+msgstr ""
+
+#: tortoisehg/hgqt/settings.py:662
+msgid "Configure the selected COM Bug Tracker plugin."
+msgstr ""
+
+#: tortoisehg/hgqt/settings.py:667
msgid "Server"
-msgstr ""
-
-#: tortoisehg/hgqt/settings.py:562
+msgstr "Сервер"
+
+#: tortoisehg/hgqt/settings.py:668
msgid "Path to review board example \"http://demo.reviewboard.org\""
msgstr ""
-#: tortoisehg/hgqt/settings.py:565
+#: tortoisehg/hgqt/settings.py:671
msgid "User name to authenticate with review board"
msgstr ""
-#: tortoisehg/hgqt/settings.py:567
+#: tortoisehg/hgqt/settings.py:673
msgid "Password to authenticate with review board"
-msgstr ""
-
-#: tortoisehg/hgqt/settings.py:568
+msgstr "Пароль для аутентифікації з переглядом на дошці"
+
+#: tortoisehg/hgqt/settings.py:674
msgid "Server Repository ID"
-msgstr ""
-
-#: tortoisehg/hgqt/settings.py:569
+msgstr "ID серверу сховища"
+
+#: tortoisehg/hgqt/settings.py:675
msgid "The default repository id for this repo on the review board server"
msgstr ""
-#: tortoisehg/hgqt/settings.py:570
+#: tortoisehg/hgqt/settings.py:676
msgid "Target Groups"
-msgstr ""
-
-#: tortoisehg/hgqt/settings.py:571
+msgstr "Зацікавленість груп"
+
+#: tortoisehg/hgqt/settings.py:677
msgid "A comma separated list of target groups"
msgstr ""
-#: tortoisehg/hgqt/settings.py:572
+#: tortoisehg/hgqt/settings.py:678
msgid "Target People"
-msgstr ""
-
-#: tortoisehg/hgqt/settings.py:573
+msgstr "Зацікавленість осіб"
+
+#: tortoisehg/hgqt/settings.py:679
msgid "A comma separated list of target people"
msgstr ""
-#: tortoisehg/hgqt/settings.py:585
+#: tortoisehg/hgqt/settings.py:691
msgid "TortoiseHg Settings"
-msgstr ""
-
-#: tortoisehg/hgqt/settings.py:590 tortoisehg/hgtk/thgconfig.py:648
+msgstr "Налаштування TortoiseHg"
+
+#: tortoisehg/hgqt/settings.py:696 tortoisehg/hgtk/thgconfig.py:648
msgid "Iniparse package not found"
msgstr "Відсутній пакет для розбору ini-файлів"
-#: tortoisehg/hgqt/settings.py:591 tortoisehg/hgtk/thgconfig.py:649
+#: tortoisehg/hgqt/settings.py:697 tortoisehg/hgtk/thgconfig.py:649
msgid "Can't change settings without iniparse package - view is readonly."
msgstr ""
"Неможливо змінити налаштування без пакунку для розбору ini-файлів - перегляд "
"лише для читання."
-#: tortoisehg/hgqt/settings.py:615
+#: tortoisehg/hgqt/settings.py:721
#, python-format
msgid "%s's global settings"
-msgstr ""
-
-#: tortoisehg/hgqt/settings.py:629 tortoisehg/hgtk/thgconfig.py:638
+msgstr "%s'і загальні налаштування"
+
+#: tortoisehg/hgqt/settings.py:735 tortoisehg/hgtk/thgconfig.py:638
msgid "No repository found"
msgstr "Не знайдено сховища"
-#: tortoisehg/hgqt/settings.py:630 tortoisehg/hgtk/thgconfig.py:639
+#: tortoisehg/hgqt/settings.py:736 tortoisehg/hgtk/thgconfig.py:639
msgid "no repo at "
msgstr "немає сховища у "
-#: tortoisehg/hgqt/settings.py:636 tortoisehg/hgtk/thgconfig.py:671
+#: tortoisehg/hgqt/settings.py:742 tortoisehg/hgtk/thgconfig.py:671
#, python-format
msgid "%s repository settings"
msgstr "налаштування %s сховища"
-#: tortoisehg/hgqt/settings.py:663
+#: tortoisehg/hgqt/settings.py:769
msgid ""
"Restart all TortoiseHg applications for the following changes to take effect:"
-msgstr ""
-
-#: tortoisehg/hgqt/settings.py:671
+msgstr "Перезавантажити всі TortoiseHg додатки аби зміни вступили в дію:"
+
+#: tortoisehg/hgqt/settings.py:777
msgid "Apply changes before exit?"
-msgstr ""
-
-#: tortoisehg/hgqt/settings.py:672 tortoisehg/hgtk/commit.py:325
-#: tortoisehg/hgtk/commit.py:1193 tortoisehg/hgtk/commit.py:1200
+msgstr "Прийняти зміни перед виходом?"
+
+#: tortoisehg/hgqt/settings.py:778 tortoisehg/hgtk/commit.py:324
+#: tortoisehg/hgtk/commit.py:1192 tortoisehg/hgtk/commit.py:1199
#: tortoisehg/hgtk/status.py:1320 tortoisehg/hgtk/thgconfig.py:848
#: tortoisehg/hgtk/thgmq.py:369
msgid "&Yes"
msgstr "&Так"
-#: tortoisehg/hgqt/settings.py:672 tortoisehg/hgtk/thgconfig.py:848
+#: tortoisehg/hgqt/settings.py:778 tortoisehg/hgtk/thgconfig.py:848
msgid "&No (discard changes)"
msgstr "&Ні (відкинути зміни)"
-#: tortoisehg/hgqt/settings.py:726
+#: tortoisehg/hgqt/settings.py:832
msgid "Settings File:"
-msgstr ""
-
-#: tortoisehg/hgqt/settings.py:769
+msgstr "Налаштування файлу:"
+
+#: tortoisehg/hgqt/settings.py:890
msgid "Confirm Save"
-msgstr ""
-
-#: tortoisehg/hgqt/settings.py:770
+msgstr "Підтвердіть запис"
+
+#: tortoisehg/hgqt/settings.py:891
msgid "Save changes before editing?"
-msgstr ""
-
-#: tortoisehg/hgqt/settings.py:771 tortoisehg/hgtk/thgconfig.py:775
+msgstr "Зберегти зміни перед редагуванням?"
+
+#: tortoisehg/hgqt/settings.py:892 tortoisehg/hgtk/thgconfig.py:775
msgid "&Save"
msgstr "&Зберегти"
-#: tortoisehg/hgqt/settings.py:829 tortoisehg/hgtk/thgconfig.py:822
+#: tortoisehg/hgqt/settings.py:954 tortoisehg/hgtk/thgconfig.py:822
msgid "Confirm Reload"
msgstr "Підтвердіть перезавантаження"
-#: tortoisehg/hgqt/settings.py:830 tortoisehg/hgtk/thgconfig.py:823
+#: tortoisehg/hgqt/settings.py:955 tortoisehg/hgtk/thgconfig.py:823
msgid ""
"Unsaved changes will be lost.\n"
"Do you want to reload?"
@@ -5668,17 +6159,17 @@"Незбережені зміни буде втрачено.\n"
"Ви хочете, щоб перезавантажити?"
-#: tortoisehg/hgqt/settings.py:936 tortoisehg/hgtk/thgconfig.py:1550
+#: tortoisehg/hgqt/settings.py:1066 tortoisehg/hgtk/thgconfig.py:1550
msgid "Unable to create a Mercurial.ini file"
msgstr "Неможливо створити Mercurial.ini файл"
-#: tortoisehg/hgqt/settings.py:937
+#: tortoisehg/hgqt/settings.py:1067
msgid "Insufficient access rights, reverting to read-only mode."
msgstr ""
#: tortoisehg/hgqt/shellconf.py:86
msgid "Contex Menu"
-msgstr ""
+msgstr "Контекстне меню"
#: tortoisehg/hgqt/shellconf.py:88 tortoisehg/hgtk/shellconf.py:82
msgid "Top menu items:"
@@ -5690,7 +6181,7 @@
#: tortoisehg/hgqt/shellconf.py:118 tortoisehg/hgtk/shellconf.py:112
msgid "Menu Behavior"
-msgstr ""
+msgstr "Меню поведінки"
#: tortoisehg/hgqt/shellconf.py:120 tortoisehg/hgtk/shellconf.py:120
msgid "Hide context menu outside repositories"
@@ -5707,11 +6198,11 @@
#: tortoisehg/hgqt/shellconf.py:133 tortoisehg/hgtk/shellconf.py:129
msgid "Overlays"
-msgstr "Позначки"
+msgstr "Оверлеї"
#: tortoisehg/hgqt/shellconf.py:137
msgid "Enabled overlays"
-msgstr ""
+msgstr "Включити перезапис"
#: tortoisehg/hgqt/shellconf.py:139 tortoisehg/hgtk/shellconf.py:138
msgid "Local disks only"
@@ -5735,7 +6226,7 @@
#: tortoisehg/hgqt/shellconf.py:155 tortoisehg/hgtk/shellconf.py:173
msgid "Ignored*"
-msgstr "ігнорується*"
+msgstr "Ігнорується*"
#: tortoisehg/hgqt/shellconf.py:157 tortoisehg/hgtk/shellconf.py:161
msgid "Unversioned"
@@ -5771,7 +6262,7 @@
#: tortoisehg/hgqt/shelve.py:65 tortoisehg/hgqt/shelve.py:94
msgid "Clear"
-msgstr ""
+msgstr "Очистити"
#: tortoisehg/hgqt/shelve.py:66 tortoisehg/hgqt/shelve.py:95
msgid "Clear the current shelf file"
@@ -5783,7 +6274,7 @@
#: tortoisehg/hgqt/shelve.py:110
msgid "Left Toolbar"
-msgstr ""
+msgstr "Ліва панель інструментів"
#: tortoisehg/hgqt/shelve.py:112 tortoisehg/hgqt/shelve.py:163
msgid "Delete selected chunks"
@@ -5791,15 +6282,15 @@
#: tortoisehg/hgqt/shelve.py:116
msgid "Move all files right"
-msgstr ""
+msgstr "Перемістити всі файли праворуч"
#: tortoisehg/hgqt/shelve.py:120
msgid "Move selected file right"
-msgstr ""
+msgstr "Перемістити обрані файли праворуч"
#: tortoisehg/hgqt/shelve.py:124 tortoisehg/hgqt/shelve.py:152
msgid "Edit file"
-msgstr ""
+msgstr "Редагувати файл"
#: tortoisehg/hgqt/shelve.py:127
msgid "Move selected chunks right"
@@ -5807,10 +6298,10 @@
#: tortoisehg/hgqt/shelve.py:132
msgid "Refresh Toolbar"
-msgstr ""
-
-#: tortoisehg/hgqt/shelve.py:135 tortoisehg/hgqt/status.py:231
-#: tortoisehg/hgqt/status.py:242 tortoisehg/hgtk/commit.py:241
+msgstr "Оновити панель інструментів"
+
+#: tortoisehg/hgqt/shelve.py:135 tortoisehg/hgqt/status.py:244
+#: tortoisehg/hgqt/status.py:257 tortoisehg/hgtk/commit.py:240
#: tortoisehg/hgtk/hgignore.py:142 tortoisehg/hgtk/history.py:404
msgid "Refresh"
msgstr "Оновити"
@@ -5821,7 +6312,7 @@
#: tortoisehg/hgqt/shelve.py:145
msgid "Right Toolbar"
-msgstr ""
+msgstr "Права панель"
#: tortoisehg/hgqt/shelve.py:148
msgid "Move selected chunks left"
@@ -5854,476 +6345,476 @@
#: tortoisehg/hgqt/shelve.py:265
msgid "File already exists"
-msgstr ""
+msgstr "Файл вже існує"
#: tortoisehg/hgqt/shelve.py:266
msgid "A shelf file of that name already exists"
msgstr ""
-#: tortoisehg/hgqt/shelve.py:269
+#: tortoisehg/hgqt/shelve.py:270
msgid "New shelf created"
msgstr ""
-#: tortoisehg/hgqt/shelve.py:280 tortoisehg/hgqt/shelve.py:293
-#: tortoisehg/hgqt/shelve.py:306 tortoisehg/hgqt/shelve.py:321
-#: tortoisehg/hgqt/shelve.py:335
+#: tortoisehg/hgqt/shelve.py:281 tortoisehg/hgqt/shelve.py:294
+#: tortoisehg/hgqt/shelve.py:307 tortoisehg/hgqt/shelve.py:322
+#: tortoisehg/hgqt/shelve.py:336
msgid "Are you sure?"
-msgstr ""
-
-#: tortoisehg/hgqt/shelve.py:281 tortoisehg/hgqt/shelve.py:322
+msgstr "Ви впевнені?"
+
+#: tortoisehg/hgqt/shelve.py:282 tortoisehg/hgqt/shelve.py:323
#, python-format
msgid "Delete shelf file %s?"
msgstr ""
-#: tortoisehg/hgqt/shelve.py:285 tortoisehg/hgqt/shelve.py:326
+#: tortoisehg/hgqt/shelve.py:286 tortoisehg/hgqt/shelve.py:327
msgid "Shelf deleted"
msgstr ""
-#: tortoisehg/hgqt/shelve.py:294
+#: tortoisehg/hgqt/shelve.py:295
msgid "Revert all working copy changes?"
-msgstr ""
-
-#: tortoisehg/hgqt/shelve.py:307 tortoisehg/hgqt/shelve.py:336
+msgstr "Повернути всі робочі копії змін?"
+
+#: tortoisehg/hgqt/shelve.py:308 tortoisehg/hgqt/shelve.py:337
#, python-format
msgid "Clear contents of shelf file %s?"
msgstr ""
-#: tortoisehg/hgqt/shelve.py:312 tortoisehg/hgqt/shelve.py:341
+#: tortoisehg/hgqt/shelve.py:313 tortoisehg/hgqt/shelve.py:342
msgid "Shelf cleared"
msgstr ""
-#: tortoisehg/hgqt/shelve.py:378
+#: tortoisehg/hgqt/shelve.py:379
#, python-format
msgid "Shelf: %s"
msgstr ""
-#: tortoisehg/hgqt/shelve.py:381
+#: tortoisehg/hgqt/shelve.py:382
#, python-format
msgid "Patch: %s"
-msgstr ""
-
-#: tortoisehg/hgqt/status.py:96
-msgid "Refresh file list"
-msgstr ""
-
-#: tortoisehg/hgqt/status.py:101
+msgstr "Латка: %s"
+
+#: tortoisehg/hgqt/status.py:100
msgid "### filter text ###"
-msgstr ""
-
-#: tortoisehg/hgqt/status.py:103
+msgstr "### текст фільтру ###"
+
+#: tortoisehg/hgqt/status.py:102
msgid "Filter:"
-msgstr ""
+msgstr "Фільтр:"
+
+#: tortoisehg/hgqt/status.py:113
+msgid "Check all files"
+msgstr "Перевірити всі файли"
#: tortoisehg/hgqt/status.py:114
+msgid "Uncheck all files"
+msgstr "Роззвірити всі файли"
+
+#: tortoisehg/hgqt/status.py:119
msgid "Status File List Toolbar"
msgstr ""
-#: tortoisehg/hgqt/status.py:133 tortoisehg/hgtk/status.py:330
+#: tortoisehg/hgqt/status.py:141 tortoisehg/hgtk/status.py:330
msgid "Remove filter, show root"
msgstr "Вилучити фільтр, показати корінь"
-#: tortoisehg/hgqt/status.py:140
-msgid "Check all files"
-msgstr ""
-
-#: tortoisehg/hgqt/status.py:144
-msgid "Uncheck all files"
-msgstr ""
-
-#: tortoisehg/hgqt/status.py:197
+#: tortoisehg/hgqt/status.py:198
#, python-format
msgid "%s - status (selection filtered)"
msgstr ""
-#: tortoisehg/hgqt/status.py:199
+#: tortoisehg/hgqt/status.py:200
#, python-format
msgid "%s - status"
-msgstr ""
-
-#: tortoisehg/hgqt/status.py:231 tortoisehg/hgtk/browse.py:112
+msgstr "%s - стан"
+
+#: tortoisehg/hgqt/status.py:244 tortoisehg/hgtk/browse.py:112
#: tortoisehg/hgtk/quickop.py:106 tortoisehg/hgtk/status.py:95
msgid "status"
msgstr "стан"
-#: tortoisehg/hgqt/status.py:257 tortoisehg/hgtk/quickop.py:186
+#: tortoisehg/hgqt/status.py:272 tortoisehg/hgtk/quickop.py:186
msgid "No appropriate files"
msgstr "Немає відповідних файлів"
-#: tortoisehg/hgqt/status.py:258 tortoisehg/hgtk/quickop.py:187
+#: tortoisehg/hgqt/status.py:273 tortoisehg/hgtk/quickop.py:187
msgid "No files found for this operation"
msgstr "Не знайдено файлів для цієї операції"
-#: tortoisehg/hgqt/status.py:305
-#, python-format
-msgid "Checked count: %d"
-msgstr ""
-
-#: tortoisehg/hgqt/status.py:546
+#: tortoisehg/hgqt/status.py:582
msgid "Stat"
-msgstr "Статус"
-
-#: tortoisehg/hgqt/status.py:546
+msgstr "Статистика"
+
+#: tortoisehg/hgqt/status.py:582
msgid "M"
-msgstr ""
-
-#: tortoisehg/hgqt/status.py:546 tortoisehg/hgtk/datamine.py:140
+msgstr "М"
+
+#: tortoisehg/hgqt/status.py:582 tortoisehg/hgtk/datamine.py:140
msgid "Filename"
msgstr "Назва файлу"
-#: tortoisehg/hgqt/status.py:547 tortoisehg/hgtk/thgconfig.py:414
+#: tortoisehg/hgqt/status.py:583 tortoisehg/hgtk/thgconfig.py:414
msgid "Type"
msgstr "Тип"
-#: tortoisehg/hgqt/status.py:547
+#: tortoisehg/hgqt/status.py:583
msgid "Size (KB)"
-msgstr ""
-
-#: tortoisehg/hgqt/status.py:730
+msgstr "Розмір (Кб)"
+
+#: tortoisehg/hgqt/status.py:619
+#, python-format
+msgid "Checked count: %d"
+msgstr "Перевірена кількість: %d"
+
+#: tortoisehg/hgqt/status.py:768
msgid ", resolved merge"
-msgstr ""
-
-#: tortoisehg/hgqt/status.py:732
+msgstr ", об'єднавши розвязки"
+
+#: tortoisehg/hgqt/status.py:770
msgid ", unresolved merge"
msgstr ""
-#: tortoisehg/hgqt/status.py:745
+#: tortoisehg/hgqt/status.py:783
#, python-format
msgid "%s is modified"
-msgstr ""
-
-#: tortoisehg/hgqt/status.py:746 tortoisehg/hgtk/quickop.py:163
+msgstr "%s змінено"
+
+#: tortoisehg/hgqt/status.py:784 tortoisehg/hgtk/quickop.py:163
msgid "modified"
msgstr "змінено"
-#: tortoisehg/hgqt/status.py:747
+#: tortoisehg/hgqt/status.py:785
#, python-format
msgid "%s is added"
-msgstr ""
-
-#: tortoisehg/hgqt/status.py:748 tortoisehg/hgtk/quickop.py:166
+msgstr "%s додано"
+
+#: tortoisehg/hgqt/status.py:786 tortoisehg/hgtk/quickop.py:166
msgid "added"
msgstr "додано"
-#: tortoisehg/hgqt/status.py:749
+#: tortoisehg/hgqt/status.py:787
#, python-format
msgid "%s is removed"
-msgstr ""
-
-#: tortoisehg/hgqt/status.py:750 tortoisehg/hgtk/quickop.py:169
+msgstr "%s видаляється"
+
+#: tortoisehg/hgqt/status.py:788 tortoisehg/hgtk/quickop.py:169
msgid "removed"
msgstr "видалено"
-#: tortoisehg/hgqt/status.py:751
+#: tortoisehg/hgqt/status.py:789
#, python-format
msgid "%s is not tracked (unknown)"
msgstr ""
-#: tortoisehg/hgqt/status.py:752 tortoisehg/hgtk/quickop.py:175
+#: tortoisehg/hgqt/status.py:790 tortoisehg/hgtk/quickop.py:175
#: tortoisehg/hgtk/quickop.py:255 tortoisehg/hgtk/serve.py:127
#: tortoisehg/util/version.py:47 tortoisehg/util/version.py:73
msgid "unknown"
msgstr "невідомо"
-#: tortoisehg/hgqt/status.py:753
+#: tortoisehg/hgqt/status.py:791
#, python-format
msgid "%s is missing!"
-msgstr ""
-
-#: tortoisehg/hgqt/status.py:754
+msgstr "%s відсутній!"
+
+#: tortoisehg/hgqt/status.py:792
msgid "deleted"
-msgstr ""
-
-#: tortoisehg/hgqt/status.py:755
+msgstr "видалено"
+
+#: tortoisehg/hgqt/status.py:793
#, python-format
msgid "%s is ignored"
-msgstr ""
-
-#: tortoisehg/hgqt/status.py:756 tortoisehg/hgtk/quickop.py:179
+msgstr "%s проігнорований"
+
+#: tortoisehg/hgqt/status.py:794 tortoisehg/hgtk/quickop.py:179
#: tortoisehg/hgtk/quickop.py:255
msgid "ignored"
msgstr "ігноровано"
-#: tortoisehg/hgqt/status.py:757
+#: tortoisehg/hgqt/status.py:795
#, python-format
msgid "%s is not modified (clean)"
-msgstr ""
-
-#: tortoisehg/hgqt/status.py:758 tortoisehg/hgtk/quickop.py:183
+msgstr "%s не змінений (первісний)"
+
+#: tortoisehg/hgqt/status.py:796 tortoisehg/hgtk/quickop.py:183
msgid "clean"
-msgstr "чистий"
-
-#: tortoisehg/hgqt/status.py:759
+msgstr "чиста"
+
+#: tortoisehg/hgqt/status.py:797
#, python-format
msgid "%s is a dirty subrepo"
msgstr ""
-#: tortoisehg/hgqt/status.py:760
+#: tortoisehg/hgqt/status.py:798
msgid "subrepo"
-msgstr ""
-
-#: tortoisehg/hgqt/sync.py:41
+msgstr "вкладене сховище"
+
+#: tortoisehg/hgqt/sync.py:39
msgid "Malformed ssh URL"
-msgstr ""
-
-#: tortoisehg/hgqt/sync.py:89
+msgstr "Потворний ssh URL"
+
+#: tortoisehg/hgqt/sync.py:94
msgid "TortoiseHg Sync"
-msgstr ""
-
-#: tortoisehg/hgqt/sync.py:107
+msgstr "Обмін TortoiseHg"
+
+#: tortoisehg/hgqt/sync.py:112
msgid "Preview incoming changesets from remote repository"
-msgstr ""
-
-#: tortoisehg/hgqt/sync.py:110
+msgstr "Перегляд вхідного набору змін з віддаленого сховища"
+
+#: tortoisehg/hgqt/sync.py:115
msgid "Pull incoming changesets from remote repository"
msgstr ""
-#: tortoisehg/hgqt/sync.py:113
+#: tortoisehg/hgqt/sync.py:118
msgid "Filter outgoing changesets to remote repository"
msgstr ""
-#: tortoisehg/hgqt/sync.py:116
+#: tortoisehg/hgqt/sync.py:121
msgid "Push outgoing changesets to remote repository"
msgstr ""
-#: tortoisehg/hgqt/sync.py:118
+#: tortoisehg/hgqt/sync.py:123
msgid "Email outgoing changesets for remote repository"
msgstr ""
-#: tortoisehg/hgqt/sync.py:123
+#: tortoisehg/hgqt/sync.py:128
msgid "Manage pending perforce changelists"
msgstr ""
-#: tortoisehg/hgqt/sync.py:130
+#: tortoisehg/hgqt/sync.py:134
+msgid "Unbundle"
+msgstr ""
+
+#: tortoisehg/hgqt/sync.py:138
msgid "Stop current operation"
-msgstr ""
-
-#: tortoisehg/hgqt/sync.py:144 tortoisehg/hgqt/update.py:68
+msgstr "Зупинити поточну операцію"
+
+#: tortoisehg/hgqt/sync.py:152 tortoisehg/hgqt/update.py:68
#: tortoisehg/hgtk/update.py:78
msgid "Target:"
msgstr "Об'єкт:"
-#: tortoisehg/hgqt/sync.py:154
+#: tortoisehg/hgqt/sync.py:162
msgid "<b>Selected Options:</b>"
-msgstr ""
-
-#: tortoisehg/hgqt/sync.py:164
+msgstr "<b>Обрані параметри:</b>"
+
+#: tortoisehg/hgqt/sync.py:172
msgid "<b>Remote Repository:</b>"
-msgstr ""
+msgstr "<b>віддалене сховище:</b>"
#: tortoisehg/hgqt/sync.py:183
+msgid "Path Edit Toolbar"
+msgstr ""
+
+#: tortoisehg/hgqt/sync.py:192
+msgid "Security"
+msgstr "Безпека"
+
+#: tortoisehg/hgqt/sync.py:193
msgid "Manage HTTPS connection security and user authentication"
msgstr ""
-#: tortoisehg/hgqt/sync.py:187
+#: tortoisehg/hgqt/sync.py:198
msgid "Hostname"
-msgstr ""
-
-#: tortoisehg/hgqt/sync.py:214
+msgstr "Назва вузла"
+
+#: tortoisehg/hgqt/sync.py:226 tortoisehg/hgqt/webconf_ui.py:77
+msgid "Save"
+msgstr "Зберегти"
+
+#: tortoisehg/hgqt/sync.py:227
msgid "Save current URL under an alias"
msgstr ""
-#: tortoisehg/hgqt/sync.py:228
+#: tortoisehg/hgqt/sync.py:241
msgid "Paths in Repository Settings:"
-msgstr ""
-
-#: tortoisehg/hgqt/sync.py:243
+msgstr "Шлях до налаштувань сховища"
+
+#: tortoisehg/hgqt/sync.py:256
msgid "Related Paths:"
msgstr ""
-#: tortoisehg/hgqt/sync.py:277
+#: tortoisehg/hgqt/sync.py:293
#, python-format
msgid "Preview incoming changesets from %s"
msgstr ""
-#: tortoisehg/hgqt/sync.py:278
+#: tortoisehg/hgqt/sync.py:294
#, python-format
msgid "Pull incoming changesets from %s"
msgstr ""
-#: tortoisehg/hgqt/sync.py:279
+#: tortoisehg/hgqt/sync.py:295
#, python-format
msgid "Filter outgoing changesets to %s"
msgstr ""
-#: tortoisehg/hgqt/sync.py:280
+#: tortoisehg/hgqt/sync.py:296
#, python-format
msgid "Push outgoing changesets to %s"
msgstr ""
-#: tortoisehg/hgqt/sync.py:287
+#: tortoisehg/hgqt/sync.py:303
#, python-format
msgid "rev: %d (%s)"
-msgstr ""
-
-#: tortoisehg/hgqt/sync.py:292 tortoisehg/hgtk/commit.py:792
+msgstr "ревізія: %d (%s)"
+
+#: tortoisehg/hgqt/sync.py:308 tortoisehg/hgtk/commit.py:791
msgid "branch: "
-msgstr "Гілка: "
-
-#: tortoisehg/hgqt/sync.py:298
+msgstr "гілка: "
+
+#: tortoisehg/hgqt/sync.py:314
msgid "bookmark: "
-msgstr ""
-
-#: tortoisehg/hgqt/sync.py:351 tortoisehg/hgtk/synch.py:157
+msgstr "закладка: "
+
+#: tortoisehg/hgqt/sync.py:367 tortoisehg/hgtk/synch.py:157
msgid "Post Pull: "
msgstr "Після отримання: "
-#: tortoisehg/hgqt/sync.py:522
+#: tortoisehg/hgqt/sync.py:538
msgid "Repository not local"
-msgstr ""
-
-#: tortoisehg/hgqt/sync.py:523
+msgstr "Сховище не локальне"
+
+#: tortoisehg/hgqt/sync.py:539
msgid "A terminal shell cannot be opened for remote"
msgstr ""
-#: tortoisehg/hgqt/sync.py:533
-msgid "Repository not found"
-msgstr ""
-
-#: tortoisehg/hgqt/sync.py:538 tortoisehg/hgqt/workbench.py:700
-msgid "No shell configured"
-msgstr ""
-
-#: tortoisehg/hgqt/sync.py:539 tortoisehg/hgqt/workbench.py:701
-msgid "A terminal shell must be configured"
-msgstr ""
-
-#: tortoisehg/hgqt/sync.py:541 tortoisehg/hgqt/sync.py:1305
+#: tortoisehg/hgqt/sync.py:544 tortoisehg/hgqt/sync.py:1338
msgid "Confirm path delete"
-msgstr ""
-
-#: tortoisehg/hgqt/sync.py:542 tortoisehg/hgqt/sync.py:1306
+msgstr "Підтвердіть видалення шляху"
+
+#: tortoisehg/hgqt/sync.py:545 tortoisehg/hgqt/sync.py:1339
#, python-format
msgid "Delete %s from your repo configuration file?"
msgstr ""
-#: tortoisehg/hgqt/sync.py:622
+#: tortoisehg/hgqt/sync.py:628
msgid "No URL selected"
msgstr ""
-#: tortoisehg/hgqt/sync.py:623
+#: tortoisehg/hgqt/sync.py:629
msgid "An URL must be selected for this operation."
msgstr ""
-#: tortoisehg/hgqt/sync.py:638
+#: tortoisehg/hgqt/sync.py:644
msgid "Redundant authentication info"
-msgstr ""
-
-#: tortoisehg/hgqt/sync.py:639
+msgstr "Резервна інформація аутентифікації"
+
+#: tortoisehg/hgqt/sync.py:645
msgid ""
"You have authentication info configured for this host and inside this URL. "
"Remove authentication info from this URL?"
msgstr ""
-#: tortoisehg/hgqt/sync.py:658 tortoisehg/hgqt/sync.py:664
-#: tortoisehg/hgqt/sync.py:670 tortoisehg/hgqt/sync.py:676
-#: tortoisehg/hgqt/sync.py:683
+#: tortoisehg/hgqt/sync.py:664 tortoisehg/hgqt/sync.py:670
+#: tortoisehg/hgqt/sync.py:676 tortoisehg/hgqt/sync.py:682
+#: tortoisehg/hgqt/sync.py:689
msgid "sync command already running"
-msgstr ""
-
-#: tortoisehg/hgqt/sync.py:701
+msgstr "команда синхронізації вже запущена"
+
+#: tortoisehg/hgqt/sync.py:707
#, python-format
msgid "Getting incoming changesets from %s..."
msgstr ""
-#: tortoisehg/hgqt/sync.py:706 tortoisehg/hgqt/sync.py:724
+#: tortoisehg/hgqt/sync.py:712 tortoisehg/hgqt/sync.py:730
#, python-format
msgid "Found incoming changesets from %s"
msgstr ""
-#: tortoisehg/hgqt/sync.py:709 tortoisehg/hgqt/sync.py:726
+#: tortoisehg/hgqt/sync.py:715 tortoisehg/hgqt/sync.py:732
#, python-format
msgid "No incoming changesets from %s"
msgstr ""
-#: tortoisehg/hgqt/sync.py:711 tortoisehg/hgqt/sync.py:728
+#: tortoisehg/hgqt/sync.py:717 tortoisehg/hgqt/sync.py:734
#, python-format
msgid "Incoming from %s aborted, ret %d"
msgstr ""
-#: tortoisehg/hgqt/sync.py:738
+#: tortoisehg/hgqt/sync.py:744
#, python-format
msgid "Pull from %s completed"
msgstr ""
-#: tortoisehg/hgqt/sync.py:740
+#: tortoisehg/hgqt/sync.py:746
#, python-format
msgid "Pull from %s aborted, ret %d"
msgstr ""
-#: tortoisehg/hgqt/sync.py:752 tortoisehg/hgqt/update.py:333
+#: tortoisehg/hgqt/sync.py:758 tortoisehg/hgqt/update.py:335
msgid "Merge caused file conflicts"
msgstr ""
-#: tortoisehg/hgqt/sync.py:753 tortoisehg/hgqt/update.py:334
+#: tortoisehg/hgqt/sync.py:759 tortoisehg/hgqt/update.py:336
msgid "File conflicts need to be resolved"
msgstr ""
-#: tortoisehg/hgqt/sync.py:759
+#: tortoisehg/hgqt/sync.py:765
#, python-format
msgid "Pulling from %s..."
msgstr ""
-#: tortoisehg/hgqt/sync.py:774
+#: tortoisehg/hgqt/sync.py:780
#, python-format
msgid "Finding outgoing changesets to %s..."
msgstr ""
-#: tortoisehg/hgqt/sync.py:786
+#: tortoisehg/hgqt/sync.py:792
#, python-format
msgid "%d outgoing changesets to %s"
msgstr ""
-#: tortoisehg/hgqt/sync.py:789
+#: tortoisehg/hgqt/sync.py:795
#, python-format
msgid "No outgoing changesets to %s"
msgstr ""
-#: tortoisehg/hgqt/sync.py:791
+#: tortoisehg/hgqt/sync.py:797
#, python-format
msgid "Outgoing to %s aborted, ret %d"
msgstr ""
-#: tortoisehg/hgqt/sync.py:816 tortoisehg/hgtk/history.py:584
+#: tortoisehg/hgqt/sync.py:822 tortoisehg/hgtk/history.py:584
#, python-format
msgid "%s (submitted)"
msgstr "%s (представлений)"
-#: tortoisehg/hgqt/sync.py:818 tortoisehg/hgtk/history.py:586
+#: tortoisehg/hgqt/sync.py:824 tortoisehg/hgtk/history.py:586
#: tortoisehg/hgtk/history.py:592
#, python-format
msgid "%s (pending)"
msgstr "%s (в очікуванні)"
-#: tortoisehg/hgqt/sync.py:823 tortoisehg/hgtk/history.py:595
+#: tortoisehg/hgqt/sync.py:829 tortoisehg/hgtk/history.py:595
msgid "Unable to parse p4pending output"
msgstr "Не вдалося розібрати p4pending вихідний"
-#: tortoisehg/hgqt/sync.py:825 tortoisehg/hgtk/history.py:597
+#: tortoisehg/hgqt/sync.py:831 tortoisehg/hgtk/history.py:597
#, python-format
msgid "%d pending changelists found"
msgstr "%d переліку змін знайдено"
-#: tortoisehg/hgqt/sync.py:827 tortoisehg/hgtk/history.py:599
+#: tortoisehg/hgqt/sync.py:833 tortoisehg/hgtk/history.py:599
msgid "No pending Perforce changelists"
msgstr "Не очікуваний Perforce набір змін"
-#: tortoisehg/hgqt/sync.py:829 tortoisehg/hgtk/history.py:601
+#: tortoisehg/hgqt/sync.py:835 tortoisehg/hgtk/history.py:601
msgid "Aborted p4pending"
msgstr "перервано p4pending"
-#: tortoisehg/hgqt/sync.py:831 tortoisehg/hgtk/history.py:603
+#: tortoisehg/hgqt/sync.py:837 tortoisehg/hgtk/history.py:603
msgid "Unable to determine pending changesets"
msgstr "Неможливо визначити набор змін"
-#: tortoisehg/hgqt/sync.py:841
+#: tortoisehg/hgqt/sync.py:847
msgid "Perforce pending..."
msgstr ""
-#: tortoisehg/hgqt/sync.py:848 tortoisehg/hgtk/history.py:2623
+#: tortoisehg/hgqt/sync.py:855 tortoisehg/hgtk/history.py:2623
msgid "Confirm Push to remote Repository"
msgstr "Підтвердіть відправлення до зовнішнього сховища"
-#: tortoisehg/hgqt/sync.py:849 tortoisehg/hgtk/history.py:2624
+#: tortoisehg/hgqt/sync.py:856 tortoisehg/hgtk/history.py:2624
#, python-format
msgid ""
"Push to remote repository\n"
@@ -6334,167 +6825,170 @@"%s\n"
"?"
-#: tortoisehg/hgqt/sync.py:852
+#: tortoisehg/hgqt/sync.py:859
#, python-format
msgid "Push to %s aborted"
-msgstr ""
-
-#: tortoisehg/hgqt/sync.py:855
+msgstr "відправка до %s перервана"
+
+#: tortoisehg/hgqt/sync.py:863
#, python-format
msgid "Pushing to %s..."
-msgstr ""
-
-#: tortoisehg/hgqt/sync.py:858
+msgstr "відправляння до %s..."
+
+#: tortoisehg/hgqt/sync.py:866
#, python-format
msgid "Push to %s completed"
-msgstr ""
-
-#: tortoisehg/hgqt/sync.py:860
+msgstr "відправка до %s завершена"
+
+#: tortoisehg/hgqt/sync.py:868
#, python-format
msgid "Push to %s aborted, ret %d"
-msgstr ""
-
-#: tortoisehg/hgqt/sync.py:872
+msgstr "Відправка до %s перервана, ret %d"
+
+#: tortoisehg/hgqt/sync.py:885
msgid "Determining outgoing changesets to email..."
msgstr ""
-#: tortoisehg/hgqt/sync.py:876 tortoisehg/hgtk/history.py:2021
-#, python-format
-msgid "%d outgoing changesets"
-msgstr "%d вихідні набори змін"
-
-#: tortoisehg/hgqt/sync.py:886 tortoisehg/hgtk/history.py:2025
+#: tortoisehg/hgqt/sync.py:899 tortoisehg/hgtk/history.py:2025
msgid "No outgoing changesets"
msgstr "Відсутні вихідні набори змін"
-#: tortoisehg/hgqt/sync.py:888
+#: tortoisehg/hgqt/sync.py:901
#, python-format
msgid "Outgoing aborted, ret %d"
msgstr ""
-#: tortoisehg/hgqt/sync.py:900
+#: tortoisehg/hgqt/sync.py:908
+msgid "Select bundle file"
+msgstr ""
+
+#: tortoisehg/hgqt/sync.py:909
+msgid "Bundle files (*.hg)"
+msgstr ""
+
+#: tortoisehg/hgqt/sync.py:928
msgid "Unable to remove URL"
-msgstr ""
-
-#: tortoisehg/hgqt/sync.py:922
+msgstr "Неможливо видалити URL"
+
+#: tortoisehg/hgqt/sync.py:950
msgid "Post Pull Behavior"
msgstr ""
-#: tortoisehg/hgqt/sync.py:926
+#: tortoisehg/hgqt/sync.py:954
msgid "Select post-pull operation for this repository"
msgstr ""
-#: tortoisehg/hgqt/sync.py:929
+#: tortoisehg/hgqt/sync.py:957
msgid "None - simply pull changesets"
msgstr ""
-#: tortoisehg/hgqt/sync.py:930
+#: tortoisehg/hgqt/sync.py:958
msgid "Update - pull, then try to update"
msgstr ""
-#: tortoisehg/hgqt/sync.py:936
+#: tortoisehg/hgqt/sync.py:964
msgid "Fetch - use fetch (auto merge pulled changes)"
msgstr ""
-#: tortoisehg/hgqt/sync.py:938
+#: tortoisehg/hgqt/sync.py:966
msgid "Fetch - use fetch extension (fetch is not active!)"
msgstr ""
-#: tortoisehg/hgqt/sync.py:945
+#: tortoisehg/hgqt/sync.py:973
msgid "Rebase - rebase local commits above pulled changes"
msgstr ""
-#: tortoisehg/hgqt/sync.py:947
+#: tortoisehg/hgqt/sync.py:975
msgid "Rebase - use rebase extension (rebase is not active!)"
msgstr ""
-#: tortoisehg/hgqt/sync.py:965
+#: tortoisehg/hgqt/sync.py:993
msgid "<a href=\"config\">Launch settings tool...</a>"
msgstr ""
-#: tortoisehg/hgqt/sync.py:998
+#: tortoisehg/hgqt/sync.py:1026
msgid "Unable to save post pull operation"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1022
+#: tortoisehg/hgqt/sync.py:1050
msgid "Save Path"
-msgstr ""
-
-#: tortoisehg/hgqt/sync.py:1032 tortoisehg/hgqt/sync.py:1349
+msgstr "Зберегти шлях"
+
+#: tortoisehg/hgqt/sync.py:1060 tortoisehg/hgqt/sync.py:1382
#: tortoisehg/hgtk/thgconfig.py:371 tortoisehg/hgtk/thgconfig.py:954
msgid "Alias"
-msgstr "Псевдонім"
-
-#: tortoisehg/hgqt/sync.py:1035 tortoisehg/hgqt/sync.py:1349
+msgstr "Прізвисько"
+
+#: tortoisehg/hgqt/sync.py:1063 tortoisehg/hgqt/sync.py:1382
#: tortoisehg/hgtk/thgconfig.py:368
msgid "URL"
msgstr "URL"
-#: tortoisehg/hgqt/sync.py:1044
+#: tortoisehg/hgqt/sync.py:1072
msgid "Remove authentication data from URL"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1046
+#: tortoisehg/hgqt/sync.py:1074
msgid ""
"User authentication data should be associated with the hostname using the "
"security dialog."
msgstr ""
-#: tortoisehg/hgqt/sync.py:1068
+#: tortoisehg/hgqt/sync.py:1096
msgid "Unable to save an URL"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1079
+#: tortoisehg/hgqt/sync.py:1107
msgid "Confirm URL replace"
-msgstr ""
-
-#: tortoisehg/hgqt/sync.py:1080
+msgstr "Підтвердіть заміну URL"
+
+#: tortoisehg/hgqt/sync.py:1108
#, python-format
msgid "%s already exists, replace URL?"
-msgstr ""
-
-#: tortoisehg/hgqt/sync.py:1104
+msgstr "%s вже існує, замінити URL?"
+
+#: tortoisehg/hgqt/sync.py:1132
msgid "Certificate Query Error"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1117
+#: tortoisehg/hgqt/sync.py:1145
msgid "Security: "
-msgstr ""
-
-#: tortoisehg/hgqt/sync.py:1132
+msgstr "Безпека: "
+
+#: tortoisehg/hgqt/sync.py:1164
#, python-format
msgid "<b>Host:</b> %s"
-msgstr ""
-
-#: tortoisehg/hgqt/sync.py:1134
+msgstr "<b>вузол:</b> %s"
+
+#: tortoisehg/hgqt/sync.py:1166
msgid "Secure HTTPS Connection"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1141
+#: tortoisehg/hgqt/sync.py:1173
msgid "Verify with Certificate Authority certificates (best)"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1143
+#: tortoisehg/hgqt/sync.py:1175
msgid "Verify with stored host fingerprint (good)"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1145
+#: tortoisehg/hgqt/sync.py:1177
msgid "No host validation, but still encrypted (bad)"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1152
+#: tortoisehg/hgqt/sync.py:1184
msgid "### host certificate fingerprint ###"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1156
+#: tortoisehg/hgqt/sync.py:1188
msgid "Query"
-msgstr ""
-
-#: tortoisehg/hgqt/sync.py:1175
+msgstr "Запит"
+
+#: tortoisehg/hgqt/sync.py:1207
msgid "User Authentication"
-msgstr ""
-
-#: tortoisehg/hgqt/sync.py:1182
+msgstr "Аутентифікація користувача"
+
+#: tortoisehg/hgqt/sync.py:1214
msgid ""
"Optional. Username to authenticate with. If not given, and the remote\n"
"site requires basic or digest authentication, the user will be prompted for\n"
@@ -6502,84 +6996,84 @@"foo.username = $USER."
msgstr ""
-#: tortoisehg/hgqt/sync.py:1191
+#: tortoisehg/hgqt/sync.py:1223
msgid ""
"Optional. Password to authenticate with. If not given, and the remote\n"
"site requires basic or digest authentication, the user will be prompted for\n"
"it."
msgstr ""
-#: tortoisehg/hgqt/sync.py:1198
+#: tortoisehg/hgqt/sync.py:1230
msgid ""
"Mercurial keyring extension is enabled. Passwords will be stored in a "
"platform-native secure method."
msgstr ""
-#: tortoisehg/hgqt/sync.py:1204
+#: tortoisehg/hgqt/sync.py:1236
msgid ""
"Optional. PEM encoded client certificate key file. Environment variables\n"
"are expanded in the filename."
msgstr ""
-#: tortoisehg/hgqt/sync.py:1206
+#: tortoisehg/hgqt/sync.py:1238
msgid "User Certificate Key File"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1210
+#: tortoisehg/hgqt/sync.py:1242
msgid ""
"Optional. PEM encoded client certificate chain file. Environment variables\n"
"are expanded in the filename."
msgstr ""
-#: tortoisehg/hgqt/sync.py:1212
+#: tortoisehg/hgqt/sync.py:1244
msgid "User Certificate Chain File"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1232
+#: tortoisehg/hgqt/sync.py:1264
msgid "Unable to save authentication"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1393
+#: tortoisehg/hgqt/sync.py:1426
#, python-format
msgid "%s - sync options"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1400
+#: tortoisehg/hgqt/sync.py:1433
msgid "Allow push of a new branch (--new-branch)"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1405
+#: tortoisehg/hgqt/sync.py:1438
msgid "Force push or pull (override safety checks, --force)"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1415
+#: tortoisehg/hgqt/sync.py:1448
msgid "Temporarily disable configured HTTP proxy"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1422
+#: tortoisehg/hgqt/sync.py:1455
msgid "Emit debugging output (--debug)"
msgstr ""
#: tortoisehg/hgqt/tag.py:29 tortoisehg/hgtk/tagadd.py:31
#, python-format
msgid "Tag - %s"
-msgstr "Мітка - %s"
+msgstr "Ярлик - %s"
#: tortoisehg/hgqt/tag.py:58 tortoisehg/hgtk/tagadd.py:57
msgid "Tag:"
-msgstr "Мітка:"
+msgstr "Ярлик:"
#: tortoisehg/hgqt/tag.py:61
msgid "Tagged:"
-msgstr ""
+msgstr "Ярликом:"
#: tortoisehg/hgqt/tag.py:76
msgid "Local tag"
-msgstr ""
+msgstr "Локальний ярлик"
#: tortoisehg/hgqt/tag.py:78
msgid "Replace existing tag (-f/--force)"
-msgstr ""
+msgstr "Замінити поточний ярлик (-f/--force)"
#: tortoisehg/hgqt/tag.py:83 tortoisehg/hgtk/tagadd.py:82
msgid "Use English commit message"
@@ -6594,65 +7088,70 @@msgstr "локально"
#: tortoisehg/hgqt/tag.py:184 tortoisehg/hgtk/bookmark.py:46
-#: tortoisehg/hgtk/commit.py:262 tortoisehg/hgtk/status.py:124
+#: tortoisehg/hgtk/commit.py:261 tortoisehg/hgtk/status.py:124
msgid "Move"
msgstr "Перемістити"
#: tortoisehg/hgqt/tag.py:239
#, python-format
msgid "Tag '%s' already exists"
-msgstr ""
-
-#: tortoisehg/hgqt/tag.py:244 tortoisehg/hgqt/tag.py:300
+msgstr "Ярлик '%s' вже існує"
+
+#: tortoisehg/hgqt/tag.py:244 tortoisehg/hgqt/tag.py:307
msgid "uncommitted merge"
msgstr ""
-#: tortoisehg/hgqt/tag.py:248 tortoisehg/hgqt/tag.py:304
+#: tortoisehg/hgqt/tag.py:248 tortoisehg/hgqt/tag.py:311
msgid "not at a branch head (use force)"
-msgstr ""
-
-#: tortoisehg/hgqt/tag.py:252 tortoisehg/hgtk/tagadd.py:285
+msgstr "не вершина гілка (використовуйте force)"
+
+#: tortoisehg/hgqt/tag.py:254
+#, python-format
+msgid "Moved tag %s to changeset %s (from changeset %s)"
+msgstr ""
+
+#: tortoisehg/hgqt/tag.py:259 tortoisehg/hgtk/tagadd.py:285
#, python-format
msgid "Added tag %s for changeset %s"
-msgstr "Додана мітка %s для набору змін %s"
-
-#: tortoisehg/hgqt/tag.py:259
+msgstr "Доданий ярлик %s для набору змін %s"
+
+#: tortoisehg/hgqt/tag.py:266
#, python-format
msgid "Tag '%s' has been moved"
-msgstr ""
-
-#: tortoisehg/hgqt/tag.py:261
+msgstr "Ярлик '%s' був переміщений"
+
+#: tortoisehg/hgqt/tag.py:268
#, python-format
msgid "Tag '%s' has been added"
-msgstr ""
-
-#: tortoisehg/hgqt/tag.py:292 tortoisehg/hgtk/tagadd.py:303
+msgstr "Ярлик '%s' був доданий"
+
+#: tortoisehg/hgqt/tag.py:299 tortoisehg/hgtk/tagadd.py:303
#, python-format
msgid "tag '%s' is not a local tag"
-msgstr "мітка '%s' не є локальною міткою"
-
-#: tortoisehg/hgqt/tag.py:296 tortoisehg/hgtk/tagadd.py:306
+msgstr "ярлик '%s' не є локальним ярликом"
+
+#: tortoisehg/hgqt/tag.py:303 tortoisehg/hgtk/tagadd.py:306
#, python-format
msgid "tag '%s' is not a global tag"
-msgstr "мітка '%s' не є глобальною міткою"
-
-#: tortoisehg/hgqt/tag.py:307 tortoisehg/hgtk/tagadd.py:309
+msgstr "ярлик '%s' не є глобальним ярликом"
+
+#: tortoisehg/hgqt/tag.py:314 tortoisehg/hgtk/tagadd.py:309
#, python-format
msgid "Removed tag %s"
-msgstr "Видалення мітки %s"
-
-#: tortoisehg/hgqt/tag.py:312
+msgstr "Видалення ярлика %s"
+
+#: tortoisehg/hgqt/tag.py:319
#, python-format
msgid "Tag '%s' has been removed"
-msgstr ""
+msgstr "Ярлик '%s' був видалений"
#: tortoisehg/hgqt/thgimport.py:22
msgid "Patch files (*.diff *.patch)"
-msgstr ""
+msgstr "Файли латок (*.diff *.patch)"
#: tortoisehg/hgqt/thgimport.py:23
msgid "All files (*)"
-msgstr ""
+msgstr "Всі файли (*)"
#: tortoisehg/hgqt/thgimport.py:56 tortoisehg/hgtk/thgimport.py:76
msgid "Browse Directory..."
@@ -6666,7 +7165,7 @@msgid "Do not strip paths (-p0), required for SVN patches"
msgstr "Не різати латки (-p0), вимога SVN латок"
-#: tortoisehg/hgqt/thgimport.py:79 tortoisehg/hgqt/thgstrip.py:51
+#: tortoisehg/hgqt/thgimport.py:79 tortoisehg/hgqt/thgstrip.py:54
#: tortoisehg/hgtk/thgimport.py:105 tortoisehg/hgtk/thgstrip.py:76
msgid "Preview:"
msgstr "Попередній перегляд:"
@@ -6677,16 +7176,16 @@
#: tortoisehg/hgqt/thgimport.py:103
msgid "Checking working directory status..."
-msgstr ""
+msgstr "Перевіряємо робочий стан каталогу..."
#: tortoisehg/hgqt/thgimport.py:114
msgid "&Import"
-msgstr ""
+msgstr "&Імпорт"
#: tortoisehg/hgqt/thgimport.py:132 tortoisehg/hgtk/thgimport.py:44
#, python-format
msgid "Import - %s"
-msgstr "Імпортовано- %s"
+msgstr "Імпортовано - %s"
#: tortoisehg/hgqt/thgimport.py:156
msgid "Working directory is not clean! <a href=\"view\">View changes...</a>"
@@ -6694,11 +7193,11 @@
#: tortoisehg/hgqt/thgimport.py:175
msgid "Select patches"
-msgstr ""
+msgstr "Обрані латки"
#: tortoisehg/hgqt/thgimport.py:186
msgid "Select Directory containing patches"
-msgstr ""
+msgstr "Оберіть каталог з латками"
#: tortoisehg/hgqt/thgimport.py:208 tortoisehg/hgtk/thgimport.py:281
#, python-format
@@ -6714,62 +7213,62 @@msgid "Nothing to import"
msgstr "Нічого імпортувати"
-#: tortoisehg/hgqt/thgstrip.py:49 tortoisehg/hgtk/thgstrip.py:51
+#: tortoisehg/hgqt/thgstrip.py:52 tortoisehg/hgtk/thgstrip.py:51
msgid "Strip:"
msgstr "Смуга:"
-#: tortoisehg/hgqt/thgstrip.py:80 tortoisehg/hgqt/update.py:88
+#: tortoisehg/hgqt/thgstrip.py:83 tortoisehg/hgqt/update.py:88
#: tortoisehg/hgtk/thgstrip.py:85 tortoisehg/hgtk/update.py:94
msgid "Options:"
-msgstr "Варіанти:"
-
-#: tortoisehg/hgqt/thgstrip.py:85 tortoisehg/hgtk/thgstrip.py:89
+msgstr "Параметри:"
+
+#: tortoisehg/hgqt/thgstrip.py:88 tortoisehg/hgtk/thgstrip.py:89
msgid "Discard local changes, no backup (-f/--force)"
msgstr "Відмінити локальні зміни, без резервної копії (-f/--force)"
-#: tortoisehg/hgqt/thgstrip.py:86 tortoisehg/hgtk/thgstrip.py:114
+#: tortoisehg/hgqt/thgstrip.py:89 tortoisehg/hgtk/thgstrip.py:114
msgid "No backup (-n/--nobackup)"
msgstr "Без резервної копії (-n/--nobackup)"
-#: tortoisehg/hgqt/thgstrip.py:107
+#: tortoisehg/hgqt/thgstrip.py:110
msgid "&Strip"
-msgstr ""
-
-#: tortoisehg/hgqt/thgstrip.py:127 tortoisehg/hgtk/thgstrip.py:36
+msgstr "&Смуга"
+
+#: tortoisehg/hgqt/thgstrip.py:130 tortoisehg/hgtk/thgstrip.py:36
#, python-format
msgid "Strip - %s"
msgstr "Смуга - %s"
-#: tortoisehg/hgqt/thgstrip.py:172
+#: tortoisehg/hgqt/thgstrip.py:175
#, python-format
msgid "<b>%d changesets</b> will be stripped"
-msgstr ""
-
-#: tortoisehg/hgqt/thgstrip.py:178 tortoisehg/hgtk/thgstrip.py:176
+msgstr "<b>%d набір змін</b> був порізаний"
+
+#: tortoisehg/hgqt/thgstrip.py:181 tortoisehg/hgtk/thgstrip.py:176
msgid "Unknown revision!"
msgstr "Невідома ревізія!"
-#: tortoisehg/hgqt/thgstrip.py:202
+#: tortoisehg/hgqt/thgstrip.py:205
msgid "Detected uncommitted local changes."
msgstr ""
-#: tortoisehg/hgqt/thgstrip.py:203
+#: tortoisehg/hgqt/thgstrip.py:206
msgid "Do you want to discard them and continue?"
-msgstr ""
-
-#: tortoisehg/hgqt/thgstrip.py:204 tortoisehg/hgtk/thgstrip.py:217
+msgstr "Ви хочете скасувати їх та продовжити?"
+
+#: tortoisehg/hgqt/thgstrip.py:207 tortoisehg/hgtk/thgstrip.py:217
msgid "&Yes (--force)"
msgstr "&Так (--force)"
-#: tortoisehg/hgqt/thgstrip.py:205 tortoisehg/hgtk/commit.py:325
-#: tortoisehg/hgtk/commit.py:1193 tortoisehg/hgtk/commit.py:1200
+#: tortoisehg/hgqt/thgstrip.py:208 tortoisehg/hgtk/commit.py:324
+#: tortoisehg/hgtk/commit.py:1192 tortoisehg/hgtk/commit.py:1199
#: tortoisehg/hgtk/thgstrip.py:217
msgid "&No"
msgstr "&Ні"
-#: tortoisehg/hgqt/thgstrip.py:206 tortoisehg/hgtk/thgstrip.py:214
+#: tortoisehg/hgqt/thgstrip.py:209 tortoisehg/hgtk/thgstrip.py:214
msgid "Confirm Strip"
-msgstr "Підтвердіть вирізання"
+msgstr "Підтвердіть нарізку"
#: tortoisehg/hgqt/thread.py:63 tortoisehg/hgqt/thread.py:72
#: tortoisehg/hgqt/thread.py:77 tortoisehg/hgtk/hgthread.py:78
@@ -6787,17 +7286,17 @@
#: tortoisehg/hgqt/thread.py:278
msgid "hint: "
-msgstr ""
+msgstr "натяк: "
#: tortoisehg/hgqt/thread.py:282
#, python-format
msgid "HTTP Error: %d (%s)"
-msgstr ""
+msgstr "HTTP Error: %d (%s)"
#: tortoisehg/hgqt/thread.py:285
#, python-format
msgid "URLError: %s"
-msgstr ""
+msgstr "URLError: %s"
#: tortoisehg/hgqt/thread.py:293 tortoisehg/hgtk/hgthread.py:198
msgid "SSL: Server certificate verify failed"
@@ -6806,12 +7305,12 @@#: tortoisehg/hgqt/thread.py:295 tortoisehg/hgtk/hgthread.py:200
#, python-format
msgid "SSL: unknown error %s:%s"
-msgstr ""
+msgstr "SSL: невідома помилка %s:%s"
#: tortoisehg/hgqt/thread.py:297 tortoisehg/hgtk/hgthread.py:202
#, python-format
msgid "SSL error: %s"
-msgstr ""
+msgstr "SSL помилка: %s"
#: tortoisehg/hgqt/thread.py:302
#, python-format
@@ -6844,7 +7343,7 @@#: tortoisehg/hgqt/thread.py:352
#, python-format
msgid "abort: %s: %s\n"
-msgstr ""
+msgstr "перервати: %s: %s\n"
#: tortoisehg/hgqt/thread.py:317
#, python-format
@@ -6854,26 +7353,26 @@#: tortoisehg/hgqt/thread.py:322
#, python-format
msgid "abort: %s"
-msgstr ""
+msgstr "перервати: %s"
#: tortoisehg/hgqt/thread.py:326
msgid " empty string\n"
-msgstr ""
+msgstr " порожній рядок\n"
#: tortoisehg/hgqt/thread.py:333 tortoisehg/hgqt/thread.py:347
#: tortoisehg/hgqt/thread.py:354
#, python-format
msgid "abort: %s\n"
-msgstr ""
+msgstr "перервати: %s\n"
#: tortoisehg/hgqt/thread.py:339
#, python-format
msgid "abort: error: %s\n"
-msgstr ""
+msgstr "перервати: помилка: %s\n"
#: tortoisehg/hgqt/thread.py:342
msgid "broken pipe\n"
-msgstr ""
+msgstr "канал заблокований\n"
#: tortoisehg/hgqt/thread.py:365
#, python-format
@@ -6907,11 +7406,11 @@
#: tortoisehg/hgqt/update.py:99
msgid "Always show command log"
-msgstr ""
+msgstr "Завжди показувати журнал команд"
#: tortoisehg/hgqt/update.py:135
msgid "&Update"
-msgstr ""
+msgstr "&Оновити"
#: tortoisehg/hgqt/update.py:152 tortoisehg/hgtk/update.py:27
#, python-format
@@ -6926,15 +7425,11 @@msgid "unknown revision!"
msgstr "невідома ревізія!"
-#: tortoisehg/hgqt/update.py:246 tortoisehg/hgtk/update.py:231
+#: tortoisehg/hgqt/update.py:246
msgid ""
"Detected uncommitted local changes in working tree.\n"
"Please select to continue:\n"
-"\n"
-msgstr ""
-"Знайдено незафіксовані локальні зміни у робочому дереві.\n"
-"Оберіть для продовження:\n"
-"\n"
+msgstr ""
#: tortoisehg/hgqt/update.py:249 tortoisehg/hgtk/update.py:234
msgid "Discard - discard local changes, no backup"
@@ -6942,7 +7437,7 @@
#: tortoisehg/hgqt/update.py:250 tortoisehg/hgtk/update.py:235
msgid "&Shelve"
-msgstr "&Відкласти на потім"
+msgstr "&Згодом"
#: tortoisehg/hgqt/update.py:251
msgid "Shelve - move local changes to a patch"
@@ -6952,276 +7447,257 @@msgid "Merge - allow to merge with local changes"
msgstr "Об’єднати - дозволяє об’єднати з локальними змінами"
-#: tortoisehg/hgqt/update.py:262 tortoisehg/hgtk/update.py:251
+#: tortoisehg/hgqt/update.py:261 tortoisehg/hgtk/update.py:251
msgid "Confirm Update"
-msgstr "Підтвердіть поновлення"
-
-#: tortoisehg/hgqt/visdiff.py:35 tortoisehg/hgtk/visdiff.py:34
+msgstr "Підтвердіть оновлення"
+
+#: tortoisehg/hgqt/visdiff.py:29 tortoisehg/hgtk/visdiff.py:34
msgid "[non-existant]"
msgstr "[non-existant]"
-#: tortoisehg/hgqt/visdiff.py:141 tortoisehg/hgtk/visdiff.py:125
+#: tortoisehg/hgqt/visdiff.py:143 tortoisehg/hgtk/visdiff.py:125
msgid "Tool launch failure"
msgstr "Помилка під час запуску Інструменту"
-#: tortoisehg/hgqt/visdiff.py:142 tortoisehg/hgqt/wctxactions.py:213
-#: tortoisehg/hgtk/visdiff.py:126
+#: tortoisehg/hgqt/visdiff.py:144 tortoisehg/hgtk/visdiff.py:126
#, python-format
msgid "%s : %s"
msgstr "%s : %s"
-#: tortoisehg/hgqt/visdiff.py:149 tortoisehg/hgqt/visdiff.py:221
+#: tortoisehg/hgqt/visdiff.py:151 tortoisehg/hgqt/visdiff.py:223
#: tortoisehg/hgtk/visdiff.py:132 tortoisehg/hgtk/visdiff.py:201
msgid "No diff tool found"
msgstr "Не знайдено інструменту порівнянь"
-#: tortoisehg/hgqt/visdiff.py:150 tortoisehg/hgqt/visdiff.py:222
+#: tortoisehg/hgqt/visdiff.py:152 tortoisehg/hgqt/visdiff.py:224
#: tortoisehg/hgtk/visdiff.py:133 tortoisehg/hgtk/visdiff.py:202
msgid "No visual diff tools were detected"
msgstr "Не виявлено відмінностей у візуальному інструменті порівнянь"
-#: tortoisehg/hgqt/visdiff.py:155 tortoisehg/hgtk/visdiff.py:138
+#: tortoisehg/hgqt/visdiff.py:157 tortoisehg/hgtk/visdiff.py:138
msgid "[working copy]"
msgstr "[робоча копія]"
-#: tortoisehg/hgqt/visdiff.py:157 tortoisehg/hgtk/visdiff.py:140
+#: tortoisehg/hgqt/visdiff.py:159 tortoisehg/hgtk/visdiff.py:140
msgid "[original]"
msgstr "[оригінал]"
-#: tortoisehg/hgqt/visdiff.py:196 tortoisehg/hgtk/visdiff.py:177
+#: tortoisehg/hgqt/visdiff.py:198 tortoisehg/hgtk/visdiff.py:177
msgid "Unable to find changeset"
msgstr "Неможливо знайти набір змін"
-#: tortoisehg/hgqt/visdiff.py:197 tortoisehg/hgtk/visdiff.py:178
+#: tortoisehg/hgqt/visdiff.py:199 tortoisehg/hgtk/visdiff.py:178
msgid "You likely need to refresh this application"
msgstr "Вам, ймовірно, буде потрібно оновити цю програму"
-#: tortoisehg/hgqt/visdiff.py:214 tortoisehg/hgtk/visdiff.py:195
+#: tortoisehg/hgqt/visdiff.py:216 tortoisehg/hgtk/visdiff.py:195
msgid "No file changes"
msgstr "Відсутні змінені файли"
-#: tortoisehg/hgqt/visdiff.py:215 tortoisehg/hgtk/visdiff.py:196
+#: tortoisehg/hgqt/visdiff.py:217 tortoisehg/hgtk/visdiff.py:196
msgid "There are no file changes to view"
msgstr "У переглянутих файлах відсутні зміни"
-#: tortoisehg/hgqt/visdiff.py:350 tortoisehg/hgtk/visdiff.py:326
+#: tortoisehg/hgqt/visdiff.py:352 tortoisehg/hgtk/visdiff.py:326
msgid "cleaning up temp directory\n"
msgstr "очищення тимчасового каталогу\n"
-#: tortoisehg/hgqt/visdiff.py:370 tortoisehg/hgtk/visdiff.py:352
+#: tortoisehg/hgqt/visdiff.py:372 tortoisehg/hgtk/visdiff.py:352
msgid "working changes"
msgstr "робочі зміни"
-#: tortoisehg/hgqt/visdiff.py:372
+#: tortoisehg/hgqt/visdiff.py:374
#, python-format
msgid "changeset %d:%s"
-msgstr ""
-
-#: tortoisehg/hgqt/visdiff.py:374
+msgstr "набір змін %d:%s"
+
+#: tortoisehg/hgqt/visdiff.py:376
#, python-format
msgid "revisions %d:%s to %d:%s"
msgstr ""
-#: tortoisehg/hgqt/visdiff.py:376 tortoisehg/hgtk/visdiff.py:357
+#: tortoisehg/hgqt/visdiff.py:378 tortoisehg/hgtk/visdiff.py:357
msgid "Visual Diffs - "
msgstr "Наочні різниці - "
-#: tortoisehg/hgqt/visdiff.py:378 tortoisehg/hgtk/visdiff.py:359
+#: tortoisehg/hgqt/visdiff.py:380 tortoisehg/hgtk/visdiff.py:359
msgid " filtered"
-msgstr " відфільтрований"
-
-#: tortoisehg/hgqt/visdiff.py:393 tortoisehg/hgtk/visdiff.py:370
+msgstr " фільтрований"
+
+#: tortoisehg/hgqt/visdiff.py:395 tortoisehg/hgtk/visdiff.py:370
msgid "Temporary files are removed when this dialog is closed"
msgstr "Тимчасові файли видалено під час закриття діалогу"
-#: tortoisehg/hgqt/visdiff.py:411
+#: tortoisehg/hgqt/visdiff.py:413
msgid "Select Tool:"
msgstr ""
-#: tortoisehg/hgqt/visdiff.py:435 tortoisehg/hgtk/visdiff.py:424
+#: tortoisehg/hgqt/visdiff.py:437 tortoisehg/hgtk/visdiff.py:424
msgid "Dir diff to p1"
msgstr "Каталог порівняти до p1"
-#: tortoisehg/hgqt/visdiff.py:437 tortoisehg/hgtk/visdiff.py:426
+#: tortoisehg/hgqt/visdiff.py:439 tortoisehg/hgtk/visdiff.py:426
msgid "Dir diff to p2"
msgstr "каталог порівняти до p2"
-#: tortoisehg/hgqt/visdiff.py:439 tortoisehg/hgtk/visdiff.py:428
+#: tortoisehg/hgqt/visdiff.py:441 tortoisehg/hgtk/visdiff.py:428
msgid "3-way dir diff"
msgstr "зовнішній інструмент порівняння каталогів"
-#: tortoisehg/hgqt/visdiff.py:442 tortoisehg/hgtk/visdiff.py:434
+#: tortoisehg/hgqt/visdiff.py:444 tortoisehg/hgtk/visdiff.py:434
msgid "Directory diff"
msgstr "Порівняння каталогу"
-#: tortoisehg/hgqt/visdiff.py:610 tortoisehg/hgtk/visdiff.py:631
+#: tortoisehg/hgqt/visdiff.py:612 tortoisehg/hgtk/visdiff.py:631
msgid "No repository found here"
msgstr "Не знайдено сховищ тут"
-#: tortoisehg/hgqt/wctxactions.py:45
+#: tortoisehg/hgqt/wctxactions.py:41
msgid "&Visual Diff"
-msgstr ""
-
-#: tortoisehg/hgqt/wctxactions.py:48 tortoisehg/hgtk/status.py:1244
+msgstr "Наочне порівнювання"
+
+#: tortoisehg/hgqt/wctxactions.py:45 tortoisehg/hgtk/status.py:1244
msgid "View missing"
msgstr "Переглянути загублені"
-#: tortoisehg/hgqt/wctxactions.py:50 tortoisehg/hgtk/status.py:1245
-msgid "View other"
-msgstr "Переглянути інші"
-
-#: tortoisehg/hgqt/wctxactions.py:52
-msgid "&Revert"
-msgstr ""
-
-#: tortoisehg/hgqt/wctxactions.py:55 tortoisehg/hgtk/status.py:1250
+#: tortoisehg/hgqt/wctxactions.py:47
+msgid "&Revert..."
+msgstr "&Повернути..."
+
+#: tortoisehg/hgqt/wctxactions.py:50 tortoisehg/hgtk/status.py:1250
#: tortoisehg/util/menuthg.py:49
msgid "File History"
msgstr "Файл історії"
-#: tortoisehg/hgqt/wctxactions.py:56
+#: tortoisehg/hgqt/wctxactions.py:51
msgid "&Annotate"
msgstr ""
-#: tortoisehg/hgqt/wctxactions.py:58
+#: tortoisehg/hgqt/wctxactions.py:53
msgid "&Forget"
msgstr ""
-#: tortoisehg/hgqt/wctxactions.py:60
+#: tortoisehg/hgqt/wctxactions.py:55
msgid "&Detect Renames..."
msgstr ""
-#: tortoisehg/hgqt/wctxactions.py:61
-msgid "&Ignore"
-msgstr ""
-
-#: tortoisehg/hgqt/wctxactions.py:62 tortoisehg/hgtk/status.py:1257
+#: tortoisehg/hgqt/wctxactions.py:57
+msgid "&Ignore..."
+msgstr "&Ігнорувати..."
+
+#: tortoisehg/hgqt/wctxactions.py:58 tortoisehg/hgtk/status.py:1257
msgid "Remove versioned"
msgstr "Переміщення версіонується"
-#: tortoisehg/hgqt/wctxactions.py:63
-msgid "&Delete unversioned"
-msgstr ""
-
-#: tortoisehg/hgqt/wctxactions.py:69
-msgid "Was renamed from"
-msgstr ""
-
-#: tortoisehg/hgqt/wctxactions.py:77
+#: tortoisehg/hgqt/wctxactions.py:59
+msgid "&Delete unversioned..."
+msgstr ""
+
+#: tortoisehg/hgqt/wctxactions.py:61 tortoisehg/hgtk/status.py:1265
+msgid "Mark unresolved"
+msgstr "Відмітити, як невиріше"
+
+#: tortoisehg/hgqt/wctxactions.py:62 tortoisehg/hgtk/status.py:1266
+msgid "Mark resolved"
+msgstr "Відмітити, як вирішене"
+
+#: tortoisehg/hgqt/wctxactions.py:105 tortoisehg/hgtk/status.py:1245
+msgid "View other"
+msgstr "Переглянути інші"
+
+#: tortoisehg/hgqt/wctxactions.py:109
msgid "&Copy..."
msgstr ""
-#: tortoisehg/hgqt/wctxactions.py:78 tortoisehg/hgtk/status.py:1262
+#: tortoisehg/hgqt/wctxactions.py:110 tortoisehg/hgtk/status.py:1262
msgid "Rename..."
msgstr "Змінити назву..."
-#: tortoisehg/hgqt/wctxactions.py:80 tortoisehg/hgtk/status.py:1265
-msgid "Mark unresolved"
-msgstr "Відмітити, як невиріше"
-
-#: tortoisehg/hgqt/wctxactions.py:81 tortoisehg/hgtk/status.py:1266
-msgid "Mark resolved"
-msgstr "Відмітити, як вирішене"
-
-#: tortoisehg/hgqt/wctxactions.py:82 tortoisehg/hgtk/status.py:1264
+#: tortoisehg/hgqt/wctxactions.py:116
+msgid "Was renamed from"
+msgstr ""
+
+#: tortoisehg/hgqt/wctxactions.py:126 tortoisehg/hgtk/status.py:1264
msgid "Restart Merge..."
msgstr "Перезапуск об'єднання..."
-#: tortoisehg/hgqt/wctxactions.py:85 tortoisehg/hgtk/status.py:1274
+#: tortoisehg/hgqt/wctxactions.py:128 tortoisehg/hgtk/status.py:1274
msgid "Restart merge with"
msgstr "Перезапуск з об'єднанням"
-#: tortoisehg/hgqt/wctxactions.py:108
+#: tortoisehg/hgqt/wctxactions.py:156
msgid " errors"
-msgstr ""
-
-#: tortoisehg/hgqt/wctxactions.py:111
+msgstr " помилки"
+
+#: tortoisehg/hgqt/wctxactions.py:159
msgid " output"
-msgstr ""
-
-#: tortoisehg/hgqt/wctxactions.py:118 tortoisehg/hgqt/wctxactions.py:125
-#: tortoisehg/hgqt/wctxactions.py:128 tortoisehg/hgtk/gdialog.py:582
+msgstr " виведення"
+
+#: tortoisehg/hgqt/wctxactions.py:166 tortoisehg/hgqt/wctxactions.py:173
+#: tortoisehg/hgqt/wctxactions.py:176 tortoisehg/hgtk/gdialog.py:582
#: tortoisehg/hgtk/gdialog.py:585
msgid " Aborted"
msgstr " Перервано"
-#: tortoisehg/hgqt/wctxactions.py:130
-msgid " not implemented"
-msgstr ""
-
-#: tortoisehg/hgqt/wctxactions.py:199 tortoisehg/hgtk/gdialog.py:682
-#: tortoisehg/hgtk/gtklib.py:406
-msgid "No visual editor configured"
-msgstr "Не налаштований візуальний редактор"
-
-#: tortoisehg/hgqt/wctxactions.py:200 tortoisehg/hgtk/gdialog.py:683
-#: tortoisehg/hgtk/gtklib.py:407
-msgid "Please configure a visual editor."
-msgstr "Будь ласка, налаштуйте візуальний редактор"
-
-#: tortoisehg/hgqt/wctxactions.py:212
-msgid "Editor launch failure"
-msgstr ""
-
-#: tortoisehg/hgqt/wctxactions.py:232 tortoisehg/hgtk/statusact.py:125
+#: tortoisehg/hgqt/wctxactions.py:227 tortoisehg/hgtk/statusact.py:125
msgid "Uncommited merge - please select a parent revision"
msgstr "Не підтверджене об'єднання - оберіть ревізію попередника"
-#: tortoisehg/hgqt/wctxactions.py:233 tortoisehg/hgtk/statusact.py:126
+#: tortoisehg/hgqt/wctxactions.py:228 tortoisehg/hgtk/statusact.py:126
msgid "Revert files to local or other parent?"
msgstr "Відновити файли на локальному або іншому попереднику?"
-#: tortoisehg/hgqt/wctxactions.py:234 tortoisehg/hgtk/statusact.py:127
+#: tortoisehg/hgqt/wctxactions.py:229 tortoisehg/hgtk/statusact.py:127
msgid "&Local"
msgstr "&Локальні"
-#: tortoisehg/hgqt/wctxactions.py:234 tortoisehg/hgtk/statusact.py:127
+#: tortoisehg/hgqt/wctxactions.py:229 tortoisehg/hgtk/statusact.py:127
msgid "&Other"
msgstr "&Інше"
-#: tortoisehg/hgqt/wctxactions.py:245
+#: tortoisehg/hgqt/wctxactions.py:240
msgid "Revert local file changes?"
msgstr ""
-#: tortoisehg/hgqt/wctxactions.py:246
+#: tortoisehg/hgqt/wctxactions.py:241
msgid "&Revert with backup"
msgstr ""
-#: tortoisehg/hgqt/wctxactions.py:246
+#: tortoisehg/hgqt/wctxactions.py:241
msgid "&Discard changes"
-msgstr ""
-
-#: tortoisehg/hgqt/wctxactions.py:300
+msgstr "&відкинути зміни"
+
+#: tortoisehg/hgqt/wctxactions.py:295
msgid "Confirm Delete Unversioned"
msgstr ""
-#: tortoisehg/hgqt/wctxactions.py:301
+#: tortoisehg/hgqt/wctxactions.py:296
msgid "Delete the following unversioned files?"
msgstr ""
-#: tortoisehg/hgqt/wctxactions.py:313 tortoisehg/hgtk/statusact.py:40
+#: tortoisehg/hgqt/wctxactions.py:308 tortoisehg/hgtk/statusact.py:40
msgid "Copy file to"
msgstr "Копіювати файл до"
#: tortoisehg/hgqt/webconf.py:16
msgid "Config files (*.conf *.config *.ini);;Any files (*)"
-msgstr ""
+msgstr "Файли налаштувань (*.conf *.config *.ini);;Інші файли (*)"
#: tortoisehg/hgqt/webconf.py:105
msgid "Open hgweb config"
-msgstr ""
+msgstr "Відкрити файл налаштувань hgweb config"
#: tortoisehg/hgqt/webconf.py:120
msgid "Save hgweb config"
-msgstr ""
+msgstr "Зберегти файл налаштувань hgweb config"
#: tortoisehg/hgqt/webconf.py:198
msgid "Path:"
-msgstr ""
+msgstr "Шлях:"
#: tortoisehg/hgqt/webconf.py:201
msgid "Local Path:"
-msgstr ""
+msgstr "Локальний шлях:"
#: tortoisehg/hgqt/webconf.py:226 tortoisehg/hgtk/synch.py:383
msgid "Select Repository"
@@ -7245,251 +7721,298 @@
#: tortoisehg/hgqt/webconf_ui.py:75
msgid "Config File:"
-msgstr ""
-
-#: tortoisehg/hgqt/webconf_ui.py:77
-msgid "Save"
-msgstr ""
-
-#: tortoisehg/hgqt/workbench.py:45 tortoisehg/hgqt/workbench.py:417
+msgstr "конфігурація файла:"
+
+#: tortoisehg/hgqt/workbench.py:46 tortoisehg/hgqt/workbench.py:548
msgid "TortoiseHg Workbench"
-msgstr ""
-
-#: tortoisehg/hgqt/workbench.py:70
+msgstr "TortoiseHg Workbench"
+
+#: tortoisehg/hgqt/workbench.py:77
msgid "New Repository..."
-msgstr ""
-
-#: tortoisehg/hgqt/workbench.py:72 tortoisehg/hgqt/workbench.py:196
+msgstr "Нове сховище..."
+
+#: tortoisehg/hgqt/workbench.py:79 tortoisehg/hgqt/workbench.py:203
msgid "Clone Repository..."
-msgstr ""
-
-#: tortoisehg/hgqt/workbench.py:74
+msgstr "Клонування сховища..."
+
+#: tortoisehg/hgqt/workbench.py:81
msgid "Open Repository..."
-msgstr ""
-
-#: tortoisehg/hgqt/workbench.py:107
+msgstr "Відкрити сховище..."
+
+#: tortoisehg/hgqt/workbench.py:122
msgid "&File"
-msgstr ""
-
-#: tortoisehg/hgqt/workbench.py:108
+msgstr "&Файл"
+
+#: tortoisehg/hgqt/workbench.py:123
msgid "&View"
-msgstr ""
-
-#: tortoisehg/hgqt/workbench.py:109
+msgstr "&Перегляд"
+
+#: tortoisehg/hgqt/workbench.py:124 tortoisehg/hgqt/workbench.py:355
+msgid "Workbench Toolbars"
+msgstr ""
+
+#: tortoisehg/hgqt/workbench.py:125
msgid "&Repository"
-msgstr ""
-
-#: tortoisehg/hgqt/workbench.py:110
+msgstr "&Сховище"
+
+#: tortoisehg/hgqt/workbench.py:126
msgid "&Help"
-msgstr ""
-
-#: tortoisehg/hgqt/workbench.py:112
+msgstr "&Допомога"
+
+#: tortoisehg/hgqt/workbench.py:128
msgid "Edit Toolbar"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:114
+#: tortoisehg/hgqt/workbench.py:130
msgid "Dock Toolbar"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:116
+#: tortoisehg/hgqt/workbench.py:132
msgid "Sync Toolbar"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:118
+#: tortoisehg/hgqt/workbench.py:134
msgid "Task Toolbar"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:185
+#: tortoisehg/hgqt/workbench.py:201
+msgid "&New Repository..."
+msgstr ""
+
+#: tortoisehg/hgqt/workbench.py:207
msgid "&Open Repository..."
-msgstr ""
-
-#: tortoisehg/hgqt/workbench.py:187
+msgstr "&Відкриття сховища..."
+
+#: tortoisehg/hgqt/workbench.py:209
msgid "&Close Repository"
-msgstr ""
-
-#: tortoisehg/hgqt/workbench.py:194
-msgid "&New Repository..."
-msgstr ""
-
-#: tortoisehg/hgqt/workbench.py:200
+msgstr "&акрити сховище"
+
+#: tortoisehg/hgqt/workbench.py:216
msgid "&Settings..."
-msgstr ""
-
-#: tortoisehg/hgqt/workbench.py:206
+msgstr "&Налаштування..."
+
+#: tortoisehg/hgqt/workbench.py:222
msgid "Show Repository Registry"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:213
+#: tortoisehg/hgqt/workbench.py:229
+msgid "Show Patch Queue"
+msgstr ""
+
+#: tortoisehg/hgqt/workbench.py:235
+msgid "Show Output &Log"
+msgstr ""
+
+#: tortoisehg/hgqt/workbench.py:242
+msgid "Repository Registry Options"
+msgstr ""
+
+#: tortoisehg/hgqt/workbench.py:244
msgid "Show Paths"
-msgstr ""
-
-#: tortoisehg/hgqt/workbench.py:217
-msgid "Show Output &Log"
-msgstr ""
-
-#: tortoisehg/hgqt/workbench.py:224
+msgstr "Показати шлях"
+
+#: tortoisehg/hgqt/workbench.py:248
+msgid "Show Subrepos on Registry"
+msgstr ""
+
+#: tortoisehg/hgqt/workbench.py:253
+msgid "Show Subrepos for remote repositories"
+msgstr ""
+
+#: tortoisehg/hgqt/workbench.py:258
+msgid "Show Short Paths"
+msgstr ""
+
+#: tortoisehg/hgqt/workbench.py:263
msgid "Choose Log Columns..."
msgstr ""
-#: tortoisehg/hgqt/workbench.py:227
+#: tortoisehg/hgqt/workbench.py:266
msgid "Save Open Repositories On Exit"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:243
+#: tortoisehg/hgqt/workbench.py:279
msgid "Revision &Details"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:245
+#: tortoisehg/hgqt/workbench.py:280
+msgid "&Commit"
+msgstr "&Фіксувати"
+
+#: tortoisehg/hgqt/workbench.py:282
+msgid "MQ Patch"
+msgstr ""
+
+#: tortoisehg/hgqt/workbench.py:283
msgid "S&ynchronize"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:246
+#: tortoisehg/hgqt/workbench.py:284
msgid "&Manifest"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:247
+#: tortoisehg/hgqt/workbench.py:285
msgid "&Search"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:249
-msgid "Patch &Queue"
-msgstr ""
-
-#: tortoisehg/hgqt/workbench.py:251
+#: tortoisehg/hgqt/workbench.py:287
msgid "&Patch Branch"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:254 tortoisehg/hgtk/status.py:1320
+#: tortoisehg/hgqt/workbench.py:290 tortoisehg/hgtk/status.py:1320
msgid "&Refresh"
msgstr "&Поновити"
-#: tortoisehg/hgqt/workbench.py:257
+#: tortoisehg/hgqt/workbench.py:293
msgid "Refresh current repository"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:258
+#: tortoisehg/hgqt/workbench.py:294
msgid "Refresh &Task Tab"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:261
+#: tortoisehg/hgqt/workbench.py:297
msgid "Refresh only the current task tab"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:263
+#: tortoisehg/hgqt/workbench.py:299
msgid "Load all revisions"
-msgstr ""
-
-#: tortoisehg/hgqt/workbench.py:265
+msgstr "Завантажити всі ревізії"
+
+#: tortoisehg/hgqt/workbench.py:301
msgid "Load all revisions into graph"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:267
+#: tortoisehg/hgqt/workbench.py:303
msgid "Web Server..."
-msgstr ""
-
-#: tortoisehg/hgqt/workbench.py:270
+msgstr "Web Server..."
+
+#: tortoisehg/hgqt/workbench.py:306
msgid "Shelve..."
-msgstr ""
-
-#: tortoisehg/hgqt/workbench.py:272 tortoisehg/hgtk/history.py:458
+msgstr "Відтермінування..."
+
+#: tortoisehg/hgqt/workbench.py:308 tortoisehg/hgtk/history.py:458
msgid "Import..."
msgstr "Імпорт..."
-#: tortoisehg/hgqt/workbench.py:275 tortoisehg/hgtk/recovery.py:68
+#: tortoisehg/hgqt/workbench.py:311 tortoisehg/hgtk/recovery.py:68
msgid "Verify"
msgstr "Перевірити"
-#: tortoisehg/hgqt/workbench.py:277 tortoisehg/hgtk/recovery.py:63
+#: tortoisehg/hgqt/workbench.py:313 tortoisehg/hgtk/recovery.py:63
msgid "Recover"
msgstr "Відновити"
-#: tortoisehg/hgqt/workbench.py:280
+#: tortoisehg/hgqt/workbench.py:316
msgid "Resolve..."
msgstr ""
-#: tortoisehg/hgqt/workbench.py:283
+#: tortoisehg/hgqt/workbench.py:319
msgid "Rollback/Undo..."
msgstr ""
-#: tortoisehg/hgqt/workbench.py:286
+#: tortoisehg/hgqt/workbench.py:322
msgid "Purge..."
-msgstr ""
-
-#: tortoisehg/hgqt/workbench.py:289
+msgstr "Чищення..."
+
+#: tortoisehg/hgqt/workbench.py:325
msgid "Bisect..."
-msgstr ""
-
-#: tortoisehg/hgqt/workbench.py:299
+msgstr "Розрізати навпіл..."
+
+#: tortoisehg/hgqt/workbench.py:335
msgid "Help"
-msgstr ""
-
-#: tortoisehg/hgqt/workbench.py:312
+msgstr "Допомога"
+
+#: tortoisehg/hgqt/workbench.py:336
+msgid "About Qt"
+msgstr "Про Qt"
+
+#: tortoisehg/hgqt/workbench.py:337 tortoisehg/util/menuthg.py:73
+msgid "About TortoiseHg"
+msgstr "Про TortoiseHg"
+
+#: tortoisehg/hgqt/workbench.py:350
msgid "Filter Toolbar"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:315
+#: tortoisehg/hgqt/workbench.py:353
msgid "Filter graph with revision sets or branches"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:317
-msgid "Workbench Toolbars"
-msgstr ""
-
-#: tortoisehg/hgqt/workbench.py:324 tortoisehg/hgtk/history.py:438
+#: tortoisehg/hgqt/workbench.py:362 tortoisehg/hgtk/history.py:438
#: tortoisehg/hgtk/history.py:1856 tortoisehg/hgtk/synch.py:57
msgid "Incoming"
msgstr "Надходження"
-#: tortoisehg/hgqt/workbench.py:325
+#: tortoisehg/hgqt/workbench.py:363
msgid "Check for incoming changes from selected URL"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:327 tortoisehg/hgtk/history.py:440
+#: tortoisehg/hgqt/workbench.py:365 tortoisehg/hgtk/history.py:440
#: tortoisehg/hgtk/history.py:1986
msgid "Pull"
msgstr "Отримати"
-#: tortoisehg/hgqt/workbench.py:328
+#: tortoisehg/hgqt/workbench.py:366
msgid "Pull incoming changes from selected URL"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:330 tortoisehg/hgtk/history.py:442
+#: tortoisehg/hgqt/workbench.py:368 tortoisehg/hgtk/history.py:442
#: tortoisehg/hgtk/history.py:2029 tortoisehg/hgtk/synch.py:68
msgid "Outgoing"
msgstr "На відправку"
-#: tortoisehg/hgqt/workbench.py:331
+#: tortoisehg/hgqt/workbench.py:369
msgid "Detect outgoing changes to selected URL"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:333 tortoisehg/hgtk/history.py:444
-#: tortoisehg/hgtk/history.py:2069 tortoisehg/hgtk/synch.py:73
-msgid "Push"
-msgstr "Відправити"
-
-#: tortoisehg/hgqt/workbench.py:334
+#: tortoisehg/hgqt/workbench.py:372
msgid "Push outgoing changes to selected URL"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:419
+#: tortoisehg/hgqt/workbench.py:378 tortoisehg/hgqt/workbench.py:379
+msgid "Close tab"
+msgstr ""
+
+#: tortoisehg/hgqt/workbench.py:380 tortoisehg/hgqt/workbench.py:381
+msgid "Close other tabs"
+msgstr ""
+
+#: tortoisehg/hgqt/workbench.py:382
+msgid "Undo close tab"
+msgstr ""
+
+#: tortoisehg/hgqt/workbench.py:383
+msgid "Reopen last closed tab"
+msgstr ""
+
+#: tortoisehg/hgqt/workbench.py:384
+msgid "Undo close other tabs"
+msgstr ""
+
+#: tortoisehg/hgqt/workbench.py:385
+msgid "Reopen last closed tab group"
+msgstr ""
+
+#: tortoisehg/hgqt/workbench.py:550
#, python-format
msgid "%s - TortoiseHg Workbench - %s"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:422
+#: tortoisehg/hgqt/workbench.py:553
#, python-format
msgid "%s - TortoiseHg Workbench"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:577
+#: tortoisehg/hgqt/workbench.py:737
msgid "Select repository directory to open"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:599
+#: tortoisehg/hgqt/workbench.py:760
msgid "Failed to open repository"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:722
+#: tortoisehg/hgqt/workbench.py:900
#, python-format
msgid "Hg file log viewer [%s] - %s"
msgstr ""
@@ -7543,7 +8066,7 @@"\n"
"Do you want to overwrite it?"
msgstr ""
-"Призначення \"%s\" вже існує!\n"
+"Отримувач \"%s\" вже існує!\n"
"\n"
"Ви хочете перезаписати?"
@@ -7566,12 +8089,20 @@msgid "Changeset Description"
msgstr "Опис набору змін"
+#: tortoisehg/hgtk/backout.py:52
+msgid "Backout commit message"
+msgstr "Відновити повідомлення фіксації"
+
#: tortoisehg/hgtk/backout.py:78
msgid ""
"Commit message text for new changeset that reverses the effect of the change "
"being backed out."
msgstr ""
+#: tortoisehg/hgtk/backout.py:90
+msgid "Commit backout before merging with current working parent"
+msgstr ""
+
#: tortoisehg/hgtk/backout.py:95
msgid "Backout"
msgstr "Відновити"
@@ -7724,7 +8255,7 @@
#: tortoisehg/hgtk/changeset.py:478 tortoisehg/hgtk/status.py:1242
msgid "_Visual Diff"
-msgstr "_Візуальне порівняння"
+msgstr "_Візуальне порівнювання"
#: tortoisehg/hgtk/changeset.py:480
msgid "Diff to _local"
@@ -7755,14 +8286,6 @@msgid "Diff to second Parent"
msgstr "Різниця по відношенню до другого попередника"
-#: tortoisehg/hgtk/changeset.py:958
-msgid "Save file to"
-msgstr "Зберегти файл як"
-
-#: tortoisehg/hgtk/changeset.py:969
-msgid "Unable to save file"
-msgstr "Неможливо зберегти файл"
-
#: tortoisehg/hgtk/changeset.py:1040
msgid "Confirm revert file to old revision"
msgstr "Вимагати підтвердження повернення файла до старої ревізії"
@@ -7776,6 +8299,10 @@msgid "Enable _Wordwrap"
msgstr "Ввімкнути _Wordwrap"
+#: tortoisehg/hgtk/chunks.py:73
+msgid "File is larger than the specified max size.\n"
+msgstr "Файл перевищує максимально дозволений розмір.\n"
+
#: tortoisehg/hgtk/chunks.py:74 tortoisehg/hgtk/chunks.py:86
msgid "Hunk selection is disabled for this file.\n"
msgstr "Можливість вибору частини з цього файлу відключена.\n"
@@ -7790,7 +8317,7 @@
#: tortoisehg/hgtk/clone.py:90
msgid "Source path:"
-msgstr "Звідки:"
+msgstr "Шлях до оригіналу:"
#: tortoisehg/hgtk/clone.py:117 tortoisehg/hgtk/merge.py:90
#: tortoisehg/hgtk/tagadd.py:69
@@ -7823,117 +8350,111 @@
#: tortoisehg/hgtk/clone.py:289
msgid "Please enter a valid source path"
-msgstr "Надайте правильний шлях до основи"
+msgstr "Вкажіть правильний шлях до оригіналу"
#: tortoisehg/hgtk/clone.py:295
msgid "Please specify different paths"
msgstr "Оберіть інши шляхи"
-#: tortoisehg/hgtk/commit.py:38
+#: tortoisehg/hgtk/commit.py:37
msgid "Branch Operations"
msgstr "Дії над гілками"
-#: tortoisehg/hgtk/commit.py:70
+#: tortoisehg/hgtk/commit.py:69
msgid "Close current named branch"
msgstr "Закрити поточну гілку названу"
-#: tortoisehg/hgtk/commit.py:174
+#: tortoisehg/hgtk/commit.py:173
msgid "merging "
msgstr "об'єднання "
-#: tortoisehg/hgtk/commit.py:180
+#: tortoisehg/hgtk/commit.py:179
msgid " - qnew"
msgstr " - швидкі новини"
-#: tortoisehg/hgtk/commit.py:183
+#: tortoisehg/hgtk/commit.py:182
msgid " - qrefresh "
msgstr " - швидко перечитати "
-#: tortoisehg/hgtk/commit.py:184
+#: tortoisehg/hgtk/commit.py:183
msgid " - commit"
msgstr " - фіксація"
-#: tortoisehg/hgtk/commit.py:227 tortoisehg/hgtk/commit.py:309
-#: tortoisehg/hgtk/history.py:258 tortoisehg/hgtk/history.py:368
-#: tortoisehg/hgtk/thgimport.py:111
-msgid "Patch Queue"
-msgstr "Черга латок"
-
-#: tortoisehg/hgtk/commit.py:232 tortoisehg/hgtk/history.py:391
+#: tortoisehg/hgtk/commit.py:231 tortoisehg/hgtk/history.py:391
msgid "_View"
msgstr "_Перегляд"
-#: tortoisehg/hgtk/commit.py:233 tortoisehg/hgtk/history.py:397
+#: tortoisehg/hgtk/commit.py:232 tortoisehg/hgtk/history.py:397
msgid "Toolbar"
msgstr "Пенал"
-#: tortoisehg/hgtk/commit.py:235
+#: tortoisehg/hgtk/commit.py:234
msgid "Advanced"
msgstr "Додатково"
-#: tortoisehg/hgtk/commit.py:243 tortoisehg/hgtk/history.py:418
+#: tortoisehg/hgtk/commit.py:242 tortoisehg/hgtk/history.py:418
msgid "Ignore Max Diff Size"
msgstr "Не зважати на максимальний розмір різниць"
-#: tortoisehg/hgtk/commit.py:245 tortoisehg/hgtk/history.py:420
+#: tortoisehg/hgtk/commit.py:244 tortoisehg/hgtk/history.py:420
msgid "Always Show Output"
msgstr "Always Show Output"
-#: tortoisehg/hgtk/commit.py:248
+#: tortoisehg/hgtk/commit.py:247
msgid "_Operations"
msgstr "_Операції"
-#: tortoisehg/hgtk/commit.py:249 tortoisehg/hgtk/commit.py:303
-#: tortoisehg/hgtk/commit.py:778
+#: tortoisehg/hgtk/commit.py:248 tortoisehg/hgtk/commit.py:302
+#: tortoisehg/hgtk/commit.py:777
msgid "_Commit"
msgstr "_Фіксувати"
-#: tortoisehg/hgtk/commit.py:251 tortoisehg/hgtk/commit.py:301
+#: tortoisehg/hgtk/commit.py:250 tortoisehg/hgtk/commit.py:300
msgid "_Undo"
msgstr "_Скасувати дію"
-#: tortoisehg/hgtk/commit.py:254 tortoisehg/hgtk/status.py:115
+#: tortoisehg/hgtk/commit.py:253 tortoisehg/hgtk/status.py:115
msgid "_Diff"
msgstr "_Різниця"
-#: tortoisehg/hgtk/commit.py:256 tortoisehg/hgtk/status.py:118
+#: tortoisehg/hgtk/commit.py:255 tortoisehg/hgtk/status.py:118
msgid "Re_vert"
msgstr "_Відновити"
-#: tortoisehg/hgtk/commit.py:258 tortoisehg/hgtk/status.py:121
+#: tortoisehg/hgtk/commit.py:257 tortoisehg/hgtk/status.py:121
#: tortoisehg/hgtk/status.py:1248 tortoisehg/hgtk/status.py:1254
#: tortoisehg/hgtk/thgconfig.py:975
msgid "_Add"
msgstr "_Додати"
-#: tortoisehg/hgtk/commit.py:260 tortoisehg/hgtk/status.py:127
+#: tortoisehg/hgtk/commit.py:259 tortoisehg/hgtk/status.py:127
#: tortoisehg/hgtk/thgconfig.py:983
msgid "_Remove"
msgstr "_Вилучити"
-#: tortoisehg/hgtk/commit.py:264 tortoisehg/hgtk/status.py:130
+#: tortoisehg/hgtk/commit.py:263 tortoisehg/hgtk/status.py:130
#: tortoisehg/hgtk/status.py:1253
msgid "_Forget"
msgstr "_Забути"
-#: tortoisehg/hgtk/commit.py:302
+#: tortoisehg/hgtk/commit.py:301
msgid "undo recent commit"
msgstr "скасувати останню фіксацію"
-#: tortoisehg/hgtk/commit.py:304 tortoisehg/hgtk/commit.py:655
+#: tortoisehg/hgtk/commit.py:303 tortoisehg/hgtk/commit.py:654
msgid "commit"
msgstr "фіксувати"
-#: tortoisehg/hgtk/commit.py:310 tortoisehg/hgtk/history.py:260
+#: tortoisehg/hgtk/commit.py:309 tortoisehg/hgtk/history.py:260
msgid "Show/Hide Patch Queue"
msgstr "Показати/Приховати чергу латок"
-#: tortoisehg/hgtk/commit.py:324
+#: tortoisehg/hgtk/commit.py:323
msgid "Save commit message at exit?"
-msgstr "Зберегти зроблені повідомлення на виході?"
-
-#: tortoisehg/hgtk/commit.py:325 tortoisehg/hgtk/commit.py:1193
-#: tortoisehg/hgtk/commit.py:1200 tortoisehg/hgtk/history.py:220
+msgstr "Зберегти зроблені повідомлення перед виходом?"
+
+#: tortoisehg/hgtk/commit.py:324 tortoisehg/hgtk/commit.py:1192
+#: tortoisehg/hgtk/commit.py:1199 tortoisehg/hgtk/history.py:220
#: tortoisehg/hgtk/history.py:2636 tortoisehg/hgtk/status.py:1320
#: tortoisehg/hgtk/statusact.py:127 tortoisehg/hgtk/statusact.py:148
#: tortoisehg/hgtk/thgconfig.py:775 tortoisehg/hgtk/thgconfig.py:849
@@ -7941,115 +8462,112 @@msgid "&Cancel"
msgstr "&Скасувати"
-#: tortoisehg/hgtk/commit.py:371
+#: tortoisehg/hgtk/commit.py:370
msgid "Committer:"
-msgstr "Той, що фіксує:"
-
-#: tortoisehg/hgtk/commit.py:385
+msgstr "Дописувач:"
+
+#: tortoisehg/hgtk/commit.py:384
msgid "Auto-includes:"
msgstr "Включено автоматично:"
-#: tortoisehg/hgtk/commit.py:388
+#: tortoisehg/hgtk/commit.py:387
msgid "Push after commit"
msgstr "Надіслати після фіксації"
-#: tortoisehg/hgtk/commit.py:429
+#: tortoisehg/hgtk/commit.py:428
msgid "Recent commit messages..."
msgstr "Нове повідомлення про фіксацію..."
-#: tortoisehg/hgtk/commit.py:503
+#: tortoisehg/hgtk/commit.py:502
#, python-format
msgid "Parent: %(rev)s"
msgstr "Попередник: %(rev)s"
-#: tortoisehg/hgtk/commit.py:511
+#: tortoisehg/hgtk/commit.py:510
msgid "Not at head"
-msgstr "Не головна"
-
-#: tortoisehg/hgtk/commit.py:536 tortoisehg/hgtk/status.py:467
+msgstr "Не вершина"
+
+#: tortoisehg/hgtk/commit.py:535 tortoisehg/hgtk/status.py:467
msgid "Patch Preview"
msgstr "Попередній перегляд латки"
-#: tortoisehg/hgtk/commit.py:538 tortoisehg/hgtk/status.py:471
+#: tortoisehg/hgtk/commit.py:537 tortoisehg/hgtk/status.py:471
msgid "Commit Preview"
msgstr "Фіксація попередньо переглянутого"
-#: tortoisehg/hgtk/commit.py:654 tortoisehg/hgtk/commit.py:951
-#: tortoisehg/hgtk/commit.py:1015 tortoisehg/hgtk/commit.py:1264
-#: tortoisehg/hgtk/gdialog.py:485 tortoisehg/hgtk/history.py:279
-#: tortoisehg/hgtk/merge.py:136 tortoisehg/hgtk/thgconfig.py:89
-msgid "Commit"
-msgstr "Зафіксувати"
-
-#: tortoisehg/hgtk/commit.py:659
+#: tortoisehg/hgtk/commit.py:658
msgid "create new MQ patch"
msgstr "створити нову MQ латку"
-#: tortoisehg/hgtk/commit.py:662
+#: tortoisehg/hgtk/commit.py:661
msgid "refresh top MQ patch"
msgstr "оновити головну MQ латку"
-#: tortoisehg/hgtk/commit.py:664
+#: tortoisehg/hgtk/commit.py:663
msgid "_Commit (+1 head)"
-msgstr "_Фіксація (+1 голова)"
-
-#: tortoisehg/hgtk/commit.py:664
+msgstr "_Фіксація (+1 вершина)"
+
+#: tortoisehg/hgtk/commit.py:663
msgid "_Commit (-1 head)"
-msgstr "_Фіксація (-1 голова)"
-
-#: tortoisehg/hgtk/commit.py:670
+msgstr "_Фіксація (-1 вершина)"
+
+#: tortoisehg/hgtk/commit.py:669
msgid "commit to merge one head"
-msgstr "Зробити об'єднання у одну голову"
-
-#: tortoisehg/hgtk/commit.py:673
+msgstr "Об'єднання до однієї вершини"
+
+#: tortoisehg/hgtk/commit.py:672
msgid "neither parent is a head, commit to add a new head"
-msgstr "жоден з попередників не є головою, додати нову голову"
-
-#: tortoisehg/hgtk/commit.py:678
+msgstr "жоден з попередників не є вершиною, додати нову вершину"
+
+#: tortoisehg/hgtk/commit.py:677
msgid "parent is not a head, commit to add a new head"
-msgstr "Попередник не голова, додати нову голову"
-
-#: tortoisehg/hgtk/commit.py:788
+msgstr "попередник не вершина, додати нову вершину"
+
+#: tortoisehg/hgtk/commit.py:787
msgid "new branch: "
msgstr "нова гілка: "
-#: tortoisehg/hgtk/commit.py:790
+#: tortoisehg/hgtk/commit.py:789
msgid "close branch: "
msgstr "закрити гілку: "
-#: tortoisehg/hgtk/commit.py:859
+#: tortoisehg/hgtk/commit.py:822
+msgid "Merge "
+msgstr "Об'єднання "
+
+#: tortoisehg/hgtk/commit.py:858
msgid "Patch Contents"
msgstr "Зміст латки"
-#: tortoisehg/hgtk/commit.py:904
+#: tortoisehg/hgtk/commit.py:903
msgid "Bug Traq"
msgstr "Помилка Traq"
-#: tortoisehg/hgtk/commit.py:936
+#: tortoisehg/hgtk/commit.py:935
msgid "No committable files selected"
msgstr "Не можливо фіксувати, вибрані файли"
-#: tortoisehg/hgtk/commit.py:952
+#: tortoisehg/hgtk/commit.py:951
msgid "Unable to create "
msgstr "Неможливо створити "
-#: tortoisehg/hgtk/commit.py:1016
+#: tortoisehg/hgtk/commit.py:1015
msgid "Unable to apply patch"
msgstr "Неможливо застосувати латку"
-#: tortoisehg/hgtk/commit.py:1029
+#: tortoisehg/hgtk/commit.py:1028
msgid "Commit failed"
-msgstr "Фіксація не вдалася"
-
-#: tortoisehg/hgtk/commit.py:1034
+msgstr "Зафіксувати не вдалося"
+
+#: tortoisehg/hgtk/commit.py:1033
msgid "Confirm Undo Commit"
msgstr "Підтвердіть відмову від фіксації"
-#: tortoisehg/hgtk/commit.py:1041 tortoisehg/hgtk/commit.py:1056
+#: tortoisehg/hgtk/commit.py:1040 tortoisehg/hgtk/commit.py:1055
msgid "Undo Commit"
msgstr "Скасувати фіксацію"
-#: tortoisehg/hgtk/commit.py:1042
+#: tortoisehg/hgtk/commit.py:1041
msgid ""
"Unable to undo!\n"
"\n"
@@ -8058,34 +8576,34 @@"Неможливо повернути!\n"
"Вершина ревізії відрізняється від останньої фіксації."
-#: tortoisehg/hgtk/commit.py:1057
+#: tortoisehg/hgtk/commit.py:1056
msgid "Errors during rollback!"
msgstr "Помилки під час повернення!"
-#: tortoisehg/hgtk/commit.py:1063
+#: tortoisehg/hgtk/commit.py:1062
msgid "Confirm Add/Remove"
msgstr "Підтвердіть додати/видалити"
-#: tortoisehg/hgtk/commit.py:1064
+#: tortoisehg/hgtk/commit.py:1063
msgid "Add/Remove the following files?"
msgstr "Додати/видалити вказані файли?"
-#: tortoisehg/hgtk/commit.py:1099
+#: tortoisehg/hgtk/commit.py:1098
msgid ""
"No issue link found in the commit message.The commit message should contain "
"an issue link. Configure this in the 'Issue' section in the settings"
msgstr ""
-#: tortoisehg/hgtk/commit.py:1109
+#: tortoisehg/hgtk/commit.py:1108
msgid "Message format configuration error"
msgstr "Помилка налаштування формату повідомлення"
-#: tortoisehg/hgtk/commit.py:1118 tortoisehg/hgtk/commit.py:1126
-#: tortoisehg/hgtk/commit.py:1138
+#: tortoisehg/hgtk/commit.py:1117 tortoisehg/hgtk/commit.py:1125
+#: tortoisehg/hgtk/commit.py:1137
msgid "Confirm Commit"
msgstr "Підтвердіть фіксацію"
-#: tortoisehg/hgtk/commit.py:1119
+#: tortoisehg/hgtk/commit.py:1118
#, python-format
msgid ""
"The summary line length of %i is greater than %i.\n"
@@ -8096,7 +8614,7 @@"\n"
"Не зважати на правила форматування та продовжити фіксацію?"
-#: tortoisehg/hgtk/commit.py:1127
+#: tortoisehg/hgtk/commit.py:1126
msgid ""
"The summary line is not followed by a blank line.\n"
"\n"
@@ -8106,7 +8624,7 @@"\n"
"Не зважати на правила форматування та продовжити фіксацію?"
-#: tortoisehg/hgtk/commit.py:1139
+#: tortoisehg/hgtk/commit.py:1138
#, python-format
msgid ""
"The following lines are over the %i-character limit: %s.\n"
@@ -8117,11 +8635,11 @@"\n"
"Не зважати на правила форматування та продовжити фіксацію?"
-#: tortoisehg/hgtk/commit.py:1151
+#: tortoisehg/hgtk/commit.py:1150
msgid "Commit: Invalid username"
msgstr "Фіксація: помилкове ім'я користувача"
-#: tortoisehg/hgtk/commit.py:1152
+#: tortoisehg/hgtk/commit.py:1151
msgid ""
"Your username has not been configured.\n"
"\n"
@@ -8131,7 +8649,7 @@"\n"
"Будь-ласка вкажіть ім'я користувача та спробуйте знову."
-#: tortoisehg/hgtk/commit.py:1187
+#: tortoisehg/hgtk/commit.py:1186
#, python-format
msgid ""
"Named branch \"%s\" already exists, last used in revision %d\n"
@@ -8144,7 +8662,7 @@"No\t- Make commit without changing branch\n"
"Cancel - Cancel this commit"
-#: tortoisehg/hgtk/commit.py:1196
+#: tortoisehg/hgtk/commit.py:1195
#, python-format
msgid ""
"Create new named branch \"%s\" with this commit?\n"
@@ -8157,27 +8675,27 @@"No\t- Make commit without branch change\n"
"Cancel - Cancel this commit"
-#: tortoisehg/hgtk/commit.py:1253
+#: tortoisehg/hgtk/commit.py:1252
msgid "Finished committing and pushing"
-msgstr "Зафіксовано та відправлено"
-
-#: tortoisehg/hgtk/commit.py:1255
+msgstr "Фіксація та відправка завершена"
+
+#: tortoisehg/hgtk/commit.py:1254
msgid "Finished committing"
-msgstr "Готові для дії"
-
-#: tortoisehg/hgtk/commit.py:1257
+msgstr "Фіксація завершена"
+
+#: tortoisehg/hgtk/commit.py:1256
msgid "Aborted committing"
msgstr "Фіксація перервана"
-#: tortoisehg/hgtk/commit.py:1259
+#: tortoisehg/hgtk/commit.py:1258
msgid "Failed to commit"
-msgstr "Не вдалося здійснити"
-
-#: tortoisehg/hgtk/commit.py:1263
+msgstr "Не вдалося зафіксувати"
+
+#: tortoisehg/hgtk/commit.py:1262
msgid "Committing changes..."
-msgstr "Внесення змін..."
-
-#: tortoisehg/hgtk/commit.py:1265 tortoisehg/hgtk/history.py:613
+msgstr "Зафіксування змін..."
+
+#: tortoisehg/hgtk/commit.py:1264 tortoisehg/hgtk/history.py:613
#: tortoisehg/hgtk/history.py:638 tortoisehg/hgtk/history.py:1775
#: tortoisehg/hgtk/history.py:1857 tortoisehg/hgtk/history.py:1987
#: tortoisehg/hgtk/history.py:2030 tortoisehg/hgtk/history.py:2070
@@ -8187,36 +8705,36 @@msgid "Cannot run now"
msgstr "Неможливо виконати зараз"
-#: tortoisehg/hgtk/commit.py:1266
+#: tortoisehg/hgtk/commit.py:1265
msgid "Please try again after the running operation is completed"
msgstr "Please try again after the running operation is completed"
-#: tortoisehg/hgtk/commit.py:1292
+#: tortoisehg/hgtk/commit.py:1291
msgid "Paste _Filenames"
msgstr "Вставити _назви файлів"
-#: tortoisehg/hgtk/commit.py:1293
+#: tortoisehg/hgtk/commit.py:1292
msgid "App_ly Format"
msgstr "За_стосування формату"
-#: tortoisehg/hgtk/commit.py:1294
+#: tortoisehg/hgtk/commit.py:1293
msgid "C_onfigure Format..."
msgstr "На_лаштування формату..."
+#: tortoisehg/hgtk/commit.py:1338
+msgid "Info Required"
+msgstr "Обов'язкові поля"
+
#: tortoisehg/hgtk/commit.py:1339
-msgid "Info Required"
-msgstr "Інформація обов'язкова"
-
-#: tortoisehg/hgtk/commit.py:1340
msgid "Message format needs to be configured"
msgstr "Формат повідомлення повинен бути налаштований"
-#: tortoisehg/hgtk/commit.py:1353
+#: tortoisehg/hgtk/commit.py:1352
#, python-format
msgid "The summary line length of %i is greater than %i"
msgstr "Загальна довжина рядка %i більше ніж %i"
-#: tortoisehg/hgtk/commit.py:1358
+#: tortoisehg/hgtk/commit.py:1357
msgid "The summary line is not followed by a blank line"
msgstr "Підсумковий рядок не повинен бути порожнім"
@@ -8241,7 +8759,7 @@#: tortoisehg/hgtk/datamine.py:45
#, python-format
msgid "%s - datamine"
-msgstr "%s - datamine"
+msgstr "%s - аналіз даних"
#: tortoisehg/hgtk/datamine.py:56
msgid "Stop operation on current tab"
@@ -8293,7 +8811,7 @@"Comma separated list of inclusion patterns. By default, the entire "
"repository is searched."
msgstr ""
-"Перелік взірців, які застосовуються, відокремлений комами. За "
+"Перелік шаблонів, відокремлені комами, які застосовуються. За "
"замовчуванням, пошук по всім сховищам."
#: tortoisehg/hgtk/datamine.py:323
@@ -8301,8 +8819,8 @@"Comma separated list of exclusion patterns. Exclusion patterns are applied "
"after inclusion patterns."
msgstr ""
-"Перелік взірців виключення, відокремлений комами. Взірці виключення "
-"застосовуються після взірців."
+"Перелік шаблонів виключень, відокремлені комами. Шаблони виключення "
+"застосовуються після шаблонів включень."
#: tortoisehg/hgtk/datamine.py:331
msgid "Show line numbers"
@@ -8417,7 +8935,7 @@
#: tortoisehg/hgtk/gdialog.py:674
msgid "edit failed"
-msgstr "панувати не вдалось"
+msgstr "редагування не вдалося"
#: tortoisehg/hgtk/gdialog.py:823
#, python-format
@@ -8442,7 +8960,7 @@
#: tortoisehg/hgtk/gorev.py:44
msgid "revision number, changeset ID, branch or tag"
-msgstr "номер ревізії, ID набору змін, гілки або мітки"
+msgstr "номер ревізії, ID набору змін, гілки або ярлики"
#: tortoisehg/hgtk/gorev.py:59
msgid "Ambiguous Revision"
@@ -8505,7 +9023,7 @@
#: tortoisehg/hgtk/guess.py:116
msgid "Candidate Matches"
-msgstr "Претендент на співпадання"
+msgstr "Кандидат на співпадання"
#: tortoisehg/hgtk/guess.py:168
msgid "Accept Match"
@@ -8513,11 +9031,11 @@
#: tortoisehg/hgtk/guess.py:173
msgid "Differences from Source to Dest"
-msgstr "Відмінність між основою та наступником"
+msgstr "Відмінність між оригіналом та отримувачем"
#: tortoisehg/hgtk/guess.py:263
msgid "finding source of "
-msgstr "знаходження основи "
+msgstr "знаходження оригіналу у "
#: tortoisehg/hgtk/guess.py:367
#, python-format
@@ -8654,7 +9172,7 @@
#: tortoisehg/hgtk/hgignore.py:104
msgid "Patterns"
-msgstr "Взірці"
+msgstr "Шаблони"
#: tortoisehg/hgtk/hgignore.py:112
msgid "Remove Selected"
@@ -8754,12 +9272,12 @@msgid "use \"hgtk -v help%s\" to show aliases and global options"
msgstr ""
"виконайте \"hgtk -v help%s\" для перегляду псевдонімів та загальних "
-"налаштувань"
+"параметрів"
#: tortoisehg/hgtk/hgtk.py:558
#, python-format
msgid "use \"hgtk -v help %s\" to show global options"
-msgstr "виконайте \"hgtk -v help %s\" для перегляду загальних налаштувань"
+msgstr "виконайте \"hgtk -v help %s\" для перегляду загальних параметрів"
#: tortoisehg/hgtk/hgtk.py:583 tortoisehg/hgtk/hgtk.py:648
msgid "(No help text available)"
@@ -8779,7 +9297,7 @@
#: tortoisehg/hgtk/hgtk.py:758
msgid "hgtk clone SOURCE [DEST]"
-msgstr "hgtk clone SOURCE [ПРИЗНАЧЕННЯ]"
+msgstr "hgtk clone ОРИГІНАЛ [ОТРИМУВАЧ]"
#: tortoisehg/hgtk/hgtk.py:762
msgid "hgtk commit [OPTIONS] [FILE]..."
@@ -8795,7 +9313,7 @@
#: tortoisehg/hgtk/hgtk.py:765
msgid "hgtk init [DEST]"
-msgstr "hgtk init [ПРИЗНАЧЕННЯ]"
+msgstr "hgtk init [ОТРИМУВАЧ]"
#: tortoisehg/hgtk/hgtk.py:768
msgid "hgtk log [OPTIONS] [FILE]"
@@ -8847,7 +9365,7 @@
#: tortoisehg/hgtk/hgtk.py:786
msgid "hgtk rename SOURCE [DEST]"
-msgstr "hgtk rename SOURCE [ПРИЗНАЧЕННЯ]"
+msgstr "hgtk rename ОРИГІНАЛ [ОТРИМУВАЧ]"
#: tortoisehg/hgtk/hgtk.py:787
msgid "hgtk revert [FILE]..."
@@ -8907,7 +9425,7 @@
#: tortoisehg/hgtk/hgtk.py:827
msgid "hgtk import [OPTION] [SOURCE]..."
-msgstr "hgtk import [ПАРАМЕТРИ] [ДЖЕРЕЛО]..."
+msgstr "hgtk import [ПАРАМЕТРИ] [ОРИГІНАЛ]..."
#: tortoisehg/hgtk/hgtk.py:832
msgid "hgtk shellconfig"
@@ -8915,7 +9433,7 @@
#: tortoisehg/hgtk/histdetails.py:35
msgid "Log Details"
-msgstr "Журнал деталізацій"
+msgstr "Розгорнутий журнал"
#: tortoisehg/hgtk/histdetails.py:40
msgid "Columns"
@@ -8932,11 +9450,11 @@#: tortoisehg/hgtk/history.py:53 tortoisehg/hgtk/history.py:475
msgctxt "changesets"
msgid "All"
-msgstr ""
+msgstr "Всі"
#: tortoisehg/hgtk/history.py:58 tortoisehg/hgtk/history.py:477
msgid "Tagged"
-msgstr "З міткою"
+msgstr "З ярликом"
#: tortoisehg/hgtk/history.py:62 tortoisehg/hgtk/history.py:479
msgid "Ancestry"
@@ -8945,7 +9463,7 @@#: tortoisehg/hgtk/history.py:70 tortoisehg/hgtk/history.py:483
#: tortoisehg/hgtk/history.py:1229
msgid "Heads"
-msgstr "Голови"
+msgstr "Вершини"
#: tortoisehg/hgtk/history.py:74 tortoisehg/hgtk/history.py:485
msgid "Merges"
@@ -8978,7 +9496,7 @@#: tortoisehg/hgtk/history.py:101 tortoisehg/hgtk/history.py:105
#: tortoisehg/hgtk/history.py:493
msgid "File Patterns"
-msgstr "Файл взірців"
+msgstr "Файл шаблонів"
#: tortoisehg/hgtk/history.py:158
msgid "Branches..."
@@ -9062,7 +9580,7 @@#: tortoisehg/hgtk/history.py:355 tortoisehg/hgtk/history.py:699
#: tortoisehg/hgtk/logview/treeview.py:559
msgid "Tags"
-msgstr "Мітки"
+msgstr "Ярлики"
#: tortoisehg/hgtk/history.py:363
msgid "Sync Bar"
@@ -9256,7 +9774,7 @@
#: tortoisehg/hgtk/history.py:697
msgid "UTC Date"
-msgstr "UTC Дата"
+msgstr "Всесвітній час"
#: tortoisehg/hgtk/history.py:698 tortoisehg/hgtk/logview/treeview.py:547
msgid "Age"
@@ -9264,7 +9782,7 @@
#: tortoisehg/hgtk/history.py:700 tortoisehg/hgtk/logview/treeview.py:571
msgid "Subversion"
-msgstr ""
+msgstr "Subversion"
#: tortoisehg/hgtk/history.py:774
msgid "No matches"
@@ -9284,7 +9802,7 @@
#: tortoisehg/hgtk/history.py:792
msgid "Invalid file pattern"
-msgstr "Зразок файлу з помилкою"
+msgstr "Шаблон файлу з помилкою"
#: tortoisehg/hgtk/history.py:848
#, python-format
@@ -9308,7 +9826,7 @@#: tortoisehg/hgtk/history.py:1184
#, python-format
msgid "file patterns \"%s\""
-msgstr "файл взірців \"%s\""
+msgstr "файл шаблонів \"%s\""
#: tortoisehg/hgtk/history.py:1197
msgid "merges"
@@ -9341,7 +9859,7 @@
#: tortoisehg/hgtk/history.py:1225
msgid "heads"
-msgstr "голови"
+msgstr "вершини"
#: tortoisehg/hgtk/history.py:1231
msgid "no Merges"
@@ -9391,11 +9909,11 @@
#: tortoisehg/hgtk/history.py:1295
msgid "Tag"
-msgstr "Мітка"
+msgstr "Ярлик"
#: tortoisehg/hgtk/history.py:1315
msgid "Mercurial Queues"
-msgstr "Mercurial Queues"
+msgstr "Повідомлення Mercurial"
#: tortoisehg/hgtk/history.py:1320
msgid "Transp_lant to Local"
@@ -9423,7 +9941,7 @@
#: tortoisehg/hgtk/history.py:1341
msgid "Add/Remove _Tag..."
-msgstr "Додати/видалити _мітку..."
+msgstr "Додати/видалити ярлик..."
#: tortoisehg/hgtk/history.py:1342
msgid "Add/Move/Remove B_ookmark..."
@@ -9439,7 +9957,7 @@
#: tortoisehg/hgtk/history.py:1350
msgid "Strip Revision..."
-msgstr "Порізана ревізія..."
+msgstr "Порізка ревізія..."
#: tortoisehg/hgtk/history.py:1373
msgid "Reset"
@@ -9463,7 +9981,7 @@
#: tortoisehg/hgtk/history.py:1388
msgid "Visual Diff with selected"
-msgstr "Показати різницю з обраним"
+msgstr "Порівнювати з обраним"
#: tortoisehg/hgtk/history.py:1397
msgid "Email from here to selected..."
@@ -9630,7 +10148,7 @@
#: tortoisehg/hgtk/history.py:1978
msgid "Finished pull"
-msgstr "Отримання закінчено"
+msgstr "Отримання завершено"
#: tortoisehg/hgtk/history.py:1980
msgid "No changesets to pull"
@@ -9650,7 +10168,7 @@
#: tortoisehg/hgtk/history.py:2028
msgid "Checking outgoing changesets..."
-msgstr "Перевірка вихідних наборів змін"
+msgstr "Перевірка вихідних наборів змін..."
#: tortoisehg/hgtk/history.py:2037 tortoisehg/hgtk/synch.py:505
msgid "No repository selected"
@@ -9662,7 +10180,7 @@
#: tortoisehg/hgtk/history.py:2063
msgid "Finished push"
-msgstr "Відправка закінчена"
+msgstr "Відправка завершена"
#: tortoisehg/hgtk/history.py:2065 tortoisehg/hgtk/history.py:2688
msgid "Aborted push"
@@ -9809,17 +10327,17 @@#: tortoisehg/hgtk/history.py:2666
#, python-format
msgid "Finished push to revision %s"
-msgstr "Закінчено відправлення до ревізії %s"
+msgstr "Відправка до ревізії %s завершена"
#: tortoisehg/hgtk/history.py:2674
#, python-format
msgid "Finished pushing branch %s"
-msgstr "Закінчено відправлення гілки %s"
+msgstr "Відправка гілки %s завершена"
#: tortoisehg/hgtk/history.py:2691
#, python-format
msgid "Pushing branch %s..."
-msgstr "відправлена гілка %s..."
+msgstr "Відправлена гілка %s..."
#: tortoisehg/hgtk/history.py:2693
#, python-format
@@ -9834,7 +10352,7 @@#: tortoisehg/hgtk/history.py:2720
#, python-format
msgid "Finished pull to revision %s"
-msgstr "Закінчено отримання ревізії %s"
+msgstr "Отримання ревізії %s завершено"
#: tortoisehg/hgtk/history.py:2725
#, python-format
@@ -9908,10 +10426,6 @@msgid "Use merge tool:"
msgstr ""
-#: tortoisehg/hgtk/merge.py:135
-msgid "Merge"
-msgstr "Об’єднати"
-
#: tortoisehg/hgtk/merge.py:165
msgid "Merged successfully"
msgstr "Об’єднано успішно"
@@ -9960,7 +10474,7 @@
#: tortoisehg/hgtk/merge.py:254
msgid "Clean checkout of original revision?"
-msgstr "Очистити вивантажене до оригінальної ревізії?"
+msgstr "Очистити звірене до оригінальної ревізії?"
#: tortoisehg/hgtk/p4pending.py:43
msgid "Changelist:"
@@ -10021,13 +10535,9 @@msgid "Stop the hg operation"
msgstr "Зупинити дії hg"
-#: tortoisehg/hgtk/recovery.py:52
-msgid "Clean"
-msgstr "Очистити"
-
#: tortoisehg/hgtk/recovery.py:54
msgid "Clean checkout, undo all changes"
-msgstr "Очистити випробовування, відмінити всі зміни"
+msgstr "Очистити звірене, відмінити всі зміни"
#: tortoisehg/hgtk/recovery.py:57
msgid "Rollback"
@@ -10067,12 +10577,12 @@#: tortoisehg/hgtk/recovery.py:146
#, python-format
msgid "Rollback repository '%s' to %d, undo %s from %s?"
-msgstr "Rollback repository '%s' to %d, undo %s from %s?"
+msgstr "Повернення сховища '%s' до %d, скасував %s через %s?"
#: tortoisehg/hgtk/recovery.py:149
#, python-format
msgid "Rollback repository '%s' to %d, undo %s?"
-msgstr "Відкат сховища '%s' до %d, скасовано %s?"
+msgstr "Повернення сховища '%s' до %d, скасував %s?"
#: tortoisehg/hgtk/recovery.py:152
#, python-format
@@ -10295,7 +10805,7 @@
#: tortoisehg/hgtk/status.py:117
msgid "Visual diff checked files"
-msgstr "Візуальні відмінності у перевірених файлах"
+msgstr "Відмінності у перевірених файлах"
#: tortoisehg/hgtk/status.py:120
msgid "Revert checked files"
@@ -10468,6 +10978,10 @@msgid "No clean files selected"
msgstr "Вибрані файли не чисті"
+#: tortoisehg/hgtk/status.py:1251
+msgid "Annotate"
+msgstr "Примітка"
+
#: tortoisehg/hgtk/status.py:1255
msgid "_Guess Rename..."
msgstr "_Guess зміна назви..."
@@ -10680,15 +11194,15 @@
#: tortoisehg/hgtk/tagadd.py:79
msgid "Replace existing tag"
-msgstr "Замінити мітку, яка існує"
+msgstr "Замінити ярлик, який існує"
#: tortoisehg/hgtk/tagadd.py:219
msgid "Tag input is empty"
-msgstr "Вхідна мітка порожня"
+msgstr "Вхідний ярлик порожній"
#: tortoisehg/hgtk/tagadd.py:220
msgid "Please enter tag name"
-msgstr "Введіть назву мітки"
+msgstr "Вкажіть назву ярлика"
#: tortoisehg/hgtk/tagadd.py:224
msgid "Custom commit message is empty"
@@ -10696,7 +11210,7 @@
#: tortoisehg/hgtk/tagadd.py:233 tortoisehg/hgtk/tagadd.py:265
msgid "Tagging completed"
-msgstr "Встановлення міток завершено"
+msgstr "Встановлення ярликів завершено"
#: tortoisehg/hgtk/tagadd.py:234
#, python-format
@@ -10706,35 +11220,35 @@#: tortoisehg/hgtk/tagadd.py:237 tortoisehg/hgtk/tagadd.py:240
#: tortoisehg/hgtk/tagadd.py:269 tortoisehg/hgtk/tagadd.py:272
msgid "Error in tagging"
-msgstr "Помилка під час встановлення мітки"
+msgstr "Помилка під час встановлення ярлика"
#: tortoisehg/hgtk/tagadd.py:253
msgid "Tag name is empty"
-msgstr "Назва мітки порожня"
+msgstr "Ярлику не надана назва"
#: tortoisehg/hgtk/tagadd.py:254
msgid "Please select tag name to remove"
-msgstr "Оберіть назву мітки для видалення"
+msgstr "Оберіть назву ярлика для видалення"
#: tortoisehg/hgtk/tagadd.py:266
#, python-format
msgid "Tag \"%s\" has been removed"
-msgstr "Мітка \"%s\" буде видалена"
+msgstr "Ярлик \"%s\" буде видалений"
#: tortoisehg/hgtk/tagadd.py:279
#, python-format
msgid "a tag named \"%s\" already exists"
-msgstr "мітка з такою назвою \"%s\" вже існує"
+msgstr "ярлик з такою назвою \"%s\" вже існує"
#: tortoisehg/hgtk/tagadd.py:289
#, python-format
msgid "Tag '%s' already exist"
-msgstr "Мітка з такою назвою '%s' вже існує"
+msgstr "Ярлик з такою назвою '%s' вже існує"
#: tortoisehg/hgtk/tagadd.py:300
#, python-format
msgid "tag '%s' does not exist"
-msgstr "мітка '%s' не існує"
+msgstr "ярлик '%s' не існує"
#: tortoisehg/hgtk/thgconfig.py:46
msgid ""
@@ -10800,6 +11314,18 @@"відтермінування, та фіксації. За замовчуванням: Ні (різниці показують "
"праворуч від переліку файлів)"
+#: tortoisehg/hgtk/thgconfig.py:75
+msgid "Capture stderr"
+msgstr "Захоплення stderr"
+
+#: tortoisehg/hgtk/thgconfig.py:76
+msgid ""
+"Redirect stderr to a buffer which is parsed at the end of the process for "
+"runtime errors. Default: True"
+msgstr ""
+"Перенаправляти stderr до буферу для розбору його помилок виконання в кінці "
+"процесу. За замовчуванням: Так"
+
#: tortoisehg/hgtk/thgconfig.py:78
msgid "Fork hgtk"
msgstr "Зробити окрему гілку hgtk"
@@ -11051,23 +11577,23 @@
#: tortoisehg/hgtk/thgconfig.py:773
msgid "Confirm Switch"
-msgstr "Підтвердіть обмін"
+msgstr "Підтвердіть перехід"
#: tortoisehg/hgtk/thgconfig.py:774
msgid "Switch after saving changes?"
-msgstr "Перемкнути після збереження змін?"
+msgstr "Перейти після збереження змін?"
#: tortoisehg/hgtk/thgconfig.py:793
msgid "TortoiseHg Configure Repository - "
-msgstr "TortoiseHg Налаштування Сховища - "
+msgstr "Налаштунки сховища TortoiseHg - "
#: tortoisehg/hgtk/thgconfig.py:798
msgid "TortoiseHg Configure User-Global Settings"
-msgstr "TortoiseHg налаштування загальних параметрів користувача"
+msgstr "Налаштунки для загальних параметрів користувача TortoiseHg"
#: tortoisehg/hgtk/thgconfig.py:847
msgid "Exit after saving changes?"
-msgstr "Закінчити після зберігання змін?"
+msgstr "Закрити після збереження змін?"
#: tortoisehg/hgtk/thgconfig.py:939
msgid "Remote repository paths"
@@ -11107,7 +11633,7 @@
#: tortoisehg/hgtk/thgconfig.py:1117
msgid "Custom fonts:"
-msgstr "Користувальницькі шрифти:"
+msgstr "Шрифти користувача:"
#: tortoisehg/hgtk/thgconfig.py:1125
msgid " - Select Preset -"
@@ -11135,7 +11661,7 @@
#: tortoisehg/hgtk/thgconfig.py:1471
msgid "History"
-msgstr "Історія"
+msgstr "Журнал"
#: tortoisehg/hgtk/thgconfig.py:1551
msgid "Insufficient access rights, reverting to read-onlymode."
@@ -11199,7 +11725,7 @@#: tortoisehg/hgtk/thgimport.py:345
#, python-format
msgid "unexpected destination name: %s"
-msgstr "несподівана назва призначення: %s"
+msgstr "несподівана назва отримувача: %s"
#: tortoisehg/hgtk/thgmq.py:115
msgid "Unapply last patch"
@@ -11377,7 +11903,7 @@
#: tortoisehg/hgtk/thgpbranch.py:551
msgid "Patch branch finished"
-msgstr "Накладання латок на гілку закінчено"
+msgstr "Накладання латок на гілку завершено"
#: tortoisehg/hgtk/thgpbranch.py:653
msgid "_new"
@@ -11546,6 +12072,16 @@msgid "Failed to update"
msgstr "Не вдалося оновити"
+#: tortoisehg/hgtk/update.py:231
+msgid ""
+"Detected uncommitted local changes in working tree.\n"
+"Please select to continue:\n"
+"\n"
+msgstr ""
+"Знайдено незафіксовані локальні зміни у робочому дереві.\n"
+"Оберіть для продовження:\n"
+"\n"
+
#: tortoisehg/hgtk/update.py:236
msgid "Shelve - launch Shelve tool and continue"
msgstr ""
@@ -11595,80 +12131,80 @@msgid "&Quit"
msgstr "Ви&йти"
-#: tortoisehg/util/hglib.py:290
+#: tortoisehg/util/hglib.py:339
msgid "inotify is not supported on this platform"
msgstr ""
-#: tortoisehg/util/hglib.py:292
+#: tortoisehg/util/hglib.py:341
msgid "eol is incompatible with win32text"
msgstr ""
-#: tortoisehg/util/hglib.py:294
+#: tortoisehg/util/hglib.py:343
msgid "win32text is incompatible with eol"
msgstr ""
-#: tortoisehg/util/hglib.py:296
+#: tortoisehg/util/hglib.py:345
msgid "hgsubversion is incompatible with perfarce"
msgstr ""
-#: tortoisehg/util/hglib.py:298
+#: tortoisehg/util/hglib.py:347
msgid "perfarce is incompatible with hgsubversion"
msgstr ""
-#: tortoisehg/util/hglib.py:504
+#: tortoisehg/util/hglib.py:538
#, python-format
msgid "%d year"
msgid_plural "%d years"
msgstr[0] ""
msgstr[1] ""
-#: tortoisehg/util/hglib.py:505
+#: tortoisehg/util/hglib.py:539
#, python-format
msgid "%d month"
msgid_plural "%d months"
msgstr[0] ""
msgstr[1] ""
-#: tortoisehg/util/hglib.py:506
+#: tortoisehg/util/hglib.py:540
#, python-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] ""
msgstr[1] ""
-#: tortoisehg/util/hglib.py:507
+#: tortoisehg/util/hglib.py:541
#, python-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] ""
msgstr[1] ""
-#: tortoisehg/util/hglib.py:508
+#: tortoisehg/util/hglib.py:542
#, python-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] ""
msgstr[1] ""
-#: tortoisehg/util/hglib.py:509
+#: tortoisehg/util/hglib.py:543
#, python-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] ""
msgstr[1] ""
-#: tortoisehg/util/hglib.py:510
+#: tortoisehg/util/hglib.py:544
#, python-format
msgid "%d second"
msgid_plural "%d seconds"
msgstr[0] ""
msgstr[1] ""
-#: tortoisehg/util/hglib.py:520
+#: tortoisehg/util/hglib.py:554
msgid "in the future"
msgstr ""
-#: tortoisehg/util/hglib.py:524
+#: tortoisehg/util/hglib.py:558
msgid "now"
msgstr ""
@@ -11876,7 +12412,7 @@
#: tortoisehg/util/menuthg.py:26
msgid "Create clone here from source"
-msgstr "Створити клона з цієї основи"
+msgstr "Створити копію з цього оригіналу"
#: tortoisehg/util/menuthg.py:28
msgid "File Status"
@@ -11924,11 +12460,11 @@
#: tortoisehg/util/menuthg.py:47
msgid "View change history in repository"
-msgstr "Переглянути історію змін сховища"
+msgstr "Переглянути журнал змін сховища"
#: tortoisehg/util/menuthg.py:50
msgid "View change history of selected files"
-msgstr "Переглянути історію змін для обраних файлів"
+msgstr "Переглянути журнал змін для обраних файлів"
#: tortoisehg/util/menuthg.py:53
msgid "Synchronize with remote repository"
@@ -11974,10 +12510,6 @@msgid "Configure Explorer extension"
msgstr "Конфігурація розширень Explorer"
-#: tortoisehg/util/menuthg.py:73
-msgid "About TortoiseHg"
-msgstr "Про TortoiseHg"
-
#: tortoisehg/util/menuthg.py:74
msgid "Show About Dialog"
msgstr "Показати вікно Про програму"
@@ -12005,11 +12537,11 @@
#: tortoisehg/util/menuthg.py:85
msgid "Search History"
-msgstr "Історія пошуку"
+msgstr "Пошук журналу"
#: tortoisehg/util/menuthg.py:86
msgid "Search file revisions for patterns"
-msgstr "Пошук ревізії файлу за взірцями"
+msgstr "Пошук ревізії файлу за шаблоном"
#: tortoisehg/util/menuthg.py:88
msgid "DnD Synchronize"
@@ -12187,9 +12719,6 @@#~ "discuss@lists.sourceforge.net or "
#~ "http://bitbucket.org/tortoisehg/stable/issues\n"
-#~ msgid "tags"
-#~ msgstr "мітка"
-
#~ msgid "rev"
#~ msgstr "Версія"
@@ -12202,9 +12731,6 @@#~ msgid "child:"
#~ msgstr "нащадок:"
-#~ msgid "tags:"
-#~ msgstr "мітка:"
-
#~ msgid "user/date:"
#~ msgstr "користувач/дата:"
@@ -12226,12 +12752,6 @@#~ msgid "_view at revision"
#~ msgstr "показати для версії"
-#~ msgid "Please specify a different destination"
-#~ msgstr "Будь-ласка, оберіть інше призначення"
-
-#~ msgid "DataMining"
-#~ msgstr "Пошук даних"
-
#~ msgid "Detect Copies/Renames in "
#~ msgstr "Визначити Копії/Зміна назви у "
@@ -12284,9 +12804,6 @@#~ msgid "_DataMine"
#~ msgstr "Пошук даних"
-#~ msgid "Search Repository History"
-#~ msgstr "Шукати у історії сховища"
-
#~ msgid "Show Revision Ancestry"
#~ msgstr "Переглянути походження версії"
@@ -12323,9 +12840,6 @@#~ msgid "_update"
#~ msgstr "оновити"
-#~ msgid "Show Head Revisions"
-#~ msgstr "Переглянути головні версії"
-
#~ msgid "e_mail patch"
#~ msgstr "відправити латку e_mail"
@@ -12335,9 +12849,6 @@#~ msgid "backout revision"
#~ msgstr "відновити версію"
-#~ msgid "add/remove _tag"
-#~ msgstr "додати/видалити мітку"
-
#~ msgid "visual diff with selected"
#~ msgstr "наочно порівняти з обраною"
@@ -12431,9 +12942,6 @@#~ msgid "Show Patches"
#~ msgstr "Показати латки"
-#~ msgid "Remove tag from repository"
-#~ msgstr "Видалити мітку з сховища"
-
#~ msgid "Event Log"
#~ msgstr "Журнал подій"
@@ -12526,12 +13034,6 @@#~ msgid "View pulled revisions"
#~ msgstr "Показати отримані версії"
-#~ msgid "Add tag to selected version"
-#~ msgstr "Додати мітку до обраної версії"
-
-#~ msgid "TortoiseHg Tag - %s"
-#~ msgstr "TortoiseHg Мітка - %s"
-
#~ msgid "TortoiseHg Taskbar"
#~ msgstr "TortoiseHg Панель задач"
@@ -12580,9 +13082,6 @@#~ msgid "Revert selected files"
#~ msgstr "Повернути обрані файли"
-#~ msgid "Search revisions of files for a text pattern"
-#~ msgstr "Пошук версії файлів за тектовим взірцем"
-
#~ msgid "Synchronize..."
#~ msgstr "Обмін..."
@@ -12592,9 +13091,6 @@#~ msgid "View Changelog"
#~ msgstr "Показати Журнал Змін"
-#~ msgid "View revision history"
-#~ msgstr "Показати історію версії"
-
#~ msgid "Clone a repository here"
#~ msgstr "Клонування цього сховища"
@@ -12613,18 +13109,9 @@#~ msgid "diff other parent"
#~ msgstr "різниця у порівнянні з іншим попередником"
-#~ msgid "Destination Path:"
-#~ msgstr "Шлях до призначення:"
-
-#~ msgid "Source Path:"
-#~ msgstr "Шлях до основи:"
-
#~ msgid "Clone To Revision:"
#~ msgstr "Клонувати до Версії"
-#~ msgid "Source and dest are the same"
-#~ msgstr "Основа та Призначення співпадають"
-
#~ msgid "_commit"
#~ msgstr "фіксація"
@@ -12770,9 +13257,6 @@#~ msgid "Backed out successfully"
#~ msgstr "Успішно підтримано"
-#~ msgid "not at head revision"
-#~ msgstr "не головна редакція"
-
#~ msgid "_zoom to change"
#~ msgstr "_збільшити зміни"
@@ -12782,25 +13266,9 @@#~ msgid "_annotate parent"
#~ msgstr "_опис попередників"
-#~ msgid ""
-#~ "Patch series description is sent in initial summary email with [PATCH 0 of "
-#~ "N] subject. It should describe the effects of the entire patch series. "
-#~ "When emailing a bundle, these fields make up the message subject and body. "
-#~ "Flags is a comma separated list of tags which are inserted into the message "
-#~ "header."
-#~ msgstr ""
-#~ "Опис серії латок відправлених до первісної електронною поштою з супроводом "
-#~ "[PATCH 0 п] у питанні. Вона повинна описувати вплив цілого ряду виправлень. "
-#~ "При відправці у зв'язці, ці поля утворюють тему повідомлення і тіло. "
-#~ "Прапори, розділених комами списків міток, які вставляються в заголовок "
-#~ "повідомлення."
-
#~ msgid "%s - changelog"
#~ msgstr "%s - журнал змін"
-#~ msgid "file history: "
-#~ msgstr "файл історії: "
-
#~ msgid "custom filter"
#~ msgstr "фільтр користувача"
@@ -12859,9 +13327,6 @@#~ msgid "Invalid Remote Repository"
#~ msgstr "Невірне віддалене сховище"
-#~ msgid "_file history"
-#~ msgstr "_файл історії"
-
#~ msgid "_annotate file"
#~ msgstr "_опис файлу"
@@ -12880,9 +13345,6 @@#~ msgid "Pull to here"
#~ msgstr "Отримати сюди"
-#~ msgid "Push to here"
-#~ msgstr "Віддати сюди"
-
#~ msgid "Backout Revision..."
#~ msgstr "Назад з редакції..."
@@ -12972,9 +13434,6 @@#~ msgid "Canceled cloning"
#~ msgstr "Клонування скасовано"
-#~ msgid "no parent is a head, commit to add a new head"
-#~ msgstr "Відсутній попередник голови, додати нову голову"
-
#~ msgid "C_onfigure Format"
#~ msgstr "На_лаштувати формат"
@@ -13230,6 +13689,16 @@#~ "наприклад, \\ U0040 будуть розшифровані на знак \"@\", а \\n перехід рядка. "
#~ "За замовчуванням: None"
+#~ msgid "Target changeset"
+#~ msgstr "Об'єкт набору змін"
+
+#~ msgid "&Backout"
+#~ msgstr "&Повернути"
+
+#, python-format
+#~ msgid "Backout '%s' - %s"
+#~ msgstr "Повернути '%s' - %s"
+
#~ msgid "New name:"
#~ msgstr "Нова назва:"
@@ -13244,3 +13713,89 @@
#~ msgid "None"
#~ msgstr "Жодного"
+
+#~ msgid "Unable to annotate"
+#~ msgstr "Коментарі заборонені"
+
+#, python-format
+#~ msgid "%s is not found in revision %d"
+#~ msgstr "%s не знайдено в ревізії %d"
+
+#, python-format
+#~ msgid "Annotate %s@%d"
+#~ msgstr "Коментар %s@%d"
+
+#~ msgid "Search Repository History"
+#~ msgstr "Шукати у журналі сховища"
+
+#~ msgid "Show Head Revisions"
+#~ msgstr "Показати вершини ревізій"
+
+#~ msgid "View revision history"
+#~ msgstr "Показати журнал версії"
+
+#~ msgid "not at head revision"
+#~ msgstr "не вершина ревізії"
+
+#~ msgid "file history: "
+#~ msgstr "файл журналу: "
+
+#~ msgid "_file history"
+#~ msgstr "_файл журналу"
+
+#~ msgid "no parent is a head, commit to add a new head"
+#~ msgstr "відсутній попередник вершини, додати нову вершину"
+
+#~ msgid "tags"
+#~ msgstr "ярлики"
+
+#~ msgid "tags:"
+#~ msgstr "ярлики:"
+
+#~ msgid "add/remove _tag"
+#~ msgstr "додати/видалити ярлик"
+
+#~ msgid "Remove tag from repository"
+#~ msgstr "Видалити ярлик з сховища"
+
+#~ msgid "Add tag to selected version"
+#~ msgstr "Додати ярлик до обраної версії"
+
+#~ msgid "TortoiseHg Tag - %s"
+#~ msgstr "TortoiseHg Ярлик - %s"
+
+#~ msgid ""
+#~ "Patch series description is sent in initial summary email with [PATCH 0 of "
+#~ "N] subject. It should describe the effects of the entire patch series. "
+#~ "When emailing a bundle, these fields make up the message subject and body. "
+#~ "Flags is a comma separated list of tags which are inserted into the message "
+#~ "header."
+#~ msgstr ""
+#~ "Опис серії латок відправлених до первісної електронною поштою з супроводом "
+#~ "[PATCH 0 п] у питанні. Вона повинна описувати вплив цілого ряду виправлень. "
+#~ "При відправці у зв'язці, ці поля утворюють тему повідомлення і тіло. Ознаки, "
+#~ "розділених комами списків міток, які вставляються в заголовок повідомлення."
+
+#~ msgid "Revision has changed from:"
+#~ msgstr "Ревізія була змінена від:"
+
+#~ msgid "Find Rename"
+#~ msgstr "Знайти зміни назв"
+
+#~ msgid "Please specify a different destination"
+#~ msgstr "Будь-ласка, оберіть іншого отримувача"
+
+#~ msgid "DataMining"
+#~ msgstr "Аналіз даних"
+
+#~ msgid "Search revisions of files for a text pattern"
+#~ msgstr "Пошук версії файлів за текстовим шаблоном"
+
+#~ msgid "Destination Path:"
+#~ msgstr "Шлях до отримувача:"
+
+#~ msgid "Source Path:"
+#~ msgstr "Шлях до оригіналу:"
+
+#~ msgid "Source and dest are the same"
+#~ msgstr "Шляхи до оригіналу та отримувача співпадають"
|
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
|
@@ -166,13 +166,14 @@ output = pyqtSignal(QString, QString)
makeLogVisible = pyqtSignal(bool)
- def __init__(self, repo, pats, opts, embedded=False, parent=None):
+ def __init__(self, repo, pats, opts, embedded=False, parent=None, rev=None):
QWidget.__init__(self, parent=parent)
repo.configChanged.connect(self.configChanged)
repo.repositoryChanged.connect(self.repositoryChanged)
repo.workingBranchChanged.connect(self.workingBranchChanged)
self.repo = repo
+ self._rev = rev
self.lastAction = None
self.lastCommitMsg = ''
self.currentAction = None
@@ -308,6 +309,46 @@ QShortcut(QKeySequence('Ctrl+Enter'), self,
self.commit).setContext(Qt.WidgetWithChildrenShortcut)
+ @property
+ def rev(self):
+ """Return current revision"""
+ return self._rev
+
+ def selectRev(self, rev):
+ """
+ Select the revision that must be set when the dialog is shown again
+ """
+ self._rev = rev
+
+ @pyqtSlot(int)
+ @pyqtSlot(object)
+ def setRev(self, rev):
+ """Change revision to show"""
+ self.selectRev(rev)
+ if self.hasmqbutton:
+ preferredActionName = self._getPreferredActionName()
+ curractionName = self.mqgroup.checkedAction()._name
+ if curractionName != preferredActionName:
+ self.mqSetAction(refresh=True,
+ actionName=preferredActionName)
+
+ def _getPreferredActionName(self):
+ """Select the preferred action, depending on the selected revision"""
+ if not self.hasmqbutton:
+ return 'commit'
+ else:
+ pctx = self.repo.changectx('.')
+ ispatch = 'qtip' in pctx.tags()
+ if not ispatch:
+ # Set the button to Commit
+ return 'commit'
+ elif self.rev is None:
+ # Set the button to QNew
+ return 'qnew'
+ else:
+ # Set the button to QRefresh
+ return 'qref'
+
def mqSetupButton(self):
ispatch = lambda r: 'qtip' in r.changectx('.').tags()
notpatch = lambda r: 'qtip' not in r.changectx('.').tags()
@@ -364,13 +405,11 @@ action._enablefunc = a[3]
action.triggered.connect(menurefresh)
action.setCheckable(True)
- if a[3] and a[3](self.repo):
- action.setChecked(True)
mqmenu.addAction(action)
mqtb.setMenu(mqmenu)
mqtb.clicked.connect(self.mqPerformAction)
self.mqButtonEnable.connect(mqtb.setEnabled)
- self.mqSetAction()
+ self.mqSetAction(actionName=self._getPreferredActionName())
sc = QShortcut(QKeySequence('Ctrl+Return'), self, self.mqPerformAction)
sc.setContext(Qt.WidgetWithChildrenShortcut)
sc = QShortcut(QKeySequence('Ctrl+Enter'), self, self.mqPerformAction)
@@ -378,7 +417,12 @@ return mqtb
@pyqtSlot(bool)
- def mqSetAction(self, refresh=False):
+ def mqSetAction(self, refresh=False, actionName=None):
+ if actionName:
+ selectedAction = \
+ [act for act in self.mqgroup.actions() \
+ if act._name == actionName][0]
+ selectedAction.setChecked(True)
curraction = self.mqgroup.checkedAction()
oldpctx = self.stwidget.pctx
pctx = self.repo.changectx('.')
@@ -425,7 +469,7 @@ '''
Create the command line to change or create the selected branch unless
it is the selected branch
-
+
Verify whether a branch exists on a repo. If it doesn't ask the user
to confirm that it wants to create the branch. If it does and it is not
the current branch as the user whether it wants to change to that branch.
@@ -465,7 +509,7 @@ elif resp == 2:
return None, False
return commandlines, newbranch
-
+
@pyqtSlot()
def mqPerformAction(self):
curraction = self.mqgroup.checkedAction()
@@ -475,7 +519,7 @@ # Check if we need to change branch first
commandlines = []
if self.branchop:
- commandlines, newbranch = self.getBranchCommandLine(self.branchop,
+ commandlines, newbranch = self.getBranchCommandLine(self.branchop,
self.repo)
if commandlines is None:
return
|
|
|
@@ -325,6 +325,8 @@ if status in ('M', 'A'):
res = self.checkMaxDiff(ctx, wfile, maxdiff)
if res is None:
+ if status == 'A':
+ self.flabel += _(' <i>(was added)</i>')
return
fctx, newdata = res
self.contents = newdata
|
||
|
|
@@ -17,12 +17,13 @@ Qt4 dialogs to display hg revisions of a file
"""
+import os
import difflib
from tortoisehg.util import hglib
from tortoisehg.hgqt.i18n import _
from tortoisehg.hgqt import qtlib, visdiff, filerevmodel, blockmatcher, lexers
-from tortoisehg.hgqt import fileview, repoview, revpanel
+from tortoisehg.hgqt import fileview, repoview, revpanel, revert
from PyQt4.QtCore import *
from PyQt4.QtGui import *
@@ -205,6 +206,16 @@ a = menu.addAction(_('Diff file to local...'))
a.setIcon(qtlib.getmenuicon('ldiff'))
a.triggered.connect(self.onVisualDiffFileToLocal)
+ menu.addSeparator()
+ a = menu.addAction(_('View at revision...'))
+ a.setIcon(qtlib.getmenuicon('view-at-revision'))
+ a.triggered.connect(self.onViewFileAtRevision)
+ a = menu.addAction(_('Edit local'))
+ a.setIcon(qtlib.getmenuicon('edit-file'))
+ a.triggered.connect(self.onEditLocal)
+ a = menu.addAction(_('Revert to revision...'))
+ a.setIcon(qtlib.getmenuicon('hg-revert'))
+ a.triggered.connect(self.onRevertFileToRevision)
self.selection = selection
self.menu.exec_(point)
@@ -240,6 +251,37 @@ dlg.exec_()
dlg.deleteLater()
+ def onEditLocal(self):
+ filenames = [self.filename]
+ if not filenames:
+ return
+ qtlib.editfiles(self.repo, filenames, parent=self)
+
+ def onRevertFileToRevision(self):
+ rev = self.selection[0]
+ if rev is None:
+ rev = self.repo['.'].rev()
+ fileSelection = [self.filerevmodel.graph.filename(rev)]
+ if len(fileSelection) == 0:
+ return
+ dlg = revert.RevertDialog(self.repo, fileSelection, rev, self)
+ if dlg:
+ dlg.exec_()
+ dlg.deleteLater()
+
+ def onViewFileAtRevision(self):
+ rev = self.selection[0]
+ filenames = [self.filerevmodel.graph.filename(rev)]
+ if not filenames:
+ return
+ if rev is None:
+ qtlib.editfiles(self.repo, filenames, parent=self)
+ else:
+ base, _ = visdiff.snapshot(self.repo, filenames, self.repo[rev])
+ files = [os.path.join(base, filename)
+ for filename in filenames]
+ qtlib.editfiles(self.repo, files, parent=self)
+
@pyqtSlot(QString)
def onLinkActivated(self, link):
link = unicode(link)
@@ -277,6 +319,7 @@ def __init__(self, repo, filename, repoviewer=None):
super(FileDiffDialog, self).__init__(repo, filename, repoviewer)
self._readSettings()
+ self.menu = None
def closeEvent(self, event):
self._writeSettings()
@@ -416,6 +459,8 @@ self.filerevmodel.filled.connect(self.modelFilled)
self.tableView_revisions_left.setModel(self.filerevmodel)
self.tableView_revisions_right.setModel(self.filerevmodel)
+ self.tableView_revisions_left.menuRequested.connect(self.viewMenuRequest)
+ self.tableView_revisions_right.menuRequested.connect(self.viewMenuRequest)
def createActions(self):
self.actionClose.triggered.connect(self.close)
@@ -616,3 +661,99 @@ self.tableView_revisions_left.saveSettings()
self.tableView_revisions_right.saveSettings()
super(FileDiffDialog, self).reload()
+
+ @pyqtSlot(QPoint, object)
+ def viewMenuRequest(self, point, selection):
+ 'User requested a context menu in repo view widget'
+ if not selection:
+ return
+ if self.menu is None:
+ self.menu = menu = QMenu(self)
+ a = menu.addAction(_('Visual diff...'))
+ a.setIcon(qtlib.getmenuicon('visualdiff'))
+ a.triggered.connect(self.onVisualDiff)
+ a = menu.addAction(_('Diff to local...'))
+ a.setIcon(qtlib.getmenuicon('ldiff'))
+ a.triggered.connect(self.onVisualDiffToLocal)
+ menu.addSeparator()
+ a = menu.addAction(_('Visual diff file...'))
+ a.setIcon(qtlib.getmenuicon('visualdiff'))
+ a.triggered.connect(self.onVisualDiffFile)
+ a = menu.addAction(_('Diff file to local...'))
+ a.setIcon(qtlib.getmenuicon('ldiff'))
+ a.triggered.connect(self.onVisualDiffFileToLocal)
+ menu.addSeparator()
+ a = menu.addAction(_('View at revision...'))
+ a.setIcon(qtlib.getmenuicon('view-at-revision'))
+ a.triggered.connect(self.onViewFileAtRevision)
+ a = menu.addAction(_('Edit local'))
+ a.setIcon(qtlib.getmenuicon('edit-file'))
+ a.triggered.connect(self.onEditLocal)
+ a = menu.addAction(_('Revert to revision...'))
+ a.setIcon(qtlib.getmenuicon('hg-revert'))
+ a.triggered.connect(self.onRevertFileToRevision)
+ self.selection = selection
+ self.menu.exec_(point)
+
+ def onVisualDiff(self):
+ opts = dict(change=self.selection[0])
+ dlg = visdiff.visualdiff(self.repo.ui, self.repo, [], opts)
+ if dlg:
+ dlg.exec_()
+ dlg.deleteLater()
+
+ def onVisualDiffToLocal(self):
+ opts = dict(rev=['rev(%d)' % self.selection[0]])
+ dlg = visdiff.visualdiff(self.repo.ui, self.repo, [], opts)
+ if dlg:
+ dlg.exec_()
+ dlg.deleteLater()
+
+ def onVisualDiffFile(self):
+ rev = self.selection[0]
+ paths = [self.filerevmodel.graph.filename(rev)]
+ opts = dict(change=self.selection[0])
+ dlg = visdiff.visualdiff(self.repo.ui, self.repo, paths, opts)
+ if dlg:
+ dlg.exec_()
+ dlg.deleteLater()
+
+ def onVisualDiffFileToLocal(self):
+ rev = self.selection[0]
+ paths = [self.filerevmodel.graph.filename(rev)]
+ opts = dict(rev=['rev(%d)' % rev])
+ dlg = visdiff.visualdiff(self.repo.ui, self.repo, paths, opts)
+ if dlg:
+ dlg.exec_()
+ dlg.deleteLater()
+
+ def onEditLocal(self):
+ filenames = [self.filename]
+ if not filenames:
+ return
+ qtlib.editfiles(self.repo, filenames, parent=self)
+
+ def onRevertFileToRevision(self):
+ rev = self.selection[0]
+ if rev is None:
+ rev = self.repo['.'].rev()
+ fileSelection = [self.filerevmodel.graph.filename(rev)]
+ if len(fileSelection) == 0:
+ return
+ dlg = revert.RevertDialog(self.repo, fileSelection, rev, self)
+ if dlg:
+ dlg.exec_()
+ dlg.deleteLater()
+
+ def onViewFileAtRevision(self):
+ rev = self.selection[0]
+ filenames = [self.filerevmodel.graph.filename(rev)]
+ if not filenames:
+ return
+ if rev is None:
+ qtlib.editfiles(self.repo, filenames, parent=self)
+ else:
+ base, _ = visdiff.snapshot(self.repo, filenames, self.repo[rev])
+ files = [os.path.join(base, filename)
+ for filename in filenames]
+ qtlib.editfiles(self.repo, files, parent=self)
|
|
|
@@ -682,7 +682,10 @@ if ctx.rev() is None:
return
wsub, filename, ctx = hglib.getDeepestSubrepoContainingFile(filename, ctx)
- assert filename in ctx
+ if wsub is None:
+ # The file was not found in the repo context or its subrepos
+ # This may happen for files that have been removed
+ return
self.ctx = ctx
self.annfile = filename
self._thread.abort()
|
||
|
@@ -244,7 +244,7 @@ remdests[dest] = src
for dest, src in remdests.iteritems():
if not os.path.exists(self.repo.wjoin(src)):
- wctx.remove([src]) # !->R
+ wctx.forget([src]) # !->R
wctx.copy(src, dest)
self.matchtv.model().remove(dest)
self.matchAccepted.emit()
|
||
|
@@ -58,7 +58,7 @@ def openhelpcontents(url):
'Open online help, use local CHM file if available'
if not url.startswith('http'):
- fullurl = 'http://tortoisehg.org/manual/2.0/' + url
+ fullurl = 'http://tortoisehg.org/manual/2.1/' + url
# Use local CHM file if it can be found
if os.name == 'nt' and paths.bin_path:
chm = os.path.join(paths.bin_path, 'doc', 'TortoiseHg.chm')
|
||
|
@@ -205,6 +205,9 @@ text=_('Branch'), popupMode=QToolButton.InstantPopup,
statusTip=_('Display graph the named branch only'))
self._branchMenu = QMenu(self._branchLabel)
+ self._abranchAction = self._branchMenu.addAction(
+ _('Display only active branches'), self.refresh)
+ self._abranchAction.setCheckable(True)
self._cbranchAction = self._branchMenu.addAction(
_('Display closed branches'), self.refresh)
self._cbranchAction.setCheckable(True)
@@ -226,7 +229,11 @@ """Update the list of branches"""
curbranch = self.branch()
- if self._cbranchAction.isChecked():
+ if self._abranchAction.isChecked():
+ branches = sorted(set([self._repo[n].branch()
+ for n in self._repo.heads()
+ if not self._repo[n].extra().get('close')]))
+ elif self._cbranchAction.isChecked():
branches = sorted(self._repo.branchtags().keys())
else:
branches = self._repo.namedbranches
@@ -237,8 +244,8 @@ for branch in branches:
self._branchCombo.addItem(branch)
self._branchCombo.setItemData(self._branchCombo.count() - 1, branch, Qt.ToolTipRole)
- self._branchLabel.setEnabled(self.filterEnabled and len(branches) > 1)
- self._branchCombo.setEnabled(self.filterEnabled and len(branches) > 1)
+ self._branchLabel.setEnabled(self.filterEnabled and (len(branches) > 1 or self._abranchAction.isChecked()))
+ self._branchCombo.setEnabled(self.filterEnabled and (len(branches) > 1 or self._abranchAction.isChecked()))
self._branchReloading = False
if not curbranch:
|
||
|
@@ -35,7 +35,7 @@ # TODO: Remove these two when we adopt GTK author color scheme
COLORS = [ "blue", "darkgreen", "red", "green", "darkblue", "purple",
"cyan", Qt.darkYellow, "magenta", "darkred", "darkmagenta",
- "darkcyan", "gray", "yellow", ]
+ "darkcyan", "gray", ]
COLORS = [str(QColor(x).name()) for x in COLORS]
COLUMNHEADERS = (
@@ -588,7 +588,7 @@ msg = '*** ' + _('Working Directory') + ' ***'
for pctx in ctx.parents():
- if pctx.node() not in self.repo._branchheads:
+ if self.repo._branchheads and pctx.node() not in self.repo._branchheads:
text = _('Not a head revision!')
msg += " " + qtlib.markup(text, fg='red', weight='bold')
|
||
|
@@ -296,7 +296,7 @@ def dropAccepted(self):
# Whenever a drag and drop operation is completed, update the settings
# file
- self.updateSettingsFile()
+ QTimer.singleShot(0, self.updateSettingsFile)
@pyqtSlot(QString)
def modifiedSettings(self):
|
||
|
|
|
@@ -70,6 +70,7 @@ self.revsetfilter = False
self.ubranch = u''
self.bundle = None
+ self.outgoingMode = False
self.revset = []
self.busyIcons = []
self.namedTabs = {}
@@ -78,10 +79,31 @@ self.basenode = None
self.destroyed.connect(self.repo.thginvalidate)
+ # Determine the "initial revision" that must be shown when
+ # opening the repo.
+ # The "initial revision" can be selected via the settings, and it can
+ # have 3 possible values:
+ # - "current": Select the current (i.e. working dir parent) revision
+ # - "tip": Select tip of the repository
+ # - "workingdir": Select the working directory pseudo-revision
+ initialRevision= \
+ self.repo.ui.config('tortoisehg', 'initialrevision', 'current').lower()
+
+ initialRevisionDict = {
+ 'current': '.',
+ 'tip': 'tip',
+ 'workingdir': None
+ }
+ if initialRevision in initialRevisionDict:
+ default_rev = initialRevisionDict[initialRevision]
+ else:
+ # By default we'll select the current (i.e. working dir parent) revision
+ default_rev = '.'
+
if repo.parents()[0].rev() == -1:
self._reload_rev = 'tip'
else:
- self._reload_rev = '.'
+ self._reload_rev = default_rev
self.currentMessage = ''
self.dirty = False
@@ -96,6 +118,30 @@ self.runner.makeLogVisible.connect(self.makeLogVisible)
self.runner.commandFinished.connect(self.onCommandFinished)
+ # Select the widget chosen by the user
+ defaultWidget = \
+ self.repo.ui.config(
+ 'tortoisehg', 'defaultwidget', 'revdetails').lower()
+ widgetDict = {
+ 'revdetails': self.logTabIndex,
+ 'commit': self.commitTabIndex,
+ 'mq': self.mqTabIndex,
+ 'sync': self.syncTabIndex,
+ 'manifest': self.manifestTabIndex,
+ 'search': self.grepTabIndex
+ }
+ if initialRevision == 'workingdir':
+ # Do not allow selecting the revision details widget when the
+ # selected revision is the working directory pseudo-revision
+ widgetDict['revdetails'] = self.commitTabIndex
+
+ if defaultWidget in widgetDict:
+ widgetIndex = widgetDict[defaultWidget]
+ # Note: if the mq extension is not enabled, self.mqTabIndex will
+ # be negative
+ if widgetIndex > 0:
+ self.taskTabsWidget.setCurrentIndex(widgetIndex)
+
def setupUi(self):
SP = QSizePolicy
@@ -270,7 +316,7 @@
def createCommitWidget(self):
pats, opts = {}, {}
- cw = CommitWidget(self.repo, pats, opts, True, self)
+ cw = CommitWidget(self.repo, pats, opts, True, self, rev=self.rev)
if cw.hasmqbutton:
cw.buttonHBox.addWidget(cw.mqSetupButton())
@@ -418,6 +464,7 @@ @pyqtSlot()
def clearRevisionSet(self):
self.toolbarVisibilityChanged.emit()
+ self.outgoingMode = False
if not self.revset:
return
self.revset = []
@@ -510,7 +557,7 @@ self.generateUnappliedPatchMenu()
self.generateMultipleSelectionMenu()
self.generateBundleMenu()
-
+ self.generateOutgoingMenu()
def detectPatches(self, paths):
filepaths = []
for p in paths:
@@ -708,14 +755,17 @@ try:
self.revDetailsWidget.onRevisionSelected(rev)
self.revisionSelected.emit(rev)
- if type(rev) != str: # unapplied patch
+ if type(rev) != str:
+ # Regular patch or working directory
if self.manifestDemand.isHidden():
self.manifestDemand.forward('selectRev', rev)
else:
self.manifestDemand.forward('setRev', rev)
self.grepDemand.forward('setRevision', rev)
self.syncDemand.forward('refreshTargets', rev)
+ self.commitDemand.forward('setRev', rev)
else:
+ # unapplied patch
if self.manifestDemand.isHidden():
self.manifestDemand.forward('selectRev', None)
else:
@@ -942,10 +992,9 @@
def pull(self):
self.syncDemand.get().pull()
-
def outgoing(self):
self.syncDemand.get().outgoing()
-
+ self.outgoingMode = True
def push(self, confirm=True):
"""Call sync push.
@@ -953,7 +1002,7 @@ confirmation. If confirm is True, the prompt might be used.
"""
self.syncDemand.get().push(confirm)
-
+ self.outgoingMode = False
##
## Repoview context menu
##
@@ -972,6 +1021,10 @@ if len(selection) == 1:
self.bundlemenu.exec_(point)
return
+ if self.outgoingMode:
+ if len(selection) == 1:
+ self.outgoingcmenu.exec_(point)
+ return
self.menuselection = selection
allunapp = False
@@ -1036,10 +1089,8 @@ self.unappacts[4].setEnabled(unapplied > 1)
self.unappacts[5].setEnabled(len(selection) == 1)
self.unappcmenu.exec_(point)
-
- def generateSingleMenu(self):
+ def generateSingleMenu(self, mode=None):
items = []
-
# This menu will never be opened for an unapplied patch, they
# have their own menu.
#
@@ -1070,20 +1121,19 @@ act.enableFunc = func
menu.addAction(act)
items.append(act)
-
menu = QMenu(self)
-
+ if mode == 'outgoing':
+ submenu = menu.addMenu(_('Push'))
+ entry(submenu, None, isrev, _('Push all'), 'hg-push',
+ self.pushToRevision)
+ entry(submenu, None, isrev, _('Push to here'), '',
+ self.pushToRevision)
+ entry(submenu, None, isrev, _('Push selected branch'), '',
+ self.pushBranch)
+ entry(menu)
entry(menu, None, isrev, _('Update...'), 'hg-update',
self.updateToRevision)
entry(menu)
- submenu = menu.addMenu(_('Push'))
- entry(submenu, None, isrev, _('Push all'), 'hg-push',
- self.pushToRevision)
- entry(submenu, None, isrev, _('Push to here'), '',
- self.pushToRevision)
- entry(submenu, None, isrev, _('Push selected branch'), '',
- self.pushBranch)
- entry(menu)
entry(menu, None, isctx, _('Visual diff...'), 'visualdiff',
self.visualDiffRevision)
entry(menu, None, isrev, _('Diff to local...'), 'ldiff',
@@ -1145,10 +1195,12 @@
entry(menu, 'rupdate', fixed, _('Remote Update...'), 'hg-update',
self.rupdate)
-
- self.singlecmenu = menu
- self.singlecmenuitems = items
-
+ if mode == 'outgoing':
+ self.outgoingcmenu = menu
+ self.outgoingcmenuitems = items
+ else:
+ self.singlecmenu = menu
+ self.singlecmenuitems = items
def generatePairMenu(self):
def dagrange():
revA, revB = self.menuselection
@@ -1355,6 +1407,8 @@ a.setIcon(qtlib.getmenuicon(icon))
menu.addAction(a)
self.bundlemenu = menu
+ def generateOutgoingMenu(self):
+ self.generateSingleMenu(mode='outgoing')
def exportRevisions(self, revisions):
if not revisions:
@@ -1513,7 +1567,7 @@
def bundleRevisions(self, base=None, tip=None):
root = self.repo.root
- if not base:
+ if base is None or base is False:
base = self.rev
data = dict(name=os.path.basename(root), base=base)
if tip is None:
|
|
@@ -438,7 +438,7 @@ u'</b> %(arg1)s'])
opts['values'] = [str(evalue), evalue.hint]
dlg = ExceptionMsgBox(hglib.tounicode(str(evalue)),
- errstr, opts,
+ hglib.tounicode(errstr), opts,
parent=self._mainapp.activeWindow())
elif etype is KeyboardInterrupt:
if qtlib.QuestionMsgBox(_('Keyboard interrupt'),
|
||
|
@@ -58,6 +58,8 @@ self.grid.addWidget(pcombo, 0, 1)
### Options
+ self.discard_chk.setText(_('Discard remote changes, no backup '
+ '(-C/--clean)'))
self.push_chk = QCheckBox(_('Perform a push before updating'
' (-p/--push)'))
self.newbranch_chk = QCheckBox(_('Allow pushing new branches'
|
||
|
@@ -410,6 +410,17 @@ )),
({'name': 'log', 'label': _('Workbench'), 'icon': 'menulog'}, (
+ _fi(_('Default widget'), 'tortoisehg.defaultwidget', (genDefaultCombo,
+ ['revdetails', 'commit', 'mq', 'sync', 'manifest', 'search']),
+ _('Select the initial widget that will be shown when opening a '
+ 'repository. '
+ 'Default: revdetails')),
+ _fi(_('Initial revision'), 'tortoisehg.initialrevision', (genDefaultCombo,
+ ['current', 'tip', 'workingdir']),
+ _('Select the initial revision that will be selected when opening a '
+ 'repository. You can select the "current" (i.e. the working directory '
+ 'parent), the current "tip" or the working directory ("workingdir"). '
+ 'Default: current')),
_fi(_('Author Coloring'), 'tortoisehg.authorcolor', genBoolCombo,
_('Color changesets by author name. If not enabled, '
'the changes are colored green for merge, red for '
|
||
|
@@ -265,7 +265,8 @@ qtlib.ErrorMsgBox(_('File already exists'),
_('A shelf file of that name already exists'))
return
- self.repo.opener(fn, 'wb').write('')
+ f = open(shelfpath, "wb")
+ f.close()
self.showMessage(_('New shelf created'))
self.refreshCombos()
if shelfpath in self.shelves:
|
||
|
@@ -459,7 +459,6 @@ self.setContextMenuPolicy(Qt.CustomContextMenu)
self.customContextMenuRequested.connect(self.menuRequested)
self.setTextElideMode(Qt.ElideLeft)
- self.doubleClicked.connect(self.onDoubleClick)
def scrollTo(self, index, hint=QAbstractItemView.EnsureVisible):
# don't update horizontal position by selection change
@@ -467,14 +466,6 @@ super(WctxFileTree, self).scrollTo(index, hint)
self.horizontalScrollBar().setValue(orighoriz)
- def onDoubleClick(self, index):
- if not index.isValid():
- return
- path = self.model().getRow(index)[COL_PATH]
- dlg = visdiff.visualdiff(self.repo.ui, self.repo, [path], {})
- if dlg:
- dlg.exec_()
-
def keyPressEvent(self, event):
if event.key() == 32:
self.model().toggleRows(self.selectedRows())
|
||
|
@@ -387,11 +387,13 @@ # repositories already opened keep their ui instances in sync
repo = thgrepo._repocache[root]
ui = repo.ui
- else:
+ elif paths.is_on_fixed_drive(root):
# directly read the repository's configuration file
tempui = self.repo.ui.copy()
tempui.readconfig(os.path.join(root, '.hg', 'hgrc'))
ui = tempui
+ else:
+ continue
for alias, path in ui.configitems('paths'):
if hg.islocal(path):
abs = os.path.abspath(hglib.localpath(path)).lower()
|
||
|
@@ -470,8 +470,10 @@ if os.path.isdir(sdir):
def getModificationTime(x):
return os.path.getmtime(os.path.join(sdir, x))
- return sorted(os.listdir(sdir),
+ shelves = sorted(os.listdir(sdir),
key=getModificationTime, reverse=True)
+ return [s for s in shelves if \
+ os.path.isfile(os.path.join(self.shelfdir, s))]
return []
def thginvalidate(self):
|
||
|
@@ -180,7 +180,7 @@
def renamefromto(repo, deleted, unknown):
repo[None].copy(deleted, unknown)
- repo[None].remove([deleted], unlink=False) # !->R
+ repo[None].forget([deleted]) # !->R
def copyPatch(parent, ui, repo, files):
ui.pushbuffer()
@@ -341,5 +341,6 @@
def resolve_with(tool, repo, files):
opts = {'tool': tool}
- commands.resolve(repo.ui, repo, *files, **opts)
+ paths = [repo.wjoin(f) for f in files]
+ commands.resolve(repo.ui, repo, *paths, **opts)
return True
|
||
|
@@ -18,7 +18,7 @@
def checkhgversion(v):
"""range check the Mercurial version"""
- reqver = ['1', '8']
+ reqver = ['1', '9']
v = v.split('+')[0]
if not v or v == 'unknown' or len(v) >= 12:
# can't make any intelligent decisions about unknown or hashes
|
||
|
@@ -47,7 +47,8 @@ if os.name == 'nt':
import _winreg
import win32net
- USE_OK = 0 # network drive status
+ import win32api
+ import win32file
def find_in_path(pgmname):
"return first executable found in search path"
@@ -72,6 +73,20 @@ pass
return os.path.dirname(os.path.dirname(os.path.dirname(__file__)))
+ def is_on_fixed_drive(path):
+ if hasattr(os.path, 'splitunc'):
+ unc, rest = os.path.splitunc(drive)
+ if unc:
+ # All UNC paths (\\host\mount) are considered not-fixed
+ return False
+ drive, remain = os.path.splitdrive(path)
+ if drive:
+ return win32file.GetDriveType(drive) == win32file.DRIVE_FIXED
+ else:
+ return False
+
+ USE_OK = 0 # network drive status
+
def netdrive_status(drive):
"""
return True if a network drive is accessible (connected, ...),
@@ -112,3 +127,7 @@ or False if <drive> is not a network drive
"""
return False
+
+ def is_on_fixed_drive(path):
+ return True
+
|
||
|
@@ -15,20 +15,20 @@ <?define doc.style.css = {F42E2E5F-6329-4269-B6D8-805C6CFD8D5E} ?>
<!-- help.wxs -->
- <?define helpFolder.guid = {4B71277D-72E9-48F2-8A06-C706E9C3B4C0} ?>
+ <?define helpFolder.guid = {0CD881E3-815A-4227-9F7C-B9D70C1191EF} ?>
<!-- i18n.wxs -->
<?define i18nFolder.guid = {5191051C-742F-470E-AD76-D83C2F1EDE4E} ?>
<!-- templates.wxs -->
<?define templates.root.guid = {6A82D0BF-6878-42F3-92FD-AB39F7A97EEF} ?>
- <?define templates.atom.guid = {602F0A54-F5AF-4D22-A2FE-80A188531D02} ?>
+ <?define templates.atom.guid = {68D030FA-56A1-4CAF-ADBF-07362B1DDF15} ?>
<?define templates.coal.guid = {89768AB3-A942-470B-8C1C-9C026B80FF8E} ?>
- <?define templates.gitweb.guid = {66F4305F-8AC6-4B55-AC24-30FFC3161EF0} ?>
- <?define templates.monoblue.guid = {F1CC0065-B3D2-4D4C-BD7F-EFDBB4B47CBB} ?>
- <?define templates.paper.guid = {516308AA-E5F5-4545-BA2C-1FCB3EF0C649} ?>
+ <?define templates.gitweb.guid = {516A9A5F-33DF-41EC-B64C-F910251549D7} ?>
+ <?define templates.monoblue.guid = {BF01AC59-C62C-4946-B820-E528748EB3B2} ?>
+ <?define templates.paper.guid = {31BF16C5-3525-47F7-9733-F67A3B02171B} ?>
<?define templates.raw.guid = {936139F7-9A73-4685-80D2-F17A2BC42EAD} ?>
- <?define templates.rss.guid = {891DA56F-B02B-456F-8471-FE47024051E7} ?>
+ <?define templates.rss.guid = {948BDACE-4E70-459A-BDD2-89158FD53F1F} ?>
<?define templates.spartan.guid = {C49A4A44-53EB-4C37-AA0B-159070F46E84} ?>
<?define templates.static.guid = {B6C414E5-CD1E-4820-86E7-EEC2386426BE} ?>
|
||
|
@@ -13,7 +13,9 @@ <File Name="diffs.txt" />
<File Name="environment.txt" />
<File Name="extensions.txt" />
+ <File Name="filesets.txt" />
<File Name="glossary.txt" />
+ <File Name="hgignore.txt" />
<File Name="hgweb.txt" />
<File Name="merge-tools.txt" />
<File Name="multirevs.txt" />
|
||
|
@@ -45,6 +45,8 @@ <File Id="atom.map" Name="map" />
<File Id="atom.tagentry.tmpl" Name="tagentry.tmpl" />
<File Id="atom.tags.tmpl" Name="tags.tmpl" />
+ <File Id="atom.bookmarks.tmpl" Name="bookmarks.tmpl" />
+ <File Id="atom.bookmarkentry.tmpl" Name="bookmarkentry.tmpl" />
</Component>
</Directory>
@@ -58,6 +60,7 @@ <Directory Id="templates.gitwebdir" Name="gitweb">
<Component Id="templates.gitweb" Guid="$(var.templates.gitweb.guid)" Win64='$(var.IsX64)'>
<File Id="gitweb.branches.tmpl" Name="branches.tmpl" KeyPath="yes" />
+ <File Id="gitweb.bookmarks.tmpl" Name="bookmarks.tmpl" />
<File Id="gitweb.changelog.tmpl" Name="changelog.tmpl" />
<File Id="gitweb.changelogentry.tmpl" Name="changelogentry.tmpl" />
<File Id="gitweb.changeset.tmpl" Name="changeset.tmpl" />
@@ -85,6 +88,7 @@ <Directory Id="templates.monobluedir" Name="monoblue">
<Component Id="templates.monoblue" Guid="$(var.templates.monoblue.guid)" Win64='$(var.IsX64)'>
<File Id="monoblue.branches.tmpl" Name="branches.tmpl" KeyPath="yes" />
+ <File Id="monoblue.bookmarks.tmpl" Name="bookmarks.tmpl" />
<File Id="monoblue.changelog.tmpl" Name="changelog.tmpl" />
<File Id="monoblue.changelogentry.tmpl" Name="changelogentry.tmpl" />
<File Id="monoblue.changeset.tmpl" Name="changeset.tmpl" />
@@ -114,6 +118,7 @@ <File Id="paper.branches.tmpl" Name="branches.tmpl" KeyPath="yes" />
<File Id="paper.bookmarks.tmpl" Name="bookmarks.tmpl" />
<File Id="paper.changeset.tmpl" Name="changeset.tmpl" />
+ <File Id="paper.diffstat.tmpl" Name="diffstat.tmpl" />
<File Id="paper.error.tmpl" Name="error.tmpl" />
<File Id="paper.fileannotate.tmpl" Name="fileannotate.tmpl" />
<File Id="paper.filediff.tmpl" Name="filediff.tmpl" />
@@ -160,6 +165,8 @@ <File Id="rss.map" Name="map" />
<File Id="rss.tagentry.tmpl" Name="tagentry.tmpl" />
<File Id="rss.tags.tmpl" Name="tags.tmpl" />
+ <File Id="rss.bookmarks.tmpl" Name="bookmarks.tmpl" />
+ <File Id="rss.bookmarkentry.tmpl" Name="bookmarkentry.tmpl" />
</Component>
</Directory>
|
||
Add a tag
Loading...