git-gui: Update German translation (12 new or changed strings).

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

diff --git a/po/git-gui.pot b/po/git-gui.pot
index 813199f782968cb0949d24119145e8b3e4a174cd..1ae2aaa0b3bb46302a9a4876dbbb1be00d2c2ddf 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-03-14 07:18+0100\n"
+"POT-Creation-Date: 2010-01-26 15:47-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:634 git-gui.sh:648 git-gui.sh:661 git-gui.sh:744
-#: git-gui.sh:763
+#: git-gui.sh:41 git-gui.sh:793 git-gui.sh:807 git-gui.sh:820 git-gui.sh:903
+#: git-gui.sh:922

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

-#: git-gui.sh:593
+#: git-gui.sh:743

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

-#: git-gui.sh:620
+#: git-gui.sh:779

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

-#: git-gui.sh:621
+#: git-gui.sh:780

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

-#: git-gui.sh:635
+#: git-gui.sh:794

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

-#: git-gui.sh:662
+#: git-gui.sh:821

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

-#: git-gui.sh:680
+#: git-gui.sh:839

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


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

-#: git-gui.sh:918
+#: git-gui.sh:1128

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

-#: git-gui.sh:925
+#: git-gui.sh:1146

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

-#: git-gui.sh:932
-msgid "Cannot use funny .git directory:"
+#: git-gui.sh:1154
+msgid "Cannot use bare repository:"

 msgstr ""
 
 msgstr ""
 

-#: git-gui.sh:937
+#: git-gui.sh:1162

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

-#: git-gui.sh:1084 lib/checkout_op.tcl:283
+#: git-gui.sh:1334 lib/checkout_op.tcl:306

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

-#: git-gui.sh:1149
+#: git-gui.sh:1390

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

-#: git-gui.sh:1324 lib/browser.tcl:246
+#: git-gui.sh:1454
+msgid "Calling prepare-commit-msg hook..."
+msgstr ""
+
+#: git-gui.sh:1471
+msgid "Commit declined by prepare-commit-msg hook."
+msgstr ""
+
+#: git-gui.sh:1629 lib/browser.tcl:246

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

-#: git-gui.sh:1590
+#: git-gui.sh:1787
+#, tcl-format
+msgid "Displaying only %s of %s files."
+msgstr ""
+
+#: git-gui.sh:1913

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

-#: git-gui.sh:1592
+#: git-gui.sh:1915

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

-#: git-gui.sh:1593 git-gui.sh:1598
+#: git-gui.sh:1916 git-gui.sh:1924

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

-#: git-gui.sh:1594 git-gui.sh:1599
+#: git-gui.sh:1917 git-gui.sh:1925

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

-#: git-gui.sh:1595 git-gui.sh:1600
+#: git-gui.sh:1918 git-gui.sh:1926

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

-#: git-gui.sh:1597
+#: git-gui.sh:1920
+msgid "File type changed, not staged"
+msgstr ""
+
+#: git-gui.sh:1921
+msgid "File type changed, staged"
+msgstr ""
+
+#: git-gui.sh:1923

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

-#: git-gui.sh:1602
+#: git-gui.sh:1928

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

-#: git-gui.sh:1603
+#: git-gui.sh:1929

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

-#: git-gui.sh:1604
+#: git-gui.sh:1930

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

-#: git-gui.sh:1606 git-gui.sh:1607 git-gui.sh:1608 git-gui.sh:1609
+#: git-gui.sh:1932 git-gui.sh:1933 git-gui.sh:1934 git-gui.sh:1935
+#: git-gui.sh:1936 git-gui.sh:1937

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

-#: git-gui.sh:1644
+#: git-gui.sh:1972

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

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

 msgstr ""
 
 msgstr ""
 

-#: git-gui.sh:1860 lib/choose_repository.tcl:36
+#: git-gui.sh:2455 lib/choose_repository.tcl:36

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

-#: git-gui.sh:1861
+#: git-gui.sh:2456

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

-#: git-gui.sh:1863 lib/choose_rev.tcl:561
+#: git-gui.sh:2458 lib/choose_rev.tcl:561

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

-#: git-gui.sh:1866 lib/choose_rev.tcl:548
+#: git-gui.sh:2461 lib/choose_rev.tcl:548

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

-#: git-gui.sh:1869 lib/merge.tcl:120 lib/merge.tcl:149 lib/merge.tcl:167
+#: git-gui.sh:2464 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168

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

-#: git-gui.sh:1870 lib/choose_rev.tcl:557
+#: git-gui.sh:2465 lib/choose_rev.tcl:557

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

-#: git-gui.sh:1879
+#: git-gui.sh:2468
+msgid "Tools"
+msgstr ""
+
+#: git-gui.sh:2477
+msgid "Explore Working Copy"
+msgstr ""
+
+#: git-gui.sh:2483

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

-#: git-gui.sh:1883
+#: git-gui.sh:2487

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

