about summary refs log tree commit diff
path: root/third_party/git/git-gui/po/git-gui.pot
diff options
context:
space:
mode:
Diffstat (limited to 'third_party/git/git-gui/po/git-gui.pot')
-rw-r--r--third_party/git/git-gui/po/git-gui.pot2506
1 files changed, 1117 insertions, 1389 deletions
diff --git a/third_party/git/git-gui/po/git-gui.pot b/third_party/git/git-gui/po/git-gui.pot
index b79ed4e133df..0c94f9c2c6df 100644
--- a/third_party/git/git-gui/po/git-gui.pot
+++ b/third_party/git/git-gui/po/git-gui.pot
@@ -8,42 +8,41 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-02-08 22:54+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"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: git-gui.sh:847
+#: 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 ""
+
+#: git-gui.sh:743
 #, tcl-format
 msgid "Invalid font specified in %s:"
 msgstr ""
 
-#: git-gui.sh:901
+#: git-gui.sh:779
 msgid "Main Font"
 msgstr ""
 
-#: git-gui.sh:902
+#: git-gui.sh:780
 msgid "Diff/Console Font"
 msgstr ""
 
-#: git-gui.sh:917 git-gui.sh:931 git-gui.sh:944 git-gui.sh:1034 git-gui.sh:1053
-#: git-gui.sh:3212
-msgid "git-gui: fatal error"
-msgstr ""
-
-#: git-gui.sh:918
+#: git-gui.sh:794
 msgid "Cannot find git in PATH."
 msgstr ""
 
-#: git-gui.sh:945
+#: git-gui.sh:821
 msgid "Cannot parse Git version string:"
 msgstr ""
 
-#: git-gui.sh:970
+#: git-gui.sh:839
 #, tcl-format
 msgid ""
 "Git version cannot be determined.\n"
@@ -55,518 +54,473 @@ msgid ""
 "Assume '%s' is version 1.5.0?\n"
 msgstr ""
 
-#: git-gui.sh:1267
+#: git-gui.sh:1128
 msgid "Git directory not found:"
 msgstr ""
 
-#: git-gui.sh:1301
+#: git-gui.sh:1146
 msgid "Cannot move to top of working directory:"
 msgstr ""
 
-#: git-gui.sh:1309
+#: git-gui.sh:1154
 msgid "Cannot use bare repository:"
 msgstr ""
 
-#: git-gui.sh:1317
+#: git-gui.sh:1162
 msgid "No working directory"
 msgstr ""
 
-#: git-gui.sh:1491 lib/checkout_op.tcl:306
+#: git-gui.sh:1334 lib/checkout_op.tcl:306
 msgid "Refreshing file status..."
 msgstr ""
 
-#: git-gui.sh:1551
+#: git-gui.sh:1390
 msgid "Scanning for modified files ..."
 msgstr ""
 
-#: git-gui.sh:1629
+#: git-gui.sh:1454
 msgid "Calling prepare-commit-msg hook..."
 msgstr ""
 
-#: git-gui.sh:1646
+#: git-gui.sh:1471
 msgid "Commit declined by prepare-commit-msg hook."
 msgstr ""
 
-#: git-gui.sh:1804 lib/browser.tcl:252
+#: git-gui.sh:1629 lib/browser.tcl:246
 msgid "Ready."
 msgstr ""
 
-#: git-gui.sh:1968
+#: git-gui.sh:1787
 #, tcl-format
-msgid ""
-"Display limit (gui.maxfilesdisplayed = %s) reached, not showing all %s files."
+msgid "Displaying only %s of %s files."
 msgstr ""
 
-#: git-gui.sh:2091
+#: git-gui.sh:1913
 msgid "Unmodified"
 msgstr ""
 
-#: git-gui.sh:2093
+#: git-gui.sh:1915
 msgid "Modified, not staged"
 msgstr ""
 
-#: git-gui.sh:2094 git-gui.sh:2106
+#: git-gui.sh:1916 git-gui.sh:1924
 msgid "Staged for commit"
 msgstr ""
 
-#: git-gui.sh:2095 git-gui.sh:2107
+#: git-gui.sh:1917 git-gui.sh:1925
 msgid "Portions staged for commit"
 msgstr ""
 
-#: git-gui.sh:2096 git-gui.sh:2108
+#: git-gui.sh:1918 git-gui.sh:1926
 msgid "Staged for commit, missing"
 msgstr ""
 
-#: git-gui.sh:2098
+#: git-gui.sh:1920
 msgid "File type changed, not staged"
 msgstr ""
 
-#: git-gui.sh:2099 git-gui.sh:2100
-msgid "File type changed, old type staged for commit"
-msgstr ""
-
-#: git-gui.sh:2101
+#: git-gui.sh:1921
 msgid "File type changed, staged"
 msgstr ""
 
-#: git-gui.sh:2102
-msgid "File type change staged, modification not staged"
-msgstr ""
-
-#: git-gui.sh:2103
-msgid "File type change staged, file missing"
-msgstr ""
-
-#: git-gui.sh:2105
+#: git-gui.sh:1923
 msgid "Untracked, not staged"
 msgstr ""
 
-#: git-gui.sh:2110
+#: git-gui.sh:1928
 msgid "Missing"
 msgstr ""
 
-#: git-gui.sh:2111
+#: git-gui.sh:1929
 msgid "Staged for removal"
 msgstr ""
 
-#: git-gui.sh:2112
+#: git-gui.sh:1930
 msgid "Staged for removal, still present"
 msgstr ""
 
-#: git-gui.sh:2114 git-gui.sh:2115 git-gui.sh:2116 git-gui.sh:2117
-#: git-gui.sh:2118 git-gui.sh:2119
+#: 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 ""
 
-#: git-gui.sh:2164
-msgid "Couldn't find gitk in PATH"
+#: git-gui.sh:1972
+msgid "Starting gitk... please wait..."
 msgstr ""
 
-#: git-gui.sh:2210 git-gui.sh:2245
-#, tcl-format
-msgid "Starting %s... please wait..."
+#: git-gui.sh:1984
+msgid "Couldn't find gitk in PATH"
 msgstr ""
 
-#: git-gui.sh:2224
+#: git-gui.sh:2043
 msgid "Couldn't find git gui in PATH"
 msgstr ""
 
-#: git-gui.sh:2726 lib/choose_repository.tcl:53
+#: git-gui.sh:2455 lib/choose_repository.tcl:36
 msgid "Repository"
 msgstr ""
 
-#: git-gui.sh:2727
+#: git-gui.sh:2456
 msgid "Edit"
 msgstr ""
 
-#: git-gui.sh:2729 lib/choose_rev.tcl:567
+#: git-gui.sh:2458 lib/choose_rev.tcl:561
 msgid "Branch"
 msgstr ""
 
-#: git-gui.sh:2732 lib/choose_rev.tcl:554
+#: git-gui.sh:2461 lib/choose_rev.tcl:548
 msgid "Commit@@noun"
 msgstr ""
 
-#: git-gui.sh:2735 lib/merge.tcl:127 lib/merge.tcl:174
+#: git-gui.sh:2464 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168
 msgid "Merge"
 msgstr ""
 
-#: git-gui.sh:2736 lib/choose_rev.tcl:563
+#: git-gui.sh:2465 lib/choose_rev.tcl:557
 msgid "Remote"
 msgstr ""
 
-#: git-gui.sh:2739
+#: git-gui.sh:2468
 msgid "Tools"
 msgstr ""
 
-#: git-gui.sh:2748
+#: git-gui.sh:2477
 msgid "Explore Working Copy"
 msgstr ""
 
-#: git-gui.sh:2763
-msgid "Git Bash"
-msgstr ""
-
-#: git-gui.sh:2772
+#: git-gui.sh:2483
 msgid "Browse Current Branch's Files"
 msgstr ""
 
-#: git-gui.sh:2776
+#: git-gui.sh:2487
 msgid "Browse Branch Files..."
 msgstr ""
 
-#: git-gui.sh:2781
+#: git-gui.sh:2492
 msgid "Visualize Current Branch's History"
 msgstr ""
 
-#: git-gui.sh:2785
+#: git-gui.sh:2496
 msgid "Visualize All Branch History"
 msgstr ""
 
-#: git-gui.sh:2792
+#: git-gui.sh:2503
 #, tcl-format
 msgid "Browse %s's Files"
 msgstr ""
 
-#: git-gui.sh:2794
+#: git-gui.sh:2505
 #, tcl-format
 msgid "Visualize %s's History"
 msgstr ""
 
-#: git-gui.sh:2799 lib/database.tcl:40
+#: git-gui.sh:2510 lib/database.tcl:27 lib/database.tcl:67
 msgid "Database Statistics"
 msgstr ""
 
-#: git-gui.sh:2802 lib/database.tcl:33
+#: git-gui.sh:2513 lib/database.tcl:34
 msgid "Compress Database"
 msgstr ""
 
-#: git-gui.sh:2805
+#: git-gui.sh:2516
 msgid "Verify Database"
 msgstr ""
 
-#: git-gui.sh:2812 git-gui.sh:2816 git-gui.sh:2820
+#: 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 ""
 
-#: git-gui.sh:2828 lib/choose_repository.tcl:209 lib/choose_repository.tcl:217
+#: git-gui.sh:2539 lib/choose_repository.tcl:183 lib/choose_repository.tcl:191
 msgid "Quit"
 msgstr ""
 
-#: git-gui.sh:2836
+#: git-gui.sh:2547
 msgid "Undo"
 msgstr ""
 
-#: git-gui.sh:2839
+#: git-gui.sh:2550
 msgid "Redo"
 msgstr ""
 
-#: git-gui.sh:2843 git-gui.sh:3461
+#: git-gui.sh:2554 git-gui.sh:3109
 msgid "Cut"
 msgstr ""
 
-#: git-gui.sh:2846 git-gui.sh:3464 git-gui.sh:3540 git-gui.sh:3633
+#: git-gui.sh:2557 git-gui.sh:3112 git-gui.sh:3186 git-gui.sh:3259
 #: lib/console.tcl:69
 msgid "Copy"
 msgstr ""
 
-#: git-gui.sh:2849 git-gui.sh:3467
+#: git-gui.sh:2560 git-gui.sh:3115
 msgid "Paste"
 msgstr ""
 
-#: git-gui.sh:2852 git-gui.sh:3470 lib/remote_branch_delete.tcl:39
-#: lib/branch_delete.tcl:28
+#: git-gui.sh:2563 git-gui.sh:3118 lib/branch_delete.tcl:26
+#: lib/remote_branch_delete.tcl:38
 msgid "Delete"
 msgstr ""
 
-#: git-gui.sh:2856 git-gui.sh:3474 git-gui.sh:3637 lib/console.tcl:71
+#: git-gui.sh:2567 git-gui.sh:3122 git-gui.sh:3263 lib/console.tcl:71
 msgid "Select All"
 msgstr ""
 
-#: git-gui.sh:2865
+#: git-gui.sh:2576
 msgid "Create..."
 msgstr ""
 
-#: git-gui.sh:2871
+#: git-gui.sh:2582
 msgid "Checkout..."
 msgstr ""
 
-#: git-gui.sh:2877
+#: git-gui.sh:2588
 msgid "Rename..."
 msgstr ""
 
-#: git-gui.sh:2882
+#: git-gui.sh:2593
 msgid "Delete..."
 msgstr ""
 
-#: git-gui.sh:2887
+#: git-gui.sh:2598
 msgid "Reset..."
 msgstr ""
 
-#: git-gui.sh:2897
+#: git-gui.sh:2608
 msgid "Done"
 msgstr ""
 
-#: git-gui.sh:2899
+#: git-gui.sh:2610
 msgid "Commit@@verb"
 msgstr ""
 
-#: git-gui.sh:2908 git-gui.sh:3400
+#: git-gui.sh:2619 git-gui.sh:3050
+msgid "New Commit"
+msgstr ""
+
+#: git-gui.sh:2627 git-gui.sh:3057
 msgid "Amend Last Commit"
 msgstr ""
 
-#: git-gui.sh:2918 git-gui.sh:3361 lib/remote_branch_delete.tcl:101
+#: git-gui.sh:2637 git-gui.sh:3011 lib/remote_branch_delete.tcl:99
 msgid "Rescan"
 msgstr ""
 
-#: git-gui.sh:2924
+#: git-gui.sh:2643
 msgid "Stage To Commit"
 msgstr ""
 
-#: git-gui.sh:2930
+#: git-gui.sh:2649
 msgid "Stage Changed Files To Commit"
 msgstr ""
 
-#: git-gui.sh:2936
+#: git-gui.sh:2655
 msgid "Unstage From Commit"
 msgstr ""
 
-#: git-gui.sh:2942 lib/index.tcl:521
+#: git-gui.sh:2661 lib/index.tcl:412
 msgid "Revert Changes"
 msgstr ""
 
-#: git-gui.sh:2950 git-gui.sh:3700 git-gui.sh:3731
+#: git-gui.sh:2669 git-gui.sh:3310 git-gui.sh:3341
 msgid "Show Less Context"
 msgstr ""
 
-#: git-gui.sh:2954 git-gui.sh:3704 git-gui.sh:3735
+#: git-gui.sh:2673 git-gui.sh:3314 git-gui.sh:3345
 msgid "Show More Context"
 msgstr ""
 
-#: git-gui.sh:2961 git-gui.sh:3374 git-gui.sh:3485
+#: git-gui.sh:2680 git-gui.sh:3024 git-gui.sh:3133
 msgid "Sign Off"
 msgstr ""
 
-#: git-gui.sh:2977
+#: git-gui.sh:2696
 msgid "Local Merge..."
 msgstr ""
 
-#: git-gui.sh:2982
+#: git-gui.sh:2701
 msgid "Abort Merge..."
 msgstr ""
 
-#: git-gui.sh:2994 git-gui.sh:3022
+#: git-gui.sh:2713 git-gui.sh:2741
 msgid "Add..."
 msgstr ""
 
-#: git-gui.sh:2998
+#: git-gui.sh:2717
 msgid "Push..."
 msgstr ""
 
-#: git-gui.sh:3002
+#: git-gui.sh:2721
 msgid "Delete Branch..."
 msgstr ""
 
