1. Peer Sommerlund
  2. thg-startup-time

Commits

Wagner Bruna  committed 06572d2

i18n: pull latest translations from Launchpad

Including messages up to 55b9bb3581ae .

  • Participants
  • Parent commits e3d3048
  • Branches stable

Comments (0)

Files changed (34)

File i18n/tortoisehg/ar.po

View file
 msgstr ""
 "Project-Id-Version: tortoisehg\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-03-19 21:15-0300\n"
+"POT-Creation-Date: 2012-03-27 21:18-0300\n"
 "PO-Revision-Date: 2011-10-25 07:12+0000\n"
 "Last-Translator: Fadi Mansour <Unknown>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= "
 "3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n"
-"X-Launchpad-Export-Date: 2012-03-20 04:59+0000\n"
-"X-Generator: Launchpad (build 14969)\n"
+"X-Launchpad-Export-Date: 2012-03-28 04:48+0000\n"
+"X-Generator: Launchpad (build 15027)\n"
 
 #: TortoiseHgOverlayServer.py:51
 msgid "TortoiseHg Overlay Icon Server"
 msgstr "فقط الملفات المعدلة/المنشأة في هذه المراجعة"
 
 #: tortoisehg/hgqt/archive.py:47 tortoisehg/hgqt/grep.py:68
-#: tortoisehg/hgqt/sync.py:1579
+#: tortoisehg/hgqt/sync.py:1587
 msgid "Recurse into subrepositories"
 msgstr "النزول للمجلدات الفرعية"
 
 #: tortoisehg/hgqt/archive.py:114 tortoisehg/hgqt/backout.py:300
 #: tortoisehg/hgqt/commit.py:402 tortoisehg/hgqt/commit.py:410
 #: tortoisehg/hgqt/commit.py:731 tortoisehg/hgqt/commit.py:794
-#: tortoisehg/hgqt/commit.py:818 tortoisehg/hgqt/compress.py:150
+#: tortoisehg/hgqt/commit.py:818 tortoisehg/hgqt/compress.py:152
 #: tortoisehg/hgqt/lfprompt.py:23 tortoisehg/hgqt/merge.py:100
 #: tortoisehg/hgqt/merge.py:235 tortoisehg/hgqt/merge.py:312
 #: tortoisehg/hgqt/quickop.py:185 tortoisehg/hgqt/rebase.py:240
 msgstr ""
 
 #: tortoisehg/hgqt/backout.py:228 tortoisehg/hgqt/merge.py:215
-#: tortoisehg/hgqt/rebase.py:76 tortoisehg/hgqt/sync.py:1123
+#: tortoisehg/hgqt/rebase.py:76 tortoisehg/hgqt/sync.py:1131
 #: tortoisehg/hgqt/update.py:103
 msgid "Automatically resolve merge conflicts where possible"
 msgstr ""
 msgid "Clean"
 msgstr ""
 
-#: tortoisehg/hgqt/backout.py:299 tortoisehg/hgqt/compress.py:149
+#: tortoisehg/hgqt/backout.py:299 tortoisehg/hgqt/compress.py:151
 #: tortoisehg/hgqt/merge.py:234 tortoisehg/hgqt/merge.py:311
 #: tortoisehg/hgqt/rebase.py:239 tortoisehg/hgqt/settings.py:1097
 #: tortoisehg/hgqt/update.py:263
 msgid "&Discard"
 msgstr ""
 
-#: tortoisehg/hgqt/backout.py:301 tortoisehg/hgqt/compress.py:151
+#: tortoisehg/hgqt/backout.py:301 tortoisehg/hgqt/compress.py:153
 #: tortoisehg/hgqt/merge.py:313 tortoisehg/hgqt/rebase.py:241
 msgid "Confirm Discard"
 msgstr ""
 
-#: tortoisehg/hgqt/backout.py:302 tortoisehg/hgqt/compress.py:152
+#: tortoisehg/hgqt/backout.py:302 tortoisehg/hgqt/compress.py:154
 #: tortoisehg/hgqt/merge.py:314 tortoisehg/hgqt/rebase.py:242
 msgid "Discard outstanding changes to working directory?"
 msgstr ""
 msgid "Skip this Revision"
 msgstr ""
 
-#: tortoisehg/hgqt/bisect.py:72 tortoisehg/hgqt/compress.py:138
+#: tortoisehg/hgqt/bisect.py:72 tortoisehg/hgqt/compress.py:140
 #: tortoisehg/hgqt/rebase.py:203
 msgid "Close"
 msgstr ""
 msgid "Do not verify host certificate"
 msgstr ""
 
-#: tortoisehg/hgqt/clone.py:151 tortoisehg/hgqt/sync.py:1604
+#: tortoisehg/hgqt/clone.py:151 tortoisehg/hgqt/sync.py:1612
 msgid "Remote command:"
 msgstr ""
 
 msgid "Stop"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:175 tortoisehg/hgqt/sync.py:191
-msgid "<b>Selected Options:</b>"
-msgstr ""
-
 #: tortoisehg/hgqt/commit.py:262
 msgid "Commit changes"
 msgstr ""
 msgid "&Commit to current branch"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:404 tortoisehg/hgqt/sync.py:975
+#: tortoisehg/hgqt/commit.py:404 tortoisehg/hgqt/sync.py:983
 msgid "Confirm New Branch"
 msgstr ""
 
 msgid "New Branch: "
 msgstr ""
 
+#: tortoisehg/hgqt/commit.py:563
+#, python-format
+msgid "<b>Selected Options:</b> %s"
+msgstr ""
+
 #: tortoisehg/hgqt/commit.py:576 tortoisehg/hgqt/revpanel.py:24
 #: tortoisehg/hgqt/update.py:87
 msgid "Parent:"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:577 tortoisehg/hgqt/pbranch.py:878
+#: tortoisehg/hgqt/commit.py:577 tortoisehg/hgqt/pbranch.py:879
 msgid "Patch name:"
 msgstr ""
 
 
 #: tortoisehg/hgqt/commit.py:1053 tortoisehg/hgqt/commit.py:1076
 #: tortoisehg/hgqt/commit.py:1099 tortoisehg/hgqt/commit.py:1122
-#: tortoisehg/hgqt/sync.py:1065 tortoisehg/hgqt/sync.py:1163
-#: tortoisehg/hgqt/sync.py:1233 tortoisehg/hgqt/sync.py:1401
+#: tortoisehg/hgqt/sync.py:1073 tortoisehg/hgqt/sync.py:1171
+#: tortoisehg/hgqt/sync.py:1241 tortoisehg/hgqt/sync.py:1409
 msgid "Iniparse must be installed."
 msgstr ""
 
 #: tortoisehg/hgqt/commit.py:1068 tortoisehg/hgqt/commit.py:1091
 #: tortoisehg/hgqt/commit.py:1114 tortoisehg/hgqt/commit.py:1137
-#: tortoisehg/hgqt/settings.py:1321 tortoisehg/hgqt/sync.py:1075
-#: tortoisehg/hgqt/sync.py:1174 tortoisehg/hgqt/sync.py:1251
-#: tortoisehg/hgqt/sync.py:1440
+#: tortoisehg/hgqt/settings.py:1321 tortoisehg/hgqt/sync.py:1083
+#: tortoisehg/hgqt/sync.py:1182 tortoisehg/hgqt/sync.py:1259
+#: tortoisehg/hgqt/sync.py:1448
 msgid "Unable to write configuration file"
 msgstr ""
 
 msgid "No username configured"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:1235 tortoisehg/hgqt/compress.py:122
-#: tortoisehg/hgqt/pbranch.py:871 tortoisehg/hgqt/repowidget.py:359
+#: tortoisehg/hgqt/commit.py:1235 tortoisehg/hgqt/compress.py:124
+#: tortoisehg/hgqt/pbranch.py:872 tortoisehg/hgqt/repowidget.py:359
 msgctxt "action button"
 msgid "Commit"
 msgstr ""
 msgid "%s - commit"
 msgstr ""
 