-#: git-gui.sh:1888
+#: git-gui.sh:2492

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

-#: git-gui.sh:1892
+#: git-gui.sh:2496

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

-#: git-gui.sh:1899
+#: git-gui.sh:2503

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

-#: git-gui.sh:1901
+#: git-gui.sh:2505

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

-#: git-gui.sh:1906 lib/database.tcl:27 lib/database.tcl:67
+#: git-gui.sh:2510 lib/database.tcl:27 lib/database.tcl:67

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

-#: git-gui.sh:1909 lib/database.tcl:34
+#: git-gui.sh:2513 lib/database.tcl:34

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

-#: git-gui.sh:1912
+#: git-gui.sh:2516

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

-#: git-gui.sh:1919 git-gui.sh:1923 git-gui.sh:1927 lib/shortcut.tcl:7
-#: lib/shortcut.tcl:39 lib/shortcut.tcl:71
+#: git-gui.sh:2523 git-gui.sh:2527 git-gui.sh:2531 lib/shortcut.tcl:8
+#: lib/shortcut.tcl:40 lib/shortcut.tcl:72

 msgid "Create Desktop Icon"
 msgstr ""
 
 msgid "Create Desktop Icon"
 msgstr ""
 

-#: git-gui.sh:1932 lib/choose_repository.tcl:177 lib/choose_repository.tcl:185
+#: git-gui.sh:2539 lib/choose_repository.tcl:183 lib/choose_repository.tcl:191

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

-#: git-gui.sh:1939
+#: git-gui.sh:2547

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

-#: git-gui.sh:1942
+#: git-gui.sh:2550

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

-#: git-gui.sh:1946 git-gui.sh:2443
+#: git-gui.sh:2554 git-gui.sh:3109

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

-#: git-gui.sh:1949 git-gui.sh:2446 git-gui.sh:2520 git-gui.sh:2614
+#: git-gui.sh:2557 git-gui.sh:3112 git-gui.sh:3186 git-gui.sh:3259

 #: lib/console.tcl:69
 msgid "Copy"
 msgstr ""
 
 #: lib/console.tcl:69
 msgid "Copy"
 msgstr ""
 

-#: git-gui.sh:1952 git-gui.sh:2449
+#: git-gui.sh:2560 git-gui.sh:3115

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

-#: git-gui.sh:1955 git-gui.sh:2452 lib/branch_delete.tcl:26
+#: git-gui.sh:2563 git-gui.sh:3118 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:1959 git-gui.sh:2456 git-gui.sh:2618 lib/console.tcl:71
+#: git-gui.sh:2567 git-gui.sh:3122 git-gui.sh:3263 lib/console.tcl:71

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

-#: git-gui.sh:1968
+#: git-gui.sh:2576

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

-#: git-gui.sh:1974
+#: git-gui.sh:2582

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

-#: git-gui.sh:1980
+#: git-gui.sh:2588

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

-#: git-gui.sh:1985 git-gui.sh:2085
+#: git-gui.sh:2593

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

-#: git-gui.sh:1990
+#: git-gui.sh:2598

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

-#: git-gui.sh:2002 git-gui.sh:2389
+#: git-gui.sh:2608
+msgid "Done"
+msgstr ""
+
+#: git-gui.sh:2610
+msgid "Commit@@verb"
+msgstr ""
+
+#: git-gui.sh:2619 git-gui.sh:3050

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

-#: git-gui.sh:2010 git-gui.sh:2396
+#: git-gui.sh:2627 git-gui.sh:3057

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

-#: git-gui.sh:2019 git-gui.sh:2356 lib/remote_branch_delete.tcl:99
+#: git-gui.sh:2637 git-gui.sh:3011 lib/remote_branch_delete.tcl:99

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

-#: git-gui.sh:2025
+#: git-gui.sh:2643

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

-#: git-gui.sh:2031
+#: git-gui.sh:2649

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

-#: git-gui.sh:2037
+#: git-gui.sh:2655

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

-#: git-gui.sh:2042 lib/index.tcl:395
+#: git-gui.sh:2661 lib/index.tcl:412

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

-#: git-gui.sh:2049 git-gui.sh:2368 git-gui.sh:2467
-msgid "Sign Off"
+#: git-gui.sh:2669 git-gui.sh:3310 git-gui.sh:3341
+msgid "Show Less Context"

 msgstr ""
 
 msgstr ""
 

-#: git-gui.sh:2053 git-gui.sh:2372
-msgid "Commit@@verb"
+#: git-gui.sh:2673 git-gui.sh:3314 git-gui.sh:3345
+msgid "Show More Context"

 msgstr ""
 
 msgstr ""
 

-#: git-gui.sh:2064
+#: git-gui.sh:2680 git-gui.sh:3024 git-gui.sh:3133
+msgid "Sign Off"
+msgstr ""
+
+#: git-gui.sh:2696

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

-#: git-gui.sh:2069
+#: git-gui.sh:2701

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

-#: git-gui.sh:2081
-msgid "Push..."
+#: git-gui.sh:2713 git-gui.sh:2741
+msgid "Add..."

 msgstr ""
 
 msgstr ""
 

-#: git-gui.sh:2092 lib/choose_repository.tcl:41
-msgid "Apple"
+#: git-gui.sh:2717
+msgid "Push..."

 msgstr ""
 
 msgstr ""
 

-#: git-gui.sh:2095 git-gui.sh:2117 lib/about.tcl:14
-#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:50
-#, tcl-format
-msgid "About %s"
+#: git-gui.sh:2721
+msgid "Delete Branch..."

 msgstr ""
 
 msgstr ""
 

-#: git-gui.sh:2099
-msgid "Preferences..."
+#: git-gui.sh:2731 git-gui.sh:3292
+msgid "Options..."

 msgstr ""
 
 msgstr ""
 

-#: git-gui.sh:2107 git-gui.sh:2639
-msgid "Options..."
+#: git-gui.sh:2742
+msgid "Remove..."

 msgstr ""
 
 msgstr ""
 

-#: git-gui.sh:2113 lib/choose_repository.tcl:47
+#: git-gui.sh:2751 lib/choose_repository.tcl:50

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

-#: git-gui.sh:2154
+#: git-gui.sh:2755 git-gui.sh:2759 lib/about.tcl:14
+#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:53
+#, tcl-format
+msgid "About %s"
+msgstr ""
+
+#: git-gui.sh:2783

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

-#: git-gui.sh:2238
+#: git-gui.sh:2786 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56
+msgid "Show SSH Key"
+msgstr ""
+
+#: git-gui.sh:2893

 #, 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:2271
+#: git-gui.sh:2926

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

-#: git-gui.sh:2292
+#: git-gui.sh:2947

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

-#: git-gui.sh:2312
+#: git-gui.sh:2967

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

-#: git-gui.sh:2362
+#: git-gui.sh:3017

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

-#: git-gui.sh:2378 lib/transport.tcl:93 lib/transport.tcl:182
+#: git-gui.sh:3036 lib/transport.tcl:104 lib/transport.tcl:193

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

-#: git-gui.sh:2408
+#: git-gui.sh:3071

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

-#: git-gui.sh:2409
+#: git-gui.sh:3072

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

-#: git-gui.sh:2410
+#: git-gui.sh:3073

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

-#: git-gui.sh:2411
+#: git-gui.sh:3074

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

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

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

-#: git-gui.sh:2413
+#: git-gui.sh:3076

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

-#: git-gui.sh:2459 git-gui.sh:2622 lib/console.tcl:73
+#: git-gui.sh:3125 git-gui.sh:3267 lib/console.tcl:73

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

-#: git-gui.sh:2483 lib/blame.tcl:107
+#: git-gui.sh:3149 lib/blame.tcl:104

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

-#: git-gui.sh:2589
+#: git-gui.sh:3255
+msgid "Refresh"
+msgstr ""
+
+#: git-gui.sh:3276
+msgid "Decrease Font Size"
+msgstr ""
+
+#: git-gui.sh:3280
+msgid "Increase Font Size"
+msgstr ""
+
+#: git-gui.sh:3288 lib/blame.tcl:281
+msgid "Encoding"
+msgstr ""
+
+#: git-gui.sh:3299

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

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

 msgstr ""
 
 msgstr ""
 

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

 msgstr ""
 
 msgstr ""
 

-#: git-gui.sh:2610
-msgid "Refresh"
+#: git-gui.sh:3328
+msgid "Use Remote Version"

 msgstr ""
 
 msgstr ""
 

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

 msgstr ""
 
 msgstr ""
 

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

 msgstr ""
 
 msgstr ""
 

-#: git-gui.sh:2646
+#: git-gui.sh:3354
+msgid "Visualize These Changes In The Submodule"
+msgstr ""
+
+#: git-gui.sh:3358
+msgid "Visualize Current Branch History In The Submodule"
+msgstr ""
+
+#: git-gui.sh:3362
+msgid "Visualize All Branch History In The Submodule"
+msgstr ""
+
+#: git-gui.sh:3367
+msgid "Start git gui In The Submodule"
+msgstr ""
+
+#: git-gui.sh:3389

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

-#: git-gui.sh:2648
+#: git-gui.sh:3391
+msgid "Unstage Lines From Commit"
+msgstr ""
+
+#: git-gui.sh:3393
+msgid "Unstage Line From Commit"
+msgstr ""
+
+#: git-gui.sh:3396

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

-#: git-gui.sh:2667
+#: git-gui.sh:3398
+msgid "Stage Lines For Commit"
+msgstr ""
+
+#: git-gui.sh:3400
+msgid "Stage Line For Commit"
+msgstr ""
+
+#: git-gui.sh:3424

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

-#: git-gui.sh:2762
+#: git-gui.sh:3541

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


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

-#: git-gui.sh:2792
+#: git-gui.sh:3570

 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:2797
+#: git-gui.sh:3575

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


@@ -455,64 +553,108 @@ msgstr ""
 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:264
+#: lib/blame.tcl:271

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

-#: lib/blame.tcl:384
+#: 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:488
+#: lib/blame.tcl:557

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

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

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

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

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

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

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

-#: lib/blame.tcl:746
+#: 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:802
+#: lib/blame.tcl:963

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

-#: lib/blame.tcl:806
+#: lib/blame.tcl:967

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

-#: lib/blame.tcl:811
+#: lib/blame.tcl:972

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

-#: lib/blame.tcl:925
+#: lib/blame.tcl:1020
+msgid "Cannot find HEAD commit:"
+msgstr ""
+
+#: lib/blame.tcl:1075
+msgid "Cannot find parent commit:"
+msgstr ""
+
+#: lib/blame.tcl:1090
+msgid "Unable to display parent"
+msgstr ""
+
+#: lib/blame.tcl:1091 lib/diff.tcl:320
+msgid "Error loading diff:"
+msgstr ""
+
+#: lib/blame.tcl:1231

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

-#: lib/blame.tcl:931
+#: lib/blame.tcl:1237

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

-#: lib/blame.tcl:936
+#: lib/blame.tcl:1242

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


@@ -526,16 +668,18 @@ msgstr ""
 
 #: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35
 #: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:282
 
 #: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35
 #: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:282

-#: lib/checkout_op.tcl:522 lib/choose_font.tcl:43 lib/merge.tcl:171
-#: lib/option.tcl:103 lib/remote_branch_delete.tcl:42 lib/transport.tcl:97
+#: lib/checkout_op.tcl:579 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:108

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

-#: lib/branch_checkout.tcl:32 lib/browser.tcl:287
+#: 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:242
+#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:280

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


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

-#: lib/branch_create.tcl:31 lib/choose_repository.tcl:371
+#: lib/branch_create.tcl:31 lib/choose_repository.tcl:381

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


@@ -563,7 +707,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 +731,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:571

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


@@ -629,8 +773,8 @@ msgstr ""
 msgid "Delete Only If Merged Into"
 msgstr ""
 
 msgid "Delete Only If Merged Into"
 msgstr ""
 

-#: lib/branch_delete.tcl:54
-msgid "Always (Do not perform merge test.)"
+#: lib/branch_delete.tcl:54 lib/remote_branch_delete.tcl:119
+msgid "Always (Do not perform merge checks)"

 msgstr ""
 
 #: lib/branch_delete.tcl:103
 msgstr ""
 
 #: lib/branch_delete.tcl:103


@@ -638,11 +782,11 @@ msgstr ""
 msgid "The following branches are not completely merged into %s:"
 msgstr ""
 
 msgid "The following branches are not completely merged into %s:"
 msgstr ""
 

-#: lib/branch_delete.tcl:115
+#: lib/branch_delete.tcl:115 lib/remote_branch_delete.tcl:217

 msgid ""
 msgid ""

-"Recovering deleted branches is difficult. \n"
+"Recovering deleted branches is difficult.\n"

 "\n"
 "\n"

-" Delete the selected branches?"
+"Delete the selected branches?"

 msgstr ""
 
 #: lib/branch_delete.tcl:141
 msgstr ""
 
 #: lib/branch_delete.tcl:141


@@ -672,7 +816,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:202

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


@@ -703,32 +847,38 @@ msgstr ""
 msgid "Browse Branch Files"
 msgstr ""
 
 msgid "Browse Branch Files"
 msgstr ""
 

-#: lib/browser.tcl:278 lib/choose_repository.tcl:387
-#: lib/choose_repository.tcl:474 lib/choose_repository.tcl:484
-#: lib/choose_repository.tcl:987
+#: lib/browser.tcl:278 lib/choose_repository.tcl:398
+#: lib/choose_repository.tcl:486 lib/choose_repository.tcl:497
+#: lib/choose_repository.tcl:1028

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

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

 #, 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:133

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

-#: lib/checkout_op.tcl:140 lib/console.tcl:81 lib/database.tcl:31
+#: lib/checkout_op.tcl:146 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:175

 #, 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:194
+#, tcl-format
+msgid "Failed to configure simplified git-pull for '%s'."
+msgstr ""
+
+#: lib/checkout_op.tcl:229

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


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

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

 #, 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:262

 #, 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:274

 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:289

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


@@ -761,30 +911,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:345

 #, 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:346

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

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

 #, 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:377

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

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

 #, 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:452

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


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

-#: lib/checkout_op.tcl:446 lib/checkout_op.tcl:450
+#: lib/checkout_op.tcl:503 lib/checkout_op.tcl:507

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

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

 #, 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:557

 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:562

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

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

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

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

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


@@ -852,221 +1002,225 @@ msgstr ""
 msgid "Git Gui"
 msgstr ""
 
 msgid "Git Gui"
 msgstr ""
 

-#: lib/choose_repository.tcl:81 lib/choose_repository.tcl:376
+#: lib/choose_repository.tcl:87 lib/choose_repository.tcl:386

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

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

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

-#: lib/choose_repository.tcl:94 lib/choose_repository.tcl:460
+#: lib/choose_repository.tcl:100 lib/choose_repository.tcl:471

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

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

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

-#: lib/choose_repository.tcl:107 lib/choose_repository.tcl:976
+#: lib/choose_repository.tcl:113 lib/choose_repository.tcl:1016

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

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

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

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

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

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

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

-#: lib/choose_repository.tcl:296 lib/choose_repository.tcl:303
-#: lib/choose_repository.tcl:310
+#: lib/choose_repository.tcl:306 lib/choose_repository.tcl:313
+#: lib/choose_repository.tcl:320

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

-#: lib/choose_repository.tcl:381 lib/choose_repository.tcl:478
+#: lib/choose_repository.tcl:391

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

-#: lib/choose_repository.tcl:412 lib/choose_repository.tcl:537
-#: lib/choose_repository.tcl:1011
+#: lib/choose_repository.tcl:423 lib/choose_repository.tcl:550
+#: lib/choose_repository.tcl:1052

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

-#: lib/choose_repository.tcl:437
+#: lib/choose_repository.tcl:448

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

-#: lib/choose_repository.tcl:441
+#: lib/choose_repository.tcl:452

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

-#: lib/choose_repository.tcl:455
+#: lib/choose_repository.tcl:466

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

-#: lib/choose_repository.tcl:468
-msgid "URL:"
+#: lib/choose_repository.tcl:479
+msgid "Source Location:"

 msgstr ""
 
 msgstr ""
 

-#: lib/choose_repository.tcl:489
+#: lib/choose_repository.tcl:490
+msgid "Target Directory:"
+msgstr ""
+
+#: lib/choose_repository.tcl:502

 msgid "Clone Type:"
 msgstr ""
 
 msgid "Clone Type:"
 msgstr ""
 

-#: lib/choose_repository.tcl:495
+#: lib/choose_repository.tcl:508

 msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
 msgstr ""
 
 msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
 msgstr ""
 

-#: lib/choose_repository.tcl:501
+#: lib/choose_repository.tcl:514

 msgid "Full Copy (Slower, Redundant Backup)"
 msgstr ""
 
 msgid "Full Copy (Slower, Redundant Backup)"
 msgstr ""
 

-#: lib/choose_repository.tcl:507
+#: lib/choose_repository.tcl:520

 msgid "Shared (Fastest, Not Recommended, No Backup)"
 msgstr ""
 
 msgid "Shared (Fastest, Not Recommended, No Backup)"
 msgstr ""
 

-#: lib/choose_repository.tcl:543 lib/choose_repository.tcl:590
-#: lib/choose_repository.tcl:736 lib/choose_repository.tcl:806
-#: lib/choose_repository.tcl:1017 lib/choose_repository.tcl:1025
+#: lib/choose_repository.tcl:556 lib/choose_repository.tcl:603
+#: lib/choose_repository.tcl:749 lib/choose_repository.tcl:819
+#: lib/choose_repository.tcl:1058 lib/choose_repository.tcl:1066

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

-#: lib/choose_repository.tcl:579
+#: lib/choose_repository.tcl:592

 msgid "Standard only available for local repository."
 msgstr ""
 
 msgid "Standard only available for local repository."
 msgstr ""
 

-#: lib/choose_repository.tcl:583
+#: lib/choose_repository.tcl:596

 msgid "Shared only available for local repository."
 msgstr ""
 
 msgid "Shared only available for local repository."
 msgstr ""
 

-#: lib/choose_repository.tcl:604
+#: lib/choose_repository.tcl:617

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

-#: lib/choose_repository.tcl:615
+#: lib/choose_repository.tcl:628

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

-#: lib/choose_repository.tcl:627
+#: lib/choose_repository.tcl:640

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

-#: lib/choose_repository.tcl:628
+#: lib/choose_repository.tcl:641

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

-#: lib/choose_repository.tcl:652
+#: lib/choose_repository.tcl:665

 #, 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:688
+#: lib/choose_repository.tcl:701

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

-#: lib/choose_repository.tcl:690 lib/choose_repository.tcl:904
-#: lib/choose_repository.tcl:916
+#: lib/choose_repository.tcl:703 lib/choose_repository.tcl:917
+#: lib/choose_repository.tcl:929

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

-#: lib/choose_repository.tcl:703
+#: lib/choose_repository.tcl:716

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

-#: lib/choose_repository.tcl:715
+#: lib/choose_repository.tcl:728

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

-#: lib/choose_repository.tcl:746
+#: lib/choose_repository.tcl:759

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

-#: lib/choose_repository.tcl:747
+#: lib/choose_repository.tcl:760

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

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

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

-#: lib/choose_repository.tcl:781
+#: lib/choose_repository.tcl:794

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

-#: lib/choose_repository.tcl:782
+#: lib/choose_repository.tcl:795

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

-#: lib/choose_repository.tcl:790
+#: lib/choose_repository.tcl:803

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

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

 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:856
+#: lib/choose_repository.tcl:869

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

-#: lib/choose_repository.tcl:880
+#: lib/choose_repository.tcl:893

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

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

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

-#: lib/choose_repository.tcl:895
+#: lib/choose_repository.tcl:908

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

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

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

-#: lib/choose_repository.tcl:913
+#: lib/choose_repository.tcl:926

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

-#: lib/choose_repository.tcl:925
+#: lib/choose_repository.tcl:938

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

-#: lib/choose_repository.tcl:926 lib/index.tcl:65 lib/index.tcl:127
-#: lib/index.tcl:193
+#: lib/choose_repository.tcl:939 lib/index.tcl:67 lib/index.tcl:130
+#: lib/index.tcl:198

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

-#: lib/choose_repository.tcl:955
+#: lib/choose_repository.tcl:968

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

-#: lib/choose_repository.tcl:971
+#: lib/choose_repository.tcl:1011

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

-#: lib/choose_repository.tcl:981
+#: lib/choose_repository.tcl:1021

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

-#: lib/choose_repository.tcl:1031
+#: lib/choose_repository.tcl:1072

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


@@ -1129,19 +1283,24 @@ msgid ""
 "current merge activity.\n"
 msgstr ""
 
 "current merge activity.\n"
 msgstr ""
 

-#: lib/commit.tcl:49
+#: lib/commit.tcl:48

 msgid "Error loading commit data for amend:"
 msgstr ""
 
 msgid "Error loading commit data for amend:"
 msgstr ""
 

-#: lib/commit.tcl:76
+#: lib/commit.tcl:75

 msgid "Unable to obtain your identity:"
 msgstr ""
 
 msgid "Unable to obtain your identity:"
 msgstr ""
 

-#: lib/commit.tcl:81
+#: lib/commit.tcl:80

 msgid "Invalid GIT_COMMITTER_IDENT:"
 msgstr ""
 
 msgid "Invalid GIT_COMMITTER_IDENT:"
 msgstr ""
 

-#: lib/commit.tcl:133
+#: lib/commit.tcl:129
+#, tcl-format
+msgid "warning: Tcl does not support encoding '%s'."
+msgstr ""
+
+#: lib/commit.tcl:149

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


@@ -1151,7 +1310,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:172

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


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

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

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


@@ -1168,14 +1327,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:188

 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:203

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


@@ -1186,45 +1345,40 @@ 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
-#, tcl-format
-msgid "warning: Tcl does not support encoding '%s'."
-msgstr ""
-
-#: lib/commit.tcl:221
+#: lib/commit.tcl:234

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

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

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

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

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

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

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

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

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

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

 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:317 lib/commit.tcl:361 lib/commit.tcl:382

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

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

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

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

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


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

-#: lib/commit.tcl:333
+#: lib/commit.tcl:346

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

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

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

-#: lib/commit.tcl:367
+#: lib/commit.tcl:381

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

-#: lib/commit.tcl:454
+#: lib/commit.tcl:469

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


@@ -1298,13 +1452,13 @@ msgstr ""
 msgid "Verifying the object database with fsck-objects"
 msgstr ""
 
 msgid "Verifying the object database with fsck-objects"
 msgstr ""
 

-#: lib/database.tcl:108
+#: lib/database.tcl:107

 #, tcl-format
 msgid ""
 "This repository currently has approximately %i loose objects.\n"
 "\n"
 "To maintain optimal performance it is strongly recommended that you compress "
 #, tcl-format
 msgid ""
 "This repository currently has approximately %i loose objects.\n"
 "\n"
 "To maintain optimal performance it is strongly recommended that you compress "

-"the database when more than %i loose objects exist.\n"
+"the database.\n"

 "\n"
 "Compress the database now?"
 msgstr ""
 "\n"
 "Compress the database now?"
 msgstr ""


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

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

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


@@ -1328,40 +1482,92 @@ msgid ""
 "the same state."
 msgstr ""
 
 "the same state."
 msgstr ""
 

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

 #, 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:125
+msgid ""
+"LOCAL: deleted\n"
+"REMOTE:\n"
+msgstr ""
+
+#: lib/diff.tcl:130
+msgid ""
+"REMOTE: deleted\n"
+"LOCAL:\n"
+msgstr ""
+
+#: lib/diff.tcl:137
+msgid "LOCAL:\n"
+msgstr ""
+
+#: lib/diff.tcl:140
+msgid "REMOTE:\n"
+msgstr ""
+
+#: lib/diff.tcl:202 lib/diff.tcl:319

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

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

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

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

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

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

 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:227
+#, tcl-format
+msgid ""
+"* Untracked file is %d bytes.\n"
+"* Showing only first %d bytes.\n"

 msgstr ""
 
 msgstr ""
 

-#: lib/diff.tcl:303
+#: lib/diff.tcl:233
+#, 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:482

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

-#: lib/diff.tcl:310
+#: lib/diff.tcl:489

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

+#: lib/diff.tcl:568
+msgid "Failed to unstage selected line."
+msgstr ""
+
+#: lib/diff.tcl:576
+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 ""
 #: lib/error.tcl:20 lib/error.tcl:114
 msgid "error"
 msgstr ""


@@ -1382,13 +1588,13 @@ msgstr ""
 msgid "Index Error"
 msgstr ""
 
 msgid "Index Error"
 msgstr ""
 

-#: lib/index.tcl:21
+#: lib/index.tcl:17

 msgid ""
 "Updating the Git index failed.  A rescan will be automatically started to "
 "resynchronize git-gui."
 msgstr ""
 
 msgid ""
 "Updating the Git index failed.  A rescan will be automatically started to "
 "resynchronize git-gui."
 msgstr ""
 

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

 msgid "Continue"
 msgstr ""
 
 msgid "Continue"
 msgstr ""
 


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

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

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

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

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

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

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

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

 #, 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:400

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

-#: lib/index.tcl:391
+#: lib/index.tcl:408

 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:394
+#: lib/index.tcl:411

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

+#: lib/index.tcl:429
+msgid "Reverting selected files"
+msgstr ""
+
+#: lib/index.tcl:433
+#, 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 +1660,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 +1671,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,41 +1682,41 @@ 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
 msgid "Merging %s and %s..."
 msgstr ""
 
 #, tcl-format
 msgid "Merging %s and %s..."
 msgstr ""
 

-#: lib/merge.tcl:130
+#: lib/merge.tcl:131

 msgid "Merge completed successfully."
 msgstr ""
 
 msgid "Merge completed successfully."
 msgstr ""
 

-#: lib/merge.tcl:132
+#: lib/merge.tcl:133

 msgid "Merge failed.  Conflict resolution is required."
 msgstr ""
 
 msgid "Merge failed.  Conflict resolution is required."
 msgstr ""
 

-#: lib/merge.tcl:157
+#: lib/merge.tcl:158

 #, tcl-format
 msgid "Merge Into %s"
 msgstr ""
 
 #, tcl-format
 msgid "Merge Into %s"
 msgstr ""
 

-#: lib/merge.tcl:176
+#: lib/merge.tcl:177

 msgid "Revision To Merge"
 msgstr ""
 
 msgid "Revision To Merge"
 msgstr ""
 

-#: lib/merge.tcl:211
+#: lib/merge.tcl:212

 msgid ""
 "Cannot abort while amending.\n"
 "\n"
 "You must finish amending this commit.\n"
 msgstr ""
 
 msgid ""
 "Cannot abort while amending.\n"
 "\n"
 "You must finish amending this commit.\n"
 msgstr ""
 

-#: lib/merge.tcl:221
+#: lib/merge.tcl:222

 msgid ""
 "Abort merge?\n"
 "\n"
 msgid ""
 "Abort merge?\n"
 "\n"


@@ -1510,7 +1725,7 @@ msgid ""
 "Continue with aborting the current merge?"
 msgstr ""
 
 "Continue with aborting the current merge?"
 msgstr ""
 

-#: lib/merge.tcl:227
+#: lib/merge.tcl:228

 msgid ""
 "Reset changes?\n"
 "\n"
 msgid ""
 "Reset changes?\n"
 "\n"


@@ -1519,122 +1734,325 @@ msgid ""
 "Continue with resetting the current changes?"
 msgstr ""
 
 "Continue with resetting the current changes?"
 msgstr ""
 

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

 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:267
+#: lib/merge.tcl:269

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

-#: lib/option.tcl:95
+#: 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:99
+#: lib/option.tcl:121

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: lib/option.tcl:123
+#: 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:124
+#: lib/option.tcl:147

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

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

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

-#: lib/option.tcl:126
+#: 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:127
+#: lib/option.tcl:153

 msgid "Commit Message Text Width"
 msgstr ""
 
 msgid "Commit Message Text Width"
 msgstr ""
 

-#: lib/option.tcl:128
+#: lib/option.tcl:154

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

-#: lib/option.tcl:192
+#: 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 ""
 
 msgid "Spelling Dictionary:"
 msgstr ""
 

-#: lib/option.tcl:216
+#: lib/option.tcl:254

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

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

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

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

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

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

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

-#: lib/option.tcl:275
+#: 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:63
+#: lib/transport.tcl:81
+#, 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
 msgid "From Repository"
 msgstr ""
 
 msgstr ""
 
 #: lib/remote_branch_delete.tcl:47
 msgid "From Repository"
 msgstr ""
 

-#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:123
+#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:134

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

-#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:138
-msgid "Arbitrary URL:"
+#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:149
+msgid "Arbitrary Location:"

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


@@ -1649,10 +2067,6 @@ msgstr ""
 msgid "Merged Into:"
 msgstr ""
 
 msgid "Merged Into:"
 msgstr ""
 

-#: lib/remote_branch_delete.tcl:119
-msgid "Always (Do not perform merge checks)"
-msgstr ""
-

 #: lib/remote_branch_delete.tcl:152
 msgid "A branch is required for 'Merged Into'."
 msgstr ""
 #: lib/remote_branch_delete.tcl:152
 msgid "A branch is required for 'Merged Into'."
 msgstr ""


@@ -1676,44 +2090,41 @@ msgstr ""
 msgid "Please select one or more branches to delete."
 msgstr ""
 
 msgid "Please select one or more branches to delete."
 msgstr ""
 

-#: lib/remote_branch_delete.tcl:216
-msgid ""
-"Recovering deleted branches is difficult.\n"
-"\n"
-"Delete the selected branches?"
-msgstr ""
-

 #: lib/remote_branch_delete.tcl:226
 #, tcl-format
 msgid "Deleting branches from %s"
 msgstr ""
 
 #: lib/remote_branch_delete.tcl:226
 #, tcl-format
 msgid "Deleting branches from %s"
 msgstr ""
 

-#: lib/remote_branch_delete.tcl:286
+#: lib/remote_branch_delete.tcl:292

 msgid "No repository selected."
 msgstr ""
 
 msgid "No repository selected."
 msgstr ""
 

-#: lib/remote_branch_delete.tcl:291
+#: lib/remote_branch_delete.tcl:297

 #, tcl-format
 msgid "Scanning %s..."
 msgstr ""
 
 #, tcl-format
 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 ""
 
 msgstr ""
 

-#: lib/shortcut.tcl:20 lib/shortcut.tcl:61
+#: lib/shortcut.tcl:21 lib/shortcut.tcl:62

 msgid "Cannot write shortcut:"
 msgstr ""
 
 msgid "Cannot write shortcut:"
 msgstr ""
 

-#: lib/shortcut.tcl:136
+#: lib/shortcut.tcl:137

 msgid "Cannot write icon:"
 msgstr ""
 
 msgid "Cannot write icon:"
 msgstr ""
 


@@ -1742,26 +2153,186 @@ msgstr ""
 msgid "Unrecognized spell checker"
 msgstr ""
 
 msgid "Unrecognized spell checker"
 msgstr ""
 

-#: lib/spellcheck.tcl:180
+#: lib/spellcheck.tcl:186

 msgid "No Suggestions"
 msgstr ""
 
 msgid "No Suggestions"
 msgstr ""
 

-#: lib/spellcheck.tcl:381
+#: lib/spellcheck.tcl:388

 msgid "Unexpected EOF from spell checker"
 msgstr ""
 
 msgid "Unexpected EOF from spell checker"
 msgstr ""
 

-#: lib/spellcheck.tcl:385
+#: lib/spellcheck.tcl:392

 msgid "Spell Checker Failed"
 msgstr ""
 
 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 successfully: %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


@@ -1779,45 +2350,45 @@ 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
+#: lib/transport.tcl:26

 #, tcl-format
 #, tcl-format

-msgid "push %s"
+msgid "Pushing changes to %s"

 msgstr ""
 
 msgstr ""
 

-#: lib/transport.tcl:26
+#: lib/transport.tcl:64

 #, tcl-format
 #, tcl-format

-msgid "Pushing changes to %s"
+msgid "Mirroring to %s"

 msgstr ""
 
 msgstr ""
 

-#: lib/transport.tcl:72
+#: lib/transport.tcl:82

 #, tcl-format
 msgid "Pushing %s %s to %s"
 msgstr ""
 
 #, tcl-format
 msgid "Pushing %s %s to %s"
 msgstr ""
 

-#: lib/transport.tcl:89
+#: lib/transport.tcl:100

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

-#: lib/transport.tcl:103
+#: lib/transport.tcl:114

 msgid "Source Branches"
 msgstr ""
 
 msgid "Source Branches"
 msgstr ""
 

-#: lib/transport.tcl:120
+#: lib/transport.tcl:131

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

-#: lib/transport.tcl:158
+#: lib/transport.tcl:169

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

-#: lib/transport.tcl:160
+#: lib/transport.tcl:171

 msgid "Force overwrite existing branch (may discard changes)"
 msgstr ""
 
 msgid "Force overwrite existing branch (may discard changes)"
 msgstr ""
 

-#: lib/transport.tcl:164
+#: lib/transport.tcl:175

 msgid "Use thin pack (for slow network connections)"
 msgstr ""
 
 msgid "Use thin pack (for slow network connections)"
 msgstr ""
 

-#: lib/transport.tcl:168
+#: lib/transport.tcl:179

 msgid "Include tags"
 msgstr ""
 msgid "Include tags"
 msgstr ""