git gui: update Italian translation

[git.git] / po / git-gui.pot

diff --git a/po/git-gui.pot b/po/git-gui.pot
index 3f139da6c7aae3cdc81312289083c1752c6e2629..58db67c217e00ee1571d0a182969ce162fad4216 100644 (file)
--- a/po/git-gui.pot
+++ b/po/git-gui.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2008-02-02 10:14+0100\n"
+"POT-Creation-Date: 2008-11-16 13:56-0800\n"

 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"


@@ -16,33 +16,33 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 

-#: git-gui.sh:41 git-gui.sh:604 git-gui.sh:618 git-gui.sh:631 git-gui.sh:714
-#: git-gui.sh:733
+#: git-gui.sh:41 git-gui.sh:737 git-gui.sh:751 git-gui.sh:764 git-gui.sh:847
+#: git-gui.sh:866

 msgid "git-gui: fatal error"
 msgstr ""
 
 msgid "git-gui: fatal error"
 msgstr ""
 

-#: git-gui.sh:565
+#: git-gui.sh:689

 #, tcl-format
 msgid "Invalid font specified in %s:"
 msgstr ""
 
 #, tcl-format
 msgid "Invalid font specified in %s:"
 msgstr ""
 

-#: git-gui.sh:590
+#: git-gui.sh:723

 msgid "Main Font"
 msgstr ""
 
 msgid "Main Font"
 msgstr ""
 

-#: git-gui.sh:591
+#: git-gui.sh:724

 msgid "Diff/Console Font"
 msgstr ""
 
 msgid "Diff/Console Font"
 msgstr ""
 

-#: git-gui.sh:605
+#: git-gui.sh:738

 msgid "Cannot find git in PATH."
 msgstr ""
 
 msgid "Cannot find git in PATH."
 msgstr ""
 

-#: git-gui.sh:632
+#: git-gui.sh:765

 msgid "Cannot parse Git version string:"
 msgstr ""
 
 msgid "Cannot parse Git version string:"
 msgstr ""
 

-#: git-gui.sh:650
+#: git-gui.sh:783

 #, tcl-format
 msgid ""
 "Git version cannot be determined.\n"
 #, tcl-format
 msgid ""
 "Git version cannot be determined.\n"


@@ -54,375 +54,444 @@ msgid ""
 "Assume '%s' is version 1.5.0?\n"
 msgstr ""
 
 "Assume '%s' is version 1.5.0?\n"
 msgstr ""
 

-#: git-gui.sh:888
+#: git-gui.sh:1062

 msgid "Git directory not found:"
 msgstr ""
 
 msgid "Git directory not found:"
 msgstr ""
 

-#: git-gui.sh:895
+#: git-gui.sh:1069

 msgid "Cannot move to top of working directory:"
 msgstr ""
 
 msgid "Cannot move to top of working directory:"
 msgstr ""
 

-#: git-gui.sh:902
+#: git-gui.sh:1076

 msgid "Cannot use funny .git directory:"
 msgstr ""
 
 msgid "Cannot use funny .git directory:"
 msgstr ""
 

-#: git-gui.sh:907
+#: git-gui.sh:1081

 msgid "No working directory"
 msgstr ""
 
 msgid "No working directory"
 msgstr ""
 

-#: git-gui.sh:1054
+#: git-gui.sh:1247 lib/checkout_op.tcl:305

 msgid "Refreshing file status..."
 msgstr ""
 
 msgid "Refreshing file status..."
 msgstr ""
 

-#: git-gui.sh:1119
+#: git-gui.sh:1303

 msgid "Scanning for modified files ..."
 msgstr ""
 
 msgid "Scanning for modified files ..."
 msgstr ""
 

-#: git-gui.sh:1294 lib/browser.tcl:245
+#: git-gui.sh:1367
+msgid "Calling prepare-commit-msg hook..."
+msgstr ""
+
+#: git-gui.sh:1384
+msgid "Commit declined by prepare-commit-msg hook."
+msgstr ""
+
+#: git-gui.sh:1542 lib/browser.tcl:246

 msgid "Ready."
 msgstr ""
 
 msgid "Ready."
 msgstr ""
 

-#: git-gui.sh:1560
+#: git-gui.sh:1819

 msgid "Unmodified"
 msgstr ""
 
 msgid "Unmodified"
 msgstr ""
 

-#: git-gui.sh:1562
+#: git-gui.sh:1821

 msgid "Modified, not staged"
 msgstr ""
 
 msgid "Modified, not staged"
 msgstr ""
 

-#: git-gui.sh:1563 git-gui.sh:1568
+#: git-gui.sh:1822 git-gui.sh:1830

 msgid "Staged for commit"
 msgstr ""
 
 msgid "Staged for commit"
 msgstr ""
 

-#: git-gui.sh:1564 git-gui.sh:1569
+#: git-gui.sh:1823 git-gui.sh:1831

 msgid "Portions staged for commit"
 msgstr ""
 
 msgid "Portions staged for commit"
 msgstr ""
 

-#: git-gui.sh:1565 git-gui.sh:1570
+#: git-gui.sh:1824 git-gui.sh:1832

 msgid "Staged for commit, missing"
 msgstr ""
 
 msgid "Staged for commit, missing"
 msgstr ""
 

-#: git-gui.sh:1567
+#: git-gui.sh:1826
+msgid "File type changed, not staged"
+msgstr ""
+
+#: git-gui.sh:1827
+msgid "File type changed, staged"
+msgstr ""
+
+#: git-gui.sh:1829

 msgid "Untracked, not staged"
 msgstr ""
 
 msgid "Untracked, not staged"
 msgstr ""
 

-#: git-gui.sh:1572
+#: git-gui.sh:1834

 msgid "Missing"
 msgstr ""
 
 msgid "Missing"
 msgstr ""
 

-#: git-gui.sh:1573
+#: git-gui.sh:1835

 msgid "Staged for removal"
 msgstr ""
 
 msgid "Staged for removal"
 msgstr ""
 

-#: git-gui.sh:1574
+#: git-gui.sh:1836

 msgid "Staged for removal, still present"
 msgstr ""
 
 msgid "Staged for removal, still present"
 msgstr ""
 

-#: git-gui.sh:1576 git-gui.sh:1577 git-gui.sh:1578 git-gui.sh:1579
+#: git-gui.sh:1838 git-gui.sh:1839 git-gui.sh:1840 git-gui.sh:1841
+#: git-gui.sh:1842 git-gui.sh:1843

 msgid "Requires merge resolution"
 msgstr ""
 
 msgid "Requires merge resolution"
 msgstr ""
 

-#: git-gui.sh:1614
+#: git-gui.sh:1878

 msgid "Starting gitk... please wait..."
 msgstr ""
 
 msgid "Starting gitk... please wait..."
 msgstr ""
 

-#: git-gui.sh:1623
-#, tcl-format
-msgid ""
-"Unable to start gitk:\n"
-"\n"
-"%s does not exist"
+#: git-gui.sh:1887
+msgid "Couldn't find gitk in PATH"

 msgstr ""
 
 msgstr ""
 

-#: git-gui.sh:1823 lib/choose_repository.tcl:35
+#: git-gui.sh:2280 lib/choose_repository.tcl:36

 msgid "Repository"
 msgstr ""
 
 msgid "Repository"
 msgstr ""
 

-#: git-gui.sh:1824
+#: git-gui.sh:2281

 msgid "Edit"
 msgstr ""
 
 msgid "Edit"
 msgstr ""
 

-#: git-gui.sh:1826 lib/choose_rev.tcl:560
+#: git-gui.sh:2283 lib/choose_rev.tcl:561

 msgid "Branch"
 msgstr ""
 
 msgid "Branch"
 msgstr ""
 

-#: git-gui.sh:1829 lib/choose_rev.tcl:547
+#: git-gui.sh:2286 lib/choose_rev.tcl:548

 msgid "Commit@@noun"
 msgstr ""
 
 msgid "Commit@@noun"
 msgstr ""
 

-#: git-gui.sh:1832 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168
+#: git-gui.sh:2289 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168

 msgid "Merge"
 msgstr ""
 
 msgid "Merge"
 msgstr ""
 

-#: git-gui.sh:1833 lib/choose_rev.tcl:556
+#: git-gui.sh:2290 lib/choose_rev.tcl:557

 msgid "Remote"
 msgstr ""
 
 msgid "Remote"
 msgstr ""
 

-#: git-gui.sh:1842
+#: git-gui.sh:2293
+msgid "Tools"
+msgstr ""
+
+#: git-gui.sh:2302
+msgid "Explore Working Copy"
+msgstr ""
+
+#: git-gui.sh:2307

 msgid "Browse Current Branch's Files"
 msgstr ""
 
 msgid "Browse Current Branch's Files"
 msgstr ""
 

-#: git-gui.sh:1846
+#: git-gui.sh:2311

 msgid "Browse Branch Files..."
 msgstr ""
 
 msgid "Browse Branch Files..."
 msgstr ""
 

-#: git-gui.sh:1851
+#: git-gui.sh:2316

 msgid "Visualize Current Branch's History"
 msgstr ""
 
 msgid "Visualize Current Branch's History"
 msgstr ""
 

-#: git-gui.sh:1855
+#: git-gui.sh:2320

 msgid "Visualize All Branch History"
 msgstr ""
 
 msgid "Visualize All Branch History"
 msgstr ""
 

-#: git-gui.sh:1862
+#: git-gui.sh:2327

 #, tcl-format
 msgid "Browse %s's Files"
 msgstr ""
 
 #, tcl-format
 msgid "Browse %s's Files"
 msgstr ""
 

-#: git-gui.sh:1864
+#: git-gui.sh:2329

 #, tcl-format
 msgid "Visualize %s's History"
 msgstr ""
 
 #, tcl-format
 msgid "Visualize %s's History"
 msgstr ""
 

-#: git-gui.sh:1869 lib/database.tcl:27 lib/database.tcl:67
+#: git-gui.sh:2334 lib/database.tcl:27 lib/database.tcl:67

 msgid "Database Statistics"
 msgstr ""
 
 msgid "Database Statistics"
 msgstr ""
 

-#: git-gui.sh:1872 lib/database.tcl:34
+#: git-gui.sh:2337 lib/database.tcl:34

 msgid "Compress Database"
 msgstr ""
 
 msgid "Compress Database"
 msgstr ""
 

-#: git-gui.sh:1875
+#: git-gui.sh:2340

 msgid "Verify Database"
 msgstr ""
 
 msgid "Verify Database"
 msgstr ""
 