+#: tortoisehg/hgqt/commit.py:1306
+msgid "TortoiseHg Commit"
+msgstr ""
+
+#: tortoisehg/hgqt/commit.py:1307
+msgid "Are you sure that you want to cancel the commit operation?"
+msgstr ""
+
 #: tortoisehg/hgqt/compress.py:38
 msgid "Compress changesets up to and including"
 msgstr ""
 msgid "Compress - %s"
 msgstr ""
 
-#: tortoisehg/hgqt/compress.py:99
+#: tortoisehg/hgqt/compress.py:101
 msgid ""
 "Before compress, you must <a href=\"commit\"><b>commit</b></a> or <a "
 "href=\"discard\"><b>discard</b></a> changes."
 msgstr ""
 
-#: tortoisehg/hgqt/compress.py:104
+#: tortoisehg/hgqt/compress.py:106
 msgid "You may continue the compress"
 msgstr ""
 
-#: tortoisehg/hgqt/compress.py:121
+#: tortoisehg/hgqt/compress.py:123
 msgid "Changes have been moved, you must now commit"
 msgstr ""
 
-#: tortoisehg/hgqt/compress.py:137
+#: tortoisehg/hgqt/compress.py:139
 msgid "Compress is complete, old history untouched"
 msgstr ""
 
 msgstr ""
 
 #: tortoisehg/hgqt/csinfo.py:108 tortoisehg/hgqt/csinfo.py:110
-#: tortoisehg/hgqt/sync.py:1610
+#: tortoisehg/hgqt/sync.py:1618
 msgid "Branch:"
 msgstr ""
 
 msgid "Filter:"
 msgstr ""
 
-#: tortoisehg/hgqt/manifestdialog.py:193
+#: tortoisehg/hgqt/manifestdialog.py:193 tortoisehg/hgqt/pbranch.py:657
 msgid "Status"
 msgstr ""
 
 "editor installed on your system."
 msgstr ""
 
-#: tortoisehg/hgqt/pbranch.py:844
+#: tortoisehg/hgqt/pbranch.py:657
+msgid "Graph"
+msgstr ""
+
+#: tortoisehg/hgqt/pbranch.py:657 tortoisehg/hgqt/settings.py:641
+msgid "Name"
+msgstr ""
+
+#: tortoisehg/hgqt/pbranch.py:657
+msgid "Title"
+msgstr ""
+
+#: tortoisehg/hgqt/pbranch.py:657
+msgid "Message"
+msgstr ""
+
+#: tortoisehg/hgqt/pbranch.py:845
 msgid "New Patch Branch"
 msgstr ""
 
-#: tortoisehg/hgqt/pbranch.py:879
+#: tortoisehg/hgqt/pbranch.py:880
 msgid "Patch message:"
 msgstr ""
 
-#: tortoisehg/hgqt/pbranch.py:880
+#: tortoisehg/hgqt/pbranch.py:881
 msgid "Patch date:"
 msgstr ""
 
-#: tortoisehg/hgqt/pbranch.py:881
+#: tortoisehg/hgqt/pbranch.py:882
 msgid "Patch user:"
 msgstr ""
 
 msgid "Checkmark files to remove"
 msgstr ""
 
-#: tortoisehg/hgqt/quickop.py:23 tortoisehg/hgqt/sync.py:581
+#: tortoisehg/hgqt/quickop.py:23 tortoisehg/hgqt/sync.py:582
 #: tortoisehg/hgqt/webconf_ui.py:80
 msgid "Remove"
 msgstr ""
 msgid "Clone Repository"
 msgstr ""
 
-#: tortoisehg/hgqt/reporegistry.py:434 tortoisehg/hgqt/sync.py:579
+#: tortoisehg/hgqt/reporegistry.py:434 tortoisehg/hgqt/sync.py:580
 #: tortoisehg/hgqt/workbench.py:333
 msgid "Explore"
 msgstr ""
 msgid "Open the repository in a file browser"
 msgstr ""
 
-#: tortoisehg/hgqt/reporegistry.py:436 tortoisehg/hgqt/sync.py:580
+#: tortoisehg/hgqt/reporegistry.py:436 tortoisehg/hgqt/sync.py:581
 #: tortoisehg/hgqt/workbench.py:336
 msgid "Terminal"
 msgstr ""
 msgstr ""
 
 #: tortoisehg/hgqt/repotreemodel.py:164 tortoisehg/hgqt/resolve.py:399
-#: tortoisehg/hgqt/sync.py:255 tortoisehg/hgqt/webconf.py:266
+#: tortoisehg/hgqt/sync.py:262 tortoisehg/hgqt/webconf.py:266
 msgid "Path"
 msgstr ""
 
 msgid "Reject incoming changesets"
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:547 tortoisehg/hgqt/sync.py:1025
+#: tortoisehg/hgqt/repowidget.py:547 tortoisehg/hgqt/sync.py:1033
 #, python-format
 msgid "%d outgoing changesets"
 msgstr ""
 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 "
-"its internal merge tool that leaves conflict markers in place.  Chose "
-"internal:merge to force conflict markers ,internal:prompt to always select "
+"its internal merge tool that leaves conflict markers in place.  Choose "
+"internal:merge to force conflict markers, internal:prompt to always select "
 "local or other, or internal:dump to leave files in the working directory for "
 "manual merging"
 msgstr ""
 msgid "Commit"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:592 tortoisehg/hgqt/sync.py:1354
+#: tortoisehg/hgqt/settings.py:592 tortoisehg/hgqt/sync.py:1362
 msgid "Username"
 msgstr ""
 
 msgid "Web Server"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:641
-msgid "Name"
-msgstr ""
-
 #: tortoisehg/hgqt/settings.py:642
 msgid ""
 "Repository name to use in the web interface, and by TortoiseHg as a "
 msgid "Comma separated list of archive formats allowed for downloading"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:657 tortoisehg/hgqt/sync.py:244
+#: tortoisehg/hgqt/settings.py:657 tortoisehg/hgqt/sync.py:251
 msgid "Port"
 msgstr ""
 
 msgstr ""
 
 #: tortoisehg/hgqt/settings.py:697 tortoisehg/hgqt/settings.py:828
-#: tortoisehg/hgqt/sync.py:1362
+#: tortoisehg/hgqt/sync.py:1370
 msgid "Password"
 msgstr ""
 
 msgstr ""
 
 #: tortoisehg/hgqt/shellconf.py:86
-msgid "Contex Menu"
+msgid "Context Menu"
 msgstr ""
 
 #: tortoisehg/hgqt/shellconf.py:88
 msgid "Malformed ssh URL"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:113
+#: tortoisehg/hgqt/sync.py:113 tortoisehg/hgqt/sync.py:621
 msgid "TortoiseHg Sync"
 msgstr ""
 
 msgid "Target:"
 msgstr ""
 
+#: tortoisehg/hgqt/sync.py:191
+msgid "<b>Selected Options:</b>"
+msgstr ""
+
 #: tortoisehg/hgqt/sync.py:201
 msgid "<b>Remote Repository:</b>"
 msgstr ""
 msgid "Path Edit Toolbar"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:223
+#: tortoisehg/hgqt/sync.py:219 tortoisehg/hgqt/webconf_ui.py:77
+msgid "Save"
+msgstr ""
+
+#: tortoisehg/hgqt/sync.py:220
+msgid "Save current URL under an alias"
+msgstr ""
+
+#: tortoisehg/hgqt/sync.py:230
 msgid "Security"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:224
+#: tortoisehg/hgqt/sync.py:231
 msgid "Manage HTTPS connection security and user authentication"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:232
+#: tortoisehg/hgqt/sync.py:239
 msgid "Hostname"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:262 tortoisehg/hgqt/webconf_ui.py:77
-msgid "Save"
-msgstr ""
-
-#: tortoisehg/hgqt/sync.py:263
-msgid "Save current URL under an alias"
-msgstr ""
-
-#: tortoisehg/hgqt/sync.py:277
+#: tortoisehg/hgqt/sync.py:278
 msgid "Paths in Repository Settings:"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:292
+#: tortoisehg/hgqt/sync.py:293
 msgid "Related Paths:"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:349
+#: tortoisehg/hgqt/sync.py:350
 #, python-format
 msgid "Preview incoming changesets from %s"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:350