-#: git-gui.sh:3012 git-gui.sh:3666
+#: git-gui.sh:2731 git-gui.sh:3292
 msgid "Options..."
 msgstr ""
 
-#: git-gui.sh:3023
+#: git-gui.sh:2742
 msgid "Remove..."
 msgstr ""
 
-#: git-gui.sh:3032 lib/choose_repository.tcl:67
+#: git-gui.sh:2751 lib/choose_repository.tcl:50
 msgid "Help"
 msgstr ""
 
-#: git-gui.sh:3036 git-gui.sh:3040 lib/choose_repository.tcl:61
-#: lib/choose_repository.tcl:70 lib/about.tcl:14
+#: 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:3064
+#: git-gui.sh:2783
 msgid "Online Documentation"
 msgstr ""
 
-#: git-gui.sh:3067 lib/choose_repository.tcl:64 lib/choose_repository.tcl:73
+#: git-gui.sh:2786 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56
 msgid "Show SSH Key"
 msgstr ""
 
-#: git-gui.sh:3097 git-gui.sh:3229
-msgid "usage:"
-msgstr ""
-
-#: git-gui.sh:3101 git-gui.sh:3233
-msgid "Usage"
-msgstr ""
-
-#: git-gui.sh:3182 lib/blame.tcl:575
-msgid "Error"
-msgstr ""
-
-#: git-gui.sh:3213
+#: git-gui.sh:2893
 #, tcl-format
 msgid "fatal: cannot stat path %s: No such file or directory"
 msgstr ""
 
-#: git-gui.sh:3246
+#: git-gui.sh:2926
 msgid "Current Branch:"
 msgstr ""
 
-#: git-gui.sh:3271
-msgid "Unstaged Changes"
+#: git-gui.sh:2947
+msgid "Staged Changes (Will Commit)"
 msgstr ""
 
-#: git-gui.sh:3293
-msgid "Staged Changes (Will Commit)"
+#: git-gui.sh:2967
+msgid "Unstaged Changes"
 msgstr ""
 
-#: git-gui.sh:3367
+#: git-gui.sh:3017
 msgid "Stage Changed"
 msgstr ""
 
-#: git-gui.sh:3386 lib/transport.tcl:137
+#: git-gui.sh:3036 lib/transport.tcl:104 lib/transport.tcl:193
 msgid "Push"
 msgstr ""
 
-#: git-gui.sh:3413
+#: git-gui.sh:3071
 msgid "Initial Commit Message:"
 msgstr ""
 
-#: git-gui.sh:3414
+#: git-gui.sh:3072
 msgid "Amended Commit Message:"
 msgstr ""
 
-#: git-gui.sh:3415
+#: git-gui.sh:3073
 msgid "Amended Initial Commit Message:"
 msgstr ""
 
-#: git-gui.sh:3416
+#: git-gui.sh:3074
 msgid "Amended Merge Commit Message:"
 msgstr ""
 
-#: git-gui.sh:3417
+#: git-gui.sh:3075
 msgid "Merge Commit Message:"
 msgstr ""
 
-#: git-gui.sh:3418
+#: git-gui.sh:3076
 msgid "Commit Message:"
 msgstr ""
 
-#: git-gui.sh:3477 git-gui.sh:3641 lib/console.tcl:73
+#: git-gui.sh:3125 git-gui.sh:3267 lib/console.tcl:73
 msgid "Copy All"
 msgstr ""
 
-#: git-gui.sh:3501 lib/blame.tcl:106
+#: git-gui.sh:3149 lib/blame.tcl:104
 msgid "File:"
 msgstr ""
 
-#: git-gui.sh:3549 lib/choose_repository.tcl:1100
-msgid "Open"
-msgstr ""
-
-#: git-gui.sh:3629
+#: git-gui.sh:3255
 msgid "Refresh"
 msgstr ""
 
-#: git-gui.sh:3650
+#: git-gui.sh:3276
 msgid "Decrease Font Size"
 msgstr ""
 
-#: git-gui.sh:3654
+#: git-gui.sh:3280
 msgid "Increase Font Size"
 msgstr ""
 
-#: git-gui.sh:3662 lib/blame.tcl:296
+#: git-gui.sh:3288 lib/blame.tcl:281
 msgid "Encoding"
 msgstr ""
 
-#: git-gui.sh:3673
+#: git-gui.sh:3299
 msgid "Apply/Reverse Hunk"
 msgstr ""
 
-#: git-gui.sh:3678
+#: git-gui.sh:3304
 msgid "Apply/Reverse Line"
 msgstr ""
 
-#: git-gui.sh:3684 git-gui.sh:3794 git-gui.sh:3805
-msgid "Revert Hunk"
-msgstr ""
-
-#: git-gui.sh:3689 git-gui.sh:3801 git-gui.sh:3812
-msgid "Revert Line"
-msgstr ""
-
-#: git-gui.sh:3694 git-gui.sh:3791
-msgid "Undo Last Revert"
-msgstr ""
-
-#: git-gui.sh:3713
+#: git-gui.sh:3323
 msgid "Run Merge Tool"
 msgstr ""
 
-#: git-gui.sh:3718
+#: git-gui.sh:3328
 msgid "Use Remote Version"
 msgstr ""
 
-#: git-gui.sh:3722
+#: git-gui.sh:3332
 msgid "Use Local Version"
 msgstr ""
 
-#: git-gui.sh:3726
+#: git-gui.sh:3336
 msgid "Revert To Base"
 msgstr ""
 
-#: git-gui.sh:3744
+#: git-gui.sh:3354
 msgid "Visualize These Changes In The Submodule"
 msgstr ""
 
-#: git-gui.sh:3748
+#: git-gui.sh:3358
 msgid "Visualize Current Branch History In The Submodule"
 msgstr ""
 
-#: git-gui.sh:3752
+#: git-gui.sh:3362
 msgid "Visualize All Branch History In The Submodule"
 msgstr ""
 
-#: git-gui.sh:3757
+#: git-gui.sh:3367
 msgid "Start git gui In The Submodule"
 msgstr ""
 
-#: git-gui.sh:3793
+#: git-gui.sh:3389
 msgid "Unstage Hunk From Commit"
 msgstr ""
 
-#: git-gui.sh:3797
+#: git-gui.sh:3391
 msgid "Unstage Lines From Commit"
 msgstr ""
 
-#: git-gui.sh:3798 git-gui.sh:3809
-msgid "Revert Lines"
-msgstr ""
-
-#: git-gui.sh:3800
+#: git-gui.sh:3393
 msgid "Unstage Line From Commit"
 msgstr ""
 
-#: git-gui.sh:3804
+#: git-gui.sh:3396
 msgid "Stage Hunk For Commit"
 msgstr ""
 
-#: git-gui.sh:3808
+#: git-gui.sh:3398
 msgid "Stage Lines For Commit"
 msgstr ""
 
-#: git-gui.sh:3811
+#: git-gui.sh:3400
 msgid "Stage Line For Commit"
 msgstr ""
 
-#: git-gui.sh:3861
+#: git-gui.sh:3424
 msgid "Initializing..."
 msgstr ""
 
-#: git-gui.sh:4017
+#: git-gui.sh:3541
 #, tcl-format
 msgid ""
 "Possible environment issues exist.\n"
@@ -577,14 +531,14 @@ msgid ""
 "\n"
 msgstr ""
 
-#: git-gui.sh:4046
+#: git-gui.sh:3570
 msgid ""
 "\n"
 "This is due to a known issue with the\n"
 "Tcl binary distributed by Cygwin."
 msgstr ""
 
-#: git-gui.sh:4051
+#: git-gui.sh:3575
 #, tcl-format
 msgid ""
 "\n"
@@ -595,2072 +549,1846 @@ msgid ""
 "~/.gitconfig file.\n"
 msgstr ""
 
-#: lib/spellcheck.tcl:57
-msgid "Unsupported spell checker"
+#: lib/about.tcl:26
+msgid "git-gui - a graphical user interface for Git."
 msgstr ""
 
-#: lib/spellcheck.tcl:65
-msgid "Spell checking is unavailable"
+#: lib/blame.tcl:72
+msgid "File Viewer"
 msgstr ""
 
-#: lib/spellcheck.tcl:68
-msgid "Invalid spell checking configuration"
+#: lib/blame.tcl:78
+msgid "Commit:"
 msgstr ""
 
-#: lib/spellcheck.tcl:70
-#, tcl-format
-msgid "Reverting dictionary to %s."
+#: lib/blame.tcl:271
+msgid "Copy Commit"
 msgstr ""
 
-#: lib/spellcheck.tcl:73
-msgid "Spell checker silently failed on startup"
+#: lib/blame.tcl:275
+msgid "Find Text..."
 msgstr ""
 
-#: lib/spellcheck.tcl:80
-msgid "Unrecognized spell checker"
+#: lib/blame.tcl:284
+msgid "Do Full Copy Detection"
 msgstr ""
 
-#: lib/spellcheck.tcl:186
-msgid "No Suggestions"
+#: lib/blame.tcl:288
+msgid "Show History Context"
 msgstr ""
 
-#: lib/spellcheck.tcl:388
-msgid "Unexpected EOF from spell checker"
+#: lib/blame.tcl:291
+msgid "Blame Parent Commit"
 msgstr ""
 
-#: lib/spellcheck.tcl:392
-msgid "Spell Checker Failed"
+#: lib/blame.tcl:450
+#, tcl-format
+msgid "Reading %s..."
 msgstr ""
 
-#: lib/transport.tcl:6 lib/remote_add.tcl:132
-#, tcl-format
-msgid "fetch %s"
+#: lib/blame.tcl:557
+msgid "Loading copy/move tracking annotations..."
 msgstr ""
 
-#: lib/transport.tcl:7
-#, tcl-format
-msgid "Fetching new changes from %s"
+#: lib/blame.tcl:577
+msgid "lines annotated"
 msgstr ""
 
-#: lib/transport.tcl:18
-#, tcl-format
-msgid "remote prune %s"
+#: lib/blame.tcl:769
+msgid "Loading original location annotations..."
 msgstr ""
 
-#: lib/transport.tcl:19
-#, tcl-format
-msgid "Pruning tracking branches deleted from %s"
+#: lib/blame.tcl:772
+msgid "Annotation complete."
 msgstr ""
 
-#: lib/transport.tcl:25
-msgid "fetch all remotes"
+#: lib/blame.tcl:802
+msgid "Busy"
 msgstr ""
 
-#: lib/transport.tcl:26
-msgid "Fetching new changes from all remotes"
+#: lib/blame.tcl:803
+msgid "Annotation process is already running."
 msgstr ""
 
-#: lib/transport.tcl:40
-msgid "remote prune all remotes"
+#: lib/blame.tcl:842
+msgid "Running thorough copy detection..."
 msgstr ""
 
-#: lib/transport.tcl:41
-msgid "Pruning tracking branches deleted from all remotes"
+#: lib/blame.tcl:910
+msgid "Loading annotation..."
 msgstr ""
 
-#: lib/transport.tcl:54 lib/transport.tcl:92 lib/transport.tcl:110
-#: lib/remote_add.tcl:162
-#, tcl-format
-msgid "push %s"
+#: lib/blame.tcl:963
+msgid "Author:"
 msgstr ""
 
-#: lib/transport.tcl:55
-#, tcl-format
-msgid "Pushing changes to %s"
+#: lib/blame.tcl:967
+msgid "Committer:"
 msgstr ""
 
-#: lib/transport.tcl:93
-#, tcl-format
-msgid "Mirroring to %s"
+#: lib/blame.tcl:972
+msgid "Original File:"
 msgstr ""
 
-#: lib/transport.tcl:111
-#, tcl-format
-msgid "Pushing %s %s to %s"
+#: lib/blame.tcl:1020
+msgid "Cannot find HEAD commit:"
 msgstr ""
 
-#: lib/transport.tcl:132
-msgid "Push Branches"
+#: lib/blame.tcl:1075
+msgid "Cannot find parent commit:"
 msgstr ""
 
-#: lib/transport.tcl:141 lib/checkout_op.tcl:580 lib/remote_add.tcl:34
-#: lib/browser.tcl:292 lib/branch_checkout.tcl:30 lib/branch_rename.tcl:32
-#: lib/choose_font.tcl:45 lib/option.tcl:127 lib/tools_dlg.tcl:41
-#: lib/tools_dlg.tcl:202 lib/tools_dlg.tcl:345 lib/remote_branch_delete.tcl:43
-#: lib/branch_create.tcl:37 lib/branch_delete.tcl:34 lib/merge.tcl:178
-msgid "Cancel"
+#: lib/blame.tcl:1090
+msgid "Unable to display parent"
 msgstr ""
 
-#: lib/transport.tcl:147
-msgid "Source Branches"
+#: lib/blame.tcl:1091 lib/diff.tcl:320
+msgid "Error loading diff:"
 msgstr ""
 
-#: lib/transport.tcl:162
-msgid "Destination Repository"
+#: lib/blame.tcl:1231
+msgid "Originally By:"
 msgstr ""
 
-#: lib/transport.tcl:165 lib/remote_branch_delete.tcl:51
-msgid "Remote:"
+#: lib/blame.tcl:1237
+msgid "In File:"
 msgstr ""
 
-#: lib/transport.tcl:187 lib/remote_branch_delete.tcl:72
-msgid "Arbitrary Location:"
+#: lib/blame.tcl:1242
+msgid "Copied Or Moved Here By:"
 msgstr ""
 
-#: lib/transport.tcl:205
-msgid "Transfer Options"
+#: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19
+msgid "Checkout Branch"
 msgstr ""
 
-#: lib/transport.tcl:207
-msgid "Force overwrite existing branch (may discard changes)"
+#: lib/branch_checkout.tcl:23
+msgid "Checkout"
 msgstr ""
 
-#: lib/transport.tcl:211
-msgid "Use thin pack (for slow network connections)"
+#: 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: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 ""
 
-#: lib/transport.tcl:215
-msgid "Include tags"
+#: lib/branch_checkout.tcl:32 lib/browser.tcl:287 lib/tools_dlg.tcl:328
+msgid "Revision"
 msgstr ""
 
-#: lib/transport.tcl:229
-#, tcl-format
-msgid "%s (%s): Push"
+#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:280
+msgid "Options"
 msgstr ""
 