-#: git-gui.sh:1882 git-gui.sh:1886 git-gui.sh:1890 lib/shortcut.tcl:7
+#: git-gui.sh:2347 git-gui.sh:2351 git-gui.sh:2355 lib/shortcut.tcl:7

 #: lib/shortcut.tcl:39 lib/shortcut.tcl:71
 msgid "Create Desktop Icon"
 msgstr ""
 
 #: lib/shortcut.tcl:39 lib/shortcut.tcl:71
 msgid "Create Desktop Icon"
 msgstr ""
 

-#: git-gui.sh:1895 lib/choose_repository.tcl:176 lib/choose_repository.tcl:184
+#: git-gui.sh:2363 lib/choose_repository.tcl:183 lib/choose_repository.tcl:191

 msgid "Quit"
 msgstr ""
 
 msgid "Quit"
 msgstr ""
 

-#: git-gui.sh:1902
+#: git-gui.sh:2371

 msgid "Undo"
 msgstr ""
 
 msgid "Undo"
 msgstr ""
 

-#: git-gui.sh:1905
+#: git-gui.sh:2374

 msgid "Redo"
 msgstr ""
 
 msgid "Redo"
 msgstr ""
 

-#: git-gui.sh:1909 git-gui.sh:2403
+#: git-gui.sh:2378 git-gui.sh:2923

 msgid "Cut"
 msgstr ""
 
 msgid "Cut"
 msgstr ""
 

-#: git-gui.sh:1912 git-gui.sh:2406 git-gui.sh:2477 git-gui.sh:2549
-#: lib/console.tcl:67
+#: git-gui.sh:2381 git-gui.sh:2926 git-gui.sh:3000 git-gui.sh:3082
+#: lib/console.tcl:69

 msgid "Copy"
 msgstr ""
 
 msgid "Copy"
 msgstr ""
 

-#: git-gui.sh:1915 git-gui.sh:2409
+#: git-gui.sh:2384 git-gui.sh:2929

 msgid "Paste"
 msgstr ""
 
 msgid "Paste"
 msgstr ""
 

-#: git-gui.sh:1918 git-gui.sh:2412 lib/branch_delete.tcl:26
+#: git-gui.sh:2387 git-gui.sh:2932 lib/branch_delete.tcl:26

 #: lib/remote_branch_delete.tcl:38
 msgid "Delete"
 msgstr ""
 
 #: lib/remote_branch_delete.tcl:38
 msgid "Delete"
 msgstr ""
 

-#: git-gui.sh:1922 git-gui.sh:2416 git-gui.sh:2553 lib/console.tcl:69
+#: git-gui.sh:2391 git-gui.sh:2936 git-gui.sh:3086 lib/console.tcl:71

 msgid "Select All"
 msgstr ""
 
 msgid "Select All"
 msgstr ""
 

-#: git-gui.sh:1931
+#: git-gui.sh:2400

 msgid "Create..."
 msgstr ""
 
 msgid "Create..."
 msgstr ""
 

-#: git-gui.sh:1937
+#: git-gui.sh:2406

 msgid "Checkout..."
 msgstr ""
 
 msgid "Checkout..."
 msgstr ""
 

-#: git-gui.sh:1943
+#: git-gui.sh:2412

 msgid "Rename..."
 msgstr ""
 
 msgid "Rename..."
 msgstr ""
 

-#: git-gui.sh:1948 git-gui.sh:2048
+#: git-gui.sh:2417

 msgid "Delete..."
 msgstr ""
 
 msgid "Delete..."
 msgstr ""
 

-#: git-gui.sh:1953
+#: git-gui.sh:2422

 msgid "Reset..."
 msgstr ""
 
 msgid "Reset..."
 msgstr ""
 

-#: git-gui.sh:1965 git-gui.sh:2350
+#: git-gui.sh:2432
+msgid "Done"
+msgstr ""
+
+#: git-gui.sh:2434
+msgid "Commit@@verb"
+msgstr ""
+
+#: git-gui.sh:2443 git-gui.sh:2864

 msgid "New Commit"
 msgstr ""
 
 msgid "New Commit"
 msgstr ""
 

-#: git-gui.sh:1973 git-gui.sh:2357
+#: git-gui.sh:2451 git-gui.sh:2871

 msgid "Amend Last Commit"
 msgstr ""
 
 msgid "Amend Last Commit"
 msgstr ""
 

-#: git-gui.sh:1982 git-gui.sh:2317 lib/remote_branch_delete.tcl:99
+#: git-gui.sh:2461 git-gui.sh:2825 lib/remote_branch_delete.tcl:99

 msgid "Rescan"
 msgstr ""
 
 msgid "Rescan"
 msgstr ""
 

-#: git-gui.sh:1988
+#: git-gui.sh:2467

 msgid "Stage To Commit"
 msgstr ""
 
 msgid "Stage To Commit"
 msgstr ""
 

-#: git-gui.sh:1994
+#: git-gui.sh:2473

 msgid "Stage Changed Files To Commit"
 msgstr ""
 
 msgid "Stage Changed Files To Commit"
 msgstr ""
 

-#: git-gui.sh:2000
+#: git-gui.sh:2479

 msgid "Unstage From Commit"
 msgstr ""
 
 msgid "Unstage From Commit"
 msgstr ""
 

-#: git-gui.sh:2005 lib/index.tcl:393
+#: git-gui.sh:2484 lib/index.tcl:410

 msgid "Revert Changes"
 msgstr ""
 
 msgid "Revert Changes"
 msgstr ""
 

-#: git-gui.sh:2012 git-gui.sh:2329 git-gui.sh:2427
-msgid "Sign Off"
+#: git-gui.sh:2491 git-gui.sh:3069
+msgid "Show Less Context"

 msgstr ""
 
 msgstr ""
 

-#: git-gui.sh:2016 git-gui.sh:2333
-msgid "Commit@@verb"
+#: git-gui.sh:2495 git-gui.sh:3073
+msgid "Show More Context"
+msgstr ""
+
+#: git-gui.sh:2502 git-gui.sh:2838 git-gui.sh:2947
+msgid "Sign Off"

 msgstr ""
 
 msgstr ""
 

-#: git-gui.sh:2027
+#: git-gui.sh:2518

 msgid "Local Merge..."
 msgstr ""
 
 msgid "Local Merge..."
 msgstr ""
 

-#: git-gui.sh:2032
+#: git-gui.sh:2523

 msgid "Abort Merge..."
 msgstr ""
 
 msgid "Abort Merge..."
 msgstr ""
 

-#: git-gui.sh:2044
+#: git-gui.sh:2535 git-gui.sh:2575
+msgid "Add..."
+msgstr ""
+
+#: git-gui.sh:2539

 msgid "Push..."
 msgstr ""
 
 msgid "Push..."
 msgstr ""
 

-#: git-gui.sh:2055 lib/choose_repository.tcl:40
-msgid "Apple"
+#: git-gui.sh:2543
+msgid "Delete Branch..."

 msgstr ""
 
 msgstr ""
 

-#: git-gui.sh:2058 git-gui.sh:2080 lib/about.tcl:13
-#: lib/choose_repository.tcl:43 lib/choose_repository.tcl:49
+#: git-gui.sh:2553 git-gui.sh:2589 lib/about.tcl:14
+#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:53

 #, tcl-format
 msgid "About %s"
 msgstr ""
 
 #, tcl-format
 msgid "About %s"
 msgstr ""
 

-#: git-gui.sh:2062
+#: git-gui.sh:2557

 msgid "Preferences..."
 msgstr ""
 
 msgid "Preferences..."
 msgstr ""
 

-#: git-gui.sh:2070 git-gui.sh:2595
+#: git-gui.sh:2565 git-gui.sh:3115

 msgid "Options..."
 msgstr ""
 
 msgid "Options..."
 msgstr ""
 

-#: git-gui.sh:2076 lib/choose_repository.tcl:46
+#: git-gui.sh:2576
+msgid "Remove..."
+msgstr ""
+
+#: git-gui.sh:2585 lib/choose_repository.tcl:50

 msgid "Help"
 msgstr ""
 
 msgid "Help"
 msgstr ""
 

-#: git-gui.sh:2117
+#: git-gui.sh:2611

 msgid "Online Documentation"
 msgstr ""
 
 msgid "Online Documentation"
 msgstr ""
 

-#: git-gui.sh:2201
+#: git-gui.sh:2614 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56
+msgid "Show SSH Key"
+msgstr ""
+
+#: git-gui.sh:2707

 #, tcl-format
 msgid "fatal: cannot stat path %s: No such file or directory"
 msgstr ""
 
 #, tcl-format
 msgid "fatal: cannot stat path %s: No such file or directory"
 msgstr ""
 

-#: git-gui.sh:2234
+#: git-gui.sh:2740

 msgid "Current Branch:"
 msgstr ""
 
 msgid "Current Branch:"
 msgstr ""
 

-#: git-gui.sh:2255
+#: git-gui.sh:2761

 msgid "Staged Changes (Will Commit)"
 msgstr ""
 
 msgid "Staged Changes (Will Commit)"
 msgstr ""
 

-#: git-gui.sh:2274
+#: git-gui.sh:2781

 msgid "Unstaged Changes"
 msgstr ""
 
 msgid "Unstaged Changes"
 msgstr ""
 

-#: git-gui.sh:2323
+#: git-gui.sh:2831

 msgid "Stage Changed"
 msgstr ""
 
 msgid "Stage Changed"
 msgstr ""
 

-#: git-gui.sh:2339 lib/transport.tcl:93 lib/transport.tcl:182
+#: git-gui.sh:2850 lib/transport.tcl:93 lib/transport.tcl:182

 msgid "Push"
 msgstr ""
 
 msgid "Push"
 msgstr ""
 

-#: git-gui.sh:2369
+#: git-gui.sh:2885

 msgid "Initial Commit Message:"
 msgstr ""
 
 msgid "Initial Commit Message:"
 msgstr ""
 

-#: git-gui.sh:2370
+#: git-gui.sh:2886

 msgid "Amended Commit Message:"
 msgstr ""
 
 msgid "Amended Commit Message:"
 msgstr ""
 

-#: git-gui.sh:2371
+#: git-gui.sh:2887

 msgid "Amended Initial Commit Message:"
 msgstr ""
 
 msgid "Amended Initial Commit Message:"
 msgstr ""
 

-#: git-gui.sh:2372
+#: git-gui.sh:2888

 msgid "Amended Merge Commit Message:"
 msgstr ""
 
 msgid "Amended Merge Commit Message:"
 msgstr ""
 

-#: git-gui.sh:2373
+#: git-gui.sh:2889

 msgid "Merge Commit Message:"
 msgstr ""
 
 msgid "Merge Commit Message:"
 msgstr ""
 

-#: git-gui.sh:2374
+#: git-gui.sh:2890

 msgid "Commit Message:"
 msgstr ""
 
 msgid "Commit Message:"
 msgstr ""
 