+#: tortoisehg/hgqt/sync.py:351
 #, python-format
 msgid "Pull incoming changesets from %s"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:351
+#: tortoisehg/hgqt/sync.py:352
 #, python-format
 msgid "Filter outgoing changesets to %s"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:352
+#: tortoisehg/hgqt/sync.py:353
 #, python-format
 msgid "Push outgoing changesets to %s"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:359
+#: tortoisehg/hgqt/sync.py:360
 #, python-format
 msgid "rev: %d (%s)"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:364
+#: tortoisehg/hgqt/sync.py:365
 msgid "branch: "
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:371
+#: tortoisehg/hgqt/sync.py:372
 msgid "bookmark: "
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:424
+#: tortoisehg/hgqt/sync.py:425
 msgid "Post Pull: "
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:607
+#: tortoisehg/hgqt/sync.py:608
 msgid "Repository not local"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:608
+#: tortoisehg/hgqt/sync.py:609
 msgid "A terminal shell cannot be opened for remote"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:613 tortoisehg/hgqt/sync.py:1474
+#: tortoisehg/hgqt/sync.py:614 tortoisehg/hgqt/sync.py:1482
 msgid "Confirm path delete"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:614 tortoisehg/hgqt/sync.py:1475
+#: tortoisehg/hgqt/sync.py:615 tortoisehg/hgqt/sync.py:1483
 #, python-format
 msgid "Delete %s from your repo configuration file?"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:711
+#: tortoisehg/hgqt/sync.py:622
+msgid "Are you sure that you want to cancel synchronization?"
+msgstr ""
+
+#: tortoisehg/hgqt/sync.py:719
 msgid "No remote repository URL or path set"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:712
+#: tortoisehg/hgqt/sync.py:720
 msgid ""
 "No valid <i>default</i> remote repository URL or path has been configured "
 "for this repository.<p>Please type and save a remote repository path on the "
 "Sync widget."
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:727
+#: tortoisehg/hgqt/sync.py:735
 msgid "Redundant authentication info"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:728
+#: tortoisehg/hgqt/sync.py:736
 msgid ""
 "You have authentication info configured for this host and inside this URL.  "
 "Remove authentication info from this URL?"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:752 tortoisehg/hgqt/sync.py:758
-#: tortoisehg/hgqt/sync.py:764 tortoisehg/hgqt/sync.py:770
-#: tortoisehg/hgqt/sync.py:777
+#: tortoisehg/hgqt/sync.py:760 tortoisehg/hgqt/sync.py:766
+#: tortoisehg/hgqt/sync.py:772 tortoisehg/hgqt/sync.py:778
+#: tortoisehg/hgqt/sync.py:785
 msgid "sync command already running"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:796
+#: tortoisehg/hgqt/sync.py:804
 #, python-format
 msgid "Getting incoming changesets from %s..."
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:801 tortoisehg/hgqt/sync.py:819
+#: tortoisehg/hgqt/sync.py:809 tortoisehg/hgqt/sync.py:827
 #, python-format
 msgid "Found incoming changesets from %s"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:804 tortoisehg/hgqt/sync.py:821
+#: tortoisehg/hgqt/sync.py:812 tortoisehg/hgqt/sync.py:829
 #, python-format
 msgid "No incoming changesets from %s"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:806 tortoisehg/hgqt/sync.py:823
+#: tortoisehg/hgqt/sync.py:814 tortoisehg/hgqt/sync.py:831
 #, python-format
 msgid "Incoming from %s aborted, ret %d"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:834
+#: tortoisehg/hgqt/sync.py:842
 #, python-format
 msgid "Pull from %s completed"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:836
+#: tortoisehg/hgqt/sync.py:844
 #, python-format
 msgid "Pull from %s aborted, ret %d"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:848 tortoisehg/hgqt/update.py:351
+#: tortoisehg/hgqt/sync.py:856 tortoisehg/hgqt/update.py:351
 msgid "Merge caused file conflicts"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:849 tortoisehg/hgqt/update.py:352
+#: tortoisehg/hgqt/sync.py:857 tortoisehg/hgqt/update.py:352
 msgid "File conflicts need to be resolved"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:855
+#: tortoisehg/hgqt/sync.py:863
 #, python-format
 msgid "Pulling from %s..."
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:874
+#: tortoisehg/hgqt/sync.py:882
 #, python-format
 msgid "Finding outgoing changesets to %s..."
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:886
+#: tortoisehg/hgqt/sync.py:894
 #, python-format
 msgid "%d outgoing changesets to %s"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:889 tortoisehg/hgqt/sync.py:901
-#: tortoisehg/hgqt/sync.py:971
+#: tortoisehg/hgqt/sync.py:897 tortoisehg/hgqt/sync.py:909
+#: tortoisehg/hgqt/sync.py:979
 #, python-format
 msgid "No outgoing changesets to %s"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:891 tortoisehg/hgqt/sync.py:903
+#: tortoisehg/hgqt/sync.py:899 tortoisehg/hgqt/sync.py:911
 #, python-format
 msgid "Outgoing to %s aborted, ret %d"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:899
+#: tortoisehg/hgqt/sync.py:907
 #, python-format
 msgid "outgoing changesets to %s found"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:923
+#: tortoisehg/hgqt/sync.py:931
 #, python-format
 msgid "%s (submitted)"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:925
+#: tortoisehg/hgqt/sync.py:933
 #, python-format
 msgid "%s (pending)"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:930
+#: tortoisehg/hgqt/sync.py:938
 msgid "Unable to parse p4pending output"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:932
+#: tortoisehg/hgqt/sync.py:940
 #, python-format
 msgid "%d pending changelists found"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:934
+#: tortoisehg/hgqt/sync.py:942
 msgid "No pending Perforce changelists"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:936
+#: tortoisehg/hgqt/sync.py:944
 msgid "Aborted p4pending"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:938
+#: tortoisehg/hgqt/sync.py:946
 msgid "Unable to determine pending changesets"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:948
+#: tortoisehg/hgqt/sync.py:956
 msgid "Perforce pending..."
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:958
+#: tortoisehg/hgqt/sync.py:966
 msgid "Confirm Push to remote Repository"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:959
+#: tortoisehg/hgqt/sync.py:967
 #, python-format
 msgid ""
 "Push to remote repository\n"
 "?"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:962
+#: tortoisehg/hgqt/sync.py:970
 #, python-format
 msgid "Push to %s aborted"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:966
+#: tortoisehg/hgqt/sync.py:974
 #, python-format
 msgid "Pushing to %s..."
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:969
+#: tortoisehg/hgqt/sync.py:977
 #, python-format
 msgid "Push to %s completed"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:973
+#: tortoisehg/hgqt/sync.py:981
 #, python-format
 msgid "Push to %s aborted, ret %d"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:976
+#: tortoisehg/hgqt/sync.py:984
 msgid ""
 "One or more of the changesets that you are attempting to push involve the "
 "creation of a new branch.  Do you want to create a new branch in the remote "
 "repository?"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1000
+#: tortoisehg/hgqt/sync.py:1008
 #, python-format
 msgid ""
 "Invalid default push revision: %s.Please check your mercurial configuration "
 "(tortoisehg.defaultpush)"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1021
+#: tortoisehg/hgqt/sync.py:1029
 msgid "Determining outgoing changesets to email..."
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1035
+#: tortoisehg/hgqt/sync.py:1043
 msgid "No outgoing changesets"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1037
+#: tortoisehg/hgqt/sync.py:1045
 #, python-format
 msgid "Outgoing aborted, ret %d"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1044
+#: tortoisehg/hgqt/sync.py:1052
 msgid "Select bundle file"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1045
+#: tortoisehg/hgqt/sync.py:1053
 msgid "Bundle files (*.hg)"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1064
+#: tortoisehg/hgqt/sync.py:1072
 msgid "Unable to remove URL"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1086
+#: tortoisehg/hgqt/sync.py:1094
 msgid "Post Pull Behavior"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1090
+#: tortoisehg/hgqt/sync.py:1098
 msgid "Select post-pull operation for this repository"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1093
+#: tortoisehg/hgqt/sync.py:1101
 msgid "None - simply pull changesets"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1094
