We are currently indexing your data, so search results may be incomplete until we finish.
stable i18n: pull translations from Launchpad
Changeset 21ef4a609bf8…
Parent 8d0cf374dccd…
by
Changes to 29 files · Browse files at 21ef4a609bf8 Showing diff from parent 8d0cf374dccd Diff from another changeset...
-
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/sv.po
-
i18n/tortoisehg/tr.po
-
i18n/tortoisehg/uk.po
-
i18n/tortoisehg/zh_CN.po
-
i18n/tortoisehg/zh_TW.po
|
|
|
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: tortoisehg\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-02-27 13:57-0300\n"
+"POT-Creation-Date: 2011-02-28 02:58-0300\n"
"PO-Revision-Date: 2009-10-18 09:21+0000\n"
"Last-Translator: peso <peer.sommerlund@gmail.com>\n"
"Language-Team: Catalan <ca@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-28 04:40+0000\n"
+"X-Launchpad-Export-Date: 2011-03-01 04:44+0000\n"
"X-Generator: Launchpad (build 12351)\n"
#: TortoiseHgOverlayServer.py:50
@@ -25,14 +25,14 @@msgid "Exit"
msgstr "Sortir"
-#: tortoisehg/hgqt/about.py:35 tortoisehg/hgqt/workbench.py:281
+#: tortoisehg/hgqt/about.py:35 tortoisehg/hgqt/workbench.py:286
#: tortoisehg/hgtk/gdialog.py:505
msgid "About"
msgstr ""
-#: tortoisehg/hgqt/about.py:60 tortoisehg/hgtk/about.py:79
-msgid "Copyright 2008-2010 Steve Borho and others"
-msgstr "Copyright 2008-2010 Steve Borho i altres"
+#: tortoisehg/hgqt/about.py:60
+msgid "Copyright 2008-2011 Steve Borho and others"
+msgstr ""
#: tortoisehg/hgqt/about.py:65 tortoisehg/hgtk/about.py:42
msgid "Several icons are courtesy of the TortoiseSVN project"
@@ -63,7 +63,7 @@msgid "with Mercurial-%s, Python-%s, PyQt-%s, Qt-%s"
msgstr ""
-#: tortoisehg/hgqt/about.py:192 tortoisehg/hgtk/about.py:70
+#: tortoisehg/hgqt/about.py:189 tortoisehg/hgtk/about.py:70
msgid "A new version of TortoiseHg is ready for download!"
msgstr "Una nova versió de TortoiseHg està llesta per descarregar !"
@@ -194,9 +194,9 @@#: tortoisehg/hgqt/archive.py:112 tortoisehg/hgqt/commit.py:516
#: tortoisehg/hgqt/commit.py:523 tortoisehg/hgqt/commit.py:550
#: tortoisehg/hgqt/commit.py:563 tortoisehg/hgqt/compress.py:150
-#: tortoisehg/hgqt/merge.py:64 tortoisehg/hgqt/merge.py:163
-#: tortoisehg/hgqt/merge.py:359 tortoisehg/hgqt/merge.py:392
-#: tortoisehg/hgqt/merge.py:449 tortoisehg/hgqt/rebase.py:214
+#: tortoisehg/hgqt/merge.py:64 tortoisehg/hgqt/merge.py:165
+#: tortoisehg/hgqt/merge.py:358 tortoisehg/hgqt/merge.py:391
+#: tortoisehg/hgqt/merge.py:450 tortoisehg/hgqt/rebase.py:214
#: tortoisehg/hgqt/rebase.py:235 tortoisehg/hgqt/rename.py:104
#: tortoisehg/hgqt/repotreeitem.py:283 tortoisehg/hgqt/resolve.py:317
#: tortoisehg/hgqt/settings.py:653 tortoisehg/hgqt/settings.py:751
@@ -287,7 +287,7 @@msgstr "Grup de canvis retirat: "
#: tortoisehg/hgqt/backout.py:60 tortoisehg/hgqt/clone.py:84
-#: tortoisehg/hgqt/commit.py:219 tortoisehg/hgqt/merge.py:309
+#: tortoisehg/hgqt/commit.py:219 tortoisehg/hgqt/merge.py:308
#: tortoisehg/hgqt/mq.py:53 tortoisehg/hgqt/postreview_ui.py:169
#: tortoisehg/hgqt/rebase.py:56 tortoisehg/hgqt/sync.py:135
#: tortoisehg/hgqt/tag.py:78 tortoisehg/hgtk/hgemail.py:64
@@ -302,7 +302,7 @@msgid "Commit backout before merging with current working parent"
msgstr ""
-#: tortoisehg/hgqt/backout.py:80 tortoisehg/hgqt/merge.py:326
+#: tortoisehg/hgqt/backout.py:80 tortoisehg/hgqt/merge.py:325
#: tortoisehg/hgqt/rebase.py:68 tortoisehg/hgqt/sync.py:898
#: tortoisehg/hgqt/update.py:97
msgid "Automatically resolve merge conflicts where possible"
@@ -561,17 +561,17 @@msgid "Add or remove patches must be merged in the working directory"
msgstr ""
-#: tortoisehg/hgqt/chunks.py:430 tortoisehg/hgqt/status.py:128
+#: tortoisehg/hgqt/chunks.py:431 tortoisehg/hgqt/status.py:128
#: tortoisehg/hgtk/history.py:53 tortoisehg/hgtk/history.py:475
msgid "All"
msgstr ""
-#: tortoisehg/hgqt/chunks.py:434 tortoisehg/hgqt/qscilib.py:194
+#: tortoisehg/hgqt/chunks.py:435 tortoisehg/hgqt/qscilib.py:194
#: tortoisehg/hgqt/status.py:132
msgid "None"
msgstr ""
-#: tortoisehg/hgqt/chunks.py:490
+#: tortoisehg/hgqt/chunks.py:491
#, python-format
msgid "Chunks selected: %d / %d"
msgstr ""
@@ -696,7 +696,7 @@msgid "Terminated"
msgstr ""
-#: tortoisehg/hgqt/cmdui.py:307 tortoisehg/hgqt/merge.py:716
+#: tortoisehg/hgqt/cmdui.py:307 tortoisehg/hgqt/merge.py:718
#: tortoisehg/hgtk/p4pending.py:101
msgid "Finished"
msgstr ""
@@ -946,7 +946,7 @@msgid "Compress"
msgstr ""
-#: tortoisehg/hgqt/compress.py:69 tortoisehg/hgqt/merge.py:257
+#: tortoisehg/hgqt/compress.py:69 tortoisehg/hgqt/merge.py:259
#: tortoisehg/hgqt/rebase.py:104
msgid "Checking..."
msgstr ""
@@ -974,20 +974,20 @@msgid "Compress is complete, old history untouched"
msgstr ""
-#: tortoisehg/hgqt/compress.py:149 tortoisehg/hgqt/merge.py:358
-#: tortoisehg/hgqt/merge.py:391 tortoisehg/hgqt/merge.py:448
+#: tortoisehg/hgqt/compress.py:149 tortoisehg/hgqt/merge.py:357
+#: tortoisehg/hgqt/merge.py:390 tortoisehg/hgqt/merge.py:449
#: tortoisehg/hgqt/rebase.py:213 tortoisehg/hgqt/settings.py:751
#: tortoisehg/hgqt/update.py:219 tortoisehg/hgtk/thgconfig.py:775
#: tortoisehg/hgtk/update.py:233
msgid "&Discard"
msgstr ""
-#: tortoisehg/hgqt/compress.py:151 tortoisehg/hgqt/merge.py:450
+#: tortoisehg/hgqt/compress.py:151 tortoisehg/hgqt/merge.py:451
#: tortoisehg/hgqt/rebase.py:215
msgid "Confirm Discard"
msgstr ""
-#: tortoisehg/hgqt/compress.py:151 tortoisehg/hgqt/merge.py:450
+#: tortoisehg/hgqt/compress.py:151 tortoisehg/hgqt/merge.py:451
#: tortoisehg/hgqt/rebase.py:215
msgid "Discard outstanding changes in working directory?"
msgstr ""
@@ -1069,11 +1069,11 @@msgid "Output Log"
msgstr ""
-#: tortoisehg/hgqt/filedialogs.py:193 tortoisehg/hgqt/workbench.py:285
+#: tortoisehg/hgqt/filedialogs.py:193 tortoisehg/hgqt/workbench.py:290
msgid "Back"
msgstr ""
-#: tortoisehg/hgqt/filedialogs.py:195 tortoisehg/hgqt/workbench.py:288
+#: tortoisehg/hgqt/filedialogs.py:195 tortoisehg/hgqt/workbench.py:293
msgid "Forward"
msgstr ""
@@ -1114,7 +1114,7 @@msgid "Compare revisions of the selected file"
msgstr ""
-#: tortoisehg/hgqt/filelistview.py:235 tortoisehg/hgqt/grep.py:506
+#: tortoisehg/hgqt/filelistview.py:235 tortoisehg/hgqt/grep.py:502
#: tortoisehg/hgqt/manifestdialog.py:200 tortoisehg/util/menuthg.py:76
msgid "Visual Diff"
msgstr ""
@@ -1279,11 +1279,10 @@msgid "Search"
msgstr ""
-#: tortoisehg/hgqt/grep.py:54 tortoisehg/hgqt/merge.py:264
-#: 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
+#: 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 ""
@@ -1337,69 +1336,69 @@msgid "\"%s\" removed from path history"
msgstr ""
-#: tortoisehg/hgqt/grep.py:273
+#: tortoisehg/hgqt/grep.py:269
#, python-format
msgid "grep: invalid match pattern: %s\n"
msgstr ""
-#: tortoisehg/hgqt/grep.py:300
+#: tortoisehg/hgqt/grep.py:296
#, python-format
msgid "grep: %s\n"
msgstr ""
-#: tortoisehg/hgqt/grep.py:331
+#: tortoisehg/hgqt/grep.py:327
msgid "No matches found"
msgstr ""
-#: tortoisehg/hgqt/grep.py:333 tortoisehg/hgqt/revset.py:382
+#: tortoisehg/hgqt/grep.py:329 tortoisehg/hgqt/revset.py:382
#, python-format
msgid "%d matches found"
msgstr ""
-#: tortoisehg/hgqt/grep.py:397 tortoisehg/hgqt/grep.py:410
-#: tortoisehg/hgqt/grep.py:442
+#: tortoisehg/hgqt/grep.py:393 tortoisehg/hgqt/grep.py:406
+#: tortoisehg/hgqt/grep.py:438
msgid "Searching"
msgstr ""
-#: tortoisehg/hgqt/grep.py:397
+#: tortoisehg/hgqt/grep.py:393
msgid "history"
msgstr ""
-#: tortoisehg/hgqt/grep.py:409
+#: tortoisehg/hgqt/grep.py:405
msgid "Interrupted"
msgstr ""
-#: tortoisehg/hgqt/grep.py:443
+#: tortoisehg/hgqt/grep.py:439
msgid "files"
msgstr ""
-#: tortoisehg/hgqt/grep.py:504
+#: tortoisehg/hgqt/grep.py:500
msgid "View file"
msgstr ""
-#: tortoisehg/hgqt/grep.py:505
+#: tortoisehg/hgqt/grep.py:501
msgid "View Changeset"
msgstr ""
-#: tortoisehg/hgqt/grep.py:507
+#: tortoisehg/hgqt/grep.py:503
msgid "Annotate file"
msgstr ""
-#: tortoisehg/hgqt/grep.py:650 tortoisehg/hgtk/datamine.py:364
+#: tortoisehg/hgqt/grep.py:646 tortoisehg/hgtk/datamine.py:364
#: tortoisehg/hgtk/datamine.py:654
msgid "File"
msgstr ""
-#: tortoisehg/hgqt/grep.py:650 tortoisehg/hgtk/datamine.py:652
+#: tortoisehg/hgqt/grep.py:646 tortoisehg/hgtk/datamine.py:652
msgid "Line"
msgstr ""
-#: tortoisehg/hgqt/grep.py:650 tortoisehg/hgtk/datamine.py:363
+#: tortoisehg/hgqt/grep.py:646 tortoisehg/hgtk/datamine.py:363
#: tortoisehg/hgtk/datamine.py:653 tortoisehg/hgtk/logview/treeview.py:441
msgid "Rev"
msgstr ""
-#: tortoisehg/hgqt/grep.py:650 tortoisehg/hgqt/settings.py:451
+#: tortoisehg/hgqt/grep.py:646 tortoisehg/hgqt/settings.py:451
#: tortoisehg/hgqt/settings.py:551 tortoisehg/hgqt/settings.py:590
#: tortoisehg/hgtk/datamine.py:142 tortoisehg/hgtk/datamine.py:655
#: tortoisehg/hgtk/history.py:101 tortoisehg/hgtk/history.py:502
@@ -1408,7 +1407,7 @@msgid "User"
msgstr ""
-#: tortoisehg/hgqt/grep.py:651
+#: tortoisehg/hgqt/grep.py:647
msgid "Match Text"
msgstr ""
@@ -1830,76 +1829,76 @@msgid "&Exit"
msgstr ""
-#: tortoisehg/hgqt/merge.py:218 tortoisehg/hgqt/revpanel.py:156
+#: tortoisehg/hgqt/merge.py:220 tortoisehg/hgqt/revpanel.py:156
#: tortoisehg/hgtk/merge.py:73
msgid "Not a head revision!"
msgstr ""
-#: tortoisehg/hgqt/merge.py:225
+#: tortoisehg/hgqt/merge.py:227
msgid "Merge from (other revision)"
msgstr ""
-#: tortoisehg/hgqt/merge.py:233 tortoisehg/hgtk/merge.py:47
+#: tortoisehg/hgqt/merge.py:235 tortoisehg/hgtk/merge.py:47
#: tortoisehg/hgtk/merge.py:60
msgid "Unable to merge"
msgstr ""
-#: tortoisehg/hgqt/merge.py:234
+#: tortoisehg/hgqt/merge.py:236
msgid "Merge revision not specified or not found"
msgstr ""
-#: tortoisehg/hgqt/merge.py:239
+#: tortoisehg/hgqt/merge.py:241
msgid "Merge to (working directory)"
msgstr ""
-#: tortoisehg/hgqt/merge.py:248
+#: tortoisehg/hgqt/merge.py:250
msgid "Working directory status"
msgstr ""
-#: tortoisehg/hgqt/merge.py:267
+#: tortoisehg/hgqt/merge.py:266
msgid "<a href=\"view\">View changes...</a>"
msgstr ""
-#: tortoisehg/hgqt/merge.py:273
+#: tortoisehg/hgqt/merge.py:272
msgid ""
"The workding 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:282
+#: tortoisehg/hgqt/merge.py:281
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:295
+#: tortoisehg/hgqt/merge.py:294
msgid "Or use:"
msgstr ""
-#: tortoisehg/hgqt/merge.py:298
+#: tortoisehg/hgqt/merge.py:297
msgid "Force a merge with outstanding changes (-f/--force)"
msgstr ""
-#: tortoisehg/hgqt/merge.py:319 tortoisehg/hgtk/merge.py:118
+#: tortoisehg/hgqt/merge.py:318 tortoisehg/hgtk/merge.py:118
msgid "Discard all changes from merge target (other) revision"
msgstr ""
-#: tortoisehg/hgqt/merge.py:339 tortoisehg/hgqt/update.py:223
+#: tortoisehg/hgqt/merge.py:338 tortoisehg/hgqt/update.py:223
#: tortoisehg/hgtk/update.py:237
msgid "&Merge"
msgstr ""
-#: tortoisehg/hgqt/merge.py:343
+#: tortoisehg/hgqt/merge.py:342
msgid "Merge another revision to the working directory"
msgstr ""
-#: tortoisehg/hgqt/merge.py:360 tortoisehg/hgtk/merge.py:215
+#: tortoisehg/hgqt/merge.py:359 tortoisehg/hgtk/merge.py:215
msgid "Confirm Discard Changes"
msgstr ""
-#: tortoisehg/hgqt/merge.py:361 tortoisehg/hgtk/merge.py:216
+#: tortoisehg/hgqt/merge.py:360 tortoisehg/hgtk/merge.py:216
#, python-format
msgid ""
"The changes from revision %s and all unmerged parents will be discarded.\n"
@@ -1907,62 +1906,62 @@"Are you sure this is what you want to do?"
msgstr ""
+#: tortoisehg/hgqt/merge.py:370
+msgid "Merging..."
+msgstr ""
+
#: tortoisehg/hgqt/merge.py:371
-msgid "Merging..."
-msgstr ""
-
-#: tortoisehg/hgqt/merge.py:372
msgid "All conflicting files will be marked unresolved."
msgstr ""
+#: tortoisehg/hgqt/merge.py:388
+msgid "Cancel merge and discard changes?"
+msgstr ""
+
#: tortoisehg/hgqt/merge.py:389
-msgid "Cancel merge and discard changes?"
-msgstr ""
-
-#: tortoisehg/hgqt/merge.py:390
msgid "Discard unfinished local changes and restart merge?"
msgstr ""
-#: tortoisehg/hgqt/merge.py:393
+#: tortoisehg/hgqt/merge.py:392
msgid "Confirm Clean Up"
msgstr ""
+#: tortoisehg/hgqt/merge.py:395
+msgid "Canceling merge...\n"
+msgstr ""
+
#: tortoisehg/hgqt/merge.py:396
-msgid "Canceling merge...\n"
-msgstr ""
-
-#: tortoisehg/hgqt/merge.py:397
msgid "(Please close any running merge tool)\n"
msgstr ""
-#: tortoisehg/hgqt/merge.py:415
+#: tortoisehg/hgqt/merge.py:416
msgid "Merge failed"
msgstr ""
-#: tortoisehg/hgqt/merge.py:415
+#: tortoisehg/hgqt/merge.py:416
msgid "Returning to first page"
msgstr ""
-#: tortoisehg/hgqt/merge.py:466
+#: tortoisehg/hgqt/merge.py:467
msgid "Rename Patch"
msgstr ""
-#: tortoisehg/hgqt/merge.py:467
+#: tortoisehg/hgqt/merge.py:468
msgid "Input a new patch name:"
msgstr ""
-#: tortoisehg/hgqt/merge.py:475
+#: tortoisehg/hgqt/merge.py:476
#, 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:522
+#: tortoisehg/hgqt/merge.py:523
msgid "<b>Uncommitted local changes are detected</b>"
msgstr ""
-#: tortoisehg/hgqt/merge.py:527 tortoisehg/hgtk/recovery.py:52
+#: tortoisehg/hgqt/merge.py:528 tortoisehg/hgtk/recovery.py:52
msgid "Clean"
msgstr ""
@@ -1972,8 +1971,8 @@msgid "Parents"
msgstr ""
-#: tortoisehg/hgqt/merge.py:561 tortoisehg/hgqt/repomodel.py:521
-#: tortoisehg/hgqt/repomodel.py:523 tortoisehg/hgqt/shelve.py:24
+#: tortoisehg/hgqt/merge.py:561 tortoisehg/hgqt/repomodel.py:514
+#: tortoisehg/hgqt/repomodel.py:516 tortoisehg/hgqt/shelve.py:24
#: tortoisehg/hgqt/thgimport.py:87
msgid "Working Directory"
msgstr ""
@@ -1990,7 +1989,7 @@msgid "Merge "
msgstr ""
-#: tortoisehg/hgqt/merge.py:638 tortoisehg/hgqt/workbench.py:229
+#: tortoisehg/hgqt/merge.py:638 tortoisehg/hgqt/workbench.py:231
msgid "&Commit"
msgstr ""
@@ -2011,17 +2010,17 @@msgid "Please wait while committing merged files."
msgstr ""
-#: tortoisehg/hgqt/merge.py:672
+#: tortoisehg/hgqt/merge.py:674
msgid ""
"There were <b>merge conflicts</b> that must be <a "
"href=\"resolve\"><b>resolved</b></a>"
msgstr ""
-#: tortoisehg/hgqt/merge.py:677
+#: tortoisehg/hgqt/merge.py:679
msgid "No merge conflicts, ready to commit"
msgstr ""
-#: tortoisehg/hgqt/merge.py:729
+#: tortoisehg/hgqt/merge.py:731
msgid "Merge changeset"
msgstr ""
@@ -2452,7 +2451,7 @@msgid "Delete"
msgstr ""
-#: tortoisehg/hgqt/qqueue.py:100 tortoisehg/hgqt/workbench.py:271
+#: tortoisehg/hgqt/qqueue.py:100
msgid "Purge"
msgstr ""
@@ -2874,12 +2873,12 @@msgid "Include all ancestors"
msgstr ""
-#: tortoisehg/hgqt/repomodel.py:189
+#: tortoisehg/hgqt/repomodel.py:188
#, python-format
msgid "filling (%d)"
msgstr ""
-#: tortoisehg/hgqt/repomodel.py:515
+#: tortoisehg/hgqt/repomodel.py:508
msgid "Mercurial User"
msgstr ""
@@ -2937,7 +2936,7 @@msgstr ""
#: tortoisehg/hgqt/reporegistry.py:106 tortoisehg/hgqt/sync.py:451
-#: tortoisehg/hgqt/workbench.py:274
+#: tortoisehg/hgqt/workbench.py:279
msgid "Explore"
msgstr ""
@@ -2946,7 +2945,7 @@msgstr ""
#: tortoisehg/hgqt/reporegistry.py:108 tortoisehg/hgqt/sync.py:452
-#: tortoisehg/hgqt/workbench.py:277
+#: tortoisehg/hgqt/workbench.py:282
msgid "Terminal"
msgstr ""
@@ -2989,7 +2988,7 @@msgid "default"
msgstr ""
-#: tortoisehg/hgqt/repotreemodel.py:143 tortoisehg/hgqt/resolve.py:363
+#: tortoisehg/hgqt/repotreemodel.py:143 tortoisehg/hgqt/resolve.py:362
#: tortoisehg/hgqt/sync.py:198 tortoisehg/hgqt/webconf.py:266
msgid "Path"
msgstr ""
@@ -3002,7 +3001,7 @@msgid "Failed to add repository"
msgstr ""
-#: tortoisehg/hgqt/repotreemodel.py:221 tortoisehg/hgqt/workbench.py:576
+#: tortoisehg/hgqt/repotreemodel.py:221 tortoisehg/hgqt/workbench.py:581
#, python-format
msgid "%s is not a valid repository"
msgstr ""
@@ -3435,16 +3434,16 @@msgid "&Quit"
msgstr ""
-#: tortoisehg/hgqt/resolve.py:363
+#: tortoisehg/hgqt/resolve.py:362
msgid "Ext"
msgstr ""
-#: tortoisehg/hgqt/resolve.py:363 tortoisehg/hgqt/thgimport.py:85
+#: tortoisehg/hgqt/resolve.py:362 tortoisehg/hgqt/thgimport.py:85
#: tortoisehg/hgtk/thgimport.py:110
msgid "Repository"
msgstr ""
-#: tortoisehg/hgqt/resolve.py:406
+#: tortoisehg/hgqt/resolve.py:405
msgid "<default>"
msgstr ""
@@ -4589,8 +4588,8 @@"Merge, Tag and Backout dialogs. Default: False"
msgstr ""
-#: tortoisehg/hgqt/settings.py:396 tortoisehg/hgqt/workbench.py:252
-#: tortoisehg/hgtk/thgconfig.py:179 tortoisehg/util/menuthg.py:55
+#: tortoisehg/hgqt/settings.py:396 tortoisehg/hgtk/thgconfig.py:179
+#: tortoisehg/util/menuthg.py:55
msgid "Web Server"
msgstr ""
@@ -5380,50 +5379,50 @@msgid "Size (KB)"
msgstr ""
-#: tortoisehg/hgqt/status.py:667
+#: tortoisehg/hgqt/status.py:684
msgid ", resolved merge"
msgstr ""
-#: tortoisehg/hgqt/status.py:669
+#: tortoisehg/hgqt/status.py:686
msgid ", unresolved merge"
msgstr ""
-#: tortoisehg/hgqt/status.py:681
+#: tortoisehg/hgqt/status.py:698
#, python-format
msgid "%s is modified"
msgstr ""
-#: tortoisehg/hgqt/status.py:683
+#: tortoisehg/hgqt/status.py:700
#, python-format
msgid "%s is added"
msgstr ""
-#: tortoisehg/hgqt/status.py:685
+#: tortoisehg/hgqt/status.py:702
#, python-format
msgid "%s is removed"
msgstr ""
-#: tortoisehg/hgqt/status.py:687
+#: tortoisehg/hgqt/status.py:704
#, python-format
msgid "%s is not tracked (unknown)"
msgstr ""
-#: tortoisehg/hgqt/status.py:689
+#: tortoisehg/hgqt/status.py:706
#, python-format
msgid "%s is missing!"
msgstr ""
-#: tortoisehg/hgqt/status.py:691
+#: tortoisehg/hgqt/status.py:708
#, python-format
msgid "%s is ignored"
msgstr ""
-#: tortoisehg/hgqt/status.py:693
+#: tortoisehg/hgqt/status.py:710
#, python-format
msgid "%s is not modified (clean)"
msgstr ""
-#: tortoisehg/hgqt/status.py:695
+#: tortoisehg/hgqt/status.py:712
#, python-format
msgid "%s is a dirty subrepo"
msgstr ""
@@ -5534,11 +5533,11 @@msgid "A terminal shell cannot be opened for remote"
msgstr ""
-#: tortoisehg/hgqt/sync.py:491 tortoisehg/hgqt/workbench.py:676
+#: tortoisehg/hgqt/sync.py:491 tortoisehg/hgqt/workbench.py:681
msgid "No shell configured"
msgstr ""
-#: tortoisehg/hgqt/sync.py:492 tortoisehg/hgqt/workbench.py:677
+#: tortoisehg/hgqt/sync.py:492 tortoisehg/hgqt/workbench.py:682
msgid "A terminal shell must be configured"
msgstr ""
@@ -6584,155 +6583,152 @@msgid "Save"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:39 tortoisehg/hgqt/workbench.py:398
+#: tortoisehg/hgqt/workbench.py:37 tortoisehg/hgqt/workbench.py:403
msgid "TortoiseHg Workbench"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:64
+#: tortoisehg/hgqt/workbench.py:62
msgid "New Repository..."
msgstr ""
-#: tortoisehg/hgqt/workbench.py:66 tortoisehg/hgqt/workbench.py:177
+#: tortoisehg/hgqt/workbench.py:64 tortoisehg/hgqt/workbench.py:183
msgid "Clone Repository..."
msgstr ""
-#: tortoisehg/hgqt/workbench.py:68
+#: tortoisehg/hgqt/workbench.py:66
msgid "Open Repository..."
msgstr ""
+#: tortoisehg/hgqt/workbench.py:98
+msgid "&File"
+msgstr ""
+
+#: tortoisehg/hgqt/workbench.py:99
+msgid "&View"
+msgstr ""
+
#: tortoisehg/hgqt/workbench.py:100
-msgid "&File"
+msgid "&Repository"
msgstr ""
#: tortoisehg/hgqt/workbench.py:101
-msgid "&View"
-msgstr ""
-
-#: tortoisehg/hgqt/workbench.py:102
-msgid "&Repository"
+msgid "&Help"
msgstr ""
#: tortoisehg/hgqt/workbench.py:103
-msgid "&Help"
+msgid "Edit Toolbar"
msgstr ""
#: tortoisehg/hgqt/workbench.py:105
-msgid "Edit Toolbar"
+msgid "Dock Toolbar"
msgstr ""
#: tortoisehg/hgqt/workbench.py:107
-msgid "Dock Toolbar"
+msgid "Sync Toolbar"
msgstr ""
#: tortoisehg/hgqt/workbench.py:109
-msgid "Sync Toolbar"
-msgstr ""
-
-#: tortoisehg/hgqt/workbench.py:111
msgid "Task Toolbar"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:175
+#: tortoisehg/hgqt/workbench.py:176
+msgid "&Open Repository..."
+msgstr ""
+
+#: tortoisehg/hgqt/workbench.py:178
+msgid "&Close Repository"
+msgstr ""
+
+#: tortoisehg/hgqt/workbench.py:181
msgid "&New Repository..."
msgstr ""
-#: tortoisehg/hgqt/workbench.py:180
-msgid "&Open Repository..."
-msgstr ""
-
-#: tortoisehg/hgqt/workbench.py:182
-msgid "&Close Repository"
-msgstr ""
-
-#: tortoisehg/hgqt/workbench.py:185
+#: tortoisehg/hgqt/workbench.py:187
msgid "&Settings..."
msgstr ""
-#: tortoisehg/hgqt/workbench.py:188
+#: tortoisehg/hgqt/workbench.py:190
msgid "E&xit"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:192
+#: tortoisehg/hgqt/workbench.py:193
msgid "Show Repository Registry"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:199
+#: tortoisehg/hgqt/workbench.py:200
msgid "Show Paths"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:203
+#: tortoisehg/hgqt/workbench.py:204
msgid "Show Output &Log"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:210
+#: tortoisehg/hgqt/workbench.py:211
msgid "Choose Log Columns..."
msgstr ""
-#: tortoisehg/hgqt/workbench.py:213
+#: tortoisehg/hgqt/workbench.py:214
msgid "Save Open Repositories On Exit"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:228
+#: tortoisehg/hgqt/workbench.py:230
msgid "Revision &Details"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:230
+#: tortoisehg/hgqt/workbench.py:232
msgid "S&ynchronize"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:231
+#: tortoisehg/hgqt/workbench.py:233
msgid "&Manifest"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:232
+#: tortoisehg/hgqt/workbench.py:234
msgid "&Search"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:234
+#: tortoisehg/hgqt/workbench.py:236
msgid "Patch &Queue"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:236
+#: tortoisehg/hgqt/workbench.py:238
msgid "&Patch Branch"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:239 tortoisehg/hgtk/status.py:1320
+#: tortoisehg/hgqt/workbench.py:241 tortoisehg/hgtk/status.py:1320
msgid "&Refresh"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:242
+#: tortoisehg/hgqt/workbench.py:244
msgid "Refresh current repository"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:243
+#: tortoisehg/hgqt/workbench.py:245
msgid "Refresh &Task Tab"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:246
+#: tortoisehg/hgqt/workbench.py:248
msgid "Refresh only the current task tab"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:248 tortoisehg/hgtk/history.py:1496
-msgid "Load all"
-msgstr ""
-
#: tortoisehg/hgqt/workbench.py:250
+msgid "Load all revisions"
+msgstr ""
+
+#: tortoisehg/hgqt/workbench.py:252
msgid "Load all revisions into graph"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:254 tortoisehg/hgtk/history.py:1324
-msgid "Bisect"
-msgstr ""
-
-#: tortoisehg/hgqt/workbench.py:257 tortoisehg/hgtk/gdialog.py:493
-#: tortoisehg/hgtk/history.py:291 tortoisehg/hgtk/synch.py:83
-#: tortoisehg/hgtk/thgshelve.py:72 tortoisehg/hgtk/thgshelve.py:145
-#: tortoisehg/hgtk/thgshelve.py:151 tortoisehg/hgtk/thgshelve.py:159
-msgid "Shelve"
-msgstr ""
-
-#: tortoisehg/hgqt/workbench.py:259 tortoisehg/hgtk/thgimport.py:164
-msgid "Import"
+#: tortoisehg/hgqt/workbench.py:254
+msgid "Web Server..."
+msgstr ""
+
+#: tortoisehg/hgqt/workbench.py:257
+msgid "Shelve..."
+msgstr ""
+
+#: tortoisehg/hgqt/workbench.py:259 tortoisehg/hgtk/history.py:458
+msgid "Import..."
msgstr ""
#: tortoisehg/hgqt/workbench.py:262 tortoisehg/hgtk/recovery.py:68
@@ -6744,80 +6740,88 @@msgstr ""
#: tortoisehg/hgqt/workbench.py:267
-msgid "Resolve"
-msgstr ""
-
-#: tortoisehg/hgqt/workbench.py:269
-msgid "Rollback/Undo"
-msgstr ""
-
-#: tortoisehg/hgqt/workbench.py:293
+msgid "Resolve..."
+msgstr ""
+
+#: tortoisehg/hgqt/workbench.py:270
+msgid "Rollback/Undo..."
+msgstr ""
+
+#: tortoisehg/hgqt/workbench.py:273
+msgid "Purge..."
+msgstr ""
+
+#: tortoisehg/hgqt/workbench.py:276
+msgid "Bisect..."
+msgstr ""
+
+#: tortoisehg/hgqt/workbench.py:298
msgid "Filter Toolbar"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:296
+#: tortoisehg/hgqt/workbench.py:301
msgid "Filter graph with revision sets or branches"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:298
+#: tortoisehg/hgqt/workbench.py:303
msgid "Workbench Toolbars"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:305 tortoisehg/hgtk/history.py:438
+#: tortoisehg/hgqt/workbench.py:310 tortoisehg/hgtk/history.py:438
#: tortoisehg/hgtk/history.py:1861 tortoisehg/hgtk/synch.py:57
msgid "Incoming"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:306
+#: tortoisehg/hgqt/workbench.py:311
msgid "Check for incoming changes from default pull target"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:308 tortoisehg/hgtk/history.py:440
+#: tortoisehg/hgqt/workbench.py:313 tortoisehg/hgtk/history.py:440
#: tortoisehg/hgtk/history.py:1991
msgid "Pull"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:309
+#: tortoisehg/hgqt/workbench.py:314
msgid "Pull incoming changes from default pull target"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:311 tortoisehg/hgtk/history.py:442
+#: tortoisehg/hgqt/workbench.py:316 tortoisehg/hgtk/history.py:442
#: tortoisehg/hgtk/history.py:2034 tortoisehg/hgtk/synch.py:68
msgid "Outgoing"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:312
+#: tortoisehg/hgqt/workbench.py:317
msgid "Detect outgoing changes to default push target"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:314 tortoisehg/hgtk/history.py:444
+#: tortoisehg/hgqt/workbench.py:319 tortoisehg/hgtk/history.py:444
#: tortoisehg/hgtk/history.py:2074 tortoisehg/hgtk/synch.py:73
msgid "Push"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:315
+#: tortoisehg/hgqt/workbench.py:320
msgid "Push outgoing changes to default push target"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:400
+#: tortoisehg/hgqt/workbench.py:405
#, python-format
msgid "%s - TortoiseHg Workbench - %s"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:403
+#: tortoisehg/hgqt/workbench.py:408
#, python-format
msgid "%s - TortoiseHg Workbench"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:554
+#: tortoisehg/hgqt/workbench.py:559
msgid "Select repository directory to open"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:575
+#: tortoisehg/hgqt/workbench.py:580
msgid "Failed to open repository"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:698
+#: tortoisehg/hgqt/workbench.py:703
#, python-format
msgid "Hg file log viewer [%s] - %s"
msgstr ""
@@ -6827,6 +6831,10 @@msgid "(version %s)"
msgstr "(versió %s)"
+#: tortoisehg/hgtk/about.py:79
+msgid "Copyright 2008-2010 Steve Borho and others"
+msgstr "Copyright 2008-2010 Steve Borho i altres"
+
#: tortoisehg/hgtk/about.py:95
#, python-format
msgid "with %s"
@@ -7682,6 +7690,13 @@msgid "Recovery"
msgstr ""
+#: tortoisehg/hgtk/gdialog.py:493 tortoisehg/hgtk/history.py:291
+#: tortoisehg/hgtk/synch.py:83 tortoisehg/hgtk/thgshelve.py:72
+#: tortoisehg/hgtk/thgshelve.py:145 tortoisehg/hgtk/thgshelve.py:151
+#: tortoisehg/hgtk/thgshelve.py:159
+msgid "Shelve"
+msgstr ""
+
#: tortoisehg/hgtk/gdialog.py:500
msgid "_Help"
msgstr ""
@@ -8400,10 +8415,6 @@msgid "Reject Bundle"
msgstr ""
-#: tortoisehg/hgtk/history.py:458
-msgid "Import..."
-msgstr ""
-
#: tortoisehg/hgtk/history.py:460
msgid "Add Bundle..."
msgstr ""
@@ -8661,6 +8672,10 @@msgid "Transp_lant to Local"
msgstr ""
+#: tortoisehg/hgtk/history.py:1324
+msgid "Bisect"
+msgstr ""
+
#: tortoisehg/hgtk/history.py:1332
msgid "_Export Patch..."
msgstr ""
@@ -8762,6 +8777,10 @@msgstr ""
#: tortoisehg/hgtk/history.py:1496
+msgid "Load all"
+msgstr ""
+
+#: tortoisehg/hgtk/history.py:1496
msgid "load all revisions"
msgstr ""
@@ -10293,6 +10312,10 @@msgid "Skipped saving path with no alias"
msgstr ""
+#: tortoisehg/hgtk/thgimport.py:164
+msgid "Import"
+msgstr ""
+
#: tortoisehg/hgtk/thgimport.py:184
msgid "Imported successfully"
msgstr ""
|
|
|
|
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: tortoisehg\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-02-27 13:57-0300\n"
-"PO-Revision-Date: 2010-11-09 20:55+0000\n"
-"Last-Translator: Tovim <Unknown>\n"
+"POT-Creation-Date: 2011-02-28 02:58-0300\n"
+"PO-Revision-Date: 2011-02-28 21:50+0000\n"
+"Last-Translator: Wagner Bruna <Unknown>\n"
"Language-Team: Czech <kde-i18n-doc@kde.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-28 04:40+0000\n"
+"X-Launchpad-Export-Date: 2011-03-01 04:44+0000\n"
"X-Generator: Launchpad (build 12351)\n"
#: TortoiseHgOverlayServer.py:50
@@ -26,14 +26,14 @@msgid "Exit"
msgstr "Ukončit"
-#: tortoisehg/hgqt/about.py:35 tortoisehg/hgqt/workbench.py:281
+#: tortoisehg/hgqt/about.py:35 tortoisehg/hgqt/workbench.py:286
#: tortoisehg/hgtk/gdialog.py:505
msgid "About"
msgstr "O programu"
-#: tortoisehg/hgqt/about.py:60 tortoisehg/hgtk/about.py:79
-msgid "Copyright 2008-2010 Steve Borho and others"
-msgstr "Copyright 2008-2010 Steve Borho a další"
+#: tortoisehg/hgqt/about.py:60
+msgid "Copyright 2008-2011 Steve Borho and others"
+msgstr ""
#: tortoisehg/hgqt/about.py:65 tortoisehg/hgtk/about.py:42
msgid "Several icons are courtesy of the TortoiseSVN project"
@@ -64,7 +64,7 @@msgid "with Mercurial-%s, Python-%s, PyQt-%s, Qt-%s"
msgstr ""
-#: tortoisehg/hgqt/about.py:192 tortoisehg/hgtk/about.py:70
+#: tortoisehg/hgqt/about.py:189 tortoisehg/hgtk/about.py:70
msgid "A new version of TortoiseHg is ready for download!"
msgstr "Nová verze TortoiseHg je připravena ke stažení"
@@ -195,9 +195,9 @@#: tortoisehg/hgqt/archive.py:112 tortoisehg/hgqt/commit.py:516
#: tortoisehg/hgqt/commit.py:523 tortoisehg/hgqt/commit.py:550
#: tortoisehg/hgqt/commit.py:563 tortoisehg/hgqt/compress.py:150
-#: tortoisehg/hgqt/merge.py:64 tortoisehg/hgqt/merge.py:163
-#: tortoisehg/hgqt/merge.py:359 tortoisehg/hgqt/merge.py:392
-#: tortoisehg/hgqt/merge.py:449 tortoisehg/hgqt/rebase.py:214
+#: tortoisehg/hgqt/merge.py:64 tortoisehg/hgqt/merge.py:165
+#: tortoisehg/hgqt/merge.py:358 tortoisehg/hgqt/merge.py:391
+#: tortoisehg/hgqt/merge.py:450 tortoisehg/hgqt/rebase.py:214
#: tortoisehg/hgqt/rebase.py:235 tortoisehg/hgqt/rename.py:104
#: tortoisehg/hgqt/repotreeitem.py:283 tortoisehg/hgqt/resolve.py:317
#: tortoisehg/hgqt/settings.py:653 tortoisehg/hgqt/settings.py:751
@@ -291,7 +291,7 @@msgstr "Anulovaná revize: "
#: tortoisehg/hgqt/backout.py:60 tortoisehg/hgqt/clone.py:84
-#: tortoisehg/hgqt/commit.py:219 tortoisehg/hgqt/merge.py:309
+#: tortoisehg/hgqt/commit.py:219 tortoisehg/hgqt/merge.py:308
#: tortoisehg/hgqt/mq.py:53 tortoisehg/hgqt/postreview_ui.py:169
#: tortoisehg/hgqt/rebase.py:56 tortoisehg/hgqt/sync.py:135
#: tortoisehg/hgqt/tag.py:78 tortoisehg/hgtk/hgemail.py:64
@@ -306,7 +306,7 @@msgid "Commit backout before merging with current working parent"
msgstr "Před sloučením s rodičem aktuální revize komitujte zrušení změny"
-#: tortoisehg/hgqt/backout.py:80 tortoisehg/hgqt/merge.py:326
+#: tortoisehg/hgqt/backout.py:80 tortoisehg/hgqt/merge.py:325
#: tortoisehg/hgqt/rebase.py:68 tortoisehg/hgqt/sync.py:898
#: tortoisehg/hgqt/update.py:97
msgid "Automatically resolve merge conflicts where possible"
@@ -565,17 +565,17 @@msgid "Add or remove patches must be merged in the working directory"
msgstr ""
-#: tortoisehg/hgqt/chunks.py:430 tortoisehg/hgqt/status.py:128
+#: tortoisehg/hgqt/chunks.py:431 tortoisehg/hgqt/status.py:128
#: tortoisehg/hgtk/history.py:53 tortoisehg/hgtk/history.py:475
msgid "All"
msgstr "Vše"
-#: tortoisehg/hgqt/chunks.py:434 tortoisehg/hgqt/qscilib.py:194
+#: tortoisehg/hgqt/chunks.py:435 tortoisehg/hgqt/qscilib.py:194
#: tortoisehg/hgqt/status.py:132
msgid "None"
msgstr ""
-#: tortoisehg/hgqt/chunks.py:490
+#: tortoisehg/hgqt/chunks.py:491
#, python-format
msgid "Chunks selected: %d / %d"
msgstr ""
@@ -700,7 +700,7 @@msgid "Terminated"
msgstr ""
-#: tortoisehg/hgqt/cmdui.py:307 tortoisehg/hgqt/merge.py:716
+#: tortoisehg/hgqt/cmdui.py:307 tortoisehg/hgqt/merge.py:718
#: tortoisehg/hgtk/p4pending.py:101
msgid "Finished"
msgstr "Ukončeno"
@@ -950,7 +950,7 @@msgid "Compress"
msgstr ""
-#: tortoisehg/hgqt/compress.py:69 tortoisehg/hgqt/merge.py:257
+#: tortoisehg/hgqt/compress.py:69 tortoisehg/hgqt/merge.py:259
#: tortoisehg/hgqt/rebase.py:104
msgid "Checking..."
msgstr ""
@@ -978,20 +978,20 @@msgid "Compress is complete, old history untouched"
msgstr ""
-#: tortoisehg/hgqt/compress.py:149 tortoisehg/hgqt/merge.py:358
-#: tortoisehg/hgqt/merge.py:391 tortoisehg/hgqt/merge.py:448
+#: tortoisehg/hgqt/compress.py:149 tortoisehg/hgqt/merge.py:357
+#: tortoisehg/hgqt/merge.py:390 tortoisehg/hgqt/merge.py:449
#: tortoisehg/hgqt/rebase.py:213 tortoisehg/hgqt/settings.py:751
#: tortoisehg/hgqt/update.py:219 tortoisehg/hgtk/thgconfig.py:775
#: tortoisehg/hgtk/update.py:233
msgid "&Discard"
msgstr "&Zavrhnout"
-#: tortoisehg/hgqt/compress.py:151 tortoisehg/hgqt/merge.py:450
+#: tortoisehg/hgqt/compress.py:151 tortoisehg/hgqt/merge.py:451
#: tortoisehg/hgqt/rebase.py:215
msgid "Confirm Discard"
msgstr ""
-#: tortoisehg/hgqt/compress.py:151 tortoisehg/hgqt/merge.py:450
+#: tortoisehg/hgqt/compress.py:151 tortoisehg/hgqt/merge.py:451
#: tortoisehg/hgqt/rebase.py:215
msgid "Discard outstanding changes in working directory?"
msgstr ""
@@ -1073,11 +1073,11 @@msgid "Output Log"
msgstr ""
-#: tortoisehg/hgqt/filedialogs.py:193 tortoisehg/hgqt/workbench.py:285
+#: tortoisehg/hgqt/filedialogs.py:193 tortoisehg/hgqt/workbench.py:290
msgid "Back"
msgstr ""
-#: tortoisehg/hgqt/filedialogs.py:195 tortoisehg/hgqt/workbench.py:288
+#: tortoisehg/hgqt/filedialogs.py:195 tortoisehg/hgqt/workbench.py:293
msgid "Forward"
msgstr ""
@@ -1118,7 +1118,7 @@msgid "Compare revisions of the selected file"
msgstr ""
-#: tortoisehg/hgqt/filelistview.py:235 tortoisehg/hgqt/grep.py:506
+#: tortoisehg/hgqt/filelistview.py:235 tortoisehg/hgqt/grep.py:502
#: tortoisehg/hgqt/manifestdialog.py:200 tortoisehg/util/menuthg.py:76
msgid "Visual Diff"
msgstr "Vizuální Diff"
@@ -1283,11 +1283,10 @@msgid "Search"
msgstr "Hledat"
-#: tortoisehg/hgqt/grep.py:54 tortoisehg/hgqt/merge.py:264
-#: 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
+#: 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 "Stop"
@@ -1341,69 +1340,69 @@msgid "\"%s\" removed from path history"
msgstr ""
-#: tortoisehg/hgqt/grep.py:273
+#: tortoisehg/hgqt/grep.py:269
#, python-format
msgid "grep: invalid match pattern: %s\n"
msgstr ""
-#: tortoisehg/hgqt/grep.py:300
+#: tortoisehg/hgqt/grep.py:296
#, python-format
msgid "grep: %s\n"
msgstr ""
-#: tortoisehg/hgqt/grep.py:331
+#: tortoisehg/hgqt/grep.py:327
msgid "No matches found"
msgstr ""
-#: tortoisehg/hgqt/grep.py:333 tortoisehg/hgqt/revset.py:382
+#: tortoisehg/hgqt/grep.py:329 tortoisehg/hgqt/revset.py:382
#, python-format
msgid "%d matches found"
msgstr ""
-#: tortoisehg/hgqt/grep.py:397 tortoisehg/hgqt/grep.py:410
-#: tortoisehg/hgqt/grep.py:442
+#: tortoisehg/hgqt/grep.py:393 tortoisehg/hgqt/grep.py:406
+#: tortoisehg/hgqt/grep.py:438
msgid "Searching"
msgstr ""
-#: tortoisehg/hgqt/grep.py:397
+#: tortoisehg/hgqt/grep.py:393
msgid "history"
msgstr ""
-#: tortoisehg/hgqt/grep.py:409
+#: tortoisehg/hgqt/grep.py:405
msgid "Interrupted"
msgstr ""
-#: tortoisehg/hgqt/grep.py:443
+#: tortoisehg/hgqt/grep.py:439
msgid "files"
msgstr ""
-#: tortoisehg/hgqt/grep.py:504
+#: tortoisehg/hgqt/grep.py:500
msgid "View file"
msgstr ""
-#: tortoisehg/hgqt/grep.py:505
+#: tortoisehg/hgqt/grep.py:501
msgid "View Changeset"
msgstr ""
-#: tortoisehg/hgqt/grep.py:507
+#: tortoisehg/hgqt/grep.py:503
msgid "Annotate file"
msgstr ""
-#: tortoisehg/hgqt/grep.py:650 tortoisehg/hgtk/datamine.py:364
+#: tortoisehg/hgqt/grep.py:646 tortoisehg/hgtk/datamine.py:364
#: tortoisehg/hgtk/datamine.py:654
msgid "File"
msgstr "Soubor"
-#: tortoisehg/hgqt/grep.py:650 tortoisehg/hgtk/datamine.py:652
+#: tortoisehg/hgqt/grep.py:646 tortoisehg/hgtk/datamine.py:652
msgid "Line"
msgstr "Řádek"
-#: tortoisehg/hgqt/grep.py:650 tortoisehg/hgtk/datamine.py:363
+#: tortoisehg/hgqt/grep.py:646 tortoisehg/hgtk/datamine.py:363
#: tortoisehg/hgtk/datamine.py:653 tortoisehg/hgtk/logview/treeview.py:441
msgid "Rev"
msgstr "Rev"
-#: tortoisehg/hgqt/grep.py:650 tortoisehg/hgqt/settings.py:451
+#: tortoisehg/hgqt/grep.py:646 tortoisehg/hgqt/settings.py:451
#: tortoisehg/hgqt/settings.py:551 tortoisehg/hgqt/settings.py:590
#: tortoisehg/hgtk/datamine.py:142 tortoisehg/hgtk/datamine.py:655
#: tortoisehg/hgtk/history.py:101 tortoisehg/hgtk/history.py:502
@@ -1412,7 +1411,7 @@msgid "User"
msgstr "Uživatel"
-#: tortoisehg/hgqt/grep.py:651
+#: tortoisehg/hgqt/grep.py:647
msgid "Match Text"
msgstr ""
@@ -1849,76 +1848,76 @@msgid "&Exit"
msgstr ""
-#: tortoisehg/hgqt/merge.py:218 tortoisehg/hgqt/revpanel.py:156
+#: tortoisehg/hgqt/merge.py:220 tortoisehg/hgqt/revpanel.py:156
#: tortoisehg/hgtk/merge.py:73
msgid "Not a head revision!"
msgstr "Bez čelní revize!"
-#: tortoisehg/hgqt/merge.py:225
+#: tortoisehg/hgqt/merge.py:227
msgid "Merge from (other revision)"
msgstr ""
-#: tortoisehg/hgqt/merge.py:233 tortoisehg/hgtk/merge.py:47
+#: tortoisehg/hgqt/merge.py:235 tortoisehg/hgtk/merge.py:47
#: tortoisehg/hgtk/merge.py:60
msgid "Unable to merge"
msgstr "Nelze sloučit"
-#: tortoisehg/hgqt/merge.py:234
+#: tortoisehg/hgqt/merge.py:236
msgid "Merge revision not specified or not found"
msgstr ""
-#: tortoisehg/hgqt/merge.py:239
+#: tortoisehg/hgqt/merge.py:241
msgid "Merge to (working directory)"
msgstr ""
-#: tortoisehg/hgqt/merge.py:248
+#: tortoisehg/hgqt/merge.py:250
msgid "Working directory status"
msgstr ""
-#: tortoisehg/hgqt/merge.py:267
+#: tortoisehg/hgqt/merge.py:266
msgid "<a href=\"view\">View changes...</a>"
msgstr ""
-#: tortoisehg/hgqt/merge.py:273
+#: tortoisehg/hgqt/merge.py:272
msgid ""
"The workding 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:282
+#: tortoisehg/hgqt/merge.py:281
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:295
+#: tortoisehg/hgqt/merge.py:294
msgid "Or use:"
msgstr ""
-#: tortoisehg/hgqt/merge.py:298
+#: tortoisehg/hgqt/merge.py:297
msgid "Force a merge with outstanding changes (-f/--force)"
msgstr ""
-#: tortoisehg/hgqt/merge.py:319 tortoisehg/hgtk/merge.py:118
+#: tortoisehg/hgqt/merge.py:318 tortoisehg/hgtk/merge.py:118
msgid "Discard all changes from merge target (other) revision"
msgstr "Zavrhnout všechny změny z cílové revize sloučení"
-#: tortoisehg/hgqt/merge.py:339 tortoisehg/hgqt/update.py:223
+#: tortoisehg/hgqt/merge.py:338 tortoisehg/hgqt/update.py:223
#: tortoisehg/hgtk/update.py:237
msgid "&Merge"
msgstr "&Sloučit"
-#: tortoisehg/hgqt/merge.py:343
+#: tortoisehg/hgqt/merge.py:342
msgid "Merge another revision to the working directory"
msgstr ""
-#: tortoisehg/hgqt/merge.py:360 tortoisehg/hgtk/merge.py:215
+#: tortoisehg/hgqt/merge.py:359 tortoisehg/hgtk/merge.py:215
msgid "Confirm Discard Changes"
msgstr ""
-#: tortoisehg/hgqt/merge.py:361 tortoisehg/hgtk/merge.py:216
+#: tortoisehg/hgqt/merge.py:360 tortoisehg/hgtk/merge.py:216
#, python-format
msgid ""
"The changes from revision %s and all unmerged parents will be discarded.\n"
@@ -1926,62 +1925,62 @@"Are you sure this is what you want to do?"
msgstr ""
+#: tortoisehg/hgqt/merge.py:370
+msgid "Merging..."
+msgstr ""
+
#: tortoisehg/hgqt/merge.py:371
-msgid "Merging..."
-msgstr ""
-
-#: tortoisehg/hgqt/merge.py:372
msgid "All conflicting files will be marked unresolved."
msgstr ""
+#: tortoisehg/hgqt/merge.py:388
+msgid "Cancel merge and discard changes?"
+msgstr ""
+
#: tortoisehg/hgqt/merge.py:389
-msgid "Cancel merge and discard changes?"
-msgstr ""
-
-#: tortoisehg/hgqt/merge.py:390
msgid "Discard unfinished local changes and restart merge?"
msgstr ""
-#: tortoisehg/hgqt/merge.py:393
+#: tortoisehg/hgqt/merge.py:392
msgid "Confirm Clean Up"
msgstr ""
+#: tortoisehg/hgqt/merge.py:395
+msgid "Canceling merge...\n"
+msgstr ""
+
#: tortoisehg/hgqt/merge.py:396
-msgid "Canceling merge...\n"
-msgstr ""
-
-#: tortoisehg/hgqt/merge.py:397
msgid "(Please close any running merge tool)\n"
msgstr ""
-#: tortoisehg/hgqt/merge.py:415
+#: tortoisehg/hgqt/merge.py:416
msgid "Merge failed"
msgstr ""
-#: tortoisehg/hgqt/merge.py:415
+#: tortoisehg/hgqt/merge.py:416
msgid "Returning to first page"
msgstr ""
-#: tortoisehg/hgqt/merge.py:466
+#: tortoisehg/hgqt/merge.py:467
msgid "Rename Patch"
msgstr ""
-#: tortoisehg/hgqt/merge.py:467
+#: tortoisehg/hgqt/merge.py:468
msgid "Input a new patch name:"
msgstr ""
-#: tortoisehg/hgqt/merge.py:475
+#: tortoisehg/hgqt/merge.py:476
#, 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:522
+#: tortoisehg/hgqt/merge.py:523
msgid "<b>Uncommitted local changes are detected</b>"
msgstr ""
-#: tortoisehg/hgqt/merge.py:527 tortoisehg/hgtk/recovery.py:52
+#: tortoisehg/hgqt/merge.py:528 tortoisehg/hgtk/recovery.py:52
msgid "Clean"
msgstr "Čistit"
@@ -1991,8 +1990,8 @@msgid "Parents"
msgstr "Rodiče"
-#: tortoisehg/hgqt/merge.py:561 tortoisehg/hgqt/repomodel.py:521
-#: tortoisehg/hgqt/repomodel.py:523 tortoisehg/hgqt/shelve.py:24
+#: tortoisehg/hgqt/merge.py:561 tortoisehg/hgqt/repomodel.py:514
+#: tortoisehg/hgqt/repomodel.py:516 tortoisehg/hgqt/shelve.py:24
#: tortoisehg/hgqt/thgimport.py:87
msgid "Working Directory"
msgstr ""
@@ -2009,7 +2008,7 @@msgid "Merge "
msgstr "Sloučit "
-#: tortoisehg/hgqt/merge.py:638 tortoisehg/hgqt/workbench.py:229
+#: tortoisehg/hgqt/merge.py:638 tortoisehg/hgqt/workbench.py:231
msgid "&Commit"
msgstr ""
@@ -2030,17 +2029,17 @@msgid "Please wait while committing merged files."
msgstr ""
-#: tortoisehg/hgqt/merge.py:672
+#: tortoisehg/hgqt/merge.py:674
msgid ""
"There were <b>merge conflicts</b> that must be <a "
"href=\"resolve\"><b>resolved</b></a>"
msgstr ""
-#: tortoisehg/hgqt/merge.py:677
+#: tortoisehg/hgqt/merge.py:679
msgid "No merge conflicts, ready to commit"
msgstr ""
-#: tortoisehg/hgqt/merge.py:729
+#: tortoisehg/hgqt/merge.py:731
msgid "Merge changeset"
msgstr ""
@@ -2471,7 +2470,7 @@msgid "Delete"
msgstr ""
-#: tortoisehg/hgqt/qqueue.py:100 tortoisehg/hgqt/workbench.py:271
+#: tortoisehg/hgqt/qqueue.py:100
msgid "Purge"
msgstr ""
@@ -2893,12 +2892,12 @@msgid "Include all ancestors"
msgstr ""
-#: tortoisehg/hgqt/repomodel.py:189
+#: tortoisehg/hgqt/repomodel.py:188
#, python-format
msgid "filling (%d)"
msgstr ""
-#: tortoisehg/hgqt/repomodel.py:515
+#: tortoisehg/hgqt/repomodel.py:508
msgid "Mercurial User"
msgstr ""
@@ -2956,7 +2955,7 @@msgstr ""
#: tortoisehg/hgqt/reporegistry.py:106 tortoisehg/hgqt/sync.py:451
-#: tortoisehg/hgqt/workbench.py:274
+#: tortoisehg/hgqt/workbench.py:279
msgid "Explore"
msgstr ""
@@ -2965,7 +2964,7 @@msgstr ""
#: tortoisehg/hgqt/reporegistry.py:108 tortoisehg/hgqt/sync.py:452
-#: tortoisehg/hgqt/workbench.py:277
+#: tortoisehg/hgqt/workbench.py:282
msgid "Terminal"
msgstr ""
@@ -3008,7 +3007,7 @@msgid "default"
msgstr ""
-#: tortoisehg/hgqt/repotreemodel.py:143 tortoisehg/hgqt/resolve.py:363
+#: tortoisehg/hgqt/repotreemodel.py:143 tortoisehg/hgqt/resolve.py:362
#: tortoisehg/hgqt/sync.py:198 tortoisehg/hgqt/webconf.py:266
msgid "Path"
msgstr ""
@@ -3021,7 +3020,7 @@msgid "Failed to add repository"
msgstr ""
-#: tortoisehg/hgqt/repotreemodel.py:221 tortoisehg/hgqt/workbench.py:576
+#: tortoisehg/hgqt/repotreemodel.py:221 tortoisehg/hgqt/workbench.py:581
#, python-format
msgid "%s is not a valid repository"
msgstr ""
@@ -3454,16 +3453,16 @@msgid "&Quit"
msgstr "&Skončit"
-#: tortoisehg/hgqt/resolve.py:363
+#: tortoisehg/hgqt/resolve.py:362
msgid "Ext"
msgstr ""
-#: tortoisehg/hgqt/resolve.py:363 tortoisehg/hgqt/thgimport.py:85
+#: tortoisehg/hgqt/resolve.py:362 tortoisehg/hgqt/thgimport.py:85
#: tortoisehg/hgtk/thgimport.py:110
msgid "Repository"
msgstr "Repozitář"
-#: tortoisehg/hgqt/resolve.py:406
+#: tortoisehg/hgqt/resolve.py:405
msgid "<default>"
msgstr ""
@@ -4649,8 +4648,8 @@"nastaveny na neanglický jazyk. Toto nastavení je použito v dialozích "
"procedur Merge, Tag a Backout (odstranit změnu). Implicitně: False"
-#: tortoisehg/hgqt/settings.py:396 tortoisehg/hgqt/workbench.py:252
-#: tortoisehg/hgtk/thgconfig.py:179 tortoisehg/util/menuthg.py:55
+#: tortoisehg/hgqt/settings.py:396 tortoisehg/hgtk/thgconfig.py:179
+#: tortoisehg/util/menuthg.py:55
msgid "Web Server"
msgstr "Web"
@@ -5469,50 +5468,50 @@msgid "Size (KB)"
msgstr ""
-#: tortoisehg/hgqt/status.py:667
+#: tortoisehg/hgqt/status.py:684
msgid ", resolved merge"
msgstr ""
-#: tortoisehg/hgqt/status.py:669
+#: tortoisehg/hgqt/status.py:686
msgid ", unresolved merge"
msgstr ""
-#: tortoisehg/hgqt/status.py:681
+#: tortoisehg/hgqt/status.py:698
#, python-format
msgid "%s is modified"
msgstr ""
-#: tortoisehg/hgqt/status.py:683
+#: tortoisehg/hgqt/status.py:700
#, python-format
msgid "%s is added"
msgstr ""
-#: tortoisehg/hgqt/status.py:685
+#: tortoisehg/hgqt/status.py:702
#, python-format
msgid "%s is removed"
msgstr ""
-#: tortoisehg/hgqt/status.py:687
+#: tortoisehg/hgqt/status.py:704
#, python-format
msgid "%s is not tracked (unknown)"
msgstr ""
-#: tortoisehg/hgqt/status.py:689
+#: tortoisehg/hgqt/status.py:706
#, python-format
msgid "%s is missing!"
msgstr ""
-#: tortoisehg/hgqt/status.py:691
+#: tortoisehg/hgqt/status.py:708
#, python-format
msgid "%s is ignored"
msgstr ""
-#: tortoisehg/hgqt/status.py:693
+#: tortoisehg/hgqt/status.py:710
#, python-format
msgid "%s is not modified (clean)"
msgstr ""
-#: tortoisehg/hgqt/status.py:695
+#: tortoisehg/hgqt/status.py:712
#, python-format
msgid "%s is a dirty subrepo"
msgstr ""
@@ -5623,11 +5622,11 @@msgid "A terminal shell cannot be opened for remote"
msgstr ""
-#: tortoisehg/hgqt/sync.py:491 tortoisehg/hgqt/workbench.py:676
+#: tortoisehg/hgqt/sync.py:491 tortoisehg/hgqt/workbench.py:681
msgid "No shell configured"
msgstr ""
-#: tortoisehg/hgqt/sync.py:492 tortoisehg/hgqt/workbench.py:677
+#: tortoisehg/hgqt/sync.py:492 tortoisehg/hgqt/workbench.py:682
msgid "A terminal shell must be configured"
msgstr ""
@@ -6679,156 +6678,153 @@msgid "Save"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:39 tortoisehg/hgqt/workbench.py:398
+#: tortoisehg/hgqt/workbench.py:37 tortoisehg/hgqt/workbench.py:403
msgid "TortoiseHg Workbench"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:64
+#: tortoisehg/hgqt/workbench.py:62
msgid "New Repository..."
msgstr ""
-#: tortoisehg/hgqt/workbench.py:66 tortoisehg/hgqt/workbench.py:177
+#: tortoisehg/hgqt/workbench.py:64 tortoisehg/hgqt/workbench.py:183
msgid "Clone Repository..."
msgstr ""
-#: tortoisehg/hgqt/workbench.py:68
+#: tortoisehg/hgqt/workbench.py:66
msgid "Open Repository..."
msgstr ""
+#: tortoisehg/hgqt/workbench.py:98
+msgid "&File"
+msgstr ""
+
+#: tortoisehg/hgqt/workbench.py:99
+msgid "&View"
+msgstr ""
+
#: tortoisehg/hgqt/workbench.py:100
-msgid "&File"
+msgid "&Repository"
msgstr ""
#: tortoisehg/hgqt/workbench.py:101
-msgid "&View"
-msgstr ""
-
-#: tortoisehg/hgqt/workbench.py:102
-msgid "&Repository"
+msgid "&Help"
msgstr ""
#: tortoisehg/hgqt/workbench.py:103
-msgid "&Help"
+msgid "Edit Toolbar"
msgstr ""
#: tortoisehg/hgqt/workbench.py:105
-msgid "Edit Toolbar"
+msgid "Dock Toolbar"
msgstr ""
#: tortoisehg/hgqt/workbench.py:107
-msgid "Dock Toolbar"
+msgid "Sync Toolbar"
msgstr ""
#: tortoisehg/hgqt/workbench.py:109
-msgid "Sync Toolbar"
-msgstr ""
-
-#: tortoisehg/hgqt/workbench.py:111
msgid "Task Toolbar"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:175
+#: tortoisehg/hgqt/workbench.py:176
+msgid "&Open Repository..."
+msgstr ""
+
+#: tortoisehg/hgqt/workbench.py:178
+msgid "&Close Repository"
+msgstr ""
+
+#: tortoisehg/hgqt/workbench.py:181
msgid "&New Repository..."
msgstr ""
-#: tortoisehg/hgqt/workbench.py:180
-msgid "&Open Repository..."
-msgstr ""
-
-#: tortoisehg/hgqt/workbench.py:182
-msgid "&Close Repository"
-msgstr ""
-
-#: tortoisehg/hgqt/workbench.py:185
+#: tortoisehg/hgqt/workbench.py:187
msgid "&Settings..."
msgstr ""
-#: tortoisehg/hgqt/workbench.py:188
+#: tortoisehg/hgqt/workbench.py:190
msgid "E&xit"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:192
+#: tortoisehg/hgqt/workbench.py:193
msgid "Show Repository Registry"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:199
+#: tortoisehg/hgqt/workbench.py:200
msgid "Show Paths"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:203
+#: tortoisehg/hgqt/workbench.py:204
msgid "Show Output &Log"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:210
+#: tortoisehg/hgqt/workbench.py:211
msgid "Choose Log Columns..."
msgstr ""
-#: tortoisehg/hgqt/workbench.py:213
+#: tortoisehg/hgqt/workbench.py:214
msgid "Save Open Repositories On Exit"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:228
+#: tortoisehg/hgqt/workbench.py:230
msgid "Revision &Details"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:230
+#: tortoisehg/hgqt/workbench.py:232
msgid "S&ynchronize"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:231
+#: tortoisehg/hgqt/workbench.py:233
msgid "&Manifest"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:232
+#: tortoisehg/hgqt/workbench.py:234
msgid "&Search"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:234
+#: tortoisehg/hgqt/workbench.py:236
msgid "Patch &Queue"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:236
+#: tortoisehg/hgqt/workbench.py:238
msgid "&Patch Branch"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:239 tortoisehg/hgtk/status.py:1320
+#: tortoisehg/hgqt/workbench.py:241 tortoisehg/hgtk/status.py:1320
msgid "&Refresh"
msgstr "&Obnovit"
-#: tortoisehg/hgqt/workbench.py:242
+#: tortoisehg/hgqt/workbench.py:244
msgid "Refresh current repository"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:243
+#: tortoisehg/hgqt/workbench.py:245
msgid "Refresh &Task Tab"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:246
+#: tortoisehg/hgqt/workbench.py:248
msgid "Refresh only the current task tab"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:248 tortoisehg/hgtk/history.py:1496
-msgid "Load all"
-msgstr "Načíst vše"
-
#: tortoisehg/hgqt/workbench.py:250
+msgid "Load all revisions"
+msgstr ""
+
+#: tortoisehg/hgqt/workbench.py:252
msgid "Load all revisions into graph"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:254 tortoisehg/hgtk/history.py:1324
-msgid "Bisect"
-msgstr "Bisect"
-
-#: tortoisehg/hgqt/workbench.py:257 tortoisehg/hgtk/gdialog.py:493
-#: tortoisehg/hgtk/history.py:291 tortoisehg/hgtk/synch.py:83
-#: tortoisehg/hgtk/thgshelve.py:72 tortoisehg/hgtk/thgshelve.py:145
-#: tortoisehg/hgtk/thgshelve.py:151 tortoisehg/hgtk/thgshelve.py:159
-msgid "Shelve"
-msgstr "Shelve"
-
-#: tortoisehg/hgqt/workbench.py:259 tortoisehg/hgtk/thgimport.py:164
-msgid "Import"
-msgstr "Import"
+#: tortoisehg/hgqt/workbench.py:254
+msgid "Web Server..."
+msgstr ""
+
+#: tortoisehg/hgqt/workbench.py:257
+msgid "Shelve..."
+msgstr ""
+
+#: tortoisehg/hgqt/workbench.py:259 tortoisehg/hgtk/history.py:458
+msgid "Import..."
+msgstr "Importovat..."
#: tortoisehg/hgqt/workbench.py:262 tortoisehg/hgtk/recovery.py:68
msgid "Verify"
@@ -6839,80 +6835,88 @@msgstr "Obnovit"
#: tortoisehg/hgqt/workbench.py:267
-msgid "Resolve"
-msgstr ""
-
-#: tortoisehg/hgqt/workbench.py:269
-msgid "Rollback/Undo"
-msgstr ""
-
-#: tortoisehg/hgqt/workbench.py:293
+msgid "Resolve..."
+msgstr ""
+
+#: tortoisehg/hgqt/workbench.py:270
+msgid "Rollback/Undo..."
+msgstr ""
+
+#: tortoisehg/hgqt/workbench.py:273
+msgid "Purge..."
+msgstr ""
+
+#: tortoisehg/hgqt/workbench.py:276
+msgid "Bisect..."
+msgstr ""
+
+#: tortoisehg/hgqt/workbench.py:298
msgid "Filter Toolbar"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:296
+#: tortoisehg/hgqt/workbench.py:301
msgid "Filter graph with revision sets or branches"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:298
+#: tortoisehg/hgqt/workbench.py:303
msgid "Workbench Toolbars"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:305 tortoisehg/hgtk/history.py:438
+#: tortoisehg/hgqt/workbench.py:310 tortoisehg/hgtk/history.py:438
#: tortoisehg/hgtk/history.py:1861 tortoisehg/hgtk/synch.py:57
msgid "Incoming"
msgstr "Příchozí"
-#: tortoisehg/hgqt/workbench.py:306
+#: tortoisehg/hgqt/workbench.py:311
msgid "Check for incoming changes from default pull target"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:308 tortoisehg/hgtk/history.py:440
+#: tortoisehg/hgqt/workbench.py:313 tortoisehg/hgtk/history.py:440
#: tortoisehg/hgtk/history.py:1991
msgid "Pull"
msgstr "Pull"
-#: tortoisehg/hgqt/workbench.py:309
+#: tortoisehg/hgqt/workbench.py:314
msgid "Pull incoming changes from default pull target"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:311 tortoisehg/hgtk/history.py:442
+#: tortoisehg/hgqt/workbench.py:316 tortoisehg/hgtk/history.py:442
#: tortoisehg/hgtk/history.py:2034 tortoisehg/hgtk/synch.py:68
msgid "Outgoing"
msgstr "Odchozí"
-#: tortoisehg/hgqt/workbench.py:312
+#: tortoisehg/hgqt/workbench.py:317
msgid "Detect outgoing changes to default push target"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:314 tortoisehg/hgtk/history.py:444
+#: tortoisehg/hgqt/workbench.py:319 tortoisehg/hgtk/history.py:444
#: tortoisehg/hgtk/history.py:2074 tortoisehg/hgtk/synch.py:73
msgid "Push"
msgstr "Push"
-#: tortoisehg/hgqt/workbench.py:315
+#: tortoisehg/hgqt/workbench.py:320
msgid "Push outgoing changes to default push target"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:400
+#: tortoisehg/hgqt/workbench.py:405
#, python-format
msgid "%s - TortoiseHg Workbench - %s"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:403
+#: tortoisehg/hgqt/workbench.py:408
#, python-format
msgid "%s - TortoiseHg Workbench"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:554
+#: tortoisehg/hgqt/workbench.py:559
msgid "Select repository directory to open"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:575
+#: tortoisehg/hgqt/workbench.py:580
msgid "Failed to open repository"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:698
+#: tortoisehg/hgqt/workbench.py:703
#, python-format
msgid "Hg file log viewer [%s] - %s"
msgstr ""
@@ -6922,6 +6926,10 @@msgid "(version %s)"
msgstr "(verze %s)"
+#: tortoisehg/hgtk/about.py:79
+msgid "Copyright 2008-2010 Steve Borho and others"
+msgstr "Copyright 2008-2010 Steve Borho a další"
+
#: tortoisehg/hgtk/about.py:95
#, python-format
msgid "with %s"
@@ -7807,6 +7815,13 @@msgid "Recovery"
msgstr "Obnova"
+#: tortoisehg/hgtk/gdialog.py:493 tortoisehg/hgtk/history.py:291
+#: tortoisehg/hgtk/synch.py:83 tortoisehg/hgtk/thgshelve.py:72
+#: tortoisehg/hgtk/thgshelve.py:145 tortoisehg/hgtk/thgshelve.py:151
+#: tortoisehg/hgtk/thgshelve.py:159
+msgid "Shelve"
+msgstr "Shelve"
+
#: tortoisehg/hgtk/gdialog.py:500
msgid "_Help"
msgstr "Nápověda"
@@ -8546,10 +8561,6 @@msgid "Reject Bundle"
msgstr "Odmítnout svazek"
-#: tortoisehg/hgtk/history.py:458
-msgid "Import..."
-msgstr "Importovat..."
-
#: tortoisehg/hgtk/history.py:460
msgid "Add Bundle..."
msgstr "Přidat svazek..."
@@ -8807,6 +8818,10 @@msgid "Transp_lant to Local"
msgstr "Přemístit k aktuální"
+#: tortoisehg/hgtk/history.py:1324
+msgid "Bisect"
+msgstr "Bisect"
+
#: tortoisehg/hgtk/history.py:1332
msgid "_Export Patch..."
msgstr "Export oprávky..."
@@ -8908,6 +8923,10 @@msgstr "načíst další revize"
#: tortoisehg/hgtk/history.py:1496
+msgid "Load all"
+msgstr "Načíst vše"
+
+#: tortoisehg/hgtk/history.py:1496
msgid "load all revisions"
msgstr "načíst všechny revize"
@@ -10505,6 +10524,10 @@msgid "Skipped saving path with no alias"
msgstr "Uložení cesty bez aliasu přeskočeno"
+#: tortoisehg/hgtk/thgimport.py:164
+msgid "Import"
+msgstr "Import"
+
#: tortoisehg/hgtk/thgimport.py:184
msgid "Imported successfully"
msgstr "Úspěšně importováno"
|
|
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... |
||
Add a tag
Loading...