-#: lib/checkout_op.tcl:85
-#, tcl-format
-msgid "Fetching %s from %s"
+#: lib/branch_checkout.tcl:39 lib/branch_create.tcl:92
+msgid "Fetch Tracking Branch"
 msgstr ""
 
-#: lib/checkout_op.tcl:133
-#, tcl-format
-msgid "fatal: Cannot resolve %s"
+#: lib/branch_checkout.tcl:44
+msgid "Detach From Local Branch"
 msgstr ""
 
-#: lib/checkout_op.tcl:146 lib/sshkey.tcl:58 lib/console.tcl:81
-#: lib/database.tcl:30
-msgid "Close"
+#: lib/branch_create.tcl:22
+msgid "Create Branch"
 msgstr ""
 
-#: lib/checkout_op.tcl:175
-#, tcl-format
-msgid "Branch '%s' does not exist."
+#: lib/branch_create.tcl:27
+msgid "Create New Branch"
 msgstr ""
 
-#: lib/checkout_op.tcl:194
-#, tcl-format
-msgid "Failed to configure simplified git-pull for '%s'."
+#: lib/branch_create.tcl:31 lib/choose_repository.tcl:381
+msgid "Create"
 msgstr ""
 
-#: lib/checkout_op.tcl:202 lib/branch_rename.tcl:102
-#, tcl-format
-msgid "Branch '%s' already exists."
+#: lib/branch_create.tcl:40
+msgid "Branch Name"
 msgstr ""
 
-#: lib/checkout_op.tcl:229
-#, tcl-format
-msgid ""
-"Branch '%s' already exists.\n"
-"\n"
-"It cannot fast-forward to %s.\n"
-"A merge is required."
+#: lib/branch_create.tcl:43 lib/remote_add.tcl:39 lib/tools_dlg.tcl:50
+msgid "Name:"
 msgstr ""
 
-#: lib/checkout_op.tcl:243
-#, tcl-format
-msgid "Merge strategy '%s' not supported."
+#: lib/branch_create.tcl:58
+msgid "Match Tracking Branch Name"
 msgstr ""
 
-#: lib/checkout_op.tcl:262
-#, tcl-format
-msgid "Failed to update '%s'."
+#: lib/branch_create.tcl:66
+msgid "Starting Revision"
 msgstr ""
 
-#: lib/checkout_op.tcl:274
-msgid "Staging area (index) is already locked."
+#: lib/branch_create.tcl:72
+msgid "Update Existing Branch:"
 msgstr ""
 
-#: lib/checkout_op.tcl:289
-msgid ""
-"Last scanned state does not match repository state.\n"
-"\n"
-"Another Git program has modified this repository since the last scan.  A "
-"rescan must be performed before the current branch can be changed.\n"
-"\n"
-"The rescan will be automatically started now.\n"
+#: lib/branch_create.tcl:75
+msgid "No"
 msgstr ""
 
-#: lib/checkout_op.tcl:345
-#, tcl-format
-msgid "Updating working directory to '%s'..."
+#: lib/branch_create.tcl:80
+msgid "Fast Forward Only"
 msgstr ""
 
-#: lib/checkout_op.tcl:346
-msgid "files checked out"
+#: lib/branch_create.tcl:85 lib/checkout_op.tcl:571
+msgid "Reset"
 msgstr ""
 
-#: lib/checkout_op.tcl:377
-#, tcl-format
-msgid "Aborted checkout of '%s' (file level merging is required)."
+#: lib/branch_create.tcl:97
+msgid "Checkout After Creation"
 msgstr ""
 
-#: lib/checkout_op.tcl:378
-msgid "File level merge required."
+#: lib/branch_create.tcl:131
+msgid "Please select a tracking branch."
 msgstr ""
 
-#: lib/checkout_op.tcl:382
+#: lib/branch_create.tcl:140
 #, tcl-format
-msgid "Staying on branch '%s'."
+msgid "Tracking branch %s is not a branch in the remote repository."
 msgstr ""
 
-#: lib/checkout_op.tcl:453
-msgid ""
-"You are no longer on a local branch.\n"
-"\n"
-"If you wanted to be on a branch, create one now starting from 'This Detached "
-"Checkout'."
+#: lib/branch_create.tcl:153 lib/branch_rename.tcl:86
+msgid "Please supply a branch name."
 msgstr ""
 
-#: lib/checkout_op.tcl:504 lib/checkout_op.tcl:508
+#: lib/branch_create.tcl:164 lib/branch_rename.tcl:106
 #, tcl-format
-msgid "Checked out '%s'."
+msgid "'%s' is not an acceptable branch name."
 msgstr ""
 
-#: lib/checkout_op.tcl:536
-#, tcl-format
-msgid "Resetting '%s' to '%s' will lose the following commits:"
+#: lib/branch_delete.tcl:15
+msgid "Delete Branch"
 msgstr ""
 
-#: lib/checkout_op.tcl:558
-msgid "Recovering lost commits may not be easy."
+#: lib/branch_delete.tcl:20
+msgid "Delete Local Branch"
 msgstr ""
 
-#: lib/checkout_op.tcl:563
-#, tcl-format
-msgid "Reset '%s'?"
+#: lib/branch_delete.tcl:37
+msgid "Local Branches"
 msgstr ""
 
-#: lib/checkout_op.tcl:568 lib/tools_dlg.tcl:336 lib/merge.tcl:170
-msgid "Visualize"
+#: lib/branch_delete.tcl:52
+msgid "Delete Only If Merged Into"
 msgstr ""
 
-#: lib/checkout_op.tcl:572 lib/branch_create.tcl:85
-msgid "Reset"
+#: lib/branch_delete.tcl:54 lib/remote_branch_delete.tcl:119
+msgid "Always (Do not perform merge checks)"
 msgstr ""
 
-#: lib/checkout_op.tcl:636
+#: lib/branch_delete.tcl:103
 #, tcl-format
+msgid "The following branches are not completely merged into %s:"
+msgstr ""
+
+#: lib/branch_delete.tcl:115 lib/remote_branch_delete.tcl:217
 msgid ""
-"Failed to set current branch.\n"
-"\n"
-"This working directory is only partially switched.  We successfully updated "
-"your files, but failed to update an internal Git file.\n"
+"Recovering deleted branches is difficult.\n"
 "\n"
-"This should not have occurred.  %s will now close and give up."
+"Delete the selected branches?"
 msgstr ""
 
-#: lib/remote_add.tcl:20
+#: lib/branch_delete.tcl:141
 #, tcl-format
-msgid "%s (%s): Add Remote"
-msgstr ""
-
-#: lib/remote_add.tcl:25
-msgid "Add New Remote"
-msgstr ""
-
-#: lib/remote_add.tcl:30 lib/tools_dlg.tcl:37
-msgid "Add"
-msgstr ""
-
-#: lib/remote_add.tcl:39
-msgid "Remote Details"
-msgstr ""
-
-#: lib/remote_add.tcl:41 lib/tools_dlg.tcl:51 lib/branch_create.tcl:44
-msgid "Name:"
-msgstr ""
-
-#: lib/remote_add.tcl:50
-msgid "Location:"
-msgstr ""
-
-#: lib/remote_add.tcl:60
-msgid "Further Action"
-msgstr ""
-
-#: lib/remote_add.tcl:63
-msgid "Fetch Immediately"
-msgstr ""
-
-#: lib/remote_add.tcl:69
-msgid "Initialize Remote Repository and Push"
+msgid ""
+"Failed to delete branches:\n"
+"%s"
 msgstr ""
 
-#: lib/remote_add.tcl:75
-msgid "Do Nothing Else Now"
+#: lib/branch_rename.tcl:14 lib/branch_rename.tcl:22
+msgid "Rename Branch"
 msgstr ""
 
-#: lib/remote_add.tcl:100
-msgid "Please supply a remote name."
+#: lib/branch_rename.tcl:26
+msgid "Rename"
 msgstr ""
 
-#: lib/remote_add.tcl:113
-#, tcl-format
-msgid "'%s' is not an acceptable remote name."
+#: lib/branch_rename.tcl:36
+msgid "Branch:"
 msgstr ""
 
-#: lib/remote_add.tcl:124
-#, tcl-format
-msgid "Failed to add remote '%s' of location '%s'."
+#: lib/branch_rename.tcl:39
+msgid "New Name:"
 msgstr ""
 
-#: lib/remote_add.tcl:133
-#, tcl-format
-msgid "Fetching the %s"
+#: lib/branch_rename.tcl:75
+msgid "Please select a branch to rename."
 msgstr ""
 
-#: lib/remote_add.tcl:156
+#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:202
 #, tcl-format
-msgid "Do not know how to initialize repository at location '%s'."
+msgid "Branch '%s' already exists."
 msgstr ""
 
-#: lib/remote_add.tcl:163
+#: lib/branch_rename.tcl:117
 #, tcl-format
-msgid "Setting up the %s (at %s)"
+msgid "Failed to rename '%s'."
 msgstr ""
 
 #: lib/browser.tcl:17
 msgid "Starting..."
 msgstr ""
 
-#: lib/browser.tcl:27
-#, tcl-format
-msgid "%s (%s): File Browser"
+#: lib/browser.tcl:26
+msgid "File Browser"
 msgstr ""
 
-#: lib/browser.tcl:132 lib/browser.tcl:149
+#: lib/browser.tcl:126 lib/browser.tcl:143
 #, tcl-format
 msgid "Loading %s..."
 msgstr ""
 
-#: lib/browser.tcl:193
+#: lib/browser.tcl:187
 msgid "[Up To Parent]"
 msgstr ""
 
-#: lib/browser.tcl:275
-#, tcl-format
-msgid "%s (%s): Browse Branch Files"
-msgstr ""
-
-#: lib/browser.tcl:282
+#: lib/browser.tcl:267 lib/browser.tcl:273
 msgid "Browse Branch Files"
 msgstr ""
 
-#: lib/browser.tcl:288 lib/choose_repository.tcl:437
-#: lib/choose_repository.tcl:524 lib/choose_repository.tcl:533
-#: lib/choose_repository.tcl:1115
+#: 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 ""
 
-#: lib/browser.tcl:297 lib/branch_checkout.tcl:35 lib/tools_dlg.tcl:321
-msgid "Revision"
-msgstr ""
-
-#: lib/index.tcl:6
-msgid "Unable to unlock the index."
-msgstr ""
-
-#: lib/index.tcl:30
-msgid "Index Error"
-msgstr ""
-
-#: lib/index.tcl:32
-msgid ""
-"Updating the Git index failed.  A rescan will be automatically started to "
-"resynchronize git-gui."
-msgstr ""
-
-#: lib/index.tcl:43
-msgid "Continue"
-msgstr ""
-
-#: lib/index.tcl:46
-msgid "Unlock Index"
-msgstr ""
-
-#: lib/index.tcl:77 lib/index.tcl:146 lib/index.tcl:220 lib/index.tcl:587
-#: lib/choose_repository.tcl:999
-msgid "files"
-msgstr ""
-
-#: lib/index.tcl:326
-msgid "Unstaging selected files from commit"
-msgstr ""
-
-#: lib/index.tcl:330
+#: lib/checkout_op.tcl:85
 #, tcl-format
-msgid "Unstaging %s from commit"
+msgid "Fetching %s from %s"
 msgstr ""
 
-#: lib/index.tcl:369
-msgid "Ready to commit."
+#: lib/checkout_op.tcl:133
+#, tcl-format
+msgid "fatal: Cannot resolve %s"
 msgstr ""
 
-#: lib/index.tcl:378
-msgid "Adding selected files"
+#: lib/checkout_op.tcl:146 lib/console.tcl:81 lib/database.tcl:31
+#: lib/sshkey.tcl:53
+msgid "Close"
 msgstr ""
 
-#: lib/index.tcl:382
+#: lib/checkout_op.tcl:175
 #, tcl-format
-msgid "Adding %s"
+msgid "Branch '%s' does not exist."
 msgstr ""
 
-#: lib/index.tcl:412
+#: lib/checkout_op.tcl:194
 #, tcl-format
-msgid "Stage %d untracked files?"
+msgid "Failed to configure simplified git-pull for '%s'."
 msgstr ""
 
-#: lib/index.tcl:420
-msgid "Adding all changed files"
+#: lib/checkout_op.tcl:229
+#, tcl-format
+msgid ""
+"Branch '%s' already exists.\n"
+"\n"
+"It cannot fast-forward to %s.\n"
+"A merge is required."
 msgstr ""
 
-#: lib/index.tcl:503
+#: lib/checkout_op.tcl:243
 #, tcl-format
-msgid "Revert changes in file %s?"
+msgid "Merge strategy '%s' not supported."
 msgstr ""
 
-#: lib/index.tcl:508
+#: lib/checkout_op.tcl:262
 #, tcl-format
-msgid "Revert changes in these %i files?"
+msgid "Failed to update '%s'."
 msgstr ""
 
-#: lib/index.tcl:517
-msgid "Any unstaged changes will be permanently lost by the revert."
+#: lib/checkout_op.tcl:274
+msgid "Staging area (index) is already locked."
 msgstr ""
 
-#: lib/index.tcl:520 lib/index.tcl:563
-msgid "Do Nothing"
+#: lib/checkout_op.tcl:289
+msgid ""
+"Last scanned state does not match repository state.\n"
+"\n"
+"Another Git program has modified this repository since the last scan.  A "
+"rescan must be performed before the current branch can be changed.\n"
+"\n"
+"The rescan will be automatically started now.\n"
 msgstr ""
 
-#: lib/index.tcl:545
+#: lib/checkout_op.tcl:345
 #, tcl-format
-msgid "Delete untracked file %s?"
+msgid "Updating working directory to '%s'..."
 msgstr ""
 
-#: lib/index.tcl:550
-#, tcl-format
-msgid "Delete these %i untracked files?"
+#: lib/checkout_op.tcl:346
+msgid "files checked out"
 msgstr ""
 
-#: lib/index.tcl:560
-msgid "Files will be permanently deleted."
+#: lib/checkout_op.tcl:376
+#, tcl-format
+msgid "Aborted checkout of '%s' (file level merging is required)."
 msgstr ""
 