-#: git-gui.sh:2419 git-gui.sh:2557 lib/console.tcl:71
+#: git-gui.sh:2939 git-gui.sh:3090 lib/console.tcl:73

 msgid "Copy All"
 msgstr ""
 
 msgid "Copy All"
 msgstr ""
 

-#: git-gui.sh:2443 lib/blame.tcl:104
+#: git-gui.sh:2963 lib/blame.tcl:104

 msgid "File:"
 msgstr ""
 
 msgid "File:"
 msgstr ""
 

-#: git-gui.sh:2573
+#: git-gui.sh:3078
+msgid "Refresh"
+msgstr ""
+
+#: git-gui.sh:3099
+msgid "Decrease Font Size"
+msgstr ""
+
+#: git-gui.sh:3103
+msgid "Increase Font Size"
+msgstr ""
+
+#: git-gui.sh:3111 lib/blame.tcl:281
+msgid "Encoding"
+msgstr ""
+
+#: git-gui.sh:3122

 msgid "Apply/Reverse Hunk"
 msgstr ""
 
 msgid "Apply/Reverse Hunk"
 msgstr ""
 

-#: git-gui.sh:2579
-msgid "Show Less Context"
+#: git-gui.sh:3127
+msgid "Apply/Reverse Line"

 msgstr ""
 
 msgstr ""
 

-#: git-gui.sh:2586
-msgid "Show More Context"
+#: git-gui.sh:3137
+msgid "Run Merge Tool"

 msgstr ""
 
 msgstr ""
 

-#: git-gui.sh:2594
-msgid "Refresh"
+#: git-gui.sh:3142
+msgid "Use Remote Version"

 msgstr ""
 
 msgstr ""
 

-#: git-gui.sh:2615
-msgid "Decrease Font Size"
+#: git-gui.sh:3146
+msgid "Use Local Version"

 msgstr ""
 
 msgstr ""
 

-#: git-gui.sh:2619
-msgid "Increase Font Size"
+#: git-gui.sh:3150
+msgid "Revert To Base"

 msgstr ""
 
 msgstr ""
 

-#: git-gui.sh:2630
+#: git-gui.sh:3169

 msgid "Unstage Hunk From Commit"
 msgstr ""
 
 msgid "Unstage Hunk From Commit"
 msgstr ""
 

-#: git-gui.sh:2604
+#: git-gui.sh:3170
+msgid "Unstage Line From Commit"
+msgstr ""
+
+#: git-gui.sh:3172

 msgid "Stage Hunk For Commit"
 msgstr ""
 
 msgid "Stage Hunk For Commit"
 msgstr ""
 

-#: git-gui.sh:2623
+#: git-gui.sh:3173
+msgid "Stage Line For Commit"
+msgstr ""
+
+#: git-gui.sh:3196

 msgid "Initializing..."
 msgstr ""
 
 msgid "Initializing..."
 msgstr ""
 

-#: git-gui.sh:2718
+#: git-gui.sh:3301

 #, tcl-format
 msgid ""
 "Possible environment issues exist.\n"
 #, tcl-format
 msgid ""
 "Possible environment issues exist.\n"


@@ -433,14 +502,14 @@ msgid ""
 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-#: git-gui.sh:2748
+#: git-gui.sh:3331

 msgid ""
 "\n"
 "This is due to a known issue with the\n"
 "Tcl binary distributed by Cygwin."
 msgstr ""
 
 msgid ""
 "\n"
 "This is due to a known issue with the\n"
 "Tcl binary distributed by Cygwin."
 msgstr ""
 

-#: git-gui.sh:2753
+#: git-gui.sh:3336

 #, tcl-format
 msgid ""
 "\n"
 #, tcl-format
 msgid ""
 "\n"


@@ -451,68 +520,112 @@ msgid ""
 "~/.gitconfig file.\n"
 msgstr ""
 
 "~/.gitconfig file.\n"
 msgstr ""
 

-#: lib/about.tcl:25
+#: lib/about.tcl:26

 msgid "git-gui - a graphical user interface for Git."
 msgstr ""
 
 msgid "git-gui - a graphical user interface for Git."
 msgstr ""
 

-#: lib/blame.tcl:77
+#: lib/blame.tcl:72

 msgid "File Viewer"
 msgstr ""
 
 msgid "File Viewer"
 msgstr ""
 

-#: lib/blame.tcl:81
+#: lib/blame.tcl:78

 msgid "Commit:"
 msgstr ""
 
 msgid "Commit:"
 msgstr ""
 

-#: lib/blame.tcl:249
+#: lib/blame.tcl:271

 msgid "Copy Commit"
 msgstr ""
 
 msgid "Copy Commit"
 msgstr ""
 

-#: lib/blame.tcl:369
+#: lib/blame.tcl:275
+msgid "Find Text..."
+msgstr ""
+
+#: lib/blame.tcl:284
+msgid "Do Full Copy Detection"
+msgstr ""
+
+#: lib/blame.tcl:288
+msgid "Show History Context"
+msgstr ""
+
+#: lib/blame.tcl:291
+msgid "Blame Parent Commit"
+msgstr ""
+
+#: lib/blame.tcl:450

 #, tcl-format
 msgid "Reading %s..."
 msgstr ""
 
 #, tcl-format
 msgid "Reading %s..."
 msgstr ""
 

-#: lib/blame.tcl:473
+#: lib/blame.tcl:557

 msgid "Loading copy/move tracking annotations..."
 msgstr ""
 
 msgid "Loading copy/move tracking annotations..."
 msgstr ""
 

-#: lib/blame.tcl:493
+#: lib/blame.tcl:577

 msgid "lines annotated"
 msgstr ""
 
 msgid "lines annotated"
 msgstr ""
 

-#: lib/blame.tcl:674
+#: lib/blame.tcl:769

 msgid "Loading original location annotations..."
 msgstr ""
 
 msgid "Loading original location annotations..."
 msgstr ""
 

-#: lib/blame.tcl:677
+#: lib/blame.tcl:772

 msgid "Annotation complete."
 msgstr ""
 
 msgid "Annotation complete."
 msgstr ""
 

-#: lib/blame.tcl:731
+#: lib/blame.tcl:802
+msgid "Busy"
+msgstr ""
+
+#: lib/blame.tcl:803
+msgid "Annotation process is already running."
+msgstr ""
+
+#: lib/blame.tcl:842
+msgid "Running thorough copy detection..."
+msgstr ""
+
+#: lib/blame.tcl:910

 msgid "Loading annotation..."
 msgstr ""
 
 msgid "Loading annotation..."
 msgstr ""
 

-#: lib/blame.tcl:787
+#: lib/blame.tcl:964

 msgid "Author:"
 msgstr ""
 
 msgid "Author:"
 msgstr ""
 

-#: lib/blame.tcl:791
+#: lib/blame.tcl:968

 msgid "Committer:"
 msgstr ""
 
 msgid "Committer:"
 msgstr ""
 

-#: lib/blame.tcl:796
+#: lib/blame.tcl:973

 msgid "Original File:"
 msgstr ""
 
 msgid "Original File:"
 msgstr ""
 

-#: lib/blame.tcl:910
+#: lib/blame.tcl:1021
+msgid "Cannot find HEAD commit:"
+msgstr ""
+
+#: lib/blame.tcl:1076
+msgid "Cannot find parent commit:"
+msgstr ""
+
+#: lib/blame.tcl:1091
+msgid "Unable to display parent"
+msgstr ""
+
+#: lib/blame.tcl:1092 lib/diff.tcl:297
+msgid "Error loading diff:"
+msgstr ""
+
+#: lib/blame.tcl:1232

 msgid "Originally By:"
 msgstr ""
 
 msgid "Originally By:"
 msgstr ""
 

-#: lib/blame.tcl:916
+#: lib/blame.tcl:1238

 msgid "In File:"
 msgstr ""
 
 msgid "In File:"
 msgstr ""
 

-#: lib/blame.tcl:921
+#: lib/blame.tcl:1243

 msgid "Copied Or Moved Here By:"
 msgstr ""
 
 msgid "Copied Or Moved Here By:"
 msgstr ""
 


@@ -525,17 +638,19 @@ msgid "Checkout"
 msgstr ""
 
 #: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35
 msgstr ""
 
 #: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35

-#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:281
-#: lib/checkout_op.tcl:522 lib/choose_font.tcl:43 lib/merge.tcl:172
-#: lib/option.tcl:90 lib/remote_branch_delete.tcl:42 lib/transport.tcl:97
+#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:282
+#: lib/checkout_op.tcl:544 lib/choose_font.tcl:43 lib/merge.tcl:172
+#: lib/option.tcl:125 lib/remote_add.tcl:32 lib/remote_branch_delete.tcl:42
+#: lib/tools_dlg.tcl:40 lib/tools_dlg.tcl:204 lib/tools_dlg.tcl:352
+#: lib/transport.tcl:97

 msgid "Cancel"
 msgstr ""
 
 msgid "Cancel"
 msgstr ""
 

-#: lib/branch_checkout.tcl:32 lib/browser.tcl:286
+#: lib/branch_checkout.tcl:32 lib/browser.tcl:287 lib/tools_dlg.tcl:328

 msgid "Revision"
 msgstr ""
 
 msgid "Revision"
 msgstr ""
 

-#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:202
+#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:280

 msgid "Options"
 msgstr ""
 
 msgid "Options"
 msgstr ""
 


@@ -555,7 +670,7 @@ msgstr ""
 msgid "Create New Branch"
 msgstr ""
 
 msgid "Create New Branch"
 msgstr ""
 

-#: lib/branch_create.tcl:31 lib/choose_repository.tcl:375
+#: lib/branch_create.tcl:31 lib/choose_repository.tcl:377

 msgid "Create"
 msgstr ""
 
 msgid "Create"
 msgstr ""
 


@@ -563,7 +678,7 @@ msgstr ""
 msgid "Branch Name"
 msgstr ""
 
 msgid "Branch Name"
 msgstr ""
 

-#: lib/branch_create.tcl:43
+#: lib/branch_create.tcl:43 lib/remote_add.tcl:39 lib/tools_dlg.tcl:50

 msgid "Name:"
 msgstr ""
 
 msgid "Name:"
 msgstr ""
 


@@ -587,7 +702,7 @@ msgstr ""
 msgid "Fast Forward Only"
 msgstr ""
 
 msgid "Fast Forward Only"
 msgstr ""
 

-#: lib/branch_create.tcl:85 lib/checkout_op.tcl:514
+#: lib/branch_create.tcl:85 lib/checkout_op.tcl:536

 msgid "Reset"
 msgstr ""
 
 msgid "Reset"
 msgstr ""
 