+#: tortoisehg/hgqt/sync.py:1102
 msgid "Update - pull, then try to update"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1100
+#: tortoisehg/hgqt/sync.py:1108
 msgid "Fetch - use fetch (auto merge pulled changes)"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1102
+#: tortoisehg/hgqt/sync.py:1110
 msgid "Fetch - use fetch extension (fetch is not active!)"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1109
+#: tortoisehg/hgqt/sync.py:1117
 msgid "Rebase - rebase local commits above pulled changes"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1111
+#: tortoisehg/hgqt/sync.py:1119
 msgid "Rebase - use rebase extension (rebase is not active!)"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1129
+#: tortoisehg/hgqt/sync.py:1137
 msgid "<a href=\"config\">Launch settings tool...</a>"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1162
+#: tortoisehg/hgqt/sync.py:1170
 msgid "Unable to save post pull operation"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1186
+#: tortoisehg/hgqt/sync.py:1194
 msgid "Save Path"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1196 tortoisehg/hgqt/sync.py:1518
+#: tortoisehg/hgqt/sync.py:1204 tortoisehg/hgqt/sync.py:1526
 msgid "Alias"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1199 tortoisehg/hgqt/sync.py:1518
+#: tortoisehg/hgqt/sync.py:1207 tortoisehg/hgqt/sync.py:1526
 msgid "URL"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1208
+#: tortoisehg/hgqt/sync.py:1216
 msgid "Remove authentication data from URL"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1210
+#: tortoisehg/hgqt/sync.py:1218
 msgid ""
 "User authentication data should be associated with the hostname using the "
 "security dialog."
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1232
+#: tortoisehg/hgqt/sync.py:1240
 msgid "Unable to save an URL"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1243
+#: tortoisehg/hgqt/sync.py:1251
 msgid "Confirm URL replace"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1244
+#: tortoisehg/hgqt/sync.py:1252
 #, python-format
 msgid "%s already exists, replace URL?"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1268
+#: tortoisehg/hgqt/sync.py:1276
 msgid "Certificate Query Error"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1281
+#: tortoisehg/hgqt/sync.py:1289
 msgid "Security: "
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1300
+#: tortoisehg/hgqt/sync.py:1308
 #, python-format
 msgid "<b>Host:</b> %s"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1302
+#: tortoisehg/hgqt/sync.py:1310
 msgid "Secure HTTPS Connection"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1309
+#: tortoisehg/hgqt/sync.py:1317
 msgid "Verify with Certificate Authority certificates (best)"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1311
+#: tortoisehg/hgqt/sync.py:1319
 msgid "Verify with stored host fingerprint (good)"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1313
+#: tortoisehg/hgqt/sync.py:1321
 msgid "No host validation, but still encrypted (bad)"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1320
+#: tortoisehg/hgqt/sync.py:1328
 msgid "### host certificate fingerprint ###"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1324
+#: tortoisehg/hgqt/sync.py:1332
 msgid "Query"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1343
+#: tortoisehg/hgqt/sync.py:1351
 msgid "User Authentication"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1350
+#: tortoisehg/hgqt/sync.py:1358
 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"
 "foo.username = $USER."
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1359
+#: tortoisehg/hgqt/sync.py:1367
 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:1366
+#: tortoisehg/hgqt/sync.py:1374
 msgid ""
 "Mercurial keyring extension is enabled. Passwords will be stored in a "
 "platform-native secure method."
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1372
+#: tortoisehg/hgqt/sync.py:1380
 msgid ""
 "Optional. PEM encoded client certificate key file. Environment variables\n"
 "are expanded in the filename."
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1374
+#: tortoisehg/hgqt/sync.py:1382
 msgid "User Certificate Key File"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1378
+#: tortoisehg/hgqt/sync.py:1386
 msgid ""
 "Optional. PEM encoded client certificate chain file. Environment variables\n"
 "are expanded in the filename."
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1380
+#: tortoisehg/hgqt/sync.py:1388
 msgid "User Certificate Chain File"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1400
+#: tortoisehg/hgqt/sync.py:1408
 msgid "Unable to save authentication"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1562
+#: tortoisehg/hgqt/sync.py:1570
 #, python-format
 msgid "%s - sync options"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1569
+#: tortoisehg/hgqt/sync.py:1577
 msgid "Allow push of a new branch (--new-branch)"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1574
+#: tortoisehg/hgqt/sync.py:1582
 msgid "Force push or pull (override safety checks, --force)"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1584
+#: tortoisehg/hgqt/sync.py:1592
 msgid "Temporarily disable configured HTTP proxy"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1591
+#: tortoisehg/hgqt/sync.py:1599
 msgid "Emit debugging output (--debug)"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1597
+#: tortoisehg/hgqt/sync.py:1605
 msgid "Work on patch queue (--mq)"
 msgstr ""
 

File i18n/tortoisehg/ca.po

View file
 msgstr ""
 "Project-Id-Version: tortoisehg\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-03-19 21:15-0300\n"
+"POT-Creation-Date: 2012-03-27 21:18-0300\n"
 "PO-Revision-Date: 2011-03-07 18:36+0000\n"
 "Last-Translator: David Planella <david.planella@ubuntu.com>\n"
 "Language-Team: Catalan <ca@li.org>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2012-03-20 04:59+0000\n"
-"X-Generator: Launchpad (build 14969)\n"
+"X-Launchpad-Export-Date: 2012-03-28 04:48+0000\n"
+"X-Generator: Launchpad (build 15027)\n"
 
 #: TortoiseHgOverlayServer.py:51
 msgid "TortoiseHg Overlay Icon Server"
 msgstr ""
 
 #: tortoisehg/hgqt/archive.py:47 tortoisehg/hgqt/grep.py:68
-#: tortoisehg/hgqt/sync.py:1579
+#: tortoisehg/hgqt/sync.py:1587
 msgid "Recurse into subrepositories"
 msgstr ""
 
 #: tortoisehg/hgqt/archive.py:114 tortoisehg/hgqt/backout.py:300
 #: tortoisehg/hgqt/commit.py:402 tortoisehg/hgqt/commit.py:410
 #: tortoisehg/hgqt/commit.py:731 tortoisehg/hgqt/commit.py:794
-#: tortoisehg/hgqt/commit.py:818 tortoisehg/hgqt/compress.py:150
+#: tortoisehg/hgqt/commit.py:818 tortoisehg/hgqt/compress.py:152
 #: tortoisehg/hgqt/lfprompt.py:23 tortoisehg/hgqt/merge.py:100
 #: tortoisehg/hgqt/merge.py:235 tortoisehg/hgqt/merge.py:312
 #: tortoisehg/hgqt/quickop.py:185 tortoisehg/hgqt/rebase.py:240
 msgstr ""
 
 #: tortoisehg/hgqt/backout.py:228 tortoisehg/hgqt/merge.py:215
-#: tortoisehg/hgqt/rebase.py:76 tortoisehg/hgqt/sync.py:1123
+#: tortoisehg/hgqt/rebase.py:76 tortoisehg/hgqt/sync.py:1131
 #: tortoisehg/hgqt/update.py:103
 msgid "Automatically resolve merge conflicts where possible"
 msgstr ""
 msgid "Clean"
 msgstr ""
 
-#: tortoisehg/hgqt/backout.py:299 tortoisehg/hgqt/compress.py:149
+#: tortoisehg/hgqt/backout.py:299 tortoisehg/hgqt/compress.py:151
 #: tortoisehg/hgqt/merge.py:234 tortoisehg/hgqt/merge.py:311
 #: tortoisehg/hgqt/rebase.py:239 tortoisehg/hgqt/settings.py:1097
 #: tortoisehg/hgqt/update.py:263
 msgid "&Discard"
 msgstr ""
 
-#: tortoisehg/hgqt/backout.py:301 tortoisehg/hgqt/compress.py:151
+#: tortoisehg/hgqt/backout.py:301 tortoisehg/hgqt/compress.py:153
 #: tortoisehg/hgqt/merge.py:313 tortoisehg/hgqt/rebase.py:241
 msgid "Confirm Discard"
 msgstr ""
 
-#: tortoisehg/hgqt/backout.py:302 tortoisehg/hgqt/compress.py:152
+#: tortoisehg/hgqt/backout.py:302 tortoisehg/hgqt/compress.py:154
 #: tortoisehg/hgqt/merge.py:314 tortoisehg/hgqt/rebase.py:242
 msgid "Discard outstanding changes to working directory?"
 msgstr ""
 msgid "Skip this Revision"
 msgstr ""
 
-#: tortoisehg/hgqt/bisect.py:72 tortoisehg/hgqt/compress.py:138
+#: tortoisehg/hgqt/bisect.py:72 tortoisehg/hgqt/compress.py:140
 #: tortoisehg/hgqt/rebase.py:203
 msgid "Close"
 msgstr ""
 msgid "Do not verify host certificate"
 msgstr ""
 
-#: tortoisehg/hgqt/clone.py:151 tortoisehg/hgqt/sync.py:1604
+#: tortoisehg/hgqt/clone.py:151 tortoisehg/hgqt/sync.py:1612
 msgid "Remote command:"
 msgstr ""
 
 msgid "Stop"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:175 tortoisehg/hgqt/sync.py:191
-msgid "<b>Selected Options:</b>"
-msgstr ""
-
 #: tortoisehg/hgqt/commit.py:262
 msgid "Commit changes"
 msgstr ""
 msgid "&Commit to current branch"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:404 tortoisehg/hgqt/sync.py:975
+#: tortoisehg/hgqt/commit.py:404 tortoisehg/hgqt/sync.py:983
 msgid "Confirm New Branch"
 msgstr ""
 
 msgid "New Branch: "
 msgstr ""
 
+#: tortoisehg/hgqt/commit.py:563
+#, python-format
+msgid "<b>Selected Options:</b> %s"
+msgstr ""
+
 #: tortoisehg/hgqt/commit.py:576 tortoisehg/hgqt/revpanel.py:24
 #: tortoisehg/hgqt/update.py:87
 msgid "Parent:"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:577 tortoisehg/hgqt/pbranch.py:878
+#: tortoisehg/hgqt/commit.py:577 tortoisehg/hgqt/pbranch.py:879
 msgid "Patch name:"
 msgstr ""
 
 
 #: tortoisehg/hgqt/commit.py:1053 tortoisehg/hgqt/commit.py:1076
 #: tortoisehg/hgqt/commit.py:1099 tortoisehg/hgqt/commit.py:1122
-#: tortoisehg/hgqt/sync.py:1065 tortoisehg/hgqt/sync.py:1163
-#: tortoisehg/hgqt/sync.py:1233 tortoisehg/hgqt/sync.py:1401
+#: tortoisehg/hgqt/sync.py:1073 tortoisehg/hgqt/sync.py:1171
+#: tortoisehg/hgqt/sync.py:1241 tortoisehg/hgqt/sync.py:1409
 msgid "Iniparse must be installed."
 msgstr ""
 
 #: tortoisehg/hgqt/commit.py:1068 tortoisehg/hgqt/commit.py:1091
 #: tortoisehg/hgqt/commit.py:1114 tortoisehg/hgqt/commit.py:1137
-#: tortoisehg/hgqt/settings.py:1321 tortoisehg/hgqt/sync.py:1075
-#: tortoisehg/hgqt/sync.py:1174 tortoisehg/hgqt/sync.py:1251
-#: tortoisehg/hgqt/sync.py:1440
+#: tortoisehg/hgqt/settings.py:1321 tortoisehg/hgqt/sync.py:1083
+#: tortoisehg/hgqt/sync.py:1182 tortoisehg/hgqt/sync.py:1259
+#: tortoisehg/hgqt/sync.py:1448
 msgid "Unable to write configuration file"
 msgstr ""
 
 msgid "No username configured"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:1235 tortoisehg/hgqt/compress.py:122
-#: tortoisehg/hgqt/pbranch.py:871 tortoisehg/hgqt/repowidget.py:359
+#: tortoisehg/hgqt/commit.py:1235 tortoisehg/hgqt/compress.py:124
+#: tortoisehg/hgqt/pbranch.py:872 tortoisehg/hgqt/repowidget.py:359
 msgctxt "action button"
 msgid "Commit"
 msgstr ""
 msgid "%s - commit"
 msgstr ""
 
+#: tortoisehg/hgqt/commit.py:1306
+msgid "TortoiseHg Commit"
+msgstr ""
+
+#: tortoisehg/hgqt/commit.py:1307
+msgid "Are you sure that you want to cancel the commit operation?"
+msgstr ""
+
 #: tortoisehg/hgqt/compress.py:38
 msgid "Compress changesets up to and including"
 msgstr ""
 msgid "Compress - %s"
 msgstr ""
 
-#: tortoisehg/hgqt/compress.py:99
+#: tortoisehg/hgqt/compress.py:101
 msgid ""
 "Before compress, you must <a href=\"commit\"><b>commit</b></a> or <a "
 "href=\"discard\"><b>discard</b></a> changes."
 msgstr ""
 
-#: tortoisehg/hgqt/compress.py:104
+#: tortoisehg/hgqt/compress.py:106
 msgid "You may continue the compress"
 msgstr ""
 
-#: tortoisehg/hgqt/compress.py:121
+#: tortoisehg/hgqt/compress.py:123
 msgid "Changes have been moved, you must now commit"
 msgstr ""
 
-#: tortoisehg/hgqt/compress.py:137
+#: tortoisehg/hgqt/compress.py:139
 msgid "Compress is complete, old history untouched"
 msgstr ""
 
 msgstr ""
 
 #: tortoisehg/hgqt/csinfo.py:108 tortoisehg/hgqt/csinfo.py:110
-#: tortoisehg/hgqt/sync.py:1610
+#: tortoisehg/hgqt/sync.py:1618
 msgid "Branch:"
 msgstr ""
 
 msgid "Filter:"
 msgstr ""
 
-#: tortoisehg/hgqt/manifestdialog.py:193
+#: tortoisehg/hgqt/manifestdialog.py:193 tortoisehg/hgqt/pbranch.py:657
 msgid "Status"
 msgstr ""
 
 "editor installed on your system."
 msgstr ""
 
-#: tortoisehg/hgqt/pbranch.py:844
+#: tortoisehg/hgqt/pbranch.py:657
+msgid "Graph"
+msgstr ""
+
+#: tortoisehg/hgqt/pbranch.py:657 tortoisehg/hgqt/settings.py:641
+msgid "Name"
+msgstr ""
+
+#: tortoisehg/hgqt/pbranch.py:657
+msgid "Title"
+msgstr ""
+
+#: tortoisehg/hgqt/pbranch.py:657
+msgid "Message"
+msgstr ""
+
+#: tortoisehg/hgqt/pbranch.py:845
 msgid "New Patch Branch"
 msgstr ""
 
-#: tortoisehg/hgqt/pbranch.py:879
+#: tortoisehg/hgqt/pbranch.py:880
 msgid "Patch message:"
 msgstr ""
 
-#: tortoisehg/hgqt/pbranch.py:880
+#: tortoisehg/hgqt/pbranch.py:881
 msgid "Patch date:"
 msgstr ""
 
-#: tortoisehg/hgqt/pbranch.py:881
+#: tortoisehg/hgqt/pbranch.py:882
 msgid "Patch user:"
 msgstr ""
 
 msgid "Checkmark files to remove"
 msgstr ""
 
-#: tortoisehg/hgqt/quickop.py:23 tortoisehg/hgqt/sync.py:581
+#: tortoisehg/hgqt/quickop.py:23 tortoisehg/hgqt/sync.py:582
 #: tortoisehg/hgqt/webconf_ui.py:80
 msgid "Remove"
 msgstr ""
 msgid "Clone Repository"
 msgstr ""
 
-#: tortoisehg/hgqt/reporegistry.py:434 tortoisehg/hgqt/sync.py:579
+#: tortoisehg/hgqt/reporegistry.py:434 tortoisehg/hgqt/sync.py:580
 #: tortoisehg/hgqt/workbench.py:333
 msgid "Explore"
 msgstr ""
 msgid "Open the repository in a file browser"
 msgstr ""
 
-#: tortoisehg/hgqt/reporegistry.py:436 tortoisehg/hgqt/sync.py:580
+#: tortoisehg/hgqt/reporegistry.py:436 tortoisehg/hgqt/sync.py:581
 #: tortoisehg/hgqt/workbench.py:336
 msgid "Terminal"
 msgstr ""
 msgstr ""
 
 #: tortoisehg/hgqt/repotreemodel.py:164 tortoisehg/hgqt/resolve.py:399
-#: tortoisehg/hgqt/sync.py:255 tortoisehg/hgqt/webconf.py:266
+#: tortoisehg/hgqt/sync.py:262 tortoisehg/hgqt/webconf.py:266
 msgid "Path"
 msgstr ""
 
 msgid "Reject incoming changesets"
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:547 tortoisehg/hgqt/sync.py:1025
+#: tortoisehg/hgqt/repowidget.py:547 tortoisehg/hgqt/sync.py:1033
 #, python-format
 msgid "%d outgoing changesets"
 msgstr ""
 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 "
-"its internal merge tool that leaves conflict markers in place.  Chose "
-"internal:merge to force conflict markers ,internal:prompt to always select "
+"its internal merge tool that leaves conflict markers in place.  Choose "
+"internal:merge to force conflict markers, internal:prompt to always select "
 "local or other, or internal:dump to leave files in the working directory for "
 "manual merging"
 msgstr ""
 msgid "Commit"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:592 tortoisehg/hgqt/sync.py:1354
+#: tortoisehg/hgqt/settings.py:592 tortoisehg/hgqt/sync.py:1362
 msgid "Username"
 msgstr ""
 
 msgid "Web Server"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:641
-msgid "Name"
-msgstr ""
-
 #: tortoisehg/hgqt/settings.py:642
 msgid ""
 "Repository name to use in the web interface, and by TortoiseHg as a "
 msgid "Comma separated list of archive formats allowed for downloading"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:657 tortoisehg/hgqt/sync.py:244
+#: tortoisehg/hgqt/settings.py:657 tortoisehg/hgqt/sync.py:251
 msgid "Port"
 msgstr ""
 
 msgstr ""
 
 #: tortoisehg/hgqt/settings.py:697 tortoisehg/hgqt/settings.py:828
-#: tortoisehg/hgqt/sync.py:1362
+#: tortoisehg/hgqt/sync.py:1370
 msgid "Password"
 msgstr ""
 
 msgstr ""
 
 #: tortoisehg/hgqt/shellconf.py:86
-msgid "Contex Menu"
+msgid "Context Menu"
 msgstr ""
 
 #: tortoisehg/hgqt/shellconf.py:88
 msgid "Malformed ssh URL"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:113
+#: tortoisehg/hgqt/sync.py:113 tortoisehg/hgqt/sync.py:621
 msgid "TortoiseHg Sync"
 msgstr ""
 
 msgid "Target:"
 msgstr ""
 
+#: tortoisehg/hgqt/sync.py:191
+msgid "<b>Selected Options:</b>"
+msgstr ""
+
 #: tortoisehg/hgqt/sync.py:201
 msgid "<b>Remote Repository:</b>"
 msgstr ""
 msgid "Path Edit Toolbar"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:223
+#: tortoisehg/hgqt/sync.py:219 tortoisehg/hgqt/webconf_ui.py:77
+msgid "Save"
+msgstr ""
+
+#: tortoisehg/hgqt/sync.py:220
+msgid "Save current URL under an alias"
+msgstr ""
+
+#: tortoisehg/hgqt/sync.py:230
 msgid "Security"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:224
+#: tortoisehg/hgqt/sync.py:231
 msgid "Manage HTTPS connection security and user authentication"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:232
+#: tortoisehg/hgqt/sync.py:239
 msgid "Hostname"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:262 tortoisehg/hgqt/webconf_ui.py:77
-msgid "Save"
-msgstr ""
-
-#: tortoisehg/hgqt/sync.py:263
-msgid "Save current URL under an alias"
-msgstr ""
-
-#: tortoisehg/hgqt/sync.py:277
+#: tortoisehg/hgqt/sync.py:278
 msgid "Paths in Repository Settings:"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:292
+#: tortoisehg/hgqt/sync.py:293
 msgid "Related Paths:"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:349
+#: tortoisehg/hgqt/sync.py:350
 #, python-format
 msgid "Preview incoming changesets from %s"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:350
+#: tortoisehg/hgqt/sync.py:351
 #, python-format
 msgid "Pull incoming changesets from %s"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:351
+#: tortoisehg/hgqt/sync.py:352
 #, python-format
 msgid "Filter outgoing changesets to %s"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:352
+#: tortoisehg/hgqt/sync.py:353
 #, python-format
 msgid "Push outgoing changesets to %s"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:359
+#: tortoisehg/hgqt/sync.py:360
 #, python-format
 msgid "rev: %d (%s)"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:364
+#: tortoisehg/hgqt/sync.py:365
 msgid "branch: "
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:371
+#: tortoisehg/hgqt/sync.py:372
 msgid "bookmark: "
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:424
+#: tortoisehg/hgqt/sync.py:425
 msgid "Post Pull: "
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:607
+#: tortoisehg/hgqt/sync.py:608
 msgid "Repository not local"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:608
+#: tortoisehg/hgqt/sync.py:609
 msgid "A terminal shell cannot be opened for remote"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:613 tortoisehg/hgqt/sync.py:1474
+#: tortoisehg/hgqt/sync.py:614 tortoisehg/hgqt/sync.py:1482
 msgid "Confirm path delete"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:614 tortoisehg/hgqt/sync.py:1475
+#: tortoisehg/hgqt/sync.py:615 tortoisehg/hgqt/sync.py:1483
 #, python-format
 msgid "Delete %s from your repo configuration file?"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:711
+#: tortoisehg/hgqt/sync.py:622
+msgid "Are you sure that you want to cancel synchronization?"
+msgstr ""
+
+#: tortoisehg/hgqt/sync.py:719
 msgid "No remote repository URL or path set"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:712
+#: tortoisehg/hgqt/sync.py:720
 msgid ""
 "No valid <i>default</i> remote repository URL or path has been configured "
 "for this repository.<p>Please type and save a remote repository path on the "
 "Sync widget."
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:727
+#: tortoisehg/hgqt/sync.py:735
 msgid "Redundant authentication info"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:728
+#: tortoisehg/hgqt/sync.py:736
 msgid ""
 "You have authentication info configured for this host and inside this URL.  "
 "Remove authentication info from this URL?"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:752 tortoisehg/hgqt/sync.py:758
-#: tortoisehg/hgqt/sync.py:764 tortoisehg/hgqt/sync.py:770
-#: tortoisehg/hgqt/sync.py:777
+#: tortoisehg/hgqt/sync.py:760 tortoisehg/hgqt/sync.py:766
+#: tortoisehg/hgqt/sync.py:772 tortoisehg/hgqt/sync.py:778
+#: tortoisehg/hgqt/sync.py:785
 msgid "sync command already running"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:796
+#: tortoisehg/hgqt/sync.py:804
 #, python-format
 msgid "Getting incoming changesets from %s..."
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:801 tortoisehg/hgqt/sync.py:819
+#: tortoisehg/hgqt/sync.py:809 tortoisehg/hgqt/sync.py:827
 #, python-format
 msgid "Found incoming changesets from %s"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:804 tortoisehg/hgqt/sync.py:821
+#: tortoisehg/hgqt/sync.py:812 tortoisehg/hgqt/sync.py:829
 #, python-format
 msgid "No incoming changesets from %s"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:806 tortoisehg/hgqt/sync.py:823
+#: tortoisehg/hgqt/sync.py:814 tortoisehg/hgqt/sync.py:831
 #, python-format
 msgid "Incoming from %s aborted, ret %d"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:834
+#: tortoisehg/hgqt/sync.py:842
 #, python-format
 msgid "Pull from %s completed"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:836
+#: tortoisehg/hgqt/sync.py:844
 #, python-format
 msgid "Pull from %s aborted, ret %d"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:848 tortoisehg/hgqt/update.py:351
+#: tortoisehg/hgqt/sync.py:856 tortoisehg/hgqt/update.py:351
 msgid "Merge caused file conflicts"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:849 tortoisehg/hgqt/update.py:352
+#: tortoisehg/hgqt/sync.py:857 tortoisehg/hgqt/update.py:352
 msgid "File conflicts need to be resolved"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:855
+#: tortoisehg/hgqt/sync.py:863
 #, python-format
 msgid "Pulling from %s..."
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:874
+#: tortoisehg/hgqt/sync.py:882
 #, python-format
 msgid "Finding outgoing changesets to %s..."
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:886
+#: tortoisehg/hgqt/sync.py:894
 #, python-format
 msgid "%d outgoing changesets to %s"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:889 tortoisehg/hgqt/sync.py:901
-#: tortoisehg/hgqt/sync.py:971
+#: tortoisehg/hgqt/sync.py:897 tortoisehg/hgqt/sync.py:909
+#: tortoisehg/hgqt/sync.py:979
 #, python-format
 msgid "No outgoing changesets to %s"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:891 tortoisehg/hgqt/sync.py:903
+#: tortoisehg/hgqt/sync.py:899 tortoisehg/hgqt/sync.py:911
 #, python-format
 msgid "Outgoing to %s aborted, ret %d"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:899
+#: tortoisehg/hgqt/sync.py:907
 #, python-format
 msgid "outgoing changesets to %s found"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:923
+#: tortoisehg/hgqt/sync.py:931
 #, python-format
 msgid "%s (submitted)"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:925
+#: tortoisehg/hgqt/sync.py:933
 #, python-format
 msgid "%s (pending)"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:930
+#: tortoisehg/hgqt/sync.py:938
 msgid "Unable to parse p4pending output"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:932
+#: tortoisehg/hgqt/sync.py:940
 #, python-format
 msgid "%d pending changelists found"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:934
+#: tortoisehg/hgqt/sync.py:942
 msgid "No pending Perforce changelists"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:936
+#: tortoisehg/hgqt/sync.py:944
 msgid "Aborted p4pending"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:938
+#: tortoisehg/hgqt/sync.py:946
 msgid "Unable to determine pending changesets"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:948
+#: tortoisehg/hgqt/sync.py:956
 msgid "Perforce pending..."
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:958
+#: tortoisehg/hgqt/sync.py:966
 msgid "Confirm Push to remote Repository"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:959
+#: tortoisehg/hgqt/sync.py:967
 #, python-format
 msgid ""
 "Push to remote repository\n"
 "?"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:962
+#: tortoisehg/hgqt/sync.py:970
 #, python-format
 msgid "Push to %s aborted"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:966
+#: tortoisehg/hgqt/sync.py:974
 #, python-format
 msgid "Pushing to %s..."
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:969
+#: tortoisehg/hgqt/sync.py:977
 #, python-format
 msgid "Push to %s completed"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:973
+#: tortoisehg/hgqt/sync.py:981
 #, python-format
 msgid "Push to %s aborted, ret %d"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:976
+#: tortoisehg/hgqt/sync.py:984
 msgid ""
 "One or more of the changesets that you are attempting to push involve the "
 "creation of a new branch.  Do you want to create a new branch in the remote "
 "repository?"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1000
+#: tortoisehg/hgqt/sync.py:1008
 #, python-format
 msgid ""
 "Invalid default push revision: %s.Please check your mercurial configuration "
 "(tortoisehg.defaultpush)"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1021
+#: tortoisehg/hgqt/sync.py:1029
 msgid "Determining outgoing changesets to email..."
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1035
+#: tortoisehg/hgqt/sync.py:1043
 msgid "No outgoing changesets"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1037
+#: tortoisehg/hgqt/sync.py:1045
 #, python-format
 msgid "Outgoing aborted, ret %d"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1044
+#: tortoisehg/hgqt/sync.py:1052
 msgid "Select bundle file"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1045
+#: tortoisehg/hgqt/sync.py:1053
 msgid "Bundle files (*.hg)"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1064
+#: tortoisehg/hgqt/sync.py:1072
 msgid "Unable to remove URL"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1086
+#: tortoisehg/hgqt/sync.py:1094
 msgid "Post Pull Behavior"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1090
+#: tortoisehg/hgqt/sync.py:1098
 msgid "Select post-pull operation for this repository"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1093
+#: tortoisehg/hgqt/sync.py:1101
 msgid "None - simply pull changesets"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1094
+#: tortoisehg/hgqt/sync.py:1102
 msgid "Update - pull, then try to update"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1100
+#: tortoisehg/hgqt/sync.py:1108
 msgid "Fetch - use fetch (auto merge pulled changes)"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1102
+#: tortoisehg/hgqt/sync.py:1110
 msgid "Fetch - use fetch extension (fetch is not active!)"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1109
+#: tortoisehg/hgqt/sync.py:1117
 msgid "Rebase - rebase local commits above pulled changes"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1111
+#: tortoisehg/hgqt/sync.py:1119
 msgid "Rebase - use rebase extension (rebase is not active!)"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1129
+#: tortoisehg/hgqt/sync.py:1137
 msgid "<a href=\"config\">Launch settings tool...</a>"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1162
+#: tortoisehg/hgqt/sync.py:1170
 msgid "Unable to save post pull operation"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1186
+#: tortoisehg/hgqt/sync.py:1194
 msgid "Save Path"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1196 tortoisehg/hgqt/sync.py:1518
+#: tortoisehg/hgqt/sync.py:1204 tortoisehg/hgqt/sync.py:1526
 msgid "Alias"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1199 tortoisehg/hgqt/sync.py:1518
+#: tortoisehg/hgqt/sync.py:1207 tortoisehg/hgqt/sync.py:1526
 msgid "URL"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1208
+#: tortoisehg/hgqt/sync.py:1216
 msgid "Remove authentication data from URL"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1210
+#: tortoisehg/hgqt/sync.py:1218
 msgid ""
 "User authentication data should be associated with the hostname using the "
 "security dialog."
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1232
+#: tortoisehg/hgqt/sync.py:1240
 msgid "Unable to save an URL"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1243
+#: tortoisehg/hgqt/sync.py:1251
 msgid "Confirm URL replace"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1244
+#: tortoisehg/hgqt/sync.py:1252
 #, python-format
 msgid "%s already exists, replace URL?"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1268
+#: tortoisehg/hgqt/sync.py:1276
 msgid "Certificate Query Error"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1281
+#: tortoisehg/hgqt/sync.py:1289
 msgid "Security: "
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1300
+#: tortoisehg/hgqt/sync.py:1308
 #, python-format
 msgid "<b>Host:</b> %s"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1302
+#: tortoisehg/hgqt/sync.py:1310
 msgid "Secure HTTPS Connection"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1309
+#: tortoisehg/hgqt/sync.py:1317
 msgid "Verify with Certificate Authority certificates (best)"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1311
+#: tortoisehg/hgqt/sync.py:1319
 msgid "Verify with stored host fingerprint (good)"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1313
+#: tortoisehg/hgqt/sync.py:1321
 msgid "No host validation, but still encrypted (bad)"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1320
+#: tortoisehg/hgqt/sync.py:1328
 msgid "### host certificate fingerprint ###"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1324
+#: tortoisehg/hgqt/sync.py:1332
 msgid "Query"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1343
+#: tortoisehg/hgqt/sync.py:1351
 msgid "User Authentication"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1350
+#: tortoisehg/hgqt/sync.py:1358
 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"
 "foo.username = $USER."
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1359
+#: tortoisehg/hgqt/sync.py:1367
 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:1366
+#: tortoisehg/hgqt/sync.py:1374
 msgid ""
 "Mercurial keyring extension is enabled. Passwords will be stored in a "
 "platform-native secure method."
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1372
+#: tortoisehg/hgqt/sync.py:1380
 msgid ""
 "Optional. PEM encoded client certificate key file. Environment variables\n"
 "are expanded in the filename."
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1374
+#: tortoisehg/hgqt/sync.py:1382
 msgid "User Certificate Key File"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1378
+#: tortoisehg/hgqt/sync.py:1386
 msgid ""
 "Optional. PEM encoded client certificate chain file. Environment variables\n"
 "are expanded in the filename."
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1380
+#: tortoisehg/hgqt/sync.py:1388
 msgid "User Certificate Chain File"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1400
+#: tortoisehg/hgqt/sync.py:1408
 msgid "Unable to save authentication"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1562
+#: tortoisehg/hgqt/sync.py:1570
 #, python-format
 msgid "%s - sync options"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1569
+#: tortoisehg/hgqt/sync.py:1577
 msgid "Allow push of a new branch (--new-branch)"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1574
+#: tortoisehg/hgqt/sync.py:1582
 msgid "Force push or pull (override safety checks, --force)"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1584
+#: tortoisehg/hgqt/sync.py:1592
 msgid "Temporarily disable configured HTTP proxy"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1591
+#: tortoisehg/hgqt/sync.py:1599
 msgid "Emit debugging output (--debug)"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1597
+#: tortoisehg/hgqt/sync.py:1605
 msgid "Work on patch queue (--mq)"
 msgstr ""
 

File i18n/tortoisehg/cs.po

View file
 msgstr ""
 "Project-Id-Version: tortoisehg\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-03-19 21:15-0300\n"
+"POT-Creation-Date: 2012-03-27 21:18-0300\n"
 "PO-Revision-Date: 2011-04-27 13:11+0000\n"
 "Last-Translator: Tovim <Unknown>\n"
 "Language-Team: Czech <kde-i18n-doc@kde.org>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2012-03-20 04:59+0000\n"
-"X-Generator: Launchpad (build 14969)\n"
+"X-Launchpad-Export-Date: 2012-03-28 04:48+0000\n"
+"X-Generator: Launchpad (build 15027)\n"
 
 #: TortoiseHgOverlayServer.py:51
 msgid "TortoiseHg Overlay Icon Server"
 msgstr "Pouze soubory upravené či vytvořené v této revizi"
 
 #: tortoisehg/hgqt/archive.py:47 tortoisehg/hgqt/grep.py:68
-#: tortoisehg/hgqt/sync.py:1579
+#: tortoisehg/hgqt/sync.py:1587
 msgid "Recurse into subrepositories"
 msgstr "Zabočit do subrepozitářů"
 
 #: tortoisehg/hgqt/archive.py:114 tortoisehg/hgqt/backout.py:300
 #: tortoisehg/hgqt/commit.py:402 tortoisehg/hgqt/commit.py:410
 #: tortoisehg/hgqt/commit.py:731 tortoisehg/hgqt/commit.py:794
-#: tortoisehg/hgqt/commit.py:818 tortoisehg/hgqt/compress.py:150
+#: tortoisehg/hgqt/commit.py:818 tortoisehg/hgqt/compress.py:152
 #: tortoisehg/hgqt/lfprompt.py:23 tortoisehg/hgqt/merge.py:100
 #: tortoisehg/hgqt/merge.py:235 tortoisehg/hgqt/merge.py:312
 #: tortoisehg/hgqt/quickop.py:185 tortoisehg/hgqt/rebase.py:240
 msgstr ""
 
 #: tortoisehg/hgqt/backout.py:228 tortoisehg/hgqt/merge.py:215
-#: tortoisehg/hgqt/rebase.py:76 tortoisehg/hgqt/sync.py:1123
+#: tortoisehg/hgqt/rebase.py:76 tortoisehg/hgqt/sync.py:1131
 #: tortoisehg/hgqt/update.py:103
 msgid "Automatically resolve merge conflicts where possible"
 msgstr "Konflikty při slučování řešit pokud možno automaticky"
 msgid "Clean"
 msgstr "Čistit"
 
-#: tortoisehg/hgqt/backout.py:299 tortoisehg/hgqt/compress.py:149
+#: tortoisehg/hgqt/backout.py:299 tortoisehg/hgqt/compress.py:151
 #: tortoisehg/hgqt/merge.py:234 tortoisehg/hgqt/merge.py:311
 #: tortoisehg/hgqt/rebase.py:239 tortoisehg/hgqt/settings.py:1097
 #: tortoisehg/hgqt/update.py:263
 msgid "&Discard"
 msgstr "&Zavrhnout"
 
-#: tortoisehg/hgqt/backout.py:301 tortoisehg/hgqt/compress.py:151
+#: tortoisehg/hgqt/backout.py:301 tortoisehg/hgqt/compress.py:153
 #: tortoisehg/hgqt/merge.py:313 tortoisehg/hgqt/rebase.py:241
 msgid "Confirm Discard"
 msgstr "Confirm Discard"
 
-#: tortoisehg/hgqt/backout.py:302 tortoisehg/hgqt/compress.py:152
+#: tortoisehg/hgqt/backout.py:302 tortoisehg/hgqt/compress.py:154
 #: tortoisehg/hgqt/merge.py:314 tortoisehg/hgqt/rebase.py:242
 msgid "Discard outstanding changes to working directory?"
 msgstr "Zavrhnout neošetřené změny pracovního adresáře?"
 msgid "Skip this Revision"
 msgstr "Přeskočit tuto revizi"
 
-#: tortoisehg/hgqt/bisect.py:72 tortoisehg/hgqt/compress.py:138
+#: tortoisehg/hgqt/bisect.py:72 tortoisehg/hgqt/compress.py:140
 #: tortoisehg/hgqt/rebase.py:203
 msgid "Close"
 msgstr "Zavřít"
 msgid "Do not verify host certificate"
 msgstr ""
 
-#: tortoisehg/hgqt/clone.py:151 tortoisehg/hgqt/sync.py:1604
+#: tortoisehg/hgqt/clone.py:151 tortoisehg/hgqt/sync.py:1612
 msgid "Remote command:"
 msgstr "Vzdálený příkaz:"
 
 msgid "Stop"
 msgstr "Stop"
 
-#: tortoisehg/hgqt/commit.py:175 tortoisehg/hgqt/sync.py:191
-msgid "<b>Selected Options:</b>"
-msgstr ""
-
 #: tortoisehg/hgqt/commit.py:262
 msgid "Commit changes"
 msgstr ""
 msgid "&Commit to current branch"
 msgstr "&Commit to current branch"
 
-#: tortoisehg/hgqt/commit.py:404 tortoisehg/hgqt/sync.py:975
+#: tortoisehg/hgqt/commit.py:404 tortoisehg/hgqt/sync.py:983
 msgid "Confirm New Branch"
 msgstr "Potvrďte novou větev"
 
 msgid "New Branch: "
 msgstr "New Branch: "
 
+#: tortoisehg/hgqt/commit.py:563
+#, python-format
+msgid "<b>Selected Options:</b> %s"
+msgstr ""
+
 #: tortoisehg/hgqt/commit.py:576 tortoisehg/hgqt/revpanel.py:24
 #: tortoisehg/hgqt/update.py:87
 msgid "Parent:"
 msgstr "Rodič:"
 
-#: tortoisehg/hgqt/commit.py:577 tortoisehg/hgqt/pbranch.py:878
+#: tortoisehg/hgqt/commit.py:577 tortoisehg/hgqt/pbranch.py:879
 msgid "Patch name:"
 msgstr ""
 
 
 #: tortoisehg/hgqt/commit.py:1053 tortoisehg/hgqt/commit.py:1076
 #: tortoisehg/hgqt/commit.py:1099 tortoisehg/hgqt/commit.py:1122
-#: tortoisehg/hgqt/sync.py:1065 tortoisehg/hgqt/sync.py:1163
-#: tortoisehg/hgqt/sync.py:1233 tortoisehg/hgqt/sync.py:1401
+#: tortoisehg/hgqt/sync.py:1073 tortoisehg/hgqt/sync.py:1171
+#: tortoisehg/hgqt/sync.py:1241 tortoisehg/hgqt/sync.py:1409
 msgid "Iniparse must be installed."
 msgstr "Iniparse must be installed."
 
 #: tortoisehg/hgqt/commit.py:1068 tortoisehg/hgqt/commit.py:1091
 #: tortoisehg/hgqt/commit.py:1114 tortoisehg/hgqt/commit.py:1137