-#: lib/index.tcl:564
-msgid "Delete Files"
+#: lib/checkout_op.tcl:377
+msgid "File level merge required."
 msgstr ""
 
-#: lib/index.tcl:586
-msgid "Deleting"
+#: lib/checkout_op.tcl:381
+#, tcl-format
+msgid "Staying on branch '%s'."
 msgstr ""
 
-#: lib/index.tcl:665
-msgid "Encountered errors deleting files:\n"
+#: lib/checkout_op.tcl:452
+msgid ""
+"You are no longer on a local branch.\n"
+"\n"
+"If you wanted to be on a branch, create one now starting from 'This Detached "
+"Checkout'."
 msgstr ""
 
-#: lib/index.tcl:674
+#: lib/checkout_op.tcl:503 lib/checkout_op.tcl:507
 #, tcl-format
-msgid "None of the %d selected files could be deleted."
+msgid "Checked out '%s'."
 msgstr ""
 
-#: lib/index.tcl:679
+#: lib/checkout_op.tcl:535
 #, tcl-format
-msgid "%d of the %d selected files could not be deleted."
+msgid "Resetting '%s' to '%s' will lose the following commits:"
 msgstr ""
 
-#: lib/index.tcl:726
-msgid "Reverting selected files"
+#: lib/checkout_op.tcl:557
+msgid "Recovering lost commits may not be easy."
 msgstr ""
 
-#: lib/index.tcl:730
+#: lib/checkout_op.tcl:562
 #, tcl-format
-msgid "Reverting %s"
+msgid "Reset '%s'?"
 msgstr ""
 
-#: lib/branch_checkout.tcl:16
-#, tcl-format
-msgid "%s (%s): Checkout Branch"
+#: lib/checkout_op.tcl:567 lib/merge.tcl:164 lib/tools_dlg.tcl:343
+msgid "Visualize"
 msgstr ""
 
-#: lib/branch_checkout.tcl:21
-msgid "Checkout Branch"
+#: lib/checkout_op.tcl:635
+#, tcl-format
+msgid ""
+"Failed to set current branch.\n"
+"\n"
+"This working directory is only partially switched.  We successfully updated "
+"your files, but failed to update an internal Git file.\n"
+"\n"
+"This should not have occurred.  %s will now close and give up."
 msgstr ""
 
-#: lib/branch_checkout.tcl:26
-msgid "Checkout"
+#: lib/choose_font.tcl:39
+msgid "Select"
 msgstr ""
 
-#: lib/branch_checkout.tcl:39 lib/option.tcl:310 lib/branch_create.tcl:69
-msgid "Options"
+#: lib/choose_font.tcl:53
+msgid "Font Family"
 msgstr ""
 
-#: lib/branch_checkout.tcl:42 lib/branch_create.tcl:92
-msgid "Fetch Tracking Branch"
+#: lib/choose_font.tcl:74
+msgid "Font Size"
 msgstr ""
 
-#: lib/branch_checkout.tcl:47
-msgid "Detach From Local Branch"
+#: lib/choose_font.tcl:91
+msgid "Font Example"
 msgstr ""
 
-#: lib/status_bar.tcl:263
-#, tcl-format
-msgid "%s ... %*i of %*i %s (%3i%%)"
+#: lib/choose_font.tcl:103
+msgid ""
+"This is example text.\n"
+"If you like this text, it can be your font."
 msgstr ""
 
-#: lib/remote.tcl:200
-msgid "Push to"
+#: lib/choose_repository.tcl:28
+msgid "Git Gui"
 msgstr ""
 
-#: lib/remote.tcl:218
-msgid "Remove Remote"
+#: lib/choose_repository.tcl:87 lib/choose_repository.tcl:386
+msgid "Create New Repository"
 msgstr ""
 
-#: lib/remote.tcl:223
-msgid "Prune from"
+#: lib/choose_repository.tcl:93
+msgid "New..."
 msgstr ""
 
-#: lib/remote.tcl:228
-msgid "Fetch from"
+#: lib/choose_repository.tcl:100 lib/choose_repository.tcl:471
+msgid "Clone Existing Repository"
 msgstr ""
 
-#: lib/remote.tcl:249 lib/remote.tcl:253 lib/remote.tcl:258 lib/remote.tcl:264
-msgid "All"
+#: lib/choose_repository.tcl:106
+msgid "Clone..."
 msgstr ""
 
-#: lib/branch_rename.tcl:15
-#, tcl-format
-msgid "%s (%s): Rename Branch"
+#: lib/choose_repository.tcl:113 lib/choose_repository.tcl:1016
+msgid "Open Existing Repository"
 msgstr ""
 
-#: lib/branch_rename.tcl:23
-msgid "Rename Branch"
+#: lib/choose_repository.tcl:119
+msgid "Open..."
 msgstr ""
 
-#: lib/branch_rename.tcl:28
-msgid "Rename"
+#: lib/choose_repository.tcl:132
+msgid "Recent Repositories"
 msgstr ""
 
-#: lib/branch_rename.tcl:38
-msgid "Branch:"
+#: lib/choose_repository.tcl:138
+msgid "Open Recent Repository:"
 msgstr ""
 
-#: lib/branch_rename.tcl:46
-msgid "New Name:"
+#: lib/choose_repository.tcl:306 lib/choose_repository.tcl:313
+#: lib/choose_repository.tcl:320
+#, tcl-format
+msgid "Failed to create repository %s:"
 msgstr ""
 
-#: lib/branch_rename.tcl:81
-msgid "Please select a branch to rename."
+#: lib/choose_repository.tcl:391
+msgid "Directory:"
 msgstr ""
 
-#: lib/branch_rename.tcl:92 lib/branch_create.tcl:154
-msgid "Please supply a branch name."
+#: lib/choose_repository.tcl:423 lib/choose_repository.tcl:550
+#: lib/choose_repository.tcl:1052
+msgid "Git Repository"
 msgstr ""
 
-#: lib/branch_rename.tcl:112 lib/branch_create.tcl:165
+#: lib/choose_repository.tcl:448
 #, tcl-format
-msgid "'%s' is not an acceptable branch name."
+msgid "Directory %s already exists."
 msgstr ""
 
-#: lib/branch_rename.tcl:123
+#: lib/choose_repository.tcl:452
 #, tcl-format
-msgid "Failed to rename '%s'."
-msgstr ""
-
-#: lib/choose_font.tcl:41
-msgid "Select"
-msgstr ""
-
-#: lib/choose_font.tcl:55
-msgid "Font Family"
+msgid "File %s already exists."
 msgstr ""
 
-#: lib/choose_font.tcl:76
-msgid "Font Size"
+#: lib/choose_repository.tcl:466
+msgid "Clone"
 msgstr ""
 
-#: lib/choose_font.tcl:93
-msgid "Font Example"
+#: lib/choose_repository.tcl:479
+msgid "Source Location:"
 msgstr ""
 
-#: lib/choose_font.tcl:105
-msgid ""
-"This is example text.\n"
-"If you like this text, it can be your font."
+#: lib/choose_repository.tcl:490
+msgid "Target Directory:"
 msgstr ""
 
-#: lib/option.tcl:11
-#, tcl-format
-msgid "Invalid global encoding '%s'"
+#: lib/choose_repository.tcl:502
+msgid "Clone Type:"
 msgstr ""
 
-#: lib/option.tcl:19
-#, tcl-format
-msgid "Invalid repo encoding '%s'"
+#: lib/choose_repository.tcl:508
+msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
 msgstr ""
 
-#: lib/option.tcl:119
-msgid "Restore Defaults"
+#: lib/choose_repository.tcl:514
+msgid "Full Copy (Slower, Redundant Backup)"
 msgstr ""
 
-#: lib/option.tcl:123
-msgid "Save"
+#: lib/choose_repository.tcl:520
+msgid "Shared (Fastest, Not Recommended, No Backup)"
 msgstr ""
 
-#: lib/option.tcl:133
+#: 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 "%s Repository"
-msgstr ""
-
-#: lib/option.tcl:134
-msgid "Global (All Repositories)"
-msgstr ""
-
-#: lib/option.tcl:140
-msgid "User Name"
-msgstr ""
-
-#: lib/option.tcl:141
-msgid "Email Address"
-msgstr ""
-
-#: lib/option.tcl:143
-msgid "Summarize Merge Commits"
+msgid "Not a Git repository: %s"
 msgstr ""
 
-#: lib/option.tcl:144
-msgid "Merge Verbosity"
+#: lib/choose_repository.tcl:592
+msgid "Standard only available for local repository."
 msgstr ""
 
-#: lib/option.tcl:145
-msgid "Show Diffstat After Merge"
+#: lib/choose_repository.tcl:596
+msgid "Shared only available for local repository."
 msgstr ""
 
-#: lib/option.tcl:146
-msgid "Use Merge Tool"
+#: lib/choose_repository.tcl:617
+#, tcl-format
+msgid "Location %s already exists."
 msgstr ""
 
-#: lib/option.tcl:148
-msgid "Trust File Modification Timestamps"
+#: lib/choose_repository.tcl:628
+msgid "Failed to configure origin"
 msgstr ""
 
-#: lib/option.tcl:149
-msgid "Prune Tracking Branches During Fetch"
+#: lib/choose_repository.tcl:640
+msgid "Counting objects"
 msgstr ""
 
-#: lib/option.tcl:150
-msgid "Match Tracking Branches"
+#: lib/choose_repository.tcl:641
+msgid "buckets"
 msgstr ""
 
-#: lib/option.tcl:151
-msgid "Use Textconv For Diffs and Blames"
+#: lib/choose_repository.tcl:665
+#, tcl-format
+msgid "Unable to copy objects/info/alternates: %s"
 msgstr ""
 
-#: lib/option.tcl:152
-msgid "Blame Copy Only On Changed Files"
+#: lib/choose_repository.tcl:701
+#, tcl-format
+msgid "Nothing to clone from %s."
 msgstr ""
 
-#: lib/option.tcl:153
-msgid "Maximum Length of Recent Repositories List"
+#: lib/choose_repository.tcl:703 lib/choose_repository.tcl:917
+#: lib/choose_repository.tcl:929
+msgid "The 'master' branch has not been initialized."
 msgstr ""
 
-#: lib/option.tcl:154
-msgid "Minimum Letters To Blame Copy On"
+#: lib/choose_repository.tcl:716
+msgid "Hardlinks are unavailable.  Falling back to copying."
 msgstr ""
 
-#: lib/option.tcl:155
-msgid "Blame History Context Radius (days)"
+#: lib/choose_repository.tcl:728
+#, tcl-format
+msgid "Cloning from %s"
 msgstr ""
 
-#: lib/option.tcl:156
-msgid "Number of Diff Context Lines"
+#: lib/choose_repository.tcl:759
+msgid "Copying objects"
 msgstr ""
 
-#: lib/option.tcl:157
-msgid "Additional Diff Parameters"
+#: lib/choose_repository.tcl:760
+msgid "KiB"
 msgstr ""
 
-#: lib/option.tcl:158
-msgid "Commit Message Text Width"
+#: lib/choose_repository.tcl:784
+#, tcl-format
+msgid "Unable to copy object: %s"
 msgstr ""
 
-#: lib/option.tcl:159
-msgid "New Branch Name Template"
+#: lib/choose_repository.tcl:794
+msgid "Linking objects"
 msgstr ""
 
-#: lib/option.tcl:160
-msgid "Default File Contents Encoding"
+#: lib/choose_repository.tcl:795
+msgid "objects"
 msgstr ""
 
-#: lib/option.tcl:161
-msgid "Warn before committing to a detached head"
+#: lib/choose_repository.tcl:803
+#, tcl-format
+msgid "Unable to hardlink object: %s"
 msgstr ""
 
-#: lib/option.tcl:162
-msgid "Staging of untracked files"
+#: lib/choose_repository.tcl:858
+msgid "Cannot fetch branches and objects.  See console output for details."
 msgstr ""
 
-#: lib/option.tcl:163
-msgid "Show untracked files"
+#: lib/choose_repository.tcl:869
+msgid "Cannot fetch tags.  See console output for details."
 msgstr ""
 
-#: lib/option.tcl:164
-msgid "Tab spacing"
+#: lib/choose_repository.tcl:893
+msgid "Cannot determine HEAD.  See console output for details."
 msgstr ""
 
-#: lib/option.tcl:182 lib/option.tcl:197 lib/option.tcl:220 lib/option.tcl:282
-#: lib/database.tcl:57
+#: lib/choose_repository.tcl:902
 #, tcl-format
-msgid "%s:"
-msgstr ""
-
-#: lib/option.tcl:210
-msgid "Change"
+msgid "Unable to cleanup %s"
 msgstr ""
 
-#: lib/option.tcl:254
-msgid "Spelling Dictionary:"
+#: lib/choose_repository.tcl:908
+msgid "Clone failed."
 msgstr ""
 
-#: lib/option.tcl:284
-msgid "Change Font"
+#: lib/choose_repository.tcl:915
+msgid "No default branch obtained."
 msgstr ""
 
-#: lib/option.tcl:288
+#: lib/choose_repository.tcl:926
 #, tcl-format
-msgid "Choose %s"
+msgid "Cannot resolve %s as a commit."
 msgstr ""
 
-#: lib/option.tcl:294
-msgid "pt."
+#: lib/choose_repository.tcl:938
+msgid "Creating working directory"
 msgstr ""
 
-#: lib/option.tcl:308
-msgid "Preferences"
+#: lib/choose_repository.tcl:939 lib/index.tcl:67 lib/index.tcl:130
+#: lib/index.tcl:198
+msgid "files"
 msgstr ""
 
-#: lib/option.tcl:345
-msgid "Failed to completely save options:"
+#: lib/choose_repository.tcl:968
+msgid "Initial file checkout failed."
 msgstr ""
 
-#: lib/encoding.tcl:443
-msgid "Default"
+#: lib/choose_repository.tcl:1011
+msgid "Open"
 msgstr ""
 
-#: lib/encoding.tcl:448
-#, tcl-format
-msgid "System (%s)"
+#: lib/choose_repository.tcl:1021
+msgid "Repository:"
 msgstr ""
 
-#: lib/encoding.tcl:459 lib/encoding.tcl:465
-msgid "Other"
+#: lib/choose_repository.tcl:1072
+#, tcl-format
+msgid "Failed to open repository %s:"
 msgstr ""
 