@@ -672,7 +787,7 @@ msgstr ""
 msgid "Please select a branch to rename."
 msgstr ""
 
 msgid "Please select a branch to rename."
 msgstr ""
 

-#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:179
+#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:201

 #, tcl-format
 msgid "Branch '%s' already exists."
 msgstr ""
 #, tcl-format
 msgid "Branch '%s' already exists."
 msgstr ""


@@ -690,45 +805,51 @@ msgstr ""
 msgid "File Browser"
 msgstr ""
 
 msgid "File Browser"
 msgstr ""
 

-#: lib/browser.tcl:125 lib/browser.tcl:142
+#: lib/browser.tcl:126 lib/browser.tcl:143

 #, tcl-format
 msgid "Loading %s..."
 msgstr ""
 
 #, tcl-format
 msgid "Loading %s..."
 msgstr ""
 

-#: lib/browser.tcl:186
+#: lib/browser.tcl:187

 msgid "[Up To Parent]"
 msgstr ""
 
 msgid "[Up To Parent]"
 msgstr ""
 

-#: lib/browser.tcl:266 lib/browser.tcl:272
+#: lib/browser.tcl:267 lib/browser.tcl:273

 msgid "Browse Branch Files"
 msgstr ""
 
 msgid "Browse Branch Files"
 msgstr ""
 

-#: lib/browser.tcl:277 lib/choose_repository.tcl:391
-#: lib/choose_repository.tcl:482 lib/choose_repository.tcl:492
-#: lib/choose_repository.tcl:989
+#: lib/browser.tcl:278 lib/choose_repository.tcl:394
+#: lib/choose_repository.tcl:480 lib/choose_repository.tcl:491
+#: lib/choose_repository.tcl:995

 msgid "Browse"
 msgstr ""
 
 msgid "Browse"
 msgstr ""
 

-#: lib/checkout_op.tcl:79
+#: lib/checkout_op.tcl:84

 #, tcl-format
 msgid "Fetching %s from %s"
 msgstr ""
 
 #, tcl-format
 msgid "Fetching %s from %s"
 msgstr ""
 

-#: lib/checkout_op.tcl:127
+#: lib/checkout_op.tcl:132

 #, tcl-format
 msgid "fatal: Cannot resolve %s"
 msgstr ""
 
 #, tcl-format
 msgid "fatal: Cannot resolve %s"
 msgstr ""
 

-#: lib/checkout_op.tcl:140 lib/console.tcl:79 lib/database.tcl:31
+#: lib/checkout_op.tcl:145 lib/console.tcl:81 lib/database.tcl:31
+#: lib/sshkey.tcl:53

 msgid "Close"
 msgstr ""
 
 msgid "Close"
 msgstr ""
 

-#: lib/checkout_op.tcl:169
+#: lib/checkout_op.tcl:174

 #, tcl-format
 msgid "Branch '%s' does not exist."
 msgstr ""
 
 #, tcl-format
 msgid "Branch '%s' does not exist."
 msgstr ""
 

-#: lib/checkout_op.tcl:206
+#: lib/checkout_op.tcl:193
+#, tcl-format
+msgid "Failed to configure simplified git-pull for '%s'."
+msgstr ""
+
+#: lib/checkout_op.tcl:228

 #, tcl-format
 msgid ""
 "Branch '%s' already exists.\n"
 #, tcl-format
 msgid ""
 "Branch '%s' already exists.\n"


@@ -737,21 +858,21 @@ msgid ""
 "A merge is required."
 msgstr ""
 
 "A merge is required."
 msgstr ""
 

-#: lib/checkout_op.tcl:220
+#: lib/checkout_op.tcl:242

 #, tcl-format
 msgid "Merge strategy '%s' not supported."
 msgstr ""
 
 #, tcl-format
 msgid "Merge strategy '%s' not supported."
 msgstr ""
 

-#: lib/checkout_op.tcl:239
+#: lib/checkout_op.tcl:261

 #, tcl-format
 msgid "Failed to update '%s'."
 msgstr ""
 
 #, tcl-format
 msgid "Failed to update '%s'."
 msgstr ""
 

-#: lib/checkout_op.tcl:251
+#: lib/checkout_op.tcl:273

 msgid "Staging area (index) is already locked."
 msgstr ""
 
 msgid "Staging area (index) is already locked."
 msgstr ""
 

-#: lib/checkout_op.tcl:266
+#: lib/checkout_op.tcl:288

 msgid ""
 "Last scanned state does not match repository state.\n"
 "\n"
 msgid ""
 "Last scanned state does not match repository state.\n"
 "\n"


@@ -761,30 +882,30 @@ msgid ""
 "The rescan will be automatically started now.\n"
 msgstr ""
 
 "The rescan will be automatically started now.\n"
 msgstr ""
 

-#: lib/checkout_op.tcl:322
+#: lib/checkout_op.tcl:344

 #, tcl-format
 msgid "Updating working directory to '%s'..."
 msgstr ""
 
 #, tcl-format
 msgid "Updating working directory to '%s'..."
 msgstr ""
 

-#: lib/checkout_op.tcl:323
+#: lib/checkout_op.tcl:345

 msgid "files checked out"
 msgstr ""
 
 msgid "files checked out"
 msgstr ""
 

-#: lib/checkout_op.tcl:353
+#: lib/checkout_op.tcl:375

 #, tcl-format
 msgid "Aborted checkout of '%s' (file level merging is required)."
 msgstr ""
 
 #, tcl-format
 msgid "Aborted checkout of '%s' (file level merging is required)."
 msgstr ""
 

-#: lib/checkout_op.tcl:354
+#: lib/checkout_op.tcl:376

 msgid "File level merge required."
 msgstr ""
 
 msgid "File level merge required."
 msgstr ""
 

-#: lib/checkout_op.tcl:358
+#: lib/checkout_op.tcl:380

 #, tcl-format
 msgid "Staying on branch '%s'."
 msgstr ""
 
 #, tcl-format
 msgid "Staying on branch '%s'."
 msgstr ""
 

-#: lib/checkout_op.tcl:429
+#: lib/checkout_op.tcl:451

 msgid ""
 "You are no longer on a local branch.\n"
 "\n"
 msgid ""
 "You are no longer on a local branch.\n"
 "\n"


@@ -792,30 +913,30 @@ msgid ""
 "Checkout'."
 msgstr ""
 
 "Checkout'."
 msgstr ""
 

-#: lib/checkout_op.tcl:446
+#: lib/checkout_op.tcl:468 lib/checkout_op.tcl:472

 #, tcl-format
 msgid "Checked out '%s'."
 msgstr ""
 
 #, tcl-format
 msgid "Checked out '%s'."
 msgstr ""
 

-#: lib/checkout_op.tcl:478
+#: lib/checkout_op.tcl:500

 #, tcl-format
 msgid "Resetting '%s' to '%s' will lose the following commits:"
 msgstr ""
 
 #, tcl-format
 msgid "Resetting '%s' to '%s' will lose the following commits:"
 msgstr ""
 

-#: lib/checkout_op.tcl:500
+#: lib/checkout_op.tcl:522

 msgid "Recovering lost commits may not be easy."
 msgstr ""
 
 msgid "Recovering lost commits may not be easy."
 msgstr ""
 

-#: lib/checkout_op.tcl:505
+#: lib/checkout_op.tcl:527

 #, tcl-format
 msgid "Reset '%s'?"
 msgstr ""
 
 #, tcl-format
 msgid "Reset '%s'?"
 msgstr ""
 

-#: lib/checkout_op.tcl:510 lib/merge.tcl:164
+#: lib/checkout_op.tcl:532 lib/merge.tcl:164 lib/tools_dlg.tcl:343

 msgid "Visualize"
 msgstr ""
 
 msgid "Visualize"
 msgstr ""
 

-#: lib/checkout_op.tcl:578
+#: lib/checkout_op.tcl:600

 #, tcl-format
 msgid ""
 "Failed to set current branch.\n"
 #, tcl-format
 msgid ""
 "Failed to set current branch.\n"


@@ -834,92 +955,91 @@ msgstr ""
 msgid "Font Family"
 msgstr ""
 
 msgid "Font Family"
 msgstr ""
 

-#: lib/choose_font.tcl:73
+#: lib/choose_font.tcl:74

 msgid "Font Size"
 msgstr ""
 
 msgid "Font Size"
 msgstr ""
 

-#: lib/choose_font.tcl:90
+#: lib/choose_font.tcl:91

 msgid "Font Example"
 msgstr ""
 
 msgid "Font Example"
 msgstr ""
 

-#: lib/choose_font.tcl:101
+#: lib/choose_font.tcl:103

 msgid ""
 "This is example text.\n"
 "If you like this text, it can be your font."
 msgstr ""
 
 msgid ""
 "This is example text.\n"
 "If you like this text, it can be your font."
 msgstr ""
 

-#: lib/choose_repository.tcl:27
+#: lib/choose_repository.tcl:28

 msgid "Git Gui"
 msgstr ""
 
 msgid "Git Gui"
 msgstr ""
 

-#: lib/choose_repository.tcl:80 lib/choose_repository.tcl:380
+#: lib/choose_repository.tcl:87 lib/choose_repository.tcl:382

 msgid "Create New Repository"
 msgstr ""
 
 msgid "Create New Repository"
 msgstr ""
 

-#: lib/choose_repository.tcl:86
+#: lib/choose_repository.tcl:93

 msgid "New..."
 msgstr ""
 
 msgid "New..."
 msgstr ""
 

-#: lib/choose_repository.tcl:93 lib/choose_repository.tcl:468
+#: lib/choose_repository.tcl:100 lib/choose_repository.tcl:465

 msgid "Clone Existing Repository"
 msgstr ""
 
 msgid "Clone Existing Repository"
 msgstr ""
 

-#: lib/choose_repository.tcl:99
+#: lib/choose_repository.tcl:106

 msgid "Clone..."
 msgstr ""
 
 msgid "Clone..."
 msgstr ""
 

-#: lib/choose_repository.tcl:106 lib/choose_repository.tcl:978
+#: lib/choose_repository.tcl:113 lib/choose_repository.tcl:983

 msgid "Open Existing Repository"
 msgstr ""
 
 msgid "Open Existing Repository"
 msgstr ""
 

-#: lib/choose_repository.tcl:112
+#: lib/choose_repository.tcl:119

 msgid "Open..."
 msgstr ""
 
 msgid "Open..."
 msgstr ""
 

-#: lib/choose_repository.tcl:125
+#: lib/choose_repository.tcl:132

 msgid "Recent Repositories"
 msgstr ""
 
 msgid "Recent Repositories"
 msgstr ""
 

-#: lib/choose_repository.tcl:131
+#: lib/choose_repository.tcl:138

 msgid "Open Recent Repository:"
 msgstr ""
 
 msgid "Open Recent Repository:"
 msgstr ""
 

-#: lib/choose_repository.tcl:294
-#, tcl-format
-msgid "Location %s already exists."
-msgstr ""
-
-#: lib/choose_repository.tcl:300 lib/choose_repository.tcl:307
-#: lib/choose_repository.tcl:314
+#: lib/choose_repository.tcl:302 lib/choose_repository.tcl:309
+#: lib/choose_repository.tcl:316

 #, tcl-format
 msgid "Failed to create repository %s:"
 msgstr ""
 
 #, tcl-format
 msgid "Failed to create repository %s:"
 msgstr ""
 

-#: lib/choose_repository.tcl:385 lib/choose_repository.tcl:486
+#: lib/choose_repository.tcl:387

 msgid "Directory:"
 msgstr ""
 
 msgid "Directory:"
 msgstr ""
 

-#: lib/choose_repository.tcl:415 lib/choose_repository.tcl:544
-#: lib/choose_repository.tcl:1013
+#: lib/choose_repository.tcl:417 lib/choose_repository.tcl:544
+#: lib/choose_repository.tcl:1017

 msgid "Git Repository"
 msgstr ""
 
 msgid "Git Repository"
 msgstr ""
 

-#: lib/choose_repository.tcl:430 lib/choose_repository.tcl:437
+#: lib/choose_repository.tcl:442

 #, tcl-format
 msgid "Directory %s already exists."
 msgstr ""
 
 #, tcl-format
 msgid "Directory %s already exists."
 msgstr ""
 

-#: lib/choose_repository.tcl:442
+#: lib/choose_repository.tcl:446

 #, tcl-format
 msgid "File %s already exists."
 msgstr ""
 
 #, tcl-format
 msgid "File %s already exists."
 msgstr ""
 

-#: lib/choose_repository.tcl:463
+#: lib/choose_repository.tcl:460

 msgid "Clone"
 msgstr ""
 
 msgid "Clone"
 msgstr ""
 

-#: lib/choose_repository.tcl:476
-msgid "URL:"
+#: lib/choose_repository.tcl:473
+msgid "Source Location:"
+msgstr ""
+
+#: lib/choose_repository.tcl:484
+msgid "Target Directory:"

 msgstr ""
 
 #: lib/choose_repository.tcl:496
 msgstr ""
 
 #: lib/choose_repository.tcl:496


@@ -939,8 +1059,8 @@ msgid "Shared (Fastest, Not Recommended, No Backup)"
 msgstr ""
 
 #: lib/choose_repository.tcl:550 lib/choose_repository.tcl:597
 msgstr ""
 
 #: lib/choose_repository.tcl:550 lib/choose_repository.tcl:597

-#: lib/choose_repository.tcl:738 lib/choose_repository.tcl:808
-#: lib/choose_repository.tcl:1019 lib/choose_repository.tcl:1027
+#: lib/choose_repository.tcl:743 lib/choose_repository.tcl:813
+#: lib/choose_repository.tcl:1023 lib/choose_repository.tcl:1031

 #, tcl-format
 msgid "Not a Git repository: %s"
 msgstr ""
 #, tcl-format
 msgid "Not a Git repository: %s"
 msgstr ""


@@ -953,120 +1073,125 @@ msgstr ""
 msgid "Shared only available for local repository."
 msgstr ""
 
 msgid "Shared only available for local repository."
 msgstr ""
 

-#: lib/choose_repository.tcl:617
+#: lib/choose_repository.tcl:611
+#, tcl-format
+msgid "Location %s already exists."
+msgstr ""
+
+#: lib/choose_repository.tcl:622

 msgid "Failed to configure origin"
 msgstr ""
 
 msgid "Failed to configure origin"
 msgstr ""
 

-#: lib/choose_repository.tcl:629
+#: lib/choose_repository.tcl:634

 msgid "Counting objects"
 msgstr ""
 
 msgid "Counting objects"
 msgstr ""
 

-#: lib/choose_repository.tcl:630
+#: lib/choose_repository.tcl:635

 msgid "buckets"
 msgstr ""
 
 msgid "buckets"
 msgstr ""
 

-#: lib/choose_repository.tcl:654
+#: lib/choose_repository.tcl:659

 #, tcl-format
 msgid "Unable to copy objects/info/alternates: %s"
 msgstr ""
 
 #, tcl-format
 msgid "Unable to copy objects/info/alternates: %s"
 msgstr ""
 

-#: lib/choose_repository.tcl:690
+#: lib/choose_repository.tcl:695

 #, tcl-format
 msgid "Nothing to clone from %s."
 msgstr ""
 
 #, tcl-format
 msgid "Nothing to clone from %s."
 msgstr ""
 

-#: lib/choose_repository.tcl:692 lib/choose_repository.tcl:906
-#: lib/choose_repository.tcl:918
+#: lib/choose_repository.tcl:697 lib/choose_repository.tcl:911
+#: lib/choose_repository.tcl:923

 msgid "The 'master' branch has not been initialized."
 msgstr ""
 
 msgid "The 'master' branch has not been initialized."
 msgstr ""
 

-#: lib/choose_repository.tcl:705
+#: lib/choose_repository.tcl:710

 msgid "Hardlinks are unavailable.  Falling back to copying."
 msgstr ""
 
 msgid "Hardlinks are unavailable.  Falling back to copying."
 msgstr ""
 

-#: lib/choose_repository.tcl:717
+#: lib/choose_repository.tcl:722

 #, tcl-format
 msgid "Cloning from %s"
 msgstr ""
 
 #, tcl-format
 msgid "Cloning from %s"
 msgstr ""
 

-#: lib/choose_repository.tcl:748
+#: lib/choose_repository.tcl:753

 msgid "Copying objects"
 msgstr ""
 
 msgid "Copying objects"
 msgstr ""
 

-#: lib/choose_repository.tcl:749
+#: lib/choose_repository.tcl:754

 msgid "KiB"
 msgstr ""
 
 msgid "KiB"
 msgstr ""
 

-#: lib/choose_repository.tcl:773
+#: lib/choose_repository.tcl:778

 #, tcl-format
 msgid "Unable to copy object: %s"
 msgstr ""
 
 #, tcl-format
 msgid "Unable to copy object: %s"
 msgstr ""
 

-#: lib/choose_repository.tcl:783
+#: lib/choose_repository.tcl:788

 msgid "Linking objects"
 msgstr ""
 
 msgid "Linking objects"
 msgstr ""
 

-#: lib/choose_repository.tcl:784
+#: lib/choose_repository.tcl:789

 msgid "objects"
 msgstr ""
 
 msgid "objects"
 msgstr ""
 

-#: lib/choose_repository.tcl:792
+#: lib/choose_repository.tcl:797

 #, tcl-format
 msgid "Unable to hardlink object: %s"
 msgstr ""
 
 #, tcl-format
 msgid "Unable to hardlink object: %s"
 msgstr ""
 

-#: lib/choose_repository.tcl:847
+#: lib/choose_repository.tcl:852

 msgid "Cannot fetch branches and objects.  See console output for details."
 msgstr ""
 
 msgid "Cannot fetch branches and objects.  See console output for details."
 msgstr ""
 

-#: lib/choose_repository.tcl:858
+#: lib/choose_repository.tcl:863

 msgid "Cannot fetch tags.  See console output for details."
 msgstr ""
 
 msgid "Cannot fetch tags.  See console output for details."
 msgstr ""
 

-#: lib/choose_repository.tcl:882
+#: lib/choose_repository.tcl:887

 msgid "Cannot determine HEAD.  See console output for details."
 msgstr ""
 
 msgid "Cannot determine HEAD.  See console output for details."
 msgstr ""
 

-#: lib/choose_repository.tcl:891
+#: lib/choose_repository.tcl:896

 #, tcl-format
 msgid "Unable to cleanup %s"
 msgstr ""
 
 #, tcl-format
 msgid "Unable to cleanup %s"
 msgstr ""
 

-#: lib/choose_repository.tcl:897
+#: lib/choose_repository.tcl:902

 msgid "Clone failed."
 msgstr ""
 
 msgid "Clone failed."
 msgstr ""
 

-#: lib/choose_repository.tcl:904
+#: lib/choose_repository.tcl:909

 msgid "No default branch obtained."
 msgstr ""
 
 msgid "No default branch obtained."
 msgstr ""
 

-#: lib/choose_repository.tcl:915
+#: lib/choose_repository.tcl:920

 #, tcl-format
 msgid "Cannot resolve %s as a commit."
 msgstr ""
 
 #, tcl-format
 msgid "Cannot resolve %s as a commit."
 msgstr ""
 

-#: lib/choose_repository.tcl:927
+#: lib/choose_repository.tcl:932

 msgid "Creating working directory"
 msgstr ""
 
 msgid "Creating working directory"
 msgstr ""
 

-#: lib/choose_repository.tcl:928 lib/index.tcl:65 lib/index.tcl:127
-#: lib/index.tcl:193
+#: lib/choose_repository.tcl:933 lib/index.tcl:65 lib/index.tcl:128
+#: lib/index.tcl:196

 msgid "files"
 msgstr ""
 
 msgid "files"
 msgstr ""
 

-#: lib/choose_repository.tcl:957
+#: lib/choose_repository.tcl:962

 msgid "Initial file checkout failed."
 msgstr ""
 
 msgid "Initial file checkout failed."
 msgstr ""
 

-#: lib/choose_repository.tcl:973
+#: lib/choose_repository.tcl:978

 msgid "Open"
 msgstr ""
 
 msgid "Open"
 msgstr ""
 

-#: lib/choose_repository.tcl:983
+#: lib/choose_repository.tcl:988

 msgid "Repository:"
 msgstr ""
 
 msgid "Repository:"
 msgstr ""
 

-#: lib/choose_repository.tcl:1033
+#: lib/choose_repository.tcl:1037

 #, tcl-format
 msgid "Failed to open repository %s:"
 msgstr ""
 #, tcl-format
 msgid "Failed to open repository %s:"
 msgstr ""


@@ -1087,7 +1212,7 @@ msgstr ""
 msgid "Tracking Branch"
 msgstr ""
 
 msgid "Tracking Branch"
 msgstr ""
 

-#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:537
+#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:538

 msgid "Tag"
 msgstr ""
 
 msgid "Tag"
 msgstr ""
 


@@ -1104,11 +1229,11 @@ msgstr ""
 msgid "Revision expression is empty."
 msgstr ""
 
 msgid "Revision expression is empty."
 msgstr ""
 

-#: lib/choose_rev.tcl:530
+#: lib/choose_rev.tcl:531

 msgid "Updated"
 msgstr ""
 
 msgid "Updated"
 msgstr ""
 

-#: lib/choose_rev.tcl:558
+#: lib/choose_rev.tcl:559

 msgid "URL"
 msgstr ""
 
 msgid "URL"
 msgstr ""
 


@@ -1151,7 +1276,7 @@ msgid ""
 "The rescan will be automatically started now.\n"
 msgstr ""
 
 "The rescan will be automatically started now.\n"
 msgstr ""
 

-#: lib/commit.tcl:154
+#: lib/commit.tcl:156

 #, tcl-format
 msgid ""
 "Unmerged files cannot be committed.\n"
 #, tcl-format
 msgid ""
 "Unmerged files cannot be committed.\n"


@@ -1160,7 +1285,7 @@ msgid ""
 "before committing.\n"
 msgstr ""
 
 "before committing.\n"
 msgstr ""
 

-#: lib/commit.tcl:162
+#: lib/commit.tcl:164

 #, tcl-format
 msgid ""
 "Unknown file state %s detected.\n"
 #, tcl-format
 msgid ""
 "Unknown file state %s detected.\n"


@@ -1168,14 +1293,14 @@ msgid ""
 "File %s cannot be committed by this program.\n"
 msgstr ""
 
 "File %s cannot be committed by this program.\n"
 msgstr ""
 

-#: lib/commit.tcl:170
+#: lib/commit.tcl:172

 msgid ""
 "No changes to commit.\n"
 "\n"
 "You must stage at least 1 file before you can commit.\n"
 msgstr ""
 
 msgid ""
 "No changes to commit.\n"
 "\n"
 "You must stage at least 1 file before you can commit.\n"
 msgstr ""
 

-#: lib/commit.tcl:183
+#: lib/commit.tcl:187

 msgid ""
 "Please supply a commit message.\n"
 "\n"
 msgid ""
 "Please supply a commit message.\n"
 "\n"


@@ -1186,45 +1311,45 @@ msgid ""
 "- Remaining lines: Describe why this change is good.\n"
 msgstr ""
 
 "- Remaining lines: Describe why this change is good.\n"
 msgstr ""
 

-#: lib/commit.tcl:207
+#: lib/commit.tcl:211

 #, tcl-format
 msgid "warning: Tcl does not support encoding '%s'."
 msgstr ""
 
 #, tcl-format
 msgid "warning: Tcl does not support encoding '%s'."
 msgstr ""
 

-#: lib/commit.tcl:221
+#: lib/commit.tcl:227

 msgid "Calling pre-commit hook..."
 msgstr ""
 
 msgid "Calling pre-commit hook..."
 msgstr ""
 

-#: lib/commit.tcl:236
+#: lib/commit.tcl:242

 msgid "Commit declined by pre-commit hook."
 msgstr ""
 
 msgid "Commit declined by pre-commit hook."
 msgstr ""
 

-#: lib/commit.tcl:259
+#: lib/commit.tcl:265

 msgid "Calling commit-msg hook..."
 msgstr ""
 
 msgid "Calling commit-msg hook..."
 msgstr ""
 

-#: lib/commit.tcl:274
+#: lib/commit.tcl:280

 msgid "Commit declined by commit-msg hook."
 msgstr ""
 
 msgid "Commit declined by commit-msg hook."
 msgstr ""
 

-#: lib/commit.tcl:287
+#: lib/commit.tcl:293

 msgid "Committing changes..."
 msgstr ""
 
 msgid "Committing changes..."
 msgstr ""
 

-#: lib/commit.tcl:303
+#: lib/commit.tcl:309

 msgid "write-tree failed:"
 msgstr ""
 
 msgid "write-tree failed:"
 msgstr ""
 

-#: lib/commit.tcl:304 lib/commit.tcl:348 lib/commit.tcl:368
+#: lib/commit.tcl:310 lib/commit.tcl:354 lib/commit.tcl:374

 msgid "Commit failed."
 msgstr ""
 
 msgid "Commit failed."
 msgstr ""
 

-#: lib/commit.tcl:321
+#: lib/commit.tcl:327

 #, tcl-format
 msgid "Commit %s appears to be corrupt"
 msgstr ""
 
 #, tcl-format
 msgid "Commit %s appears to be corrupt"
 msgstr ""
 

-#: lib/commit.tcl:279
+#: lib/commit.tcl:332

 msgid ""
 "No changes to commit.\n"
 "\n"
 msgid ""
 "No changes to commit.\n"
 "\n"


@@ -1233,32 +1358,32 @@ msgid ""
 "A rescan will be automatically started now.\n"
 msgstr ""
 
 "A rescan will be automatically started now.\n"
 msgstr ""
 

-#: lib/commit.tcl:286
+#: lib/commit.tcl:339

 msgid "No changes to commit."
 msgstr ""
 
 msgid "No changes to commit."
 msgstr ""
 

-#: lib/commit.tcl:347
+#: lib/commit.tcl:353

 msgid "commit-tree failed:"
 msgstr ""
 
 msgid "commit-tree failed:"
 msgstr ""
 

-#: lib/commit.tcl:339
+#: lib/commit.tcl:373

 msgid "update-ref failed:"
 msgstr ""
 
 msgid "update-ref failed:"
 msgstr ""
 

-#: lib/commit.tcl:430
+#: lib/commit.tcl:461

 #, tcl-format
 msgid "Created commit %s: %s"
 msgstr ""
 
 #, tcl-format
 msgid "Created commit %s: %s"
 msgstr ""
 

-#: lib/console.tcl:57
+#: lib/console.tcl:59

 msgid "Working... please wait..."
 msgstr ""
 
 msgid "Working... please wait..."
 msgstr ""
 

-#: lib/console.tcl:183
+#: lib/console.tcl:186

 msgid "Success"
 msgstr ""
 
 msgid "Success"
 msgstr ""
 

-#: lib/console.tcl:196
+#: lib/console.tcl:200

 msgid "Error: Command Failed"
 msgstr ""
 
 msgid "Error: Command Failed"
 msgstr ""
 


@@ -1314,7 +1439,7 @@ msgstr ""
 msgid "Invalid date from Git: %s"
 msgstr ""
 
 msgid "Invalid date from Git: %s"
 msgstr ""
 

-#: lib/diff.tcl:42
+#: lib/diff.tcl:59

 #, tcl-format
 msgid ""
 "No differences detected.\n"
 #, tcl-format
 msgid ""
 "No differences detected.\n"


@@ -1328,49 +1453,101 @@ msgid ""
 "the same state."
 msgstr ""
 
 "the same state."
 msgstr ""
 

-#: lib/diff.tcl:81
+#: lib/diff.tcl:99

 #, tcl-format
 msgid "Loading diff of %s..."
 msgstr ""
 
 #, tcl-format
 msgid "Loading diff of %s..."
 msgstr ""
 

-#: lib/diff.tcl:114 lib/diff.tcl:184
+#: lib/diff.tcl:120
+msgid ""
+"LOCAL: deleted\n"
+"REMOTE:\n"
+msgstr ""
+
+#: lib/diff.tcl:125
+msgid ""
+"REMOTE: deleted\n"
+"LOCAL:\n"
+msgstr ""
+
+#: lib/diff.tcl:132
+msgid "LOCAL:\n"
+msgstr ""
+
+#: lib/diff.tcl:135
+msgid "REMOTE:\n"
+msgstr ""
+
+#: lib/diff.tcl:197 lib/diff.tcl:296

 #, tcl-format
 msgid "Unable to display %s"
 msgstr ""
 
 #, tcl-format
 msgid "Unable to display %s"
 msgstr ""
 

-#: lib/diff.tcl:115
+#: lib/diff.tcl:198

 msgid "Error loading file:"
 msgstr ""
 
 msgid "Error loading file:"
 msgstr ""
 

-#: lib/diff.tcl:122
+#: lib/diff.tcl:205

 msgid "Git Repository (subproject)"
 msgstr ""
 
 msgid "Git Repository (subproject)"
 msgstr ""
 

-#: lib/diff.tcl:134
+#: lib/diff.tcl:217

 msgid "* Binary file (not showing content)."
 msgstr ""
 
 msgid "* Binary file (not showing content)."
 msgstr ""
 

-#: lib/diff.tcl:185
-msgid "Error loading diff:"
+#: lib/diff.tcl:222
+#, tcl-format
+msgid ""
+"* Untracked file is %d bytes.\n"
+"* Showing only first %d bytes.\n"

 msgstr ""
 
 msgstr ""
 

-#: lib/diff.tcl:302
+#: lib/diff.tcl:228
+#, tcl-format
+msgid ""
+"\n"
+"* Untracked file clipped here by %s.\n"
+"* To see the entire file, use an external editor.\n"
+msgstr ""
+
+#: lib/diff.tcl:436

 msgid "Failed to unstage selected hunk."
 msgstr ""
 
 msgid "Failed to unstage selected hunk."
 msgstr ""
 

-#: lib/diff.tcl:309
+#: lib/diff.tcl:443

 msgid "Failed to stage selected hunk."
 msgstr ""
 
 msgid "Failed to stage selected hunk."
 msgstr ""
 

-#: lib/error.tcl:12 lib/error.tcl:102
+#: lib/diff.tcl:509
+msgid "Failed to unstage selected line."
+msgstr ""
+
+#: lib/diff.tcl:517
+msgid "Failed to stage selected line."
+msgstr ""
+
+#: lib/encoding.tcl:443
+msgid "Default"
+msgstr ""
+
+#: lib/encoding.tcl:448
+#, tcl-format
+msgid "System (%s)"
+msgstr ""
+
+#: lib/encoding.tcl:459 lib/encoding.tcl:465
+msgid "Other"
+msgstr ""
+
+#: lib/error.tcl:20 lib/error.tcl:114

 msgid "error"
 msgstr ""
 
 msgid "error"
 msgstr ""
 

-#: lib/error.tcl:28
+#: lib/error.tcl:36

 msgid "warning"
 msgstr ""
 
 msgid "warning"
 msgstr ""
 

-#: lib/error.tcl:81
+#: lib/error.tcl:94

 msgid "You must correct the above errors before committing."
 msgstr ""
 
 msgid "You must correct the above errors before committing."
 msgstr ""
 


@@ -1396,38 +1573,47 @@ msgstr ""
 msgid "Unlock Index"
 msgstr ""
 
 msgid "Unlock Index"
 msgstr ""
 

-#: lib/index.tcl:282
+#: lib/index.tcl:287

 #, tcl-format
 msgid "Unstaging %s from commit"
 msgstr ""
 
 #, tcl-format
 msgid "Unstaging %s from commit"
 msgstr ""
 

-#: lib/index.tcl:313
+#: lib/index.tcl:326

 msgid "Ready to commit."
 msgstr ""
 
 msgid "Ready to commit."
 msgstr ""
 

-#: lib/index.tcl:326
+#: lib/index.tcl:339

 #, tcl-format
 msgid "Adding %s"
 msgstr ""
 
 #, tcl-format
 msgid "Adding %s"
 msgstr ""
 

-#: lib/index.tcl:381
+#: lib/index.tcl:396

 #, tcl-format
 msgid "Revert changes in file %s?"
 msgstr ""
 
 #, tcl-format
 msgid "Revert changes in file %s?"
 msgstr ""
 

-#: lib/index.tcl:383
+#: lib/index.tcl:398

 #, tcl-format
 msgid "Revert changes in these %i files?"
 msgstr ""
 
 #, tcl-format
 msgid "Revert changes in these %i files?"
 msgstr ""
 

-#: lib/index.tcl:389
+#: lib/index.tcl:406

 msgid "Any unstaged changes will be permanently lost by the revert."
 msgstr ""
 
 msgid "Any unstaged changes will be permanently lost by the revert."
 msgstr ""
 

-#: lib/index.tcl:392
+#: lib/index.tcl:409

 msgid "Do Nothing"
 msgstr ""
 
 msgid "Do Nothing"
 msgstr ""
 

+#: lib/index.tcl:427
+msgid "Reverting selected files"
+msgstr ""
+
+#: lib/index.tcl:431
+#, tcl-format
+msgid "Reverting %s"
+msgstr ""
+

 #: lib/merge.tcl:13
 msgid ""
 "Cannot merge while amending.\n"
 #: lib/merge.tcl:13
 msgid ""
 "Cannot merge while amending.\n"


@@ -1445,7 +1631,7 @@ msgid ""
 "The rescan will be automatically started now.\n"
 msgstr ""
 
 "The rescan will be automatically started now.\n"
 msgstr ""
 

-#: lib/merge.tcl:44
+#: lib/merge.tcl:45

 #, tcl-format
 msgid ""
 "You are in the middle of a conflicted merge.\n"
 #, tcl-format
 msgid ""
 "You are in the middle of a conflicted merge.\n"


@@ -1456,7 +1642,7 @@ msgid ""
 "merge.  Only then can you begin another merge.\n"
 msgstr ""
 
 "merge.  Only then can you begin another merge.\n"
 msgstr ""
 

-#: lib/merge.tcl:54
+#: lib/merge.tcl:55

 #, tcl-format
 msgid ""
 "You are in the middle of a change.\n"
 #, tcl-format
 msgid ""
 "You are in the middle of a change.\n"


@@ -1467,14 +1653,14 @@ msgid ""
 "will help you abort a failed merge, should the need arise.\n"
 msgstr ""
 
 "will help you abort a failed merge, should the need arise.\n"
 msgstr ""
 

-#: lib/merge.tcl:106
+#: lib/merge.tcl:107

 #, tcl-format
 msgid "%s of %s"
 msgstr ""
 
 #, tcl-format
 msgid "%s of %s"
 msgstr ""
 

-#: lib/merge.tcl:119
+#: lib/merge.tcl:120

 #, tcl-format
 #, tcl-format

-msgid "Merging %s and %s"
+msgid "Merging %s and %s..."

 msgstr ""
 
 #: lib/merge.tcl:131
 msgstr ""
 
 #: lib/merge.tcl:131


@@ -1523,98 +1709,308 @@ msgstr ""
 msgid "Aborting"
 msgstr ""
 
 msgid "Aborting"
 msgstr ""
 

-#: lib/merge.tcl:238
+#: lib/merge.tcl:239

 msgid "files reset"
 msgstr ""
 
 msgid "files reset"
 msgstr ""
 

-#: lib/merge.tcl:265
+#: lib/merge.tcl:267

 msgid "Abort failed."
 msgstr ""
 
 msgid "Abort failed."
 msgstr ""
 

-#: lib/merge.tcl:268
+#: lib/merge.tcl:269

 msgid "Abort completed.  Ready."
 msgstr ""
 
 msgid "Abort completed.  Ready."
 msgstr ""
 

-#: lib/option.tcl:82
+#: lib/mergetool.tcl:8
+msgid "Force resolution to the base version?"
+msgstr ""
+
+#: lib/mergetool.tcl:9
+msgid "Force resolution to this branch?"
+msgstr ""
+
+#: lib/mergetool.tcl:10
+msgid "Force resolution to the other branch?"
+msgstr ""
+
+#: lib/mergetool.tcl:14
+#, tcl-format
+msgid ""
+"Note that the diff shows only conflicting changes.\n"
+"\n"
+"%s will be overwritten.\n"
+"\n"
+"This operation can be undone only by restarting the merge."
+msgstr ""
+
+#: lib/mergetool.tcl:45
+#, tcl-format
+msgid "File %s seems to have unresolved conflicts, still stage?"
+msgstr ""
+
+#: lib/mergetool.tcl:60
+#, tcl-format
+msgid "Adding resolution for %s"
+msgstr ""
+
+#: lib/mergetool.tcl:141
+msgid "Cannot resolve deletion or link conflicts using a tool"
+msgstr ""
+
+#: lib/mergetool.tcl:146
+msgid "Conflict file does not exist"
+msgstr ""
+
+#: lib/mergetool.tcl:264
+#, tcl-format
+msgid "Not a GUI merge tool: '%s'"
+msgstr ""
+
+#: lib/mergetool.tcl:268
+#, tcl-format
+msgid "Unsupported merge tool '%s'"
+msgstr ""
+
+#: lib/mergetool.tcl:303
+msgid "Merge tool is already running, terminate it?"
+msgstr ""
+
+#: lib/mergetool.tcl:323
+#, tcl-format
+msgid ""
+"Error retrieving versions:\n"
+"%s"
+msgstr ""
+
+#: lib/mergetool.tcl:343
+#, tcl-format
+msgid ""
+"Could not start the merge tool:\n"
+"\n"
+"%s"
+msgstr ""
+
+#: lib/mergetool.tcl:347
+msgid "Running merge tool..."
+msgstr ""
+
+#: lib/mergetool.tcl:375 lib/mergetool.tcl:383
+msgid "Merge tool failed."
+msgstr ""
+
+#: lib/option.tcl:11
+#, tcl-format
+msgid "Invalid global encoding '%s'"
+msgstr ""
+
+#: lib/option.tcl:19
+#, tcl-format
+msgid "Invalid repo encoding '%s'"
+msgstr ""
+
+#: lib/option.tcl:117

 msgid "Restore Defaults"
 msgstr ""
 
 msgid "Restore Defaults"
 msgstr ""
 

-#: lib/option.tcl:86
+#: lib/option.tcl:121

 msgid "Save"
 msgstr ""
 
 msgid "Save"
 msgstr ""
 

-#: lib/option.tcl:96
+#: lib/option.tcl:131

 #, tcl-format
 msgid "%s Repository"
 msgstr ""
 
 #, tcl-format
 msgid "%s Repository"
 msgstr ""
 

-#: lib/option.tcl:97
+#: lib/option.tcl:132

 msgid "Global (All Repositories)"
 msgstr ""
 
 msgid "Global (All Repositories)"
 msgstr ""
 

-#: lib/option.tcl:103
+#: lib/option.tcl:138

 msgid "User Name"
 msgstr ""
 
 msgid "User Name"
 msgstr ""
 

-#: lib/option.tcl:104
+#: lib/option.tcl:139

 msgid "Email Address"
 msgstr ""
 
 msgid "Email Address"
 msgstr ""
 

-#: lib/option.tcl:106
+#: lib/option.tcl:141

 msgid "Summarize Merge Commits"
 msgstr ""
 
 msgid "Summarize Merge Commits"
 msgstr ""
 

-#: lib/option.tcl:107
+#: lib/option.tcl:142

 msgid "Merge Verbosity"
 msgstr ""
 
 msgid "Merge Verbosity"
 msgstr ""
 

-#: lib/option.tcl:108
+#: lib/option.tcl:143

 msgid "Show Diffstat After Merge"
 msgstr ""
 
 msgid "Show Diffstat After Merge"
 msgstr ""
 

-#: lib/option.tcl:110
+#: lib/option.tcl:144
+msgid "Use Merge Tool"
+msgstr ""
+
+#: lib/option.tcl:146

 msgid "Trust File Modification Timestamps"
 msgstr ""
 
 msgid "Trust File Modification Timestamps"
 msgstr ""
 

-#: lib/option.tcl:111
+#: lib/option.tcl:147

 msgid "Prune Tracking Branches During Fetch"
 msgstr ""
 
 msgid "Prune Tracking Branches During Fetch"
 msgstr ""
 

-#: lib/option.tcl:112
+#: lib/option.tcl:148

 msgid "Match Tracking Branches"
 msgstr ""
 
 msgid "Match Tracking Branches"
 msgstr ""
 

-#: lib/option.tcl:113
+#: lib/option.tcl:149
+msgid "Blame Copy Only On Changed Files"
+msgstr ""
+
+#: lib/option.tcl:150
+msgid "Minimum Letters To Blame Copy On"
+msgstr ""
+
+#: lib/option.tcl:151
+msgid "Blame History Context Radius (days)"
+msgstr ""
+
+#: lib/option.tcl:152

 msgid "Number of Diff Context Lines"
 msgstr ""
 
 msgid "Number of Diff Context Lines"
 msgstr ""
 

-#: lib/option.tcl:114
+#: lib/option.tcl:153
+msgid "Commit Message Text Width"
+msgstr ""
+
+#: lib/option.tcl:154

 msgid "New Branch Name Template"
 msgstr ""
 
 msgid "New Branch Name Template"
 msgstr ""
 

-#: lib/option.tcl:176
+#: lib/option.tcl:155
+msgid "Default File Contents Encoding"
+msgstr ""
+
+#: lib/option.tcl:203
+msgid "Change"
+msgstr ""
+
+#: lib/option.tcl:230
+msgid "Spelling Dictionary:"
+msgstr ""
+
+#: lib/option.tcl:254

 msgid "Change Font"
 msgstr ""
 
 msgid "Change Font"
 msgstr ""
 

-#: lib/option.tcl:180
+#: lib/option.tcl:258

 #, tcl-format
 msgid "Choose %s"
 msgstr ""
 
 #, tcl-format
 msgid "Choose %s"
 msgstr ""
 

-#: lib/option.tcl:186
+#: lib/option.tcl:264

 msgid "pt."
 msgstr ""
 
 msgid "pt."
 msgstr ""
 

-#: lib/option.tcl:200
+#: lib/option.tcl:278

 msgid "Preferences"
 msgstr ""
 
 msgid "Preferences"
 msgstr ""
 

-#: lib/option.tcl:235
+#: lib/option.tcl:314

 msgid "Failed to completely save options:"
 msgstr ""
 
 msgid "Failed to completely save options:"
 msgstr ""
 

+#: lib/remote.tcl:163
+msgid "Remove Remote"
+msgstr ""
+
+#: lib/remote.tcl:168
+msgid "Prune from"
+msgstr ""
+
+#: lib/remote.tcl:173
+msgid "Fetch from"
+msgstr ""
+
+#: lib/remote.tcl:215
+msgid "Push to"
+msgstr ""
+
+#: lib/remote_add.tcl:19
+msgid "Add Remote"
+msgstr ""
+
+#: lib/remote_add.tcl:24
+msgid "Add New Remote"
+msgstr ""
+
+#: lib/remote_add.tcl:28 lib/tools_dlg.tcl:36
+msgid "Add"
+msgstr ""
+
+#: lib/remote_add.tcl:37
+msgid "Remote Details"
+msgstr ""
+
+#: lib/remote_add.tcl:50
+msgid "Location:"
+msgstr ""
+
+#: lib/remote_add.tcl:62
+msgid "Further Action"
+msgstr ""
+
+#: lib/remote_add.tcl:65
+msgid "Fetch Immediately"
+msgstr ""
+
+#: lib/remote_add.tcl:71
+msgid "Initialize Remote Repository and Push"
+msgstr ""
+
+#: lib/remote_add.tcl:77
+msgid "Do Nothing Else Now"
+msgstr ""
+
+#: lib/remote_add.tcl:101
+msgid "Please supply a remote name."
+msgstr ""
+
+#: lib/remote_add.tcl:114
+#, tcl-format
+msgid "'%s' is not an acceptable remote name."
+msgstr ""
+
+#: lib/remote_add.tcl:125
+#, tcl-format
+msgid "Failed to add remote '%s' of location '%s'."
+msgstr ""
+
+#: lib/remote_add.tcl:133 lib/transport.tcl:6
+#, tcl-format
+msgid "fetch %s"
+msgstr ""
+
+#: lib/remote_add.tcl:134
+#, tcl-format
+msgid "Fetching the %s"
+msgstr ""
+
+#: lib/remote_add.tcl:157
+#, tcl-format
+msgid "Do not know how to initialize repository at location '%s'."
+msgstr ""
+
+#: lib/remote_add.tcl:163 lib/transport.tcl:25 lib/transport.tcl:71
+#, tcl-format
+msgid "push %s"
+msgstr ""
+
+#: lib/remote_add.tcl:164
+#, tcl-format
+msgid "Setting up the %s (at %s)"
+msgstr ""
+

 #: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34
 #: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34

-msgid "Delete Remote Branch"
+msgid "Delete Branch Remotely"

 msgstr ""
 
 #: lib/remote_branch_delete.tcl:47
 msgstr ""
 
 #: lib/remote_branch_delete.tcl:47


@@ -1626,7 +2022,7 @@ msgid "Remote:"
 msgstr ""
 
 #: lib/remote_branch_delete.tcl:66 lib/transport.tcl:138
 msgstr ""
 
 #: lib/remote_branch_delete.tcl:66 lib/transport.tcl:138

-msgid "Arbitrary URL:"
+msgid "Arbitrary Location:"

 msgstr ""
 
 #: lib/remote_branch_delete.tcl:84
 msgstr ""
 
 #: lib/remote_branch_delete.tcl:84


@@ -1689,16 +2085,20 @@ msgstr ""
 msgid "Scanning %s..."
 msgstr ""
 
 msgid "Scanning %s..."
 msgstr ""
 

-#: lib/remote.tcl:165
-msgid "Prune from"
+#: lib/search.tcl:21
+msgid "Find:"

 msgstr ""
 
 msgstr ""
 

-#: lib/remote.tcl:170
-msgid "Fetch from"
+#: lib/search.tcl:23
+msgid "Next"

 msgstr ""
 
 msgstr ""
 

-#: lib/remote.tcl:213
-msgid "Push to"
+#: lib/search.tcl:24
+msgid "Prev"
+msgstr ""
+
+#: lib/search.tcl:25
+msgid "Case-Sensitive"

 msgstr ""
 
 #: lib/shortcut.tcl:20 lib/shortcut.tcl:61
 msgstr ""
 
 #: lib/shortcut.tcl:20 lib/shortcut.tcl:61


@@ -1709,14 +2109,211 @@ msgstr ""
 msgid "Cannot write icon:"
 msgstr ""
 
 msgid "Cannot write icon:"
 msgstr ""
 

+#: lib/spellcheck.tcl:57
+msgid "Unsupported spell checker"
+msgstr ""
+
+#: lib/spellcheck.tcl:65
+msgid "Spell checking is unavailable"
+msgstr ""
+
+#: lib/spellcheck.tcl:68
+msgid "Invalid spell checking configuration"
+msgstr ""
+
+#: lib/spellcheck.tcl:70
+#, tcl-format
+msgid "Reverting dictionary to %s."
+msgstr ""
+
+#: lib/spellcheck.tcl:73
+msgid "Spell checker silently failed on startup"
+msgstr ""
+
+#: lib/spellcheck.tcl:80
+msgid "Unrecognized spell checker"
+msgstr ""
+
+#: lib/spellcheck.tcl:186
+msgid "No Suggestions"
+msgstr ""
+
+#: lib/spellcheck.tcl:388
+msgid "Unexpected EOF from spell checker"
+msgstr ""
+
+#: lib/spellcheck.tcl:392
+msgid "Spell Checker Failed"
+msgstr ""
+
+#: lib/sshkey.tcl:31
+msgid "No keys found."
+msgstr ""
+
+#: lib/sshkey.tcl:34
+#, tcl-format
+msgid "Found a public key in: %s"
+msgstr ""
+
+#: lib/sshkey.tcl:40
+msgid "Generate Key"
+msgstr ""
+
+#: lib/sshkey.tcl:56
+msgid "Copy To Clipboard"
+msgstr ""
+
+#: lib/sshkey.tcl:70
+msgid "Your OpenSSH Public Key"
+msgstr ""
+
+#: lib/sshkey.tcl:78
+msgid "Generating..."
+msgstr ""
+
+#: lib/sshkey.tcl:84
+#, tcl-format
+msgid ""
+"Could not start ssh-keygen:\n"
+"\n"
+"%s"
+msgstr ""
+
+#: lib/sshkey.tcl:111
+msgid "Generation failed."
+msgstr ""
+
+#: lib/sshkey.tcl:118
+msgid "Generation succeded, but no keys found."
+msgstr ""
+
+#: lib/sshkey.tcl:121
+#, tcl-format
+msgid "Your key is in: %s"
+msgstr ""
+

 #: lib/status_bar.tcl:83
 #, tcl-format
 msgid "%s ... %*i of %*i %s (%3i%%)"
 msgstr ""
 
 #: lib/status_bar.tcl:83
 #, tcl-format
 msgid "%s ... %*i of %*i %s (%3i%%)"
 msgstr ""
 

-#: lib/transport.tcl:6
+#: lib/tools.tcl:75

 #, tcl-format
 #, tcl-format

-msgid "fetch %s"
+msgid "Running %s requires a selected file."
+msgstr ""
+
+#: lib/tools.tcl:90
+#, tcl-format
+msgid "Are you sure you want to run %s?"
+msgstr ""
+
+#: lib/tools.tcl:110
+#, tcl-format
+msgid "Tool: %s"
+msgstr ""
+
+#: lib/tools.tcl:111
+#, tcl-format
+msgid "Running: %s"
+msgstr ""
+
+#: lib/tools.tcl:149
+#, tcl-format
+msgid "Tool completed succesfully: %s"
+msgstr ""
+
+#: lib/tools.tcl:151
+#, tcl-format
+msgid "Tool failed: %s"
+msgstr ""
+
+#: lib/tools_dlg.tcl:22
+msgid "Add Tool"
+msgstr ""
+
+#: lib/tools_dlg.tcl:28
+msgid "Add New Tool Command"
+msgstr ""
+
+#: lib/tools_dlg.tcl:33
+msgid "Add globally"
+msgstr ""
+
+#: lib/tools_dlg.tcl:45
+msgid "Tool Details"
+msgstr ""
+
+#: lib/tools_dlg.tcl:48
+msgid "Use '/' separators to create a submenu tree:"
+msgstr ""
+
+#: lib/tools_dlg.tcl:61
+msgid "Command:"
+msgstr ""
+
+#: lib/tools_dlg.tcl:74
+msgid "Show a dialog before running"
+msgstr ""
+
+#: lib/tools_dlg.tcl:80
+msgid "Ask the user to select a revision (sets $REVISION)"
+msgstr ""
+
+#: lib/tools_dlg.tcl:85
+msgid "Ask the user for additional arguments (sets $ARGS)"
+msgstr ""
+
+#: lib/tools_dlg.tcl:92
+msgid "Don't show the command output window"
+msgstr ""
+
+#: lib/tools_dlg.tcl:97
+msgid "Run only if a diff is selected ($FILENAME not empty)"
+msgstr ""
+
+#: lib/tools_dlg.tcl:121
+msgid "Please supply a name for the tool."
+msgstr ""
+
+#: lib/tools_dlg.tcl:129
+#, tcl-format
+msgid "Tool '%s' already exists."
+msgstr ""
+
+#: lib/tools_dlg.tcl:151
+#, tcl-format
+msgid ""
+"Could not add tool:\n"
+"%s"
+msgstr ""
+
+#: lib/tools_dlg.tcl:190
+msgid "Remove Tool"
+msgstr ""
+
+#: lib/tools_dlg.tcl:196
+msgid "Remove Tool Commands"
+msgstr ""
+
+#: lib/tools_dlg.tcl:200
+msgid "Remove"
+msgstr ""
+
+#: lib/tools_dlg.tcl:236
+msgid "(Blue denotes repository-local tools)"
+msgstr ""
+
+#: lib/tools_dlg.tcl:297
+#, tcl-format
+msgid "Run Command: %s"
+msgstr ""
+
+#: lib/tools_dlg.tcl:311
+msgid "Arguments"
+msgstr ""
+
+#: lib/tools_dlg.tcl:348
+msgid "OK"

 msgstr ""
 
 #: lib/transport.tcl:7
 msgstr ""
 
 #: lib/transport.tcl:7


@@ -1734,11 +2331,6 @@ msgstr ""
 msgid "Pruning tracking branches deleted from %s"
 msgstr ""
 
 msgid "Pruning tracking branches deleted from %s"
 msgstr ""
 

-#: lib/transport.tcl:25 lib/transport.tcl:71
-#, tcl-format
-msgid "push %s"
-msgstr ""
-

 #: lib/transport.tcl:26
 #, tcl-format
 msgid "Pushing changes to %s"
 #: lib/transport.tcl:26
 #, tcl-format
 msgid "Pushing changes to %s"