Commits

Wagner Bruna committed d806618

i18n: pull latest translations from Launchpad

Including messages up to 09fdcdae2276 .

  • Participants
  • Parent commits 60b9b8b
  • Branches stable

Comments (0)

Files changed (7)

File i18n/tortoisehg/da.po

 "Project-Id-Version: tortoisehg\n"
 "Report-Msgid-Bugs-To: Peer Sommerlund <peer.sommerlund@gmail.com>\n"
 "POT-Creation-Date: 2011-08-21 20:08-0300\n"
-"PO-Revision-Date: 2011-08-22 04:31+0000\n"
+"PO-Revision-Date: 2011-08-28 06:27+0000\n"
 "Last-Translator: peso <peer.sommerlund@gmail.com>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\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: 2011-08-22 04:38+0000\n"
-"X-Generator: Launchpad (build 13697)\n"
+"X-Launchpad-Export-Date: 2011-08-29 04:39+0000\n"
+"X-Generator: Launchpad (build 13794)\n"
 
 #: TortoiseHgOverlayServer.py:51
 msgid "TortoiseHg Overlay Icon Server"
 
 #: tortoisehg/hgqt/clone.py:147
 msgid "Do not verify host certificate"
-msgstr ""
+msgstr "Efterprøv ikke værtscertifikat"
 
 #: tortoisehg/hgqt/clone.py:151 tortoisehg/hgqt/sync.py:1539
 #: tortoisehg/hgtk/clone.py:159 tortoisehg/hgtk/synch.py:202
 
 #: tortoisehg/hgqt/repofilter.py:216
 msgid "Display closed branches"
-msgstr ""
+msgstr "Vis lukkede grene"
 
 #: tortoisehg/hgqt/repofilter.py:219
 msgid "Include all ancestors"
 
 #: tortoisehg/hgqt/sync.py:1264
 msgid "### host certificate fingerprint ###"
-msgstr ""
+msgstr "### værtscertifikat fingeraftryk ###"
 
 #: tortoisehg/hgqt/sync.py:1268
 msgid "Query"
 
 #: tortoisehg/hgqt/workbench.py:209
 msgid "&Close Repository"
-msgstr ""
+msgstr "&Luk depot"
 
 #: tortoisehg/hgqt/workbench.py:216
 msgid "&Settings..."

File i18n/tortoisehg/de.po

 "Project-Id-Version: tortoisehg\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-08-21 20:08-0300\n"
-"PO-Revision-Date: 2011-08-17 10:24+0000\n"
-"Last-Translator: simohe <Unknown>\n"
+"PO-Revision-Date: 2011-09-04 14:48+0000\n"
+"Last-Translator: Karsten Tinnefeld <Unknown>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\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: 2011-08-22 04:39+0000\n"
-"X-Generator: Launchpad (build 13697)\n"
+"X-Launchpad-Export-Date: 2011-09-05 06:07+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #: TortoiseHgOverlayServer.py:51
 msgid "TortoiseHg Overlay Icon Server"
 
 #: tortoisehg/hgqt/chunks.py:393
 msgid "Unable to remove"
-msgstr ""
+msgstr "Entfernen nicht möglich"
 
 #: tortoisehg/hgqt/chunks.py:394
 #, python-format
 "Unable to remove added file %s,\n"
 "permission denied"
 msgstr ""
+"Die hinzugefügte Datei %s kann nicht entfernt werden.\n"
+"Keine Berechtigung"
 
 #: tortoisehg/hgqt/chunks.py:530
 msgctxt "files"
 
 #: tortoisehg/hgqt/hgemail_ui.py:280
 msgid "Select &All"
-msgstr ""
+msgstr "&Alle Auswählen"
 
 #: tortoisehg/hgqt/hgemail_ui.py:281
 msgid "Select &None"
-msgstr ""
+msgstr "&Keine Auswählen"
 
 #: tortoisehg/hgqt/hgemail_ui.py:282 tortoisehg/hgqt/wctxactions.py:43
 #: tortoisehg/hgqt/webconf.py:256 tortoisehg/hgqt/webconf_ui.py:79
 
 #: tortoisehg/hgqt/manifestdialog.py:535
 msgid "Failed to open Manifest dialog"
-msgstr ""
+msgstr "Öffnen des Inhaltsverzeichnis-Dialogs gescheitert"
 
 #: tortoisehg/hgqt/merge.py:31
 #, python-format
 
 #: tortoisehg/hgqt/quickop.py:85
 msgid "Force removal of modified files (--force)"
-msgstr ""
+msgstr "Entfernen der geänderten Dateien erzwingen (--force)"
 
 #: tortoisehg/hgqt/quickop.py:146 tortoisehg/hgtk/quickop.py:261
 msgid "No files selected"
 "You have selected one or more files that have been modified.  By default, "
 "these files will not be removed.  What would you like to do?"
 msgstr ""
+"Sie haben mindestens eine veränderte Datei ausgewählt. Standardmäßig werden "
+"diese Dateien nicht entfernt. Was möchten Sie tun?"
 
 #: tortoisehg/hgqt/quickop.py:162
 msgid "Remove &Unmodified Files"
-msgstr ""
+msgstr "&Unveränderte Dateien entfernen"
 
 #: tortoisehg/hgqt/quickop.py:163
 msgid "Remove &All Selected Files"
-msgstr ""
+msgstr "&Alle ausgewählten Dateien entfernen"
 
 #: tortoisehg/hgqt/rebase.py:40
 msgid "Rebase changeset and descendants"
 "creation of a new branch.  Do you want to create a new branch in the remote "
 "repository?"
 msgstr ""
+"Mindestens eine der Änderungslisten, die Sie zu Senden versuchen, enthält "
+"die Erzeugung eines neuen Zweigs. Wollen Sie einen neuen Zweig im entfernten "
+"Archiv erzeugen?"
 
 #: tortoisehg/hgqt/sync.py:965
 msgid "Determining outgoing changesets to email..."

File i18n/tortoisehg/en_AU.po

 "Project-Id-Version: tortoisehg\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-08-21 20:08-0300\n"
-"PO-Revision-Date: 2010-04-22 09:01+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-08-24 13:22+0000\n"
+"Last-Translator: Kyle Simpson <Unknown>\n"
 "Language-Team: English (Australia) <en_AU@li.org>\n"
 "MIME-Version: 1.0\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: 2011-08-22 04:43+0000\n"
-"X-Generator: Launchpad (build 13697)\n"
+"X-Launchpad-Export-Date: 2011-08-25 04:41+0000\n"
+"X-Generator: Launchpad (build 13727)\n"
 
 #: TortoiseHgOverlayServer.py:51
 msgid "TortoiseHg Overlay Icon Server"
 
 #: tortoisehg/hgqt/about.py:56
 msgid "Copyright 2008-2011 Steve Borho and others"
-msgstr ""
+msgstr "Copyright 2008-2011 Steve Borho and others"
 
 #: tortoisehg/hgqt/about.py:61 tortoisehg/hgtk/about.py:42
 msgid "Several icons are courtesy of the TortoiseSVN project"
 
 #: tortoisehg/hgqt/about.py:71
 msgid "You can visit our site here"
-msgstr ""
+msgstr "You can visit our site here"
 
 #: tortoisehg/hgqt/about.py:80
 msgid "&License"
-msgstr ""
+msgstr "&License"
 
 #: tortoisehg/hgqt/about.py:86 tortoisehg/hgqt/archive.py:108
 #: tortoisehg/hgqt/hgemail_ui.py:286 tortoisehg/hgqt/hginit.py:58
 #: tortoisehg/hgqt/license.py:45 tortoisehg/hgqt/postreview_ui.py:179
 #: tortoisehg/hgqt/rename.py:105
 msgid "&Close"
-msgstr ""
+msgstr "&Close"
 
 #: tortoisehg/hgqt/about.py:106
 #, python-format
 msgid "version %s"
-msgstr ""
+msgstr "version %s"
 
 #: tortoisehg/hgqt/about.py:107
 #, python-format
 msgid "with Mercurial-%s, Python-%s, PyQt-%s, Qt-%s"
-msgstr ""
+msgstr "with Mercurial-%s, Python-%s, PyQt-%s, Qt-%s"
 
 #: tortoisehg/hgqt/about.py:156 tortoisehg/hgtk/about.py:70
 msgid "A new version of TortoiseHg is ready for download!"
 
 #: tortoisehg/hgqt/archive.py:46 tortoisehg/hgtk/archive.py:62
 msgid "Only files modified/created in this revision"
-msgstr ""
+msgstr "Only files modified/created in this revision"
 
 #: tortoisehg/hgqt/archive.py:47 tortoisehg/hgqt/grep.py:69
 #: tortoisehg/hgqt/sync.py:1523
 msgid "Recurse into subrepositories"
-msgstr ""
+msgstr "Recurse into subrepositories"
 
 #: tortoisehg/hgqt/archive.py:54 tortoisehg/hgqt/hginit.py:34
 #: tortoisehg/hgtk/archive.py:72 tortoisehg/hgtk/clone.py:106
 #: tortoisehg/hgqt/archive.py:84 tortoisehg/hgqt/clone.py:157
 #: tortoisehg/hgqt/hginit.py:67 tortoisehg/hgqt/rename.py:84
 msgid "Hg command:"
-msgstr ""
+msgstr "Hg command:"
 
 #: tortoisehg/hgqt/archive.py:88 tortoisehg/hgqt/rename.py:89
 msgid "Always show output"
-msgstr ""
+msgstr "Always show output"
 
 #: tortoisehg/hgqt/archive.py:106
 msgid "&Archive"
-msgstr ""
+msgstr "&Archive"
 
 #: tortoisehg/hgqt/archive.py:111 tortoisehg/hgqt/rename.py:107
 msgid "&Detail"
-msgstr ""
+msgstr "&Detail"
 
 #: tortoisehg/hgqt/archive.py:114 tortoisehg/hgqt/backout.py:293
 #: tortoisehg/hgqt/commit.py:375 tortoisehg/hgqt/commit.py:383
 
 #: tortoisehg/hgqt/archive.py:198
 msgid "Open File"
-msgstr ""
+msgstr "Open File"
 
 #: tortoisehg/hgqt/archive.py:228 tortoisehg/hgtk/archive.py:171
 msgid "Tar archives"
 
 #: tortoisehg/hgqt/archive.py:237 tortoisehg/hgqt/archive.py:240
 msgid "Zip archives"
-msgstr ""
+msgstr "Zip archives"
 
 #: tortoisehg/hgqt/archive.py:315 tortoisehg/hgqt/archive.py:333
 msgid "Duplicate Name"
-msgstr ""
+msgstr "Duplicate Name"
 
 #: tortoisehg/hgqt/archive.py:316
 #, python-format
 msgid "The destination \"%s\" already exists as a file!"
-msgstr ""
+msgstr "The destination \"%s\" already exists as a file!"
 
 #: tortoisehg/hgqt/archive.py:320 tortoisehg/hgqt/archive.py:327
 #: tortoisehg/hgtk/archive.py:213 tortoisehg/hgtk/archive.py:219
 "\n"
 "Do you want to overwrite it?"
 msgstr ""
+"The directory \"%s\" is not empty!\n"
+"\n"
+"Do you want to overwrite it?"
 
 #: tortoisehg/hgqt/archive.py:328 tortoisehg/hgtk/gtklib.py:595
 #, python-format
 #: tortoisehg/hgqt/archive.py:334
 #, python-format
 msgid "The destination \"%s\" already exists as a folder!"
-msgstr ""
+msgstr "The destination \"%s\" already exists as a folder!"
 
 #: tortoisehg/hgqt/backout.py:29
 #, python-format
 msgid "Backout - %s"
-msgstr ""
+msgstr "Backout - %s"
 
 #: tortoisehg/hgqt/backout.py:99
 msgid "Prepare to backout"
-msgstr ""
+msgstr "Prepare to backout"
 
 #: tortoisehg/hgqt/backout.py:100
 msgid "Verify backout revision and ensure your working directory is clean."
-msgstr ""
+msgstr "Verify backout revision and ensure your working directory is clean."
 
 #: tortoisehg/hgqt/backout.py:109 tortoisehg/hgqt/backout.py:121
 msgid "Unable to backout"
-msgstr ""
+msgstr "Unable to backout"
 
 #: tortoisehg/hgqt/backout.py:110
 msgid "Backout revision not found"
-msgstr ""
+msgstr "Backout revision not found"
 
 #: tortoisehg/hgqt/backout.py:114
 msgid "Backing out a parent revision is a single step operation"
-msgstr ""
+msgstr "Backing out a parent revision is a single step operation"
 
 #: tortoisehg/hgqt/backout.py:122
 msgid "Cannot backout change on a different branch"
-msgstr ""
+msgstr "Cannot backout change on a different branch"
 
 #: tortoisehg/hgqt/backout.py:128
 msgid "Backout revision"
-msgstr ""
+msgstr "Backout revision"
 
 #: tortoisehg/hgqt/backout.py:138
 msgid "Not a head, backout will create a new head!"
-msgstr ""
+msgstr "Not a head, backout will create a new head!"
 
 #: tortoisehg/hgqt/backout.py:144
 msgid "Current local revision"
-msgstr ""
+msgstr "Current local revision"
 
 #: tortoisehg/hgqt/backout.py:162
 msgid "Merge parent to backout to"
 "To backout a <b>merge</b> revision you must select which parent to backout "
 "to (i.e. whose changes will be <i>kept</i>)"
 msgstr ""
+"To backout a <b>merge</b> revision you must select which parent to backout "
+"to (i.e. whose changes will be <i>kept</i>)"
 
 #: tortoisehg/hgqt/backout.py:170
 #, python-format
 msgid "First Parent: revision %s (%s)"
-msgstr ""
+msgstr "First Parent: revision %s (%s)"
 
 #: tortoisehg/hgqt/backout.py:176
 msgid "Backout to the first parent of the merge revision"
-msgstr ""
+msgstr "Backout to the first parent of the merge revision"
 
 #: tortoisehg/hgqt/backout.py:181
 #, python-format
 msgid "Second Parent: revision %s (%s)"
-msgstr ""
+msgstr "Second Parent: revision %s (%s)"
 
 #: tortoisehg/hgqt/backout.py:186
 msgid "Backout to the second parent of the merge revision"
-msgstr ""
+msgstr "Backout to the second parent of the merge revision"
 
 #: tortoisehg/hgqt/backout.py:194 tortoisehg/hgqt/merge.py:154
 msgid "Working directory status"
-msgstr ""
+msgstr "Working directory status"
 
 #: tortoisehg/hgqt/backout.py:202 tortoisehg/hgqt/compress.py:69
 #: tortoisehg/hgqt/merge.py:162 tortoisehg/hgqt/rebase.py:110
 msgid "Checking..."
-msgstr ""
+msgstr "Checking…"
 
 #: tortoisehg/hgqt/backout.py:210
 msgid ""
 "href=\"shelve\"><b>shelve</b></a> to patch, or <a "
 "href=\"discard\"><b>discard</b></a> changes."
 msgstr ""
+"Before backout, you must <a href=\"commit\"><b>commit</b></a>, <a "
+"href=\"shelve\"><b>shelve</b></a> to patch, or <a "
+"href=\"discard\"><b>discard</b></a> changes."
 
 #: tortoisehg/hgqt/backout.py:221 tortoisehg/hgqt/merge.py:215
 #: tortoisehg/hgqt/rebase.py:73 tortoisehg/hgqt/sync.py:1067
 #: tortoisehg/hgqt/update.py:103
 msgid "Automatically resolve merge conflicts where possible"
-msgstr ""
+msgstr "Automatically resolve merge conflicts where possible"
 
 #: tortoisehg/hgqt/backout.py:267 tortoisehg/hgqt/merge.py:285
 msgid "<b>Uncommitted local changes are detected</b>"
-msgstr ""
+msgstr "<b>Uncommitted local changes are detected</b>"
 
 #: tortoisehg/hgqt/backout.py:271 tortoisehg/hgtk/recovery.py:52
 msgid "Clean"
 #: tortoisehg/hgqt/backout.py:294 tortoisehg/hgqt/compress.py:151
 #: tortoisehg/hgqt/merge.py:313 tortoisehg/hgqt/rebase.py:232
 msgid "Confirm Discard"
-msgstr ""
+msgstr "Confirm Discard"
 
 #: tortoisehg/hgqt/backout.py:295 tortoisehg/hgqt/compress.py:152
 #: tortoisehg/hgqt/merge.py:314 tortoisehg/hgqt/rebase.py:233
 msgid "Discard outstanding changes to working directory?"
-msgstr ""
+msgstr "Discard outstanding changes to working directory?"
 
 #: tortoisehg/hgqt/backout.py:320
 msgid "Backing out, then merging..."
-msgstr ""
+msgstr "Backing out, then merging..."
 
 #: tortoisehg/hgqt/backout.py:321 tortoisehg/hgqt/merge.py:342
 msgid "All conflicting files will be marked unresolved."
-msgstr ""
+msgstr "All conflicting files will be marked unresolved."
 
 #: tortoisehg/hgqt/backout.py:334
 msgid ""
 "Automatically advance to next page when backout and merge are complete."
 msgstr ""
+"Automatically advance to next page when backout and merge are complete."
 
 #: tortoisehg/hgqt/backout.py:365 tortoisehg/hgqt/merge.py:395
 #, python-format
 "%d files have <b>merge conflicts</b> that must be <a "
 "href=\"resolve\"><b>resolved</b></a>"
 msgstr ""
+"%d files have <b>merge conflicts</b> that must be <a "
+"href=\"resolve\"><b>resolved</b></a>"
 
 #: tortoisehg/hgqt/backout.py:370 tortoisehg/hgqt/merge.py:405
 msgid "No merge conflicts, ready to commit"
-msgstr ""
+msgstr "No merge conflicts, ready to commit"
 
 #: tortoisehg/hgqt/backout.py:405
 msgid "Commit backout and merge results"
-msgstr ""
+msgstr "Commit backout and merge results"
 
 #: tortoisehg/hgqt/backout.py:415 tortoisehg/hgqt/merge.py:449
 #: tortoisehg/hgtk/commit.py:236 tortoisehg/hgtk/history.py:66
 #: tortoisehg/hgqt/repomodel.py:589 tortoisehg/hgqt/repomodel.py:591
 #: tortoisehg/hgqt/shelve.py:24 tortoisehg/hgqt/thgimport.py:87
 msgid "Working Directory"
-msgstr ""
+msgstr "Working Directory"
 
 #: tortoisehg/hgqt/backout.py:459 tortoisehg/hgqt/merge.py:490
 msgid "Working Directory (merged)"
-msgstr ""
+msgstr "Working Directory (merged)"
 
 #: tortoisehg/hgqt/backout.py:467 tortoisehg/hgqt/merge.py:498
 msgid "Commit message"
-msgstr ""
+msgstr "Commit message"
 
 #: tortoisehg/hgqt/backout.py:491 tortoisehg/hgqt/merge.py:522
 msgid "Skip final confirmation page, close after commit."
-msgstr ""
+msgstr "Skip final confirmation page, close after commit."
 
 #: tortoisehg/hgqt/backout.py:502 tortoisehg/hgqt/backout.py:536
 msgid "Backed out merge changeset: "
-msgstr ""
+msgstr "Backed out merge changeset: "
 
 #: tortoisehg/hgqt/backout.py:504 tortoisehg/hgqt/backout.py:538
 #: tortoisehg/hgtk/backout.py:41
 #: tortoisehg/hgqt/backout.py:546
 #, python-format
 msgid "Backed out merge revision to its first parent (%s)"
-msgstr ""
+msgstr "Backed out merge revision to its first parent (%s)"
 
 #: tortoisehg/hgqt/backout.py:549
 #, python-format
 msgid "Backed out merge revision to its second parent (%s)"
-msgstr ""
+msgstr "Backed out merge revision to its second parent (%s)"
 
 #: tortoisehg/hgqt/backout.py:578
 msgid "Backing out and committing..."
-msgstr ""
+msgstr "Backing out and committing..."
 
 #: tortoisehg/hgqt/backout.py:579
 msgid "Please wait while making backout."
 
 #: tortoisehg/hgqt/backout.py:587 tortoisehg/hgqt/merge.py:573
 msgid "Committing..."
-msgstr ""
+msgstr "Committing..."
 
 #: tortoisehg/hgqt/backout.py:588 tortoisehg/hgqt/merge.py:574
 msgid "Please wait while committing merged files."
-msgstr ""
+msgstr "Please wait while committing merged files."
 
 #: tortoisehg/hgqt/backout.py:613 tortoisehg/hgqt/cmdui.py:313
 #: tortoisehg/hgqt/merge.py:602 tortoisehg/hgtk/p4pending.py:101
 
 #: tortoisehg/hgqt/backout.py:618
 msgid "Backout changeset"
-msgstr ""
+msgstr "Backout changeset"
 
 #: tortoisehg/hgqt/bisect.py:22
 #, python-format
 msgid "Bisect - %s"
-msgstr ""
+msgstr "Bisect - %s"
 
 #: tortoisehg/hgqt/bisect.py:34
 msgid "Known good revision:"
-msgstr ""
+msgstr "Known good revision:"
 
 #: tortoisehg/hgqt/bisect.py:38 tortoisehg/hgqt/bisect.py:48
 #: tortoisehg/hgqt/repowidget.py:428 tortoisehg/hgtk/history.py:1875
 
 #: tortoisehg/hgqt/bisect.py:43
 msgid "Known bad revision:"
-msgstr ""
+msgstr "Known bad revision:"
 
 #: tortoisehg/hgqt/bisect.py:59
 msgid "Revision is Good"
-msgstr ""
+msgstr "Revision is good"
 
 #: tortoisehg/hgqt/bisect.py:61
 msgid "Revision is Bad"
-msgstr ""
+msgstr "Revision is bad"
 
 #: tortoisehg/hgqt/bisect.py:63
 msgid "Skip this Revision"
-msgstr ""
+msgstr "Skip this revision"
 
 #: tortoisehg/hgqt/bisect.py:72 tortoisehg/hgqt/compress.py:138
 #: tortoisehg/hgqt/rebase.py:194 tortoisehg/hgtk/bugreport.py:48
 
 #: tortoisehg/hgqt/bisect.py:83
 msgid "Error encountered."
-msgstr ""
+msgstr "Error encountered."
 
 #: tortoisehg/hgqt/bisect.py:88
 msgid "Culprit found."
-msgstr ""
+msgstr "Culprit found."
 
 #: tortoisehg/hgqt/bisect.py:93 tortoisehg/hgqt/grep.py:65
 msgid "Revision"
-msgstr ""
+msgstr "Revision"
 
 #: tortoisehg/hgqt/bisect.py:94
 msgid "Test this revision and report findings. (good/bad/skip)"
-msgstr ""
+msgstr "Test this revision and report findings. (good/bad/skip)"
 
 #: tortoisehg/hgqt/bisect.py:114 tortoisehg/hgqt/bisect.py:135
 #: tortoisehg/hgqt/commit.py:742 tortoisehg/hgqt/commit.py:1009
 #: tortoisehg/hgqt/wctxactions.py:169
 #, python-format
 msgid "%s (hint: %s)"
-msgstr ""
+msgstr "%s (hint: %s)"
 
 #: tortoisehg/hgqt/bookmark.py:57 tortoisehg/hgtk/bookmark.py:66
 msgid "Bookmark:"
 #: tortoisehg/hgqt/tag.py:98 tortoisehg/hgqt/wctxactions.py:48
 #: tortoisehg/hgqt/wctxactions.py:54
 msgid "&Add"
-msgstr ""
+msgstr "&Add"
 
 #: tortoisehg/hgqt/bookmark.py:68
 msgid "Re&name"
-msgstr ""
+msgstr "Re&name"
 
 #: tortoisehg/hgqt/bookmark.py:69 tortoisehg/hgqt/commit.py:725
 #: tortoisehg/hgqt/tag.py:99
 msgid "&Remove"
-msgstr ""
+msgstr "&Remove"
 
 #: tortoisehg/hgqt/bookmark.py:70
 msgid "&Move"
-msgstr ""
+msgstr "&Move"
 
 #: tortoisehg/hgqt/bookmark.py:92 tortoisehg/hgtk/bookmark.py:34
 #, python-format
 #: tortoisehg/hgqt/bookmark.py:160 tortoisehg/hgqt/bookmark.py:214
 #, python-format
 msgid "A bookmark named \"%s\" already exists"
-msgstr ""
+msgstr "A bookmark named \"%s\" already exists"
 
 #: tortoisehg/hgqt/bookmark.py:165
 #, python-format
 msgid "Bookmark '%s' has been added"
-msgstr ""
+msgstr "Bookmark '%s' has been added"
 
 #: tortoisehg/hgqt/bookmark.py:176
 #, python-format
 msgid "Bookmark named \"%s\" does not exist"
-msgstr ""
+msgstr "Bookmark named \"%s\" does not exist"
 
 #: tortoisehg/hgqt/bookmark.py:181
 #, python-format
 msgid "Bookmark '%s' has been moved"
-msgstr ""
+msgstr "Bookmark '%s' has been moved"
 
 #: tortoisehg/hgqt/bookmark.py:192 tortoisehg/hgqt/bookmark.py:210
 #: tortoisehg/hgtk/bookmark.py:287
 #: tortoisehg/hgqt/bookmark.py:196
 #, python-format
 msgid "Bookmark '%s' has been removed"
-msgstr ""
+msgstr "Bookmark '%s' has been removed"
 
 #: tortoisehg/hgqt/bookmark.py:219
 #, python-format
 msgid "Bookmark '%s' has been renamed to '%s'"
-msgstr ""
+msgstr "Bookmark '%s' has been renamed to '%s'"
 
 #: tortoisehg/hgqt/branchop.py:22
 #, python-format
 msgid "%s - branch operation"
-msgstr ""
+msgstr "%s - branch operation"
 
 #: tortoisehg/hgqt/branchop.py:29 tortoisehg/hgtk/commit.py:47
 msgid "Select branch of merge commit"
 
 #: tortoisehg/hgqt/branchop.py:48
 msgid "Close current branch"
-msgstr ""
+msgstr "Close current branch"
 
 #: tortoisehg/hgqt/bugreport.py:26
 #, python-format
 msgid "Please report this bug to our <a href=\"%s\">bug tracker</a>"
-msgstr ""
+msgstr "Please report this bug to our <a href=\"%s\">bug tracker</a>"
 
 #: tortoisehg/hgqt/bugreport.py:44 tortoisehg/hgqt/qscilib.py:181
 #: tortoisehg/hgqt/rename.py:166
 msgid "Copy"
-msgstr ""
+msgstr "Copy"
 
 #: tortoisehg/hgqt/bugreport.py:45
 msgid "Quit"
-msgstr ""
+msgstr "Quit"
 
 #: tortoisehg/hgqt/bugreport.py:48 tortoisehg/hgtk/bugreport.py:25
 msgid "TortoiseHg Bug Report"
 
 #: tortoisehg/hgqt/bugreport.py:97
 msgid "Text files (*.txt)"
-msgstr ""
+msgstr "Text files (*.txt)"
 
 #: tortoisehg/hgqt/bugreport.py:101
 msgid "Error writing file"
-msgstr ""
+msgstr "Error writing file"
 
 #: tortoisehg/hgqt/bugreport.py:124 tortoisehg/hgqt/qqueue.py:342
 #: tortoisehg/hgqt/qreorder.py:228
 msgid "TortoiseHg Error"
-msgstr ""
+msgstr "TortoiseHg Error"
 
 #: tortoisehg/hgqt/bugreport.py:146
 msgid ""
 "If you still have trouble, <a href=\"#bugreport\">please file a bug "
 "report</a>."
 msgstr ""
+"If you still have trouble, <a href=\"#bugreport\">please file a bug "
+"report</a>."
 
 #: tortoisehg/hgqt/chunks.py:89 tortoisehg/hgqt/grep.py:549
 #: tortoisehg/hgqt/manifestdialog.py:201 tortoisehg/hgqt/revdetails.py:230
 #: tortoisehg/hgqt/chunks.py:90 tortoisehg/hgqt/manifestdialog.py:202
 #: tortoisehg/hgqt/revdetails.py:231
 msgid "View file changes in external diff tool"
-msgstr ""
+msgstr "View file changes in external diff tool"
 
 #: tortoisehg/hgqt/chunks.py:91 tortoisehg/hgqt/manifestdialog.py:208
 #: tortoisehg/hgqt/revdetails.py:239
 msgid "Edit Local"
-msgstr ""
+msgstr "Edit Local"
 
 #: tortoisehg/hgqt/chunks.py:92 tortoisehg/hgqt/manifestdialog.py:209
 #: tortoisehg/hgqt/revdetails.py:240
 msgid "Edit current file in working copy"
-msgstr ""
+msgstr "Edit current file in working copy"
 
 #: tortoisehg/hgqt/chunks.py:93 tortoisehg/hgqt/manifestdialog.py:210
 #: tortoisehg/hgqt/revdetails.py:241
 msgid "Revert to Revision"
-msgstr ""
+msgstr "Revert to revision"
 
 #: tortoisehg/hgqt/chunks.py:94 tortoisehg/hgqt/manifestdialog.py:211
 #: tortoisehg/hgqt/revdetails.py:242
 msgid "Revert file(s) to contents at this revision"
-msgstr ""
+msgstr "Revert file(s) to contents at this revision"
 
 #: tortoisehg/hgqt/chunks.py:190
 msgid "Patch failed to apply"
 
 #: tortoisehg/hgqt/sync.py:687
 msgid "An URL must be selected for this operation."
-msgstr ""
+msgstr "A URL must be selected for this operation."
 
 #: tortoisehg/hgqt/sync.py:702
 msgid "Redundant authentication info"
 
 #: tortoisehg/hgqt/sync.py:1176
 msgid "Unable to save an URL"
-msgstr ""
+msgstr "Unable to save a URL"
 
 #: tortoisehg/hgqt/sync.py:1187
 msgid "Confirm URL replace"

File i18n/tortoisehg/es.po

 "Project-Id-Version: tortoisehg\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-08-21 20:08-0300\n"
-"PO-Revision-Date: 2011-07-31 19:49+0000\n"
-"Last-Translator: HOMERO DE LA FUENTE <Unknown>\n"
+"PO-Revision-Date: 2011-08-28 00:09+0000\n"
+"Last-Translator: Sebastian Valle Herrera <Unknown>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\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: 2011-08-22 04:42+0000\n"
-"X-Generator: Launchpad (build 13697)\n"
+"X-Launchpad-Export-Date: 2011-08-29 04:39+0000\n"
+"X-Generator: Launchpad (build 13794)\n"
 
 #: TortoiseHgOverlayServer.py:51
 msgid "TortoiseHg Overlay Icon Server"
 #: tortoisehg/hgqt/backout.py:29
 #, python-format
 msgid "Backout - %s"
-msgstr ""
+msgstr "Anular - %s"
 
 #: tortoisehg/hgqt/backout.py:99
 msgid "Prepare to backout"
 #: tortoisehg/hgqt/backout.py:100
 msgid "Verify backout revision and ensure your working directory is clean."
 msgstr ""
+"Verifica la revision que quieres anular y asegurate de que tu directorio de "
+"trabajo esta limpio"
 
 #: tortoisehg/hgqt/backout.py:109 tortoisehg/hgqt/backout.py:121
 msgid "Unable to backout"
-msgstr ""
+msgstr "Incapaz de anular"
 
 #: tortoisehg/hgqt/backout.py:110
 msgid "Backout revision not found"
-msgstr ""
+msgstr "No se encontro la revision para anular"
 
 #: tortoisehg/hgqt/backout.py:114
 msgid "Backing out a parent revision is a single step operation"
 
 #: tortoisehg/hgqt/backout.py:122
 msgid "Cannot backout change on a different branch"
-msgstr ""
+msgstr "No se puede anular un cambio en una rama diferente"
 
 #: tortoisehg/hgqt/backout.py:128
 msgid "Backout revision"
-msgstr ""
+msgstr "Anular revision"
 
 #: tortoisehg/hgqt/backout.py:138
 msgid "Not a head, backout will create a new head!"
-msgstr ""
+msgstr "No estas en una cabecera, anular creara una nueva cabecera"
 
 #: tortoisehg/hgqt/backout.py:144
 msgid "Current local revision"
-msgstr "Revisión local actual"
+msgstr "Revision local actual"
 
 #: tortoisehg/hgqt/backout.py:162
 msgid "Merge parent to backout to"
 #: tortoisehg/util/prej.py:231
 #, python-format
 msgid "file %s already exists\n"
-msgstr ""
+msgstr "El archivo %s ya existe\n"
 
 #: tortoisehg/util/prej.py:283
 #, python-format
 
 #: tortoisehg/util/prej.py:546
 msgid "could not extract binary patch"
-msgstr ""
+msgstr "no se pudo extraer el parche binario"
 
 #: tortoisehg/util/prej.py:562
 #, python-format
 msgid "binary patch is %d bytes, not %d"
-msgstr ""
+msgstr "el parche binario es tiene %d bytes, no %d"
 
 #: tortoisehg/util/prej.py:587
 #, python-format

File i18n/tortoisehg/ru.po

 "Project-Id-Version: tortoisehg\n"
 "Report-Msgid-Bugs-To: Alil Adamov <diagiman@gmail.com>\n"
 "POT-Creation-Date: 2011-08-21 20:08-0300\n"
-"PO-Revision-Date: 2011-06-29 12:31+0000\n"
-"Last-Translator: Andrei Polushin <polushin@gmail.com>\n"
+"PO-Revision-Date: 2011-08-27 19:06+0000\n"
+"Last-Translator: Alil Adamov <diagiman@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2011-08-22 04:41+0000\n"
-"X-Generator: Launchpad (build 13697)\n"
+"X-Launchpad-Export-Date: 2011-08-28 05:21+0000\n"
+"X-Generator: Launchpad (build 13794)\n"
 "X-Poedit-Language: Russian\n"
 "X-Poedit-Basepath: C:\\devel\\xtern\\thg\\\n"
 
 #: tortoisehg/hgqt/backout.py:170
 #, python-format
 msgid "First Parent: revision %s (%s)"
-msgstr ""
+msgstr "Первый Родитель: ревизия %s (%s)"
 
 #: tortoisehg/hgqt/backout.py:176
 msgid "Backout to the first parent of the merge revision"
 #: tortoisehg/hgqt/backout.py:181
 #, python-format
 msgid "Second Parent: revision %s (%s)"
-msgstr ""
+msgstr "Второй Родитель: ревизия %s (%s)"
 
 #: tortoisehg/hgqt/backout.py:186
 msgid "Backout to the second parent of the merge revision"
 
 #: tortoisehg/hgqt/cmdui.py:315
 msgid "Failed!"
-msgstr ""
+msgstr "Неудача!"
 
 #: tortoisehg/hgqt/cmdui.py:543
 msgid "failed to run command\n"
 
 #: tortoisehg/hgqt/hgemail_ui.py:280
 msgid "Select &All"
-msgstr ""
+msgstr "Выделить Всё"
 
 #: tortoisehg/hgqt/hgemail_ui.py:281
 msgid "Select &None"
-msgstr ""
+msgstr "Снять Выделение"
 
 #: tortoisehg/hgqt/hgemail_ui.py:282 tortoisehg/hgqt/wctxactions.py:43
 #: tortoisehg/hgqt/webconf.py:256 tortoisehg/hgqt/webconf_ui.py:79
 
 #: tortoisehg/hgqt/manifestdialog.py:216 tortoisehg/hgqt/revdetails.py:247
 msgid "Explore subrepository"
-msgstr ""
+msgstr "Обзор подхранилища"
 
 #: tortoisehg/hgqt/manifestdialog.py:218
 msgid "Open the selected subrepository in a file browser"
-msgstr ""
+msgstr "Открыть выбранное подхранилище в обозревателе файлов"
 
 #: tortoisehg/hgqt/manifestdialog.py:220 tortoisehg/hgqt/revdetails.py:250
 msgid "Open terminal in subrepository"
-msgstr ""
+msgstr "Открыть консоль в подхранилище"
 
 #: tortoisehg/hgqt/manifestdialog.py:222 tortoisehg/hgqt/revdetails.py:252
 msgid "Open a shell terminal in the selected subrepository root"
-msgstr ""
+msgstr "Открыть консольное окно в выбранном подхранилище"
 
 #: tortoisehg/hgqt/manifestdialog.py:301 tortoisehg/hgqt/revdetails.py:389
 #, python-format
 
 #: tortoisehg/hgqt/manifestdialog.py:535
 msgid "Failed to open Manifest dialog"
-msgstr ""
+msgstr "Неудача при открытии окна Манифеста"
 
 #: tortoisehg/hgqt/merge.py:31
 #, python-format
 "href=\"skip\"><b>Continue</b></a> or <a href=\"discard\"><b>discard</b></a> "
 "existing merge."
 msgstr ""
+"Рабочий каталог уже <b>слит</b>. <a href=\"skip\"><b>Продолжить</b></a> или "
+"<a href=\"discard\"><b>отказаться</b></a> от существующего слияния."
 
 #: tortoisehg/hgqt/merge.py:179
 msgid ""
 "href=\"shelve\"><b>shelve</b></a> to patch, or <a "
 "href=\"discard\"><b>discard</b></a> changes."
 msgstr ""
+"До слияния, необходимо <a href=\"commit\"><b>зафиксировать</b></a>, <a "
+"href=\"shelve\"><b>отложить</b></a> в заплатку, или <a "
+"href=\"discard\"><b>отбросить</b></a> изменения."
 
 #: tortoisehg/hgqt/merge.py:191
 msgid "Or use:"
 
 #: tortoisehg/hgqt/pbranch.py:879
 msgid "Patch date:"
-msgstr ""
+msgstr "Дата заплатки:"
 
 #: tortoisehg/hgqt/pbranch.py:880
 msgid "Patch user:"
 #: tortoisehg/hgqt/qtlib.py:141
 #, python-format
 msgid "\"%s\" is not a valid directory"
-msgstr ""
+msgstr "\"%s\" не является подходящим каталогом"
 
 #: tortoisehg/hgqt/qtlib.py:152
 msgid "No shell configured"
 
 #: tortoisehg/hgqt/quickop.py:85
 msgid "Force removal of modified files (--force)"
-msgstr ""
+msgstr "Принудительное удаление изменённых файлов (--force)"
 
 #: tortoisehg/hgqt/quickop.py:146 tortoisehg/hgtk/quickop.py:261
 msgid "No files selected"
 "You have selected one or more files that have been modified.  By default, "
 "these files will not be removed.  What would you like to do?"
 msgstr ""
+"Выбрано один или более файлов, которые были изменены. По умолчанию, эти "
+"файлы не будут удалены. Что хотели бы вы сделать?"
 
 #: tortoisehg/hgqt/quickop.py:162
 msgid "Remove &Unmodified Files"
-msgstr ""
+msgstr "Удалить Неизменённые Файлы"
 
 #: tortoisehg/hgqt/quickop.py:163
 msgid "Remove &All Selected Files"
-msgstr ""
+msgstr "Удалить Все Выбранные Файлы"
 
 #: tortoisehg/hgqt/rebase.py:40
 msgid "Rebase changeset and descendants"
 
 #: tortoisehg/hgqt/repofilter.py:213
 msgid "Display only active branches"
-msgstr ""
+msgstr "Отображать только активные ветки"
 
 #: tortoisehg/hgqt/repofilter.py:216
 msgid "Display closed branches"
 
 #: tortoisehg/hgqt/repowidget.py:1501
 msgid "Patch exported"
-msgstr ""
+msgstr "Заплатка экспортирована"
 
 #: tortoisehg/hgqt/repowidget.py:1502
 #, python-format
 "Revision #%d (%s) was exported to:<p><a href=\"file:///%s\">%s</a>%s<a "
 "href=\"file:///%s\">%s</a>"
 msgstr ""
+"Ревизия #%d (%s) была экспортирована в:<p><a href=\"file:///%s\">%s</a>%s<a "
+"href=\"file:///%s\">%s</a>"
 
 #: tortoisehg/hgqt/repowidget.py:1510
 msgid "Patches exported"
-msgstr ""
+msgstr "Экспортированные заплатки"
 
 #: tortoisehg/hgqt/repowidget.py:1511
 #, python-format
 msgid "%d patches were exported to:<p><a href=\"file:///%s\">%s</a>"
-msgstr ""
+msgstr "%d заплаток экспортировано в:<p><a href=\"file:///%s\">%s</a>"
 
 #: tortoisehg/hgqt/repowidget.py:1625
 msgid "Write bundle"
 
 #: tortoisehg/hgqt/settings.py:174
 msgid "&Clear"
-msgstr ""
+msgstr "Очистить"
 
 #: tortoisehg/hgqt/settings.py:298
 #, python-format
 
 #: tortoisehg/hgqt/sync.py:219
 msgid "Hostname"
-msgstr ""
+msgstr "Имя хоста"
 
 #: tortoisehg/hgqt/sync.py:249 tortoisehg/hgqt/webconf_ui.py:77
 msgid "Save"

File i18n/tortoisehg/zh_CN.po

 "Project-Id-Version: tortoisehg\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-08-21 20:08-0300\n"
-"PO-Revision-Date: 2011-07-19 02:25+0000\n"
-"Last-Translator: Xiaomao Chen <Unknown>\n"
+"PO-Revision-Date: 2011-09-02 17:41+0000\n"
+"Last-Translator: jerecao <Unknown>\n"
 "Language-Team: Simplified Chinese <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2011-08-22 04:44+0000\n"
-"X-Generator: Launchpad (build 13697)\n"
+"X-Launchpad-Export-Date: 2011-09-03 05:43+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #: TortoiseHgOverlayServer.py:51
 msgid "TortoiseHg Overlay Icon Server"
 
 #: TortoiseHgOverlayServer.py:162
 msgid "Exit"
-msgstr "退出"
+msgstr "离开"
 
 #: tortoisehg/hgqt/about.py:31 tortoisehg/hgtk/gdialog.py:505
 msgid "About"

File i18n/tortoisehg/zh_TW.po

 "Project-Id-Version: tortoisehg\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-08-21 20:08-0300\n"
-"PO-Revision-Date: 2011-08-19 09:34+0000\n"
+"PO-Revision-Date: 2011-08-23 09:36+0000\n"
 "Last-Translator: leolarrel Wang <Unknown>\n"
 "Language-Team: Traditional Chinese <zh_TW@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2011-08-22 04:44+0000\n"
+"X-Launchpad-Export-Date: 2011-08-24 04:42+0000\n"
 "X-Generator: Launchpad (build 13697)\n"
 
 #: TortoiseHgOverlayServer.py:51
 
 #: tortoisehg/hgqt/chunks.py:393
 msgid "Unable to remove"
-msgstr ""
+msgstr "不能移除"
 
 #: tortoisehg/hgqt/chunks.py:394
 #, python-format
 "Unable to remove added file %s,\n"
 "permission denied"
 msgstr ""
+"不能移除已經新增的檔案 %s,\n"
+"權限不符"
 
 #: tortoisehg/hgqt/chunks.py:530
 msgctxt "files"
 "Before compress, you must <a href=\"commit\"><b>commit</b></a> or <a "
 "href=\"discard\"><b>discard</b></a> changes."
 msgstr ""
+"壓縮之前,你得要<a href=\"commit\"><b>提交</b></a> 或 <a "
+"href=\"discard\"><b>放棄</b></a>變更"
 
 #: tortoisehg/hgqt/compress.py:104
 msgid "You may continue the compress"
-msgstr ""
+msgstr "你可以繼續壓縮"
 
 #: tortoisehg/hgqt/compress.py:121
 msgid "Changes have been moved, you must now commit"
 
 #: tortoisehg/hgqt/csinfo.py:48 tortoisehg/hgtk/csinfo.py:49
 msgid "must be specified repository"
-msgstr ""
+msgstr "必須指定儲存庫"
 
 #: tortoisehg/hgqt/csinfo.py:85 tortoisehg/hgtk/csinfo.py:86
 msgid "must be specified 'type' in style"
-msgstr ""
+msgstr "必須在style裡指定type"
 
 #: tortoisehg/hgqt/csinfo.py:106 tortoisehg/hgqt/postreview_ui.py:165
 #: tortoisehg/hgqt/qfold.py:85 tortoisehg/hgqt/qreorder.py:89
 "File is larger than the specified max size.\n"
 "maxdiff = %s KB"
 msgstr ""
+"檔案比描述的最大大小還要大\n"
+"maxdiff= %s KB"
 
 #: tortoisehg/hgqt/filedata.py:51 tortoisehg/hgtk/chunks.py:85
 msgid "File is binary.\n"
 
 #: tortoisehg/hgqt/filedata.py:83 tortoisehg/hgqt/filedata.py:337
 msgid "set"
-msgstr ""
+msgstr "設定"
 
 #: tortoisehg/hgqt/filedata.py:83 tortoisehg/hgqt/filedata.py:339
 msgid "unset"
-msgstr ""
+msgstr "取消設定"
 
 #: tortoisehg/hgqt/filedata.py:86 tortoisehg/hgqt/filedata.py:106
 msgid " <i>(is a symlink)</i>"
-msgstr ""
+msgstr " <i>(是一個符號連結)</i>"
 
 #: tortoisehg/hgqt/filedata.py:135
 #, python-format
 "\t%s\n"
 "\n"
 msgstr ""
+"[WARNING] 無效的子儲存庫版本 ID:\n"
+"\t%s\n"
+"\n"
 
 #: tortoisehg/hgqt/filedata.py:155
 msgid "Subrepo created and set to initial revision."
 
 #: tortoisehg/hgqt/filedata.py:304
 msgid " <i>(was deleted)</i>"
-msgstr ""
+msgstr " <i>(已被刪除了)</i>"
 
 #: tortoisehg/hgqt/filedata.py:306
 msgid " <i>(was added, now missing)</i>"
-msgstr ""
+msgstr " <i>(已被新增,現在遺失了)</i>"
 
 #: tortoisehg/hgqt/filedata.py:312
 msgid " <i>(is unversioned)</i>"
-msgstr ""
+msgstr " <i>(不受版本控管)</i>"
 
 #: tortoisehg/hgqt/filedata.py:330 tortoisehg/hgqt/filedata.py:347
 #: tortoisehg/hgqt/filedata.py:357
 msgid " <i>(was added)</i>"
-msgstr ""
+msgstr " <i>(已被新增)</i>"
 
 #: tortoisehg/hgqt/filedata.py:352
 #, python-format
 msgid " <i>(renamed from %s)</i>"
-msgstr ""
+msgstr " <i>(已從%s更名)</i>"
 
 #: tortoisehg/hgqt/filedialogs.py:124
 msgid "File History Log Columns"
-msgstr ""
+msgstr "檔案歷史紀錄欄位"
 
 #: tortoisehg/hgqt/filedialogs.py:166 tortoisehg/hgqt/workbench.py:342
 msgid "Back"
 
 #: tortoisehg/hgqt/filedialogs.py:363
 msgid "File Differences Log Columns"
-msgstr ""
+msgstr "檔案差異紀錄欄位"
 
 #: tortoisehg/hgqt/filedialogs.py:471
 msgid "Next diff"
 
 #: tortoisehg/hgqt/guess.py:186
 msgid "Search already in progress"
-msgstr ""
+msgstr "搜尋已經在進行"
 
 #: tortoisehg/hgqt/guess.py:187
 msgid "Cannot start a new search"
 
 #: tortoisehg/hgqt/hgemail_ui.py:267 tortoisehg/hgtk/hgemail.py:114
 msgid "Plain, do not prepend Hg header"
-msgstr ""
+msgstr "純的,沒有Hg標頭"
 
 #: tortoisehg/hgqt/hgemail_ui.py:268 tortoisehg/hgtk/hgemail.py:126
 msgid ""
 
 #: tortoisehg/hgqt/hgemail_ui.py:280
 msgid "Select &All"
-msgstr ""
+msgstr "全選(&A)"
 
 #: tortoisehg/hgqt/hgemail_ui.py:281
 msgid "Select &None"
-msgstr ""
+msgstr "全不選(&N)"
 
 #: tortoisehg/hgqt/hgemail_ui.py:282 tortoisehg/hgqt/wctxactions.py:43
 #: tortoisehg/hgqt/webconf.py:256 tortoisehg/hgqt/webconf_ui.py:79
 
 #: tortoisehg/hgqt/hgignore.py:84
 msgid "<b>Ignore Filter</b>"
-msgstr ""
+msgstr "<b>忽略過濾器</b>"
 
 #: tortoisehg/hgqt/hgignore.py:91
 msgid "<b>Untracked Files</b>"
 
 #: tortoisehg/hgqt/manifestdialog.py:535
 msgid "Failed to open Manifest dialog"
-msgstr ""
+msgstr "不能開啟清單對話框"
 
 #: tortoisehg/hgqt/merge.py:31
 #, python-format
 
 #: tortoisehg/hgqt/merge.py:118
 msgid "Prepare to merge"
-msgstr ""
+msgstr "準備合併"
 
 #: tortoisehg/hgqt/merge.py:119
 msgid "Verify merge targets and ensure your working directory is clean."
-msgstr ""
+msgstr "驗證合併的目標並確保你的工作目錄是乾淨的."
 
 #: tortoisehg/hgqt/merge.py:128 tortoisehg/hgqt/repomodel.py:595
 #: tortoisehg/hgqt/revpanel.py:158 tortoisehg/hgtk/merge.py:73
 
 #: tortoisehg/hgqt/merge.py:355
 msgid "Automatically advance to next page when merge is complete."
-msgstr ""
+msgstr "合併完成時自動到下一頁"
 
 #: tortoisehg/hgqt/merge.py:400
 #, python-format
 msgid ""
 "%d files were modified on both branches and must be <a "
 "href=\"resolve\"><b>resolved</b></a>"
-msgstr ""
+msgstr "%d個檔案在兩個分支都被改過,得要<a href=\"resolve\"><b>解決衝突</b></a>"
 
 #: tortoisehg/hgqt/merge.py:439
 msgid "Commit merge results"
-msgstr ""
+msgstr "提交合併結果"
 
 #: tortoisehg/hgqt/merge.py:540 tortoisehg/hgtk/merge.py:135
 msgid "Merge"
 
 #: tortoisehg/hgqt/repowidget.py:1241
 msgid "Write diff file"
-msgstr ""
+msgstr "寫進diff檔"
 
 #: tortoisehg/hgqt/repowidget.py:1252
 msgid "Unable to write diff file"
-msgstr ""
+msgstr "不能寫進diff檔"
 
 #: tortoisehg/hgqt/repowidget.py:1296
 msgid "Unable to compress history"
 
 #: tortoisehg/hgqt/repowidget.py:1306
 msgid "Export Diff..."
-msgstr ""
+msgstr "匯出Diff..."
 
 #: tortoisehg/hgqt/repowidget.py:1308 tortoisehg/hgqt/repowidget.py:1397
 msgid "Export Selected..."
-msgstr ""
+msgstr "匯出選擇的..."
 
 #: tortoisehg/hgqt/repowidget.py:1309 tortoisehg/hgqt/repowidget.py:1398
 msgid "Email Selected..."
-msgstr ""
+msgstr "Email選擇的"
 
 #: tortoisehg/hgqt/repowidget.py:1311
 msgid "Export DAG Range..."
 
 #: tortoisehg/hgqt/repowidget.py:1317
 msgid "Compress History..."
-msgstr ""
+msgstr "壓縮歷史..."
 
 #: tortoisehg/hgqt/repowidget.py:1329 tortoisehg/hgqt/repowidget.py:1407
 msgid "Transplant Selected to local"
 
 #: tortoisehg/hgqt/repowidget.py:1377
 msgid "Fold patches..."
-msgstr ""
+msgstr "目錄路徑..."
 
 #: tortoisehg/hgqt/repowidget.py:1378
 msgid "Delete patches..."
 
 #: tortoisehg/hgqt/repowidget.py:1454
 msgid "Cannot export revision"
-msgstr ""
+msgstr "不能匯出修訂版"
 
 #: tortoisehg/hgqt/repowidget.py:1455
 #, python-format
 "\n"
 "%s\n"
 msgstr ""
+"不能匯出%s修訂版到這個檔案:\n"
+"\n"
+"%s\n"
 
 #: tortoisehg/hgqt/repowidget.py:1457
 msgid "There is already an existing folder with that same name."
 "Revision #%d (%s) was exported to:<p><a href=\"file:///%s\">%s</a>%s<a "
 "href=\"file:///%s\">%s</a>"
 msgstr ""
+"修訂版 #%d (%s) 已經匯出到:<p><a href=\"file:///%s\">%s</a>%s<a "
+"href=\"file:///%s\">%s</a>"
 
 #: tortoisehg/hgqt/repowidget.py:1510
 msgid "Patches exported"
 #: tortoisehg/hgqt/resolve.py:25
 #, python-format
 msgid "Resolve conflicts - %s"
-msgstr ""
+msgstr "解決衝突 - %s"
 
 #: tortoisehg/hgqt/resolve.py:54
 msgid "Local revision information"
 
 #: tortoisehg/hgqt/resolve.py:77
 msgid "Unresolved conflicts"
-msgstr ""
+msgstr "未解決的衝突"
 
 #: tortoisehg/hgqt/resolve.py:91
 msgid "Mercurial Resolve"
 
 #: tortoisehg/hgqt/resolve.py:94
 msgid "Tool Resolve"
-msgstr ""
+msgstr "解決衝突工具"
 
 #: tortoisehg/hgqt/resolve.py:95
 msgid "Merge using selected merge tool"
 
 #: tortoisehg/hgqt/resolve.py:97
 msgid "Take Local"
-msgstr ""
+msgstr "取用本地的"
 
 #: tortoisehg/hgqt/resolve.py:98
 msgid "Accept the local file version (yours)"
 
 #: tortoisehg/hgqt/resolve.py:100
 msgid "Take Other"
-msgstr ""
+msgstr "取用其他的"
 
 #: tortoisehg/hgqt/resolve.py:101
 msgid "Accept the other file version (theirs)"
 
 #: tortoisehg/hgqt/resolve.py:114
 msgid "Resolved conflicts"
-msgstr ""
+msgstr "已解決的衝突"
 
 #: tortoisehg/hgqt/resolve.py:129
 msgid "Edit resolved file"
 
 #: tortoisehg/hgqt/resolve.py:134 tortoisehg/hgtk/history.py:1271
 msgid "Diff to Local"
-msgstr ""
+msgstr "Diff到本地"
 
 #: tortoisehg/hgqt/resolve.py:135
 msgid "Visual diff between resolved file and first parent"
 
 #: tortoisehg/hgqt/resolve.py:137
 msgid "Diff to Other"
-msgstr ""
+msgstr "Diff到其他"
 
 #: tortoisehg/hgqt/resolve.py:138
 msgid "Visual diff between resolved file and second parent"
 
 #: tortoisehg/hgqt/resolve.py:342
 msgid "There are merge <b>conflicts</b> to be resolved"
-msgstr ""
+msgstr "有合併<b>衝突</b>被解決"
 
 #: tortoisehg/hgqt/resolve.py:344
 msgid "All conflicts are resolved."
-msgstr ""
+msgstr "全部的衝突都被解決了"
 
 #: tortoisehg/hgqt/resolve.py:346
 msgid "There are no conflicting file merges."