-#: lib/tools.tcl:76
-#, tcl-format
-msgid "Running %s requires a selected file."
+#: lib/choose_rev.tcl:53
+msgid "This Detached Checkout"
 msgstr ""
 
-#: lib/tools.tcl:92
-#, tcl-format
-msgid "Are you sure you want to run %1$s on file \"%2$s\"?"
+#: lib/choose_rev.tcl:60
+msgid "Revision Expression:"
 msgstr ""
 
-#: lib/tools.tcl:96
-#, tcl-format
-msgid "Are you sure you want to run %s?"
+#: lib/choose_rev.tcl:74
+msgid "Local Branch"
 msgstr ""
 
-#: lib/tools.tcl:118
-#, tcl-format
-msgid "Tool: %s"
+#: lib/choose_rev.tcl:79
+msgid "Tracking Branch"
 msgstr ""
 
-#: lib/tools.tcl:119
-#, tcl-format
-msgid "Running: %s"
+#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:538
+msgid "Tag"
 msgstr ""
 
-#: lib/tools.tcl:158
+#: lib/choose_rev.tcl:317
 #, tcl-format
-msgid "Tool completed successfully: %s"
+msgid "Invalid revision: %s"
 msgstr ""
 
-#: lib/tools.tcl:160
-#, tcl-format
-msgid "Tool failed: %s"
+#: lib/choose_rev.tcl:338
+msgid "No revision selected."
 msgstr ""
 
-#: lib/mergetool.tcl:8
-msgid "Force resolution to the base version?"
+#: lib/choose_rev.tcl:346
+msgid "Revision expression is empty."
 msgstr ""
 
-#: lib/mergetool.tcl:9
-msgid "Force resolution to this branch?"
+#: lib/choose_rev.tcl:531
+msgid "Updated"
 msgstr ""
 
-#: lib/mergetool.tcl:10
-msgid "Force resolution to the other branch?"
+#: lib/choose_rev.tcl:559
+msgid "URL"
 msgstr ""
 
-#: lib/mergetool.tcl:14
-#, tcl-format
+#: lib/commit.tcl:9
 msgid ""
-"Note that the diff shows only conflicting changes.\n"
-"\n"
-"%s will be overwritten.\n"
+"There is nothing to amend.\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?"
+"You are about to create the initial commit.  There is no commit before this "
+"to amend.\n"
 msgstr ""
 
-#: lib/mergetool.tcl:60
-#, tcl-format
-msgid "Adding resolution for %s"
+#: lib/commit.tcl:18
+msgid ""
+"Cannot amend while merging.\n"
+"\n"
+"You are currently in the middle of a merge that has not been fully "
+"completed.  You cannot amend the prior commit unless you first abort the "
+"current merge activity.\n"
 msgstr ""
 
-#: lib/mergetool.tcl:141
-msgid "Cannot resolve deletion or link conflicts using a tool"
+#: lib/commit.tcl:48
+msgid "Error loading commit data for amend:"
 msgstr ""
 
-#: lib/mergetool.tcl:146
-msgid "Conflict file does not exist"
+#: lib/commit.tcl:75
+msgid "Unable to obtain your identity:"
 msgstr ""
 
-#: lib/mergetool.tcl:246
-#, tcl-format
-msgid "Not a GUI merge tool: '%s'"
+#: lib/commit.tcl:80
+msgid "Invalid GIT_COMMITTER_IDENT:"
 msgstr ""
 
-#: lib/mergetool.tcl:275
+#: lib/commit.tcl:129
 #, tcl-format
-msgid "Unsupported merge tool '%s'"
-msgstr ""
-
-#: lib/mergetool.tcl:310
-msgid "Merge tool is already running, terminate it?"
+msgid "warning: Tcl does not support encoding '%s'."
 msgstr ""
 
-#: lib/mergetool.tcl:330
-#, tcl-format
+#: lib/commit.tcl:149
 msgid ""
-"Error retrieving versions:\n"
-"%s"
+"Last scanned state does not match repository state.\n"
+"\n"
+"Another Git program has modified this repository since the last scan.  A "
+"rescan must be performed before another commit can be created.\n"
+"\n"
+"The rescan will be automatically started now.\n"
 msgstr ""
 
-#: lib/mergetool.tcl:350
+#: lib/commit.tcl:172
 #, tcl-format
 msgid ""
-"Could not start the merge tool:\n"
+"Unmerged files cannot be committed.\n"
 "\n"
-"%s"
-msgstr ""
-
-#: lib/mergetool.tcl:354
-msgid "Running merge tool..."
-msgstr ""
-
-#: lib/mergetool.tcl:382 lib/mergetool.tcl:390
-msgid "Merge tool failed."
+"File %s has merge conflicts.  You must resolve them and stage the file "
+"before committing.\n"
 msgstr ""
 
-#: lib/tools_dlg.tcl:22
+#: lib/commit.tcl:180
 #, tcl-format
-msgid "%s (%s): Add Tool"
-msgstr ""
-
-#: lib/tools_dlg.tcl:28
-msgid "Add New Tool Command"
-msgstr ""
-
-#: lib/tools_dlg.tcl:34
-msgid "Add globally"
+msgid ""
+"Unknown file state %s detected.\n"
+"\n"
+"File %s cannot be committed by this program.\n"
 msgstr ""
 
-#: lib/tools_dlg.tcl:46
-msgid "Tool Details"
+#: lib/commit.tcl:188
+msgid ""
+"No changes to commit.\n"
+"\n"
+"You must stage at least 1 file before you can commit.\n"
 msgstr ""
 
-#: lib/tools_dlg.tcl:49
-msgid "Use '/' separators to create a submenu tree:"
+#: lib/commit.tcl:203
+msgid ""
+"Please supply a commit message.\n"
+"\n"
+"A good commit message has the following format:\n"
+"\n"
+"- First line: Describe in one sentence what you did.\n"
+"- Second line: Blank\n"
+"- Remaining lines: Describe why this change is good.\n"
 msgstr ""
 
-#: lib/tools_dlg.tcl:60
-msgid "Command:"
+#: lib/commit.tcl:234
+msgid "Calling pre-commit hook..."
 msgstr ""
 
-#: lib/tools_dlg.tcl:71
-msgid "Show a dialog before running"
+#: lib/commit.tcl:249
+msgid "Commit declined by pre-commit hook."
 msgstr ""
 
-#: lib/tools_dlg.tcl:77
-msgid "Ask the user to select a revision (sets $REVISION)"
+#: lib/commit.tcl:272
+msgid "Calling commit-msg hook..."
 msgstr ""
 
-#: lib/tools_dlg.tcl:82
-msgid "Ask the user for additional arguments (sets $ARGS)"
+#: lib/commit.tcl:287
+msgid "Commit declined by commit-msg hook."
 msgstr ""
 
-#: lib/tools_dlg.tcl:89
-msgid "Don't show the command output window"
+#: lib/commit.tcl:300
+msgid "Committing changes..."
 msgstr ""
 
-#: lib/tools_dlg.tcl:94
-msgid "Run only if a diff is selected ($FILENAME not empty)"
+#: lib/commit.tcl:316
+msgid "write-tree failed:"
 msgstr ""
 
-#: lib/tools_dlg.tcl:118
-msgid "Please supply a name for the tool."
+#: lib/commit.tcl:317 lib/commit.tcl:361 lib/commit.tcl:382
+msgid "Commit failed."
 msgstr ""
 
-#: lib/tools_dlg.tcl:126
+#: lib/commit.tcl:334
 #, tcl-format
-msgid "Tool '%s' already exists."
+msgid "Commit %s appears to be corrupt"
 msgstr ""
 
-#: lib/tools_dlg.tcl:148
-#, tcl-format
+#: lib/commit.tcl:339
 msgid ""
-"Could not add tool:\n"
-"%s"
-msgstr ""
-
-#: lib/tools_dlg.tcl:187
-#, tcl-format
-msgid "%s (%s): Remove Tool"
-msgstr ""
-
-#: lib/tools_dlg.tcl:193
-msgid "Remove Tool Commands"
+"No changes to commit.\n"
+"\n"
+"No files were modified by this commit and it was not a merge commit.\n"
+"\n"
+"A rescan will be automatically started now.\n"
 msgstr ""
 
-#: lib/tools_dlg.tcl:198
-msgid "Remove"
+#: lib/commit.tcl:346
+msgid "No changes to commit."
 msgstr ""
 
-#: lib/tools_dlg.tcl:231
-msgid "(Blue denotes repository-local tools)"
+#: lib/commit.tcl:360
+msgid "commit-tree failed:"
 msgstr ""
 
-#: lib/tools_dlg.tcl:283
-#, tcl-format
-msgid "%s (%s):"
+#: lib/commit.tcl:381
+msgid "update-ref failed:"
 msgstr ""
 
-#: lib/tools_dlg.tcl:292
+#: lib/commit.tcl:469
 #, tcl-format
-msgid "Run Command: %s"
-msgstr ""
-
-#: lib/tools_dlg.tcl:306
-msgid "Arguments"
-msgstr ""
-
-#: lib/tools_dlg.tcl:341
-msgid "OK"
-msgstr ""
-
-#: lib/search.tcl:48
-msgid "Find:"
-msgstr ""
-
-#: lib/search.tcl:50
-msgid "Next"
-msgstr ""
-
-#: lib/search.tcl:51
-msgid "Prev"
-msgstr ""
-
-#: lib/search.tcl:52
-msgid "RegExp"
+msgid "Created commit %s: %s"
 msgstr ""
 
-#: lib/search.tcl:54
-msgid "Case"
+#: lib/console.tcl:59
+msgid "Working... please wait..."
 msgstr ""
 
-#: lib/shortcut.tcl:8 lib/shortcut.tcl:43 lib/shortcut.tcl:75
-#, tcl-format
-msgid "%s (%s): Create Desktop Icon"
+#: lib/console.tcl:186
+msgid "Success"
 msgstr ""
 
-#: lib/shortcut.tcl:24 lib/shortcut.tcl:65
-msgid "Cannot write shortcut:"
+#: lib/console.tcl:200
+msgid "Error: Command Failed"
 msgstr ""
 
-#: lib/shortcut.tcl:140
-msgid "Cannot write icon:"
+#: lib/database.tcl:43
+msgid "Number of loose objects"
 msgstr ""
 
-#: lib/remote_branch_delete.tcl:29
-#, tcl-format
-msgid "%s (%s): Delete Branch Remotely"
+#: lib/database.tcl:44
+msgid "Disk space used by loose objects"
 msgstr ""
 
-#: lib/remote_branch_delete.tcl:34
-msgid "Delete Branch Remotely"
+#: lib/database.tcl:45
+msgid "Number of packed objects"
 msgstr ""
 
-#: lib/remote_branch_delete.tcl:48
-msgid "From Repository"
+#: lib/database.tcl:46
+msgid "Number of packs"
 msgstr ""
 
-#: lib/remote_branch_delete.tcl:88
-msgid "Branches"
+#: lib/database.tcl:47
+msgid "Disk space used by packed objects"
 msgstr ""
 
-#: lib/remote_branch_delete.tcl:110
-msgid "Delete Only If"
+#: lib/database.tcl:48
+msgid "Packed objects waiting for pruning"
 msgstr ""
 
-#: lib/remote_branch_delete.tcl:112
-msgid "Merged Into:"
+#: lib/database.tcl:49
+msgid "Garbage files"
 msgstr ""
 
-#: lib/remote_branch_delete.tcl:120 lib/branch_delete.tcl:53
-msgid "Always (Do not perform merge checks)"
+#: lib/database.tcl:72
+msgid "Compressing the object database"
 msgstr ""
 
-#: lib/remote_branch_delete.tcl:153
-msgid "A branch is required for 'Merged Into'."
+#: lib/database.tcl:83
+msgid "Verifying the object database with fsck-objects"
 msgstr ""
 
-#: lib/remote_branch_delete.tcl:185
+#: lib/database.tcl:107
 #, tcl-format
 msgid ""
-"The following branches are not completely merged into %s:\n"
+"This repository currently has approximately %i loose objects.\n"
 "\n"
-" - %s"
+"To maintain optimal performance it is strongly recommended that you compress "
+"the database.\n"
+"\n"
+"Compress the database now?"
 msgstr ""
 
-#: lib/remote_branch_delete.tcl:190
+#: lib/date.tcl:25
 #, tcl-format
-msgid ""
-"One or more of the merge tests failed because you have not fetched the "
-"necessary commits.  Try fetching from %s first."
-msgstr ""
-
-#: lib/remote_branch_delete.tcl:208
-msgid "Please select one or more branches to delete."
+msgid "Invalid date from Git: %s"
 msgstr ""
 
-#: lib/remote_branch_delete.tcl:218 lib/branch_delete.tcl:115
+#: lib/diff.tcl:64
+#, tcl-format
 msgid ""
-"Recovering deleted branches is difficult.\n"
+"No differences detected.\n"
 "\n"
-"Delete the selected branches?"
+"%s has no changes.\n"
+"\n"
+"The modification date of this file was updated by another application, but "
+"the content within the file was not changed.\n"
+"\n"
+"A rescan will be automatically started to find other files which may have "
+"the same state."
 msgstr ""
 
-#: lib/remote_branch_delete.tcl:227
+#: lib/diff.tcl:104
 #, tcl-format
-msgid "Deleting branches from %s"
+msgid "Loading diff of %s..."
 msgstr ""
 
-#: lib/remote_branch_delete.tcl:300
-msgid "No repository selected."
+#: lib/diff.tcl:125
+msgid ""
+"LOCAL: deleted\n"
+"REMOTE:\n"
 msgstr ""
 
-#: lib/remote_branch_delete.tcl:305
-#, tcl-format
-msgid "Scanning %s..."
+#: lib/diff.tcl:130
+msgid ""
+"REMOTE: deleted\n"
+"LOCAL:\n"
 msgstr ""
 
-#: lib/choose_repository.tcl:45
-msgid "Git Gui"
+#: lib/diff.tcl:137
+msgid "LOCAL:\n"
 msgstr ""
 
-#: lib/choose_repository.tcl:104 lib/choose_repository.tcl:427
-msgid "Create New Repository"
+#: lib/diff.tcl:140
+msgid "REMOTE:\n"
 msgstr ""
 
-#: lib/choose_repository.tcl:110
-msgid "New..."
+#: lib/diff.tcl:202 lib/diff.tcl:319
+#, tcl-format
+msgid "Unable to display %s"
 msgstr ""
 
-#: lib/choose_repository.tcl:117 lib/choose_repository.tcl:511
-msgid "Clone Existing Repository"
+#: lib/diff.tcl:203
+msgid "Error loading file:"
 msgstr ""
 
-#: lib/choose_repository.tcl:128
-msgid "Clone..."
+#: lib/diff.tcl:210
+msgid "Git Repository (subproject)"
 msgstr ""
 
-#: lib/choose_repository.tcl:135 lib/choose_repository.tcl:1105
-msgid "Open Existing Repository"
+#: lib/diff.tcl:222
+msgid "* Binary file (not showing content)."
 msgstr ""
 
-#: lib/choose_repository.tcl:141
-msgid "Open..."
+#: lib/diff.tcl:227
+#, tcl-format
+msgid ""
+"* Untracked file is %d bytes.\n"
+"* Showing only first %d bytes.\n"
 msgstr ""
 
-#: lib/choose_repository.tcl:154
-msgid "Recent Repositories"
+#: 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/choose_repository.tcl:164
-msgid "Open Recent Repository:"
+#: lib/diff.tcl:482
+msgid "Failed to unstage selected hunk."
 msgstr ""
 
-#: lib/choose_repository.tcl:331 lib/choose_repository.tcl:338
-#: lib/choose_repository.tcl:345
-#, tcl-format
-msgid "Failed to create repository %s:"
+#: lib/diff.tcl:489
+msgid "Failed to stage selected hunk."
 msgstr ""
 
-#: lib/choose_repository.tcl:422 lib/branch_create.tcl:33
-msgid "Create"
+#: lib/diff.tcl:568
+msgid "Failed to unstage selected line."
 msgstr ""
 
-#: lib/choose_repository.tcl:432
-msgid "Directory:"
+#: lib/diff.tcl:576
+msgid "Failed to stage selected line."
 msgstr ""
 
-#: lib/choose_repository.tcl:462 lib/choose_repository.tcl:588
-#: lib/choose_repository.tcl:1139
-msgid "Git Repository"
+#: lib/encoding.tcl:443
+msgid "Default"
 msgstr ""
 
-#: lib/choose_repository.tcl:487
+#: lib/encoding.tcl:448
 #, tcl-format
-msgid "Directory %s already exists."
+msgid "System (%s)"
 msgstr ""
 
-#: lib/choose_repository.tcl:491
-#, tcl-format
-msgid "File %s already exists."
+#: lib/encoding.tcl:459 lib/encoding.tcl:465
+msgid "Other"
 msgstr ""
 
-#: lib/choose_repository.tcl:506
-msgid "Clone"
+#: lib/error.tcl:20 lib/error.tcl:114
+msgid "error"
 msgstr ""
 
-#: lib/choose_repository.tcl:519
-msgid "Source Location:"
+#: lib/error.tcl:36
+msgid "warning"
 msgstr ""
 
-#: lib/choose_repository.tcl:528
-msgid "Target Directory:"
+#: lib/error.tcl:94
+msgid "You must correct the above errors before committing."
 msgstr ""
 
-#: lib/choose_repository.tcl:538
-msgid "Clone Type:"
+#: lib/index.tcl:6
+msgid "Unable to unlock the index."
 msgstr ""
 
-#: lib/choose_repository.tcl:543
-msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
+#: lib/index.tcl:15
+msgid "Index Error"
 msgstr ""
 
-#: lib/choose_repository.tcl:548
-msgid "Full Copy (Slower, Redundant Backup)"
+#: lib/index.tcl:17
+msgid ""
+"Updating the Git index failed.  A rescan will be automatically started to "
+"resynchronize git-gui."
 msgstr ""
 
-#: lib/choose_repository.tcl:553
-msgid "Shared (Fastest, Not Recommended, No Backup)"
+#: lib/index.tcl:28
+msgid "Continue"
 msgstr ""
 
-#: lib/choose_repository.tcl:560
-msgid "Recursively clone submodules too"
+#: lib/index.tcl:31
+msgid "Unlock Index"
 msgstr ""
 
-#: lib/choose_repository.tcl:594 lib/choose_repository.tcl:641
-#: lib/choose_repository.tcl:790 lib/choose_repository.tcl:864
-#: lib/choose_repository.tcl:1145 lib/choose_repository.tcl:1153
+#: lib/index.tcl:289
 #, tcl-format
-msgid "Not a Git repository: %s"
+msgid "Unstaging %s from commit"
 msgstr ""
 
-#: lib/choose_repository.tcl:630
-msgid "Standard only available for local repository."
+#: lib/index.tcl:328
+msgid "Ready to commit."
 msgstr ""
 
-#: lib/choose_repository.tcl:634
-msgid "Shared only available for local repository."
+#: lib/index.tcl:341
+#, tcl-format
+msgid "Adding %s"
 msgstr ""
 
-#: lib/choose_repository.tcl:655
+#: lib/index.tcl:398
 #, tcl-format
-msgid "Location %s already exists."
+msgid "Revert changes in file %s?"
 msgstr ""
 
-#: lib/choose_repository.tcl:666
-msgid "Failed to configure origin"
+#: lib/index.tcl:400
+#, tcl-format
+msgid "Revert changes in these %i files?"
 msgstr ""
 
-#: lib/choose_repository.tcl:678
-msgid "Counting objects"
+#: lib/index.tcl:408
+msgid "Any unstaged changes will be permanently lost by the revert."
 msgstr ""
 
-#: lib/choose_repository.tcl:679
-msgid "buckets"
+#: lib/index.tcl:411
+msgid "Do Nothing"
 msgstr ""
 
-#: lib/choose_repository.tcl:703
-#, tcl-format
-msgid "Unable to copy objects/info/alternates: %s"
+#: lib/index.tcl:429
+msgid "Reverting selected files"
 msgstr ""
 
-#: lib/choose_repository.tcl:740
+#: lib/index.tcl:433
 #, tcl-format
-msgid "Nothing to clone from %s."
+msgid "Reverting %s"
 msgstr ""
 
-#: lib/choose_repository.tcl:742 lib/choose_repository.tcl:962
-#: lib/choose_repository.tcl:974
-msgid "The 'master' branch has not been initialized."
+#: lib/merge.tcl:13
+msgid ""
+"Cannot merge while amending.\n"
+"\n"
+"You must finish amending this commit before starting any type of merge.\n"
 msgstr ""
 
-#: lib/choose_repository.tcl:755
-msgid "Hardlinks are unavailable.  Falling back to copying."
+#: lib/merge.tcl:27
+msgid ""
+"Last scanned state does not match repository state.\n"
+"\n"
+"Another Git program has modified this repository since the last scan.  A "
+"rescan must be performed before a merge can be performed.\n"
+"\n"
+"The rescan will be automatically started now.\n"
 msgstr ""
 
-#: lib/choose_repository.tcl:769
+#: lib/merge.tcl:45
 #, tcl-format
-msgid "Cloning from %s"
+msgid ""
+"You are in the middle of a conflicted merge.\n"
+"\n"
+"File %s has merge conflicts.\n"
+"\n"
+"You must resolve them, stage the file, and commit to complete the current "
+"merge.  Only then can you begin another merge.\n"
 msgstr ""
 
-#: lib/choose_repository.tcl:800
-msgid "Copying objects"
+#: lib/merge.tcl:55
+#, tcl-format
+msgid ""
+"You are in the middle of a change.\n"
+"\n"
+"File %s is modified.\n"
+"\n"
+"You should complete the current commit before starting a merge.  Doing so "
+"will help you abort a failed merge, should the need arise.\n"
 msgstr ""
 
-#: lib/choose_repository.tcl:801
-msgid "KiB"
+#: lib/merge.tcl:107
+#, tcl-format
+msgid "%s of %s"
 msgstr ""
 
-#: lib/choose_repository.tcl:825
+#: lib/merge.tcl:120
 #, tcl-format
-msgid "Unable to copy object: %s"
+msgid "Merging %s and %s..."
 msgstr ""
 
-#: lib/choose_repository.tcl:837
-msgid "Linking objects"
+#: lib/merge.tcl:131
+msgid "Merge completed successfully."
 msgstr ""
 
-#: lib/choose_repository.tcl:838
-msgid "objects"
+#: lib/merge.tcl:133
+msgid "Merge failed.  Conflict resolution is required."
 msgstr ""
 
-#: lib/choose_repository.tcl:846
+#: lib/merge.tcl:158
 #, tcl-format
-msgid "Unable to hardlink object: %s"
-msgstr ""
-
-#: lib/choose_repository.tcl:903
-msgid "Cannot fetch branches and objects.  See console output for details."
+msgid "Merge Into %s"
 msgstr ""
 
-#: lib/choose_repository.tcl:914
-msgid "Cannot fetch tags.  See console output for details."
+#: lib/merge.tcl:177
+msgid "Revision To Merge"
 msgstr ""
 
-#: lib/choose_repository.tcl:938
-msgid "Cannot determine HEAD.  See console output for details."
+#: lib/merge.tcl:212
+msgid ""
+"Cannot abort while amending.\n"
+"\n"
+"You must finish amending this commit.\n"
 msgstr ""
 
-#: lib/choose_repository.tcl:947
-#, tcl-format
-msgid "Unable to cleanup %s"
+#: lib/merge.tcl:222
+msgid ""
+"Abort merge?\n"
+"\n"
+"Aborting the current merge will cause *ALL* uncommitted changes to be lost.\n"
+"\n"
+"Continue with aborting the current merge?"
 msgstr ""
 
-#: lib/choose_repository.tcl:953
-msgid "Clone failed."
+#: lib/merge.tcl:228
+msgid ""
+"Reset changes?\n"
+"\n"
+"Resetting the changes will cause *ALL* uncommitted changes to be lost.\n"
+"\n"
+"Continue with resetting the current changes?"
 msgstr ""
 
-#: lib/choose_repository.tcl:960
-msgid "No default branch obtained."
+#: lib/merge.tcl:239
+msgid "Aborting"
 msgstr ""
 
-#: lib/choose_repository.tcl:971
-#, tcl-format
-msgid "Cannot resolve %s as a commit."
+#: lib/merge.tcl:239
+msgid "files reset"
 msgstr ""
 
-#: lib/choose_repository.tcl:998
-msgid "Creating working directory"
+#: lib/merge.tcl:267
+msgid "Abort failed."
 msgstr ""
 
-#: lib/choose_repository.tcl:1028
-msgid "Initial file checkout failed."
+#: lib/merge.tcl:269
+msgid "Abort completed.  Ready."
 msgstr ""
 
-#: lib/choose_repository.tcl:1072
-msgid "Cloning submodules"
+#: lib/mergetool.tcl:8
+msgid "Force resolution to the base version?"
 msgstr ""
 
-#: lib/choose_repository.tcl:1087
-msgid "Cannot clone submodules."
+#: lib/mergetool.tcl:9
+msgid "Force resolution to this branch?"
 msgstr ""
 
-#: lib/choose_repository.tcl:1110
-msgid "Repository:"
+#: lib/mergetool.tcl:10
+msgid "Force resolution to the other branch?"
 msgstr ""
 
-#: lib/choose_repository.tcl:1159
+#: lib/mergetool.tcl:14
 #, tcl-format
-msgid "Failed to open repository %s:"
-msgstr ""
-
-#: lib/about.tcl:26
-msgid "git-gui - a graphical user interface for Git."
+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/blame.tcl:74
+#: lib/mergetool.tcl:45
 #, tcl-format
-msgid "%s (%s): File Viewer"
-msgstr ""
-
-#: lib/blame.tcl:80
-msgid "Commit:"
+msgid "File %s seems to have unresolved conflicts, still stage?"
 msgstr ""
 
-#: lib/blame.tcl:282
-msgid "Copy Commit"
+#: lib/mergetool.tcl:60
+#, tcl-format
+msgid "Adding resolution for %s"
 msgstr ""
 
-#: lib/blame.tcl:286
-msgid "Find Text..."
+#: lib/mergetool.tcl:141
+msgid "Cannot resolve deletion or link conflicts using a tool"
 msgstr ""
 
-#: lib/blame.tcl:290
-msgid "Goto Line..."
+#: lib/mergetool.tcl:146
+msgid "Conflict file does not exist"
 msgstr ""
 
-#: lib/blame.tcl:299
-msgid "Do Full Copy Detection"
+#: lib/mergetool.tcl:264
+#, tcl-format
+msgid "Not a GUI merge tool: '%s'"
 msgstr ""
 
-#: lib/blame.tcl:303
-msgid "Show History Context"
+#: lib/mergetool.tcl:268
+#, tcl-format
+msgid "Unsupported merge tool '%s'"
 msgstr ""
 
-#: lib/blame.tcl:306
-msgid "Blame Parent Commit"
+#: lib/mergetool.tcl:303
+msgid "Merge tool is already running, terminate it?"
 msgstr ""
 
-#: lib/blame.tcl:468
+#: lib/mergetool.tcl:323
 #, tcl-format
-msgid "Reading %s..."
+msgid ""
+"Error retrieving versions:\n"
+"%s"
 msgstr ""
 
-#: lib/blame.tcl:596
-msgid "Loading copy/move tracking annotations..."
+#: lib/mergetool.tcl:343
+#, tcl-format
+msgid ""
+"Could not start the merge tool:\n"
+"\n"
+"%s"
 msgstr ""
 
-#: lib/blame.tcl:613
-msgid "lines annotated"
+#: lib/mergetool.tcl:347
+msgid "Running merge tool..."
 msgstr ""
 
-#: lib/blame.tcl:815
-msgid "Loading original location annotations..."
+#: lib/mergetool.tcl:375 lib/mergetool.tcl:383
+msgid "Merge tool failed."
 msgstr ""
 
-#: lib/blame.tcl:818
-msgid "Annotation complete."
+#: lib/option.tcl:11
+#, tcl-format
+msgid "Invalid global encoding '%s'"
 msgstr ""
 
-#: lib/blame.tcl:849
-msgid "Busy"
+#: lib/option.tcl:19
+#, tcl-format
+msgid "Invalid repo encoding '%s'"
 msgstr ""
 
-#: lib/blame.tcl:850
-msgid "Annotation process is already running."
+#: lib/option.tcl:117
+msgid "Restore Defaults"
 msgstr ""
 
-#: lib/blame.tcl:889
-msgid "Running thorough copy detection..."
+#: lib/option.tcl:121
+msgid "Save"
 msgstr ""
 
-#: lib/blame.tcl:957
-msgid "Loading annotation..."
+#: lib/option.tcl:131
+#, tcl-format
+msgid "%s Repository"
 msgstr ""
 
-#: lib/blame.tcl:1010
-msgid "Author:"
+#: lib/option.tcl:132
+msgid "Global (All Repositories)"
 msgstr ""
 
-#: lib/blame.tcl:1014
-msgid "Committer:"
+#: lib/option.tcl:138
+msgid "User Name"
 msgstr ""
 
-#: lib/blame.tcl:1019
-msgid "Original File:"
+#: lib/option.tcl:139
+msgid "Email Address"
 msgstr ""
 
-#: lib/blame.tcl:1067
-msgid "Cannot find HEAD commit:"
+#: lib/option.tcl:141
+msgid "Summarize Merge Commits"
 msgstr ""
 
-#: lib/blame.tcl:1122
-msgid "Cannot find parent commit:"
+#: lib/option.tcl:142
+msgid "Merge Verbosity"
 msgstr ""
 
-#: lib/blame.tcl:1137
-msgid "Unable to display parent"
+#: lib/option.tcl:143
+msgid "Show Diffstat After Merge"
 msgstr ""
 
-#: lib/blame.tcl:1138 lib/diff.tcl:345
-msgid "Error loading diff:"
+#: lib/option.tcl:144
+msgid "Use Merge Tool"
 msgstr ""
 
-#: lib/blame.tcl:1279
-msgid "Originally By:"
+#: lib/option.tcl:146
+msgid "Trust File Modification Timestamps"
 msgstr ""
 
-#: lib/blame.tcl:1285
-msgid "In File:"
+#: lib/option.tcl:147
+msgid "Prune Tracking Branches During Fetch"
 msgstr ""
 
-#: lib/blame.tcl:1290
-msgid "Copied Or Moved Here By:"
+#: lib/option.tcl:148
+msgid "Match Tracking Branches"
 msgstr ""
 
-#: lib/diff.tcl:77
-#, tcl-format
-msgid ""
-"No differences detected.\n"
-"\n"
-"%s has no changes.\n"
-"\n"
-"The modification date of this file was updated by another application, but "
-"the content within the file was not changed.\n"
-"\n"
-"A rescan will be automatically started to find other files which may have "
-"the same state."
+#: lib/option.tcl:149
+msgid "Blame Copy Only On Changed Files"
 msgstr ""
 
-#: lib/diff.tcl:117
-#, tcl-format
-msgid "Loading diff of %s..."
+#: lib/option.tcl:150
+msgid "Minimum Letters To Blame Copy On"
 msgstr ""
 
-#: lib/diff.tcl:143
-msgid ""
-"LOCAL: deleted\n"
-"REMOTE:\n"
+#: lib/option.tcl:151
+msgid "Blame History Context Radius (days)"
 msgstr ""
 
-#: lib/diff.tcl:148
-msgid ""
-"REMOTE: deleted\n"
-"LOCAL:\n"
+#: lib/option.tcl:152
+msgid "Number of Diff Context Lines"
 msgstr ""
 
-#: lib/diff.tcl:155
-msgid "LOCAL:\n"
+#: lib/option.tcl:153
+msgid "Commit Message Text Width"
 msgstr ""
 
-#: lib/diff.tcl:158
-msgid "REMOTE:\n"
+#: lib/option.tcl:154
+msgid "New Branch Name Template"
 msgstr ""
 
-#: lib/diff.tcl:220 lib/diff.tcl:344
-#, tcl-format
-msgid "Unable to display %s"
+#: lib/option.tcl:155
+msgid "Default File Contents Encoding"
 msgstr ""
 
-#: lib/diff.tcl:221
-msgid "Error loading file:"
+#: lib/option.tcl:203
+msgid "Change"
 msgstr ""
 
-#: lib/diff.tcl:227
-msgid "Git Repository (subproject)"
+#: lib/option.tcl:230
+msgid "Spelling Dictionary:"
 msgstr ""
 
-#: lib/diff.tcl:239
-msgid "* Binary file (not showing content)."
+#: lib/option.tcl:254
+msgid "Change Font"
 msgstr ""
 
-#: lib/diff.tcl:244
+#: lib/option.tcl:258
 #, tcl-format
-msgid ""
-"* Untracked file is %d bytes.\n"
-"* Showing only first %d bytes.\n"
+msgid "Choose %s"
 msgstr ""
 
-#: lib/diff.tcl:250
-#, tcl-format
-msgid ""
-"\n"
-"* Untracked file clipped here by %s.\n"
-"* To see the entire file, use an external editor.\n"
+#: lib/option.tcl:264
+msgid "pt."
 msgstr ""
 
-#: lib/diff.tcl:583
-msgid "Failed to unstage selected hunk."
+#: lib/option.tcl:278
+msgid "Preferences"
 msgstr ""
 
-#: lib/diff.tcl:591
-msgid "Failed to revert selected hunk."
+#: lib/option.tcl:314
+msgid "Failed to completely save options:"
 msgstr ""
 
-#: lib/diff.tcl:594
-msgid "Failed to stage selected hunk."
+#: lib/remote.tcl:163
+msgid "Remove Remote"
 msgstr ""
 
-#: lib/diff.tcl:687
-msgid "Failed to unstage selected line."
+#: lib/remote.tcl:168
+msgid "Prune from"
 msgstr ""
 
-#: lib/diff.tcl:696
-msgid "Failed to revert selected line."
+#: lib/remote.tcl:173
+msgid "Fetch from"
 msgstr ""
 
-#: lib/diff.tcl:700
-msgid "Failed to stage selected line."
+#: lib/remote.tcl:215
+msgid "Push to"
 msgstr ""
 
-#: lib/diff.tcl:889
-msgid "Failed to undo last revert."
+#: lib/remote_add.tcl:19
+msgid "Add Remote"
 msgstr ""
 
-#: lib/sshkey.tcl:34
-msgid "No keys found."
+#: lib/remote_add.tcl:24
+msgid "Add New Remote"
 msgstr ""
 
-#: lib/sshkey.tcl:37
-#, tcl-format
-msgid "Found a public key in: %s"
+#: lib/remote_add.tcl:28 lib/tools_dlg.tcl:36
+msgid "Add"
 msgstr ""
 
-#: lib/sshkey.tcl:43
-msgid "Generate Key"
+#: lib/remote_add.tcl:37
+msgid "Remote Details"
 msgstr ""
 
-#: lib/sshkey.tcl:61
-msgid "Copy To Clipboard"
+#: lib/remote_add.tcl:50
+msgid "Location:"
 msgstr ""
 
-#: lib/sshkey.tcl:75
-msgid "Your OpenSSH Public Key"
+#: lib/remote_add.tcl:62
+msgid "Further Action"
 msgstr ""
 
-#: lib/sshkey.tcl:83
-msgid "Generating..."
+#: lib/remote_add.tcl:65
+msgid "Fetch Immediately"
 msgstr ""
 
-#: lib/sshkey.tcl:89
-#, tcl-format
-msgid ""
-"Could not start ssh-keygen:\n"
-"\n"
-"%s"
+#: lib/remote_add.tcl:71
+msgid "Initialize Remote Repository and Push"
 msgstr ""
 
-#: lib/sshkey.tcl:116
-msgid "Generation failed."
+#: lib/remote_add.tcl:77
+msgid "Do Nothing Else Now"
 msgstr ""
 
-#: lib/sshkey.tcl:123
-msgid "Generation succeeded, but no keys found."
+#: lib/remote_add.tcl:101
+msgid "Please supply a remote name."
 msgstr ""
 
-#: lib/sshkey.tcl:126
+#: lib/remote_add.tcl:114
 #, tcl-format
-msgid "Your key is in: %s"
+msgid "'%s' is not an acceptable remote name."
 msgstr ""
 
-#: lib/branch_create.tcl:23
+#: lib/remote_add.tcl:125
 #, tcl-format
-msgid "%s (%s): Create Branch"
-msgstr ""
-
-#: lib/branch_create.tcl:28
-msgid "Create New Branch"
-msgstr ""
-
-#: lib/branch_create.tcl:42
-msgid "Branch Name"
-msgstr ""
-
-#: lib/branch_create.tcl:57
-msgid "Match Tracking Branch Name"
-msgstr ""
-
-#: lib/branch_create.tcl:66
-msgid "Starting Revision"
+msgid "Failed to add remote '%s' of location '%s'."
 msgstr ""
 
-#: lib/branch_create.tcl:72
-msgid "Update Existing Branch:"
+#: lib/remote_add.tcl:133 lib/transport.tcl:6
+#, tcl-format
+msgid "fetch %s"
 msgstr ""
 
-#: lib/branch_create.tcl:75
-msgid "No"
+#: lib/remote_add.tcl:134
+#, tcl-format
+msgid "Fetching the %s"
 msgstr ""
 
-#: lib/branch_create.tcl:80
-msgid "Fast Forward Only"
+#: lib/remote_add.tcl:157
+#, tcl-format
+msgid "Do not know how to initialize repository at location '%s'."
 msgstr ""
 
-#: lib/branch_create.tcl:97
-msgid "Checkout After Creation"
+#: lib/remote_add.tcl:163 lib/transport.tcl:25 lib/transport.tcl:63
+#: lib/transport.tcl:81
+#, tcl-format
+msgid "push %s"
 msgstr ""
 
-#: lib/branch_create.tcl:132
-msgid "Please select a tracking branch."
+#: lib/remote_add.tcl:164
+#, tcl-format
+msgid "Setting up the %s (at %s)"
 msgstr ""
 
-#: lib/branch_create.tcl:141
-#, tcl-format
-msgid "Tracking branch %s is not a branch in the remote repository."
+#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34
+msgid "Delete Branch Remotely"
 msgstr ""
 
-#: lib/console.tcl:59
-msgid "Working... please wait..."
+#: lib/remote_branch_delete.tcl:47
+msgid "From Repository"
 msgstr ""
 
-#: lib/console.tcl:186
-msgid "Success"
+#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:134
+msgid "Remote:"
 msgstr ""
 
-#: lib/console.tcl:200
-msgid "Error: Command Failed"
+#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:149
+msgid "Arbitrary Location:"
 msgstr ""
 
-#: lib/line.tcl:17
-msgid "Goto Line:"
+#: lib/remote_branch_delete.tcl:84
+msgid "Branches"
 msgstr ""
 
-#: lib/line.tcl:23
-msgid "Go"
+#: lib/remote_branch_delete.tcl:109
+msgid "Delete Only If"
 msgstr ""
 
-#: lib/choose_rev.tcl:52
-msgid "This Detached Checkout"
+#: lib/remote_branch_delete.tcl:111
+msgid "Merged Into:"
 msgstr ""
 
-#: lib/choose_rev.tcl:60
-msgid "Revision Expression:"
+#: lib/remote_branch_delete.tcl:152
+msgid "A branch is required for 'Merged Into'."
 msgstr ""
 
-#: lib/choose_rev.tcl:72
-msgid "Local Branch"
+#: lib/remote_branch_delete.tcl:184
+#, tcl-format
+msgid ""
+"The following branches are not completely merged into %s:\n"
+"\n"
+" - %s"
 msgstr ""
 
-#: lib/choose_rev.tcl:77
-msgid "Tracking Branch"
+#: lib/remote_branch_delete.tcl:189
+#, tcl-format
+msgid ""
+"One or more of the merge tests failed because you have not fetched the "
+"necessary commits.  Try fetching from %s first."
 msgstr ""
 
-#: lib/choose_rev.tcl:82 lib/choose_rev.tcl:544
-msgid "Tag"
+#: lib/remote_branch_delete.tcl:207
+msgid "Please select one or more branches to delete."
 msgstr ""
 
-#: lib/choose_rev.tcl:321
+#: lib/remote_branch_delete.tcl:226
 #, tcl-format
-msgid "Invalid revision: %s"
+msgid "Deleting branches from %s"
 msgstr ""
 
-#: lib/choose_rev.tcl:342
-msgid "No revision selected."
+#: lib/remote_branch_delete.tcl:292
+msgid "No repository selected."
 msgstr ""
 
-#: lib/choose_rev.tcl:350
-msgid "Revision expression is empty."
+#: lib/remote_branch_delete.tcl:297
+#, tcl-format
+msgid "Scanning %s..."
 msgstr ""
 
-#: lib/choose_rev.tcl:537
-msgid "Updated"
+#: lib/search.tcl:21
+msgid "Find:"
 msgstr ""
 
-#: lib/choose_rev.tcl:565
-msgid "URL"
+#: lib/search.tcl:23
+msgid "Next"
 msgstr ""
 
-#: lib/commit.tcl:9
-msgid ""
-"There is nothing to amend.\n"
-"\n"
-"You are about to create the initial commit.  There is no commit before this "
-"to amend.\n"
+#: lib/search.tcl:24
+msgid "Prev"
 msgstr ""
 
-#: lib/commit.tcl:18
-msgid ""
-"Cannot amend while merging.\n"
-"\n"
-"You are currently in the middle of a merge that has not been fully "
-"completed.  You cannot amend the prior commit unless you first abort the "
-"current merge activity.\n"
+#: lib/search.tcl:25
+msgid "Case-Sensitive"
 msgstr ""
 
-#: lib/commit.tcl:56
-msgid "Error loading commit data for amend:"
+#: lib/shortcut.tcl:21 lib/shortcut.tcl:62
+msgid "Cannot write shortcut:"
 msgstr ""
 
-#: lib/commit.tcl:83
-msgid "Unable to obtain your identity:"
+#: lib/shortcut.tcl:137
+msgid "Cannot write icon:"
 msgstr ""
 
-#: lib/commit.tcl:88
-msgid "Invalid GIT_COMMITTER_IDENT:"
+#: lib/spellcheck.tcl:57
+msgid "Unsupported spell checker"
 msgstr ""
 
-#: lib/commit.tcl:138
-#, tcl-format
-msgid "warning: Tcl does not support encoding '%s'."
+#: lib/spellcheck.tcl:65
+msgid "Spell checking is unavailable"
 msgstr ""
 
-#: lib/commit.tcl:158
-msgid ""
-"Last scanned state does not match repository state.\n"
-"\n"
-"Another Git program has modified this repository since the last scan.  A "
-"rescan must be performed before another commit can be created.\n"
-"\n"
-"The rescan will be automatically started now.\n"
+#: lib/spellcheck.tcl:68
+msgid "Invalid spell checking configuration"
 msgstr ""
 
-#: lib/commit.tcl:182
+#: lib/spellcheck.tcl:70
 #, tcl-format
-msgid ""
-"Unmerged files cannot be committed.\n"
-"\n"
-"File %s has merge conflicts.  You must resolve them and stage the file "
-"before committing.\n"
+msgid "Reverting dictionary to %s."
 msgstr ""
 
-#: lib/commit.tcl:190
-#, tcl-format
-msgid ""
-"Unknown file state %s detected.\n"
-"\n"
-"File %s cannot be committed by this program.\n"
+#: lib/spellcheck.tcl:73
+msgid "Spell checker silently failed on startup"
 msgstr ""
 
-#: lib/commit.tcl:198
-msgid ""
-"No changes to commit.\n"
-"\n"
-"You must stage at least 1 file before you can commit.\n"
+#: lib/spellcheck.tcl:80
+msgid "Unrecognized spell checker"
 msgstr ""
 
-#: lib/commit.tcl:213
-msgid ""
-"Please supply a commit message.\n"
-"\n"
-"A good commit message has the following format:\n"
-"\n"
-"- First line: Describe in one sentence what you did.\n"
-"- Second line: Blank\n"
-"- Remaining lines: Describe why this change is good.\n"
+#: lib/spellcheck.tcl:186
+msgid "No Suggestions"
 msgstr ""
 
-#: lib/commit.tcl:244
-msgid "Calling pre-commit hook..."
+#: lib/spellcheck.tcl:388
+msgid "Unexpected EOF from spell checker"
 msgstr ""
 
-#: lib/commit.tcl:259
-msgid "Commit declined by pre-commit hook."
+#: lib/spellcheck.tcl:392
+msgid "Spell Checker Failed"
 msgstr ""
 
-#: lib/commit.tcl:278
-msgid ""
-"You are about to commit on a detached head. This is a potentially dangerous "
-"thing to do because if you switch to another branch you will lose your "
-"changes and it can be difficult to retrieve them later from the reflog. You "
-"should probably cancel this commit and create a new branch to continue.\n"
-" \n"
-" Do you really want to proceed with your Commit?"
+#: lib/sshkey.tcl:31
+msgid "No keys found."
 msgstr ""
 
-#: lib/commit.tcl:299
-msgid "Calling commit-msg hook..."
+#: lib/sshkey.tcl:34
+#, tcl-format
+msgid "Found a public key in: %s"
 msgstr ""
 
-#: lib/commit.tcl:314
-msgid "Commit declined by commit-msg hook."
+#: lib/sshkey.tcl:40
+msgid "Generate Key"
 msgstr ""
 
-#: lib/commit.tcl:327
-msgid "Committing changes..."
+#: lib/sshkey.tcl:56
+msgid "Copy To Clipboard"
 msgstr ""
 
-#: lib/commit.tcl:344
-msgid "write-tree failed:"
+#: lib/sshkey.tcl:70
+msgid "Your OpenSSH Public Key"
 msgstr ""
 
-#: lib/commit.tcl:345 lib/commit.tcl:395 lib/commit.tcl:422
-msgid "Commit failed."
+#: lib/sshkey.tcl:78
+msgid "Generating..."
 msgstr ""
 
-#: lib/commit.tcl:362
+#: lib/sshkey.tcl:84
 #, tcl-format
-msgid "Commit %s appears to be corrupt"
-msgstr ""
-
-#: lib/commit.tcl:367
 msgid ""
-"No changes to commit.\n"
-"\n"
-"No files were modified by this commit and it was not a merge commit.\n"
+"Could not start ssh-keygen:\n"
 "\n"
-"A rescan will be automatically started now.\n"
-msgstr ""
-
-#: lib/commit.tcl:374
-msgid "No changes to commit."
+"%s"
 msgstr ""
 
-#: lib/commit.tcl:394
-msgid "commit-tree failed:"
+#: lib/sshkey.tcl:111
+msgid "Generation failed."
 msgstr ""
 
-#: lib/commit.tcl:421
-msgid "update-ref failed:"
+#: lib/sshkey.tcl:118
+msgid "Generation succeeded, but no keys found."
 msgstr ""
 
-#: lib/commit.tcl:514
+#: lib/sshkey.tcl:121
 #, tcl-format
-msgid "Created commit %s: %s"
+msgid "Your key is in: %s"
 msgstr ""
 
-#: lib/branch_delete.tcl:16
+#: lib/status_bar.tcl:83
 #, tcl-format
-msgid "%s (%s): Delete Branch"
-msgstr ""
-
-#: lib/branch_delete.tcl:21
-msgid "Delete Local Branch"
+msgid "%s ... %*i of %*i %s (%3i%%)"
 msgstr ""
 
-#: lib/branch_delete.tcl:39
-msgid "Local Branches"
+#: lib/tools.tcl:75
+#, tcl-format
+msgid "Running %s requires a selected file."
 msgstr ""
 
-#: lib/branch_delete.tcl:51
-msgid "Delete Only If Merged Into"
+#: lib/tools.tcl:90
+#, tcl-format
+msgid "Are you sure you want to run %s?"
 msgstr ""
 
-#: lib/branch_delete.tcl:103
+#: lib/tools.tcl:110
 #, tcl-format
-msgid "The following branches are not completely merged into %s:"
+msgid "Tool: %s"
 msgstr ""
 
-#: lib/branch_delete.tcl:131
+#: lib/tools.tcl:111
 #, tcl-format
-msgid " - %s:"
+msgid "Running: %s"
 msgstr ""
 
-#: lib/branch_delete.tcl:141
+#: lib/tools.tcl:149
 #, tcl-format
-msgid ""
-"Failed to delete branches:\n"
-"%s"
+msgid "Tool completed successfully: %s"
 msgstr ""
 
-#: lib/date.tcl:25
+#: lib/tools.tcl:151
 #, tcl-format
-msgid "Invalid date from Git: %s"
+msgid "Tool failed: %s"
 msgstr ""
 
-#: lib/database.tcl:42
-msgid "Number of loose objects"
+#: lib/tools_dlg.tcl:22
+msgid "Add Tool"
 msgstr ""
 
-#: lib/database.tcl:43
-msgid "Disk space used by loose objects"
+#: lib/tools_dlg.tcl:28
+msgid "Add New Tool Command"
 msgstr ""
 
-#: lib/database.tcl:44
-msgid "Number of packed objects"
+#: lib/tools_dlg.tcl:33
+msgid "Add globally"
 msgstr ""
 
-#: lib/database.tcl:45
-msgid "Number of packs"
+#: lib/tools_dlg.tcl:45
+msgid "Tool Details"
 msgstr ""
 
-#: lib/database.tcl:46
-msgid "Disk space used by packed objects"
+#: lib/tools_dlg.tcl:48
+msgid "Use '/' separators to create a submenu tree:"
 msgstr ""
 
-#: lib/database.tcl:47
-msgid "Packed objects waiting for pruning"
+#: lib/tools_dlg.tcl:61
+msgid "Command:"
 msgstr ""
 
-#: lib/database.tcl:48
-msgid "Garbage files"
+#: lib/tools_dlg.tcl:74
+msgid "Show a dialog before running"
 msgstr ""
 
-#: lib/database.tcl:66
-#, tcl-format
-msgid "%s (%s): Database Statistics"
+#: lib/tools_dlg.tcl:80
+msgid "Ask the user to select a revision (sets $REVISION)"
 msgstr ""
 
-#: lib/database.tcl:72
-msgid "Compressing the object database"
+#: lib/tools_dlg.tcl:85
+msgid "Ask the user for additional arguments (sets $ARGS)"
 msgstr ""
 
-#: lib/database.tcl:83
-msgid "Verifying the object database with fsck-objects"
+#: lib/tools_dlg.tcl:92
+msgid "Don't show the command output window"
 msgstr ""
 
-#: 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 "
-"the database.\n"
-"\n"
-"Compress the database now?"
+#: lib/tools_dlg.tcl:97
+msgid "Run only if a diff is selected ($FILENAME not empty)"
 msgstr ""
 
-#: lib/error.tcl:20
-#, tcl-format
-msgid "%s: error"
+#: lib/tools_dlg.tcl:121
+msgid "Please supply a name for the tool."
 msgstr ""
 
-#: lib/error.tcl:36
+#: lib/tools_dlg.tcl:129
 #, tcl-format
-msgid "%s: warning"
+msgid "Tool '%s' already exists."
 msgstr ""
 
-#: lib/error.tcl:80
+#: lib/tools_dlg.tcl:151
 #, tcl-format
-msgid "%s hook failed:"
+msgid ""
+"Could not add tool:\n"
+"%s"
 msgstr ""
 
-#: lib/error.tcl:96
-msgid "You must correct the above errors before committing."
+#: lib/tools_dlg.tcl:190
+msgid "Remove Tool"
 msgstr ""
 
-#: lib/error.tcl:116
-#, tcl-format
-msgid "%s (%s): error"
+#: lib/tools_dlg.tcl:196
+msgid "Remove Tool Commands"
 msgstr ""
 
-#: lib/merge.tcl:13
-msgid ""
-"Cannot merge while amending.\n"
-"\n"
-"You must finish amending this commit before starting any type of merge.\n"
+#: lib/tools_dlg.tcl:200
+msgid "Remove"
 msgstr ""
 
-#: lib/merge.tcl:27
-msgid ""
-"Last scanned state does not match repository state.\n"
-"\n"
-"Another Git program has modified this repository since the last scan.  A "
-"rescan must be performed before a merge can be performed.\n"
-"\n"
-"The rescan will be automatically started now.\n"
+#: lib/tools_dlg.tcl:236
+msgid "(Blue denotes repository-local tools)"
 msgstr ""
 
-#: lib/merge.tcl:45
+#: lib/tools_dlg.tcl:297
 #, tcl-format
-msgid ""
-"You are in the middle of a conflicted merge.\n"
-"\n"
-"File %s has merge conflicts.\n"
-"\n"
-"You must resolve them, stage the file, and commit to complete the current "
-"merge.  Only then can you begin another merge.\n"
+msgid "Run Command: %s"
 msgstr ""
 
-#: lib/merge.tcl:55
-#, tcl-format
-msgid ""
-"You are in the middle of a change.\n"
-"\n"
-"File %s is modified.\n"
-"\n"
-"You should complete the current commit before starting a merge.  Doing so "
-"will help you abort a failed merge, should the need arise.\n"
+#: lib/tools_dlg.tcl:311
+msgid "Arguments"
 msgstr ""
 
-#: lib/merge.tcl:108
-#, tcl-format
-msgid "%s of %s"
+#: lib/tools_dlg.tcl:348
+msgid "OK"
 msgstr ""
 
-#: lib/merge.tcl:126
+#: lib/transport.tcl:7
 #, tcl-format
-msgid "Merging %s and %s..."
+msgid "Fetching new changes from %s"
 msgstr ""
 
-#: lib/merge.tcl:137
-msgid "Merge completed successfully."
+#: lib/transport.tcl:18
+#, tcl-format
+msgid "remote prune %s"
 msgstr ""
 
-#: lib/merge.tcl:139
-msgid "Merge failed.  Conflict resolution is required."
+#: lib/transport.tcl:19
+#, tcl-format
+msgid "Pruning tracking branches deleted from %s"
 msgstr ""
 
-#: lib/merge.tcl:156
+#: lib/transport.tcl:26
 #, tcl-format
-msgid "%s (%s): Merge"
+msgid "Pushing changes to %s"
 msgstr ""
 
-#: lib/merge.tcl:164
+#: lib/transport.tcl:64
 #, tcl-format
-msgid "Merge Into %s"
+msgid "Mirroring to %s"
 msgstr ""
 
-#: lib/merge.tcl:183
-msgid "Revision To Merge"
+#: lib/transport.tcl:82
+#, tcl-format
+msgid "Pushing %s %s to %s"
 msgstr ""
 
-#: lib/merge.tcl:218
-msgid ""
-"Cannot abort while amending.\n"
-"\n"
-"You must finish amending this commit.\n"
+#: lib/transport.tcl:100
+msgid "Push Branches"
 msgstr ""
 
-#: lib/merge.tcl:228
-msgid ""
-"Abort merge?\n"
-"\n"
-"Aborting the current merge will cause *ALL* uncommitted changes to be lost.\n"
-"\n"
-"Continue with aborting the current merge?"
+#: lib/transport.tcl:114
+msgid "Source Branches"
 msgstr ""
 
-#: lib/merge.tcl:234
-msgid ""
-"Reset changes?\n"
-"\n"
-"Resetting the changes will cause *ALL* uncommitted changes to be lost.\n"
-"\n"
-"Continue with resetting the current changes?"
+#: lib/transport.tcl:131
+msgid "Destination Repository"
 msgstr ""
 
-#: lib/merge.tcl:246
-msgid "Aborting"
+#: lib/transport.tcl:169
+msgid "Transfer Options"
 msgstr ""
 
-#: lib/merge.tcl:247
-msgid "files reset"
+#: lib/transport.tcl:171
+msgid "Force overwrite existing branch (may discard changes)"
 msgstr ""
 
-#: lib/merge.tcl:277
-msgid "Abort failed."
+#: lib/transport.tcl:175
+msgid "Use thin pack (for slow network connections)"
 msgstr ""
 
-#: lib/merge.tcl:279
-msgid "Abort completed.  Ready."
+#: lib/transport.tcl:179
+msgid "Include tags"
 msgstr ""