X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=po%2Fgit-gui.pot;h=53b7d3634d842a43f8043e3f825d4232e17588aa;hb=966d0778db2e3b11f5fffa2312770ef534263058;hp=991efea5f3f9f82ae9ba6e15528021470edcec58;hpb=b2bd31006f02debe1ddf4fa8b73c52281516a871;p=git.git

diff --git a/po/git-gui.pot b/po/git-gui.pot
index 991efea5f..53b7d3634 100644
--- 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"
-"POT-Creation-Date: 2007-08-11 17:28+0200\n"
+"POT-Creation-Date: 2008-12-08 08:31-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"
@@ -16,15 +16,33 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: git-gui.sh:531
+#: git-gui.sh:41 git-gui.sh:737 git-gui.sh:751 git-gui.sh:764 git-gui.sh:847
+#: git-gui.sh:866
+msgid "git-gui: fatal error"
+msgstr ""
+
+#: git-gui.sh:689
+#, tcl-format
+msgid "Invalid font specified in %s:"
+msgstr ""
+
+#: git-gui.sh:723
+msgid "Main Font"
+msgstr ""
+
+#: git-gui.sh:724
+msgid "Diff/Console Font"
+msgstr ""
+
+#: git-gui.sh:738
 msgid "Cannot find git in PATH."
 msgstr ""
 
-#: git-gui.sh:550
+#: git-gui.sh:765
 msgid "Cannot parse Git version string:"
 msgstr ""
 
-#: git-gui.sh:567
+#: git-gui.sh:783
 #, tcl-format
 msgid ""
 "Git version cannot be determined.\n"
@@ -36,390 +54,581 @@ msgid ""
 "Assume '%s' is version 1.5.0?\n"
 msgstr ""
 
-#: git-gui.sh:689
-msgid "Cannot find the git directory:"
+#: git-gui.sh:1062
+msgid "Git directory not found:"
 msgstr ""
 
-#: git-gui.sh:697
-msgid "Git directory not found:"
+#: git-gui.sh:1069
+msgid "Cannot move to top of working directory:"
 msgstr ""
 
-#: git-gui.sh:703
+#: git-gui.sh:1076
 msgid "Cannot use funny .git directory:"
 msgstr ""
 
-#: git-gui.sh:708
+#: git-gui.sh:1081
 msgid "No working directory"
 msgstr ""
 
-#: git-gui.sh:854
+#: git-gui.sh:1247 lib/checkout_op.tcl:305
 msgid "Refreshing file status..."
 msgstr ""
 
-#: git-gui.sh:891
+#: git-gui.sh:1303
 msgid "Scanning for modified files ..."
 msgstr ""
 
-#: git-gui.sh:1057 lib/browser.tcl:247
+#: git-gui.sh:1367
+msgid "Calling prepare-commit-msg hook..."
+msgstr ""
+
+#: git-gui.sh:1384
+msgid "Commit declined by prepare-commit-msg hook."
+msgstr ""
+
+#: git-gui.sh:1542 lib/browser.tcl:246
 msgid "Ready."
 msgstr ""
 
-#: git-gui.sh:1322
+#: git-gui.sh:1819
 msgid "Unmodified"
 msgstr ""
 
-#: git-gui.sh:1324
+#: git-gui.sh:1821
 msgid "Modified, not staged"
 msgstr ""
 
-#: git-gui.sh:1325 git-gui.sh:1330
+#: git-gui.sh:1822 git-gui.sh:1830
 msgid "Staged for commit"
 msgstr ""
 
-#: git-gui.sh:1326 git-gui.sh:1331
+#: git-gui.sh:1823 git-gui.sh:1831
 msgid "Portions staged for commit"
 msgstr ""
 
-#: git-gui.sh:1327 git-gui.sh:1332
+#: git-gui.sh:1824 git-gui.sh:1832
 msgid "Staged for commit, missing"
 msgstr ""
 
-#: git-gui.sh:1329
+#: git-gui.sh:1826
+msgid "File type changed, not staged"
+msgstr ""
+
+#: git-gui.sh:1827
+msgid "File type changed, staged"
+msgstr ""
+
+#: git-gui.sh:1829
 msgid "Untracked, not staged"
 msgstr ""
 
-#: git-gui.sh:1334
+#: git-gui.sh:1834
 msgid "Missing"
 msgstr ""
 
-#: git-gui.sh:1335
+#: git-gui.sh:1835
 msgid "Staged for removal"
 msgstr ""
 
-#: git-gui.sh:1336
+#: git-gui.sh:1836
 msgid "Staged for removal, still present"
 msgstr ""
 
-#: git-gui.sh:1338 git-gui.sh:1339 git-gui.sh:1340 git-gui.sh:1341
+#: git-gui.sh:1838 git-gui.sh:1839 git-gui.sh:1840 git-gui.sh:1841
+#: git-gui.sh:1842 git-gui.sh:1843
 msgid "Requires merge resolution"
 msgstr ""
 
-#: git-gui.sh:1383
+#: git-gui.sh:1878
 msgid "Starting gitk... please wait..."
 msgstr ""
 
-#: git-gui.sh:1392
-#, tcl-format
-msgid ""
-"Unable to start gitk:\n"
-"\n"
-"%s does not exist"
-msgstr ""
-
-#: git-gui.sh:1609
-#, tcl-format
-msgid "Invalid font specified in gui.%s:"
-msgstr ""
-
-#: git-gui.sh:1634
-msgid "Main Font"
-msgstr ""
-
-#: git-gui.sh:1635
-msgid "Diff/Console Font"
+#: git-gui.sh:1887
+msgid "Couldn't find gitk in PATH"
 msgstr ""
 
-#: git-gui.sh:1649
+#: git-gui.sh:2280 lib/choose_repository.tcl:36
 msgid "Repository"
 msgstr ""
 
-#: git-gui.sh:1650
+#: git-gui.sh:2281
 msgid "Edit"
 msgstr ""
 
-#: git-gui.sh:1652
+#: git-gui.sh:2283 lib/choose_rev.tcl:561
 msgid "Branch"
 msgstr ""
 
-#: git-gui.sh:1655 git-gui.sh:1842 git-gui.sh:2152
-msgid "Commit"
+#: git-gui.sh:2286 lib/choose_rev.tcl:548
+msgid "Commit@@noun"
 msgstr ""
 
-#: git-gui.sh:1658 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168
+#: git-gui.sh:2289 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168
 msgid "Merge"
 msgstr ""
 
-#: git-gui.sh:1659
-msgid "Fetch"
+#: git-gui.sh:2290 lib/choose_rev.tcl:557
+msgid "Remote"
 msgstr ""
 
-#: git-gui.sh:1660 git-gui.sh:2158 lib/transport.tcl:88 lib/transport.tcl:172
-msgid "Push"
+#: git-gui.sh:2293
+msgid "Tools"
+msgstr ""
+
+#: git-gui.sh:2302
+msgid "Explore Working Copy"
 msgstr ""
 
-#: git-gui.sh:1669
+#: git-gui.sh:2307
 msgid "Browse Current Branch's Files"
 msgstr ""
 
-#: git-gui.sh:1673
+#: git-gui.sh:2311
 msgid "Browse Branch Files..."
 msgstr ""
 
-#: git-gui.sh:1678
+#: git-gui.sh:2316
 msgid "Visualize Current Branch's History"
 msgstr ""
 
-#: git-gui.sh:1682
+#: git-gui.sh:2320
 msgid "Visualize All Branch History"
 msgstr ""
 
-#: git-gui.sh:1689
+#: git-gui.sh:2327
 #, tcl-format
 msgid "Browse %s's Files"
 msgstr ""
 
-#: git-gui.sh:1691
+#: git-gui.sh:2329
 #, tcl-format
 msgid "Visualize %s's History"
 msgstr ""
 
-#: git-gui.sh:1696 lib/database.tcl:27 lib/database.tcl:67
+#: git-gui.sh:2334 lib/database.tcl:27 lib/database.tcl:67
 msgid "Database Statistics"
 msgstr ""
 
-#: git-gui.sh:1699 lib/database.tcl:34
+#: git-gui.sh:2337 lib/database.tcl:34
 msgid "Compress Database"
 msgstr ""
 
-#: git-gui.sh:1702
+#: git-gui.sh:2340
 msgid "Verify Database"
 msgstr ""
 
-#: git-gui.sh:1709 git-gui.sh:1713 git-gui.sh:1717 lib/shortcut.tcl:9
-#: lib/shortcut.tcl:45 lib/shortcut.tcl:84
+#: git-gui.sh:2347 git-gui.sh:2351 git-gui.sh:2355 lib/shortcut.tcl:7
+#: lib/shortcut.tcl:39 lib/shortcut.tcl:71
 msgid "Create Desktop Icon"
 msgstr ""
 
-#: git-gui.sh:1722
+#: git-gui.sh:2363 lib/choose_repository.tcl:183 lib/choose_repository.tcl:191
 msgid "Quit"
 msgstr ""
 
-#: git-gui.sh:1729
+#: git-gui.sh:2371
 msgid "Undo"
 msgstr ""
 
-#: git-gui.sh:1732
+#: git-gui.sh:2374
 msgid "Redo"
 msgstr ""
 
-#: git-gui.sh:1736 git-gui.sh:2222
+#: git-gui.sh:2378 git-gui.sh:2937
 msgid "Cut"
 msgstr ""
 
-#: git-gui.sh:1739 git-gui.sh:2225 git-gui.sh:2296 git-gui.sh:2368
+#: git-gui.sh:2381 git-gui.sh:2940 git-gui.sh:3014 git-gui.sh:3096
 #: lib/console.tcl:69
 msgid "Copy"
 msgstr ""
 
-#: git-gui.sh:1742 git-gui.sh:2228
+#: git-gui.sh:2384 git-gui.sh:2943
 msgid "Paste"
 msgstr ""
 
-#: git-gui.sh:1745 git-gui.sh:2231 lib/branch_delete.tcl:26
+#: git-gui.sh:2387 git-gui.sh:2946 lib/branch_delete.tcl:26
 #: lib/remote_branch_delete.tcl:38
 msgid "Delete"
 msgstr ""
 
-#: git-gui.sh:1749 git-gui.sh:2235 git-gui.sh:2372 lib/console.tcl:71
+#: git-gui.sh:2391 git-gui.sh:2950 git-gui.sh:3100 lib/console.tcl:71
 msgid "Select All"
 msgstr ""
 
-#: git-gui.sh:1758
+#: git-gui.sh:2400
 msgid "Create..."
 msgstr ""
 
-#: git-gui.sh:1764
+#: git-gui.sh:2406
 msgid "Checkout..."
 msgstr ""
 
-#: git-gui.sh:1770
+#: git-gui.sh:2412
 msgid "Rename..."
 msgstr ""
 
-#: git-gui.sh:1775 git-gui.sh:1873
+#: git-gui.sh:2417
 msgid "Delete..."
 msgstr ""
 
-#: git-gui.sh:1780
+#: git-gui.sh:2422
 msgid "Reset..."
 msgstr ""
 
-#: git-gui.sh:1792 git-gui.sh:2169
+#: git-gui.sh:2432
+msgid "Done"
+msgstr ""
+
+#: git-gui.sh:2434
+msgid "Commit@@verb"
+msgstr ""
+
+#: git-gui.sh:2443 git-gui.sh:2878
 msgid "New Commit"
 msgstr ""
 
-#: git-gui.sh:1800 git-gui.sh:2176
+#: git-gui.sh:2451 git-gui.sh:2885
 msgid "Amend Last Commit"
 msgstr ""
 
-#: git-gui.sh:1809 git-gui.sh:2136 lib/remote_branch_delete.tcl:99
+#: git-gui.sh:2461 git-gui.sh:2839 lib/remote_branch_delete.tcl:99
 msgid "Rescan"
 msgstr ""
 
-#: git-gui.sh:1815
+#: git-gui.sh:2467
 msgid "Stage To Commit"
 msgstr ""
 
-#: git-gui.sh:1820
+#: git-gui.sh:2473
 msgid "Stage Changed Files To Commit"
 msgstr ""
 
-#: git-gui.sh:1826
+#: git-gui.sh:2479
 msgid "Unstage From Commit"
 msgstr ""
 
-#: git-gui.sh:1831 lib/index.tcl:376
+#: git-gui.sh:2484 lib/index.tcl:410
 msgid "Revert Changes"
 msgstr ""
 
-#: git-gui.sh:1838 git-gui.sh:2148 git-gui.sh:2246
+#: git-gui.sh:2491 git-gui.sh:3083
+msgid "Show Less Context"
+msgstr ""
+
+#: git-gui.sh:2495 git-gui.sh:3087
+msgid "Show More Context"
+msgstr ""
+
+#: git-gui.sh:2502 git-gui.sh:2852 git-gui.sh:2961
 msgid "Sign Off"
 msgstr ""
 
-#: git-gui.sh:1853
+#: git-gui.sh:2518
 msgid "Local Merge..."
 msgstr ""
 
-#: git-gui.sh:1858
+#: git-gui.sh:2523
 msgid "Abort Merge..."
 msgstr ""
 
-#: git-gui.sh:1870
+#: git-gui.sh:2535 git-gui.sh:2575
+msgid "Add..."
+msgstr ""
+
+#: git-gui.sh:2539
 msgid "Push..."
 msgstr ""
 
-#: git-gui.sh:1880
-msgid "Apple"
+#: git-gui.sh:2543
+msgid "Delete Branch..."
 msgstr ""
 
-#: git-gui.sh:1883 git-gui.sh:1901 lib/option.tcl:65
+#: git-gui.sh:2553 git-gui.sh:2589 lib/about.tcl:14
+#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:53
 #, tcl-format
 msgid "About %s"
 msgstr ""
 
-#: git-gui.sh:1885 git-gui.sh:1891 git-gui.sh:2414
+#: git-gui.sh:2557
+msgid "Preferences..."
+msgstr ""
+
+#: git-gui.sh:2565 git-gui.sh:3129
 msgid "Options..."
 msgstr ""
 
-#: git-gui.sh:1897
+#: git-gui.sh:2576
+msgid "Remove..."
+msgstr ""
+
+#: git-gui.sh:2585 lib/choose_repository.tcl:50
 msgid "Help"
 msgstr ""
 
-#: git-gui.sh:1938
+#: git-gui.sh:2611
 msgid "Online Documentation"
 msgstr ""
 
-#: git-gui.sh:2054
+#: git-gui.sh:2614 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56
+msgid "Show SSH Key"
+msgstr ""
+
+#: git-gui.sh:2721
+#, tcl-format
+msgid "fatal: cannot stat path %s: No such file or directory"
+msgstr ""
+
+#: git-gui.sh:2754
 msgid "Current Branch:"
 msgstr ""
 
-#: git-gui.sh:2075
-msgid "Staged Changes (Will Be Committed)"
+#: git-gui.sh:2775
+msgid "Staged Changes (Will Commit)"
 msgstr ""
 
-#: git-gui.sh:2095
-msgid "Unstaged Changes (Will Not Be Committed)"
+#: git-gui.sh:2795
+msgid "Unstaged Changes"
 msgstr ""
 
-#: git-gui.sh:2142
+#: git-gui.sh:2845
 msgid "Stage Changed"
 msgstr ""
 
-#: git-gui.sh:2188
+#: git-gui.sh:2864 lib/transport.tcl:104 lib/transport.tcl:193
+msgid "Push"
+msgstr ""
+
+#: git-gui.sh:2899
 msgid "Initial Commit Message:"
 msgstr ""
 
-#: git-gui.sh:2189
+#: git-gui.sh:2900
 msgid "Amended Commit Message:"
 msgstr ""
 
-#: git-gui.sh:2190
+#: git-gui.sh:2901
 msgid "Amended Initial Commit Message:"
 msgstr ""
 
-#: git-gui.sh:2191
+#: git-gui.sh:2902
 msgid "Amended Merge Commit Message:"
 msgstr ""
 
-#: git-gui.sh:2192
+#: git-gui.sh:2903
 msgid "Merge Commit Message:"
 msgstr ""
 
-#: git-gui.sh:2193
+#: git-gui.sh:2904
 msgid "Commit Message:"
 msgstr ""
 
-#: git-gui.sh:2238 git-gui.sh:2376 lib/console.tcl:73
+#: git-gui.sh:2953 git-gui.sh:3104 lib/console.tcl:73
 msgid "Copy All"
 msgstr ""
 
-#: git-gui.sh:2262 lib/blame.tcl:104
+#: git-gui.sh:2977 lib/blame.tcl:104
 msgid "File:"
 msgstr ""
 
-#: git-gui.sh:2364
+#: git-gui.sh:3092
 msgid "Refresh"
 msgstr ""
 
-#: git-gui.sh:2385
+#: git-gui.sh:3113
+msgid "Decrease Font Size"
+msgstr ""
+
+#: git-gui.sh:3117
+msgid "Increase Font Size"
+msgstr ""
+
+#: git-gui.sh:3125 lib/blame.tcl:281
+msgid "Encoding"
+msgstr ""
+
+#: git-gui.sh:3136
 msgid "Apply/Reverse Hunk"
 msgstr ""
 
-#: git-gui.sh:2391
-msgid "Decrease Font Size"
+#: git-gui.sh:3141
+msgid "Apply/Reverse Line"
 msgstr ""
 
-#: git-gui.sh:2395
-msgid "Increase Font Size"
+#: git-gui.sh:3151
+msgid "Run Merge Tool"
 msgstr ""
 
-#: git-gui.sh:2400
-msgid "Show Less Context"
+#: git-gui.sh:3156
+msgid "Use Remote Version"
 msgstr ""
 
-#: git-gui.sh:2407
-msgid "Show More Context"
+#: git-gui.sh:3160
+msgid "Use Local Version"
 msgstr ""
 
-#: git-gui.sh:2422
+#: git-gui.sh:3164
+msgid "Revert To Base"
+msgstr ""
+
+#: git-gui.sh:3183
 msgid "Unstage Hunk From Commit"
 msgstr ""
 
-#: git-gui.sh:2426 git-gui.sh:2430
+#: git-gui.sh:3184
+msgid "Unstage Line From Commit"
+msgstr ""
+
+#: git-gui.sh:3186
 msgid "Stage Hunk For Commit"
 msgstr ""
 
-#: git-gui.sh:2440
+#: git-gui.sh:3187
+msgid "Stage Line For Commit"
+msgstr ""
+
+#: git-gui.sh:3210
 msgid "Initializing..."
 msgstr ""
 
-#: lib/blame.tcl:77
+#: git-gui.sh:3315
+#, tcl-format
+msgid ""
+"Possible environment issues exist.\n"
+"\n"
+"The following environment variables are probably\n"
+"going to be ignored by any Git subprocess run\n"
+"by %s:\n"
+"\n"
+msgstr ""
+
+#: git-gui.sh:3345
+msgid ""
+"\n"
+"This is due to a known issue with the\n"
+"Tcl binary distributed by Cygwin."
+msgstr ""
+
+#: git-gui.sh:3350
+#, tcl-format
+msgid ""
+"\n"
+"\n"
+"A good replacement for %s\n"
+"is placing values for the user.name and\n"
+"user.email settings into your personal\n"
+"~/.gitconfig file.\n"
+msgstr ""
+
+#: lib/about.tcl:26
+msgid "git-gui - a graphical user interface for Git."
+msgstr ""
+
+#: lib/blame.tcl:72
 msgid "File Viewer"
 msgstr ""
 
-#: lib/blame.tcl:81
+#: lib/blame.tcl:78
 msgid "Commit:"
 msgstr ""
 
-#: lib/blame.tcl:249
+#: lib/blame.tcl:271
 msgid "Copy Commit"
 msgstr ""
 
-#: lib/blame.tcl:369
+#: lib/blame.tcl:275
+msgid "Find Text..."
+msgstr ""
+
+#: lib/blame.tcl:284
+msgid "Do Full Copy Detection"
+msgstr ""
+
+#: lib/blame.tcl:288
+msgid "Show History Context"
+msgstr ""
+
+#: lib/blame.tcl:291
+msgid "Blame Parent Commit"
+msgstr ""
+
+#: lib/blame.tcl:450
 #, tcl-format
 msgid "Reading %s..."
 msgstr ""
 
+#: lib/blame.tcl:557
+msgid "Loading copy/move tracking annotations..."
+msgstr ""
+
+#: lib/blame.tcl:577
+msgid "lines annotated"
+msgstr ""
+
+#: lib/blame.tcl:769
+msgid "Loading original location annotations..."
+msgstr ""
+
+#: lib/blame.tcl:772
+msgid "Annotation complete."
+msgstr ""
+
+#: 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 ""
+
+#: lib/blame.tcl:963
+msgid "Author:"
+msgstr ""
+
+#: lib/blame.tcl:967
+msgid "Committer:"
+msgstr ""
+
+#: lib/blame.tcl:972
+msgid "Original File:"
+msgstr ""
+
+#: 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:297
+msgid "Error loading diff:"
+msgstr ""
+
+#: lib/blame.tcl:1231
+msgid "Originally By:"
+msgstr ""
+
+#: lib/blame.tcl:1237
+msgid "In File:"
+msgstr ""
+
+#: lib/blame.tcl:1242
+msgid "Copied Or Moved Here By:"
+msgstr ""
+
 #: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19
 msgid "Checkout Branch"
 msgstr ""
@@ -429,18 +638,19 @@ msgid "Checkout"
 msgstr ""
 
 #: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35
-#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:283
-#: lib/checkout_op.tcl:522 lib/merge.tcl:172 lib/option.tcl:172
-#: lib/remote_branch_delete.tcl:42 lib/transport.tcl:92
+#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:282
+#: lib/checkout_op.tcl:544 lib/choose_font.tcl:43 lib/merge.tcl:172
+#: lib/option.tcl:125 lib/remote_add.tcl:32 lib/remote_branch_delete.tcl:42
+#: lib/tools_dlg.tcl:40 lib/tools_dlg.tcl:204 lib/tools_dlg.tcl:352
+#: lib/transport.tcl:108
 msgid "Cancel"
 msgstr ""
 
-#: lib/branch_checkout.tcl:32 lib/browser.tcl:288
+#: lib/branch_checkout.tcl:32 lib/browser.tcl:287 lib/tools_dlg.tcl:328
 msgid "Revision"
 msgstr ""
 
-#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:159
-#: lib/option.tcl:274
+#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:280
 msgid "Options"
 msgstr ""
 
@@ -460,7 +670,7 @@ msgstr ""
 msgid "Create New Branch"
 msgstr ""
 
-#: lib/branch_create.tcl:31
+#: lib/branch_create.tcl:31 lib/choose_repository.tcl:377
 msgid "Create"
 msgstr ""
 
@@ -468,7 +678,7 @@ 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 ""
 
@@ -492,7 +702,7 @@ msgstr ""
 msgid "Fast Forward Only"
 msgstr ""
 
-#: lib/branch_create.tcl:85 lib/checkout_op.tcl:514
+#: lib/branch_create.tcl:85 lib/checkout_op.tcl:536
 msgid "Reset"
 msgstr ""
 
@@ -543,13 +753,6 @@ msgstr ""
 msgid "The following branches are not completely merged into %s:"
 msgstr ""
 
-#: lib/branch_delete.tcl:115
-msgid ""
-"Recovering deleted branches is difficult. \n"
-"\n"
-" Delete the selected branches?"
-msgstr ""
-
 #: lib/branch_delete.tcl:141
 #, tcl-format
 msgid ""
@@ -577,7 +780,7 @@ msgstr ""
 msgid "Please select a branch to rename."
 msgstr ""
 
-#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:179
+#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:201
 #, tcl-format
 msgid "Branch '%s' already exists."
 msgstr ""
@@ -595,38 +798,51 @@ msgstr ""
 msgid "File Browser"
 msgstr ""
 
-#: lib/browser.tcl:127 lib/browser.tcl:144
+#: lib/browser.tcl:126 lib/browser.tcl:143
 #, tcl-format
 msgid "Loading %s..."
 msgstr ""
 
-#: lib/browser.tcl:188
+#: lib/browser.tcl:187
 msgid "[Up To Parent]"
 msgstr ""
 
-#: lib/browser.tcl:268 lib/browser.tcl:274
+#: lib/browser.tcl:267 lib/browser.tcl:273
 msgid "Browse Branch Files"
 msgstr ""
 
-#: lib/browser.tcl:279
+#: lib/browser.tcl:278 lib/choose_repository.tcl:394
+#: lib/choose_repository.tcl:480 lib/choose_repository.tcl:491
+#: lib/choose_repository.tcl:995
 msgid "Browse"
 msgstr ""
 
-#: lib/checkout_op.tcl:79
+#: lib/checkout_op.tcl:84
 #, tcl-format
 msgid "Fetching %s from %s"
 msgstr ""
 
-#: lib/checkout_op.tcl:140 lib/console.tcl:81 lib/database.tcl:31
+#: lib/checkout_op.tcl:132
+#, tcl-format
+msgid "fatal: Cannot resolve %s"
+msgstr ""
+
+#: lib/checkout_op.tcl:145 lib/console.tcl:81 lib/database.tcl:31
+#: lib/sshkey.tcl:53
 msgid "Close"
 msgstr ""
 
-#: lib/checkout_op.tcl:169
+#: lib/checkout_op.tcl:174
 #, tcl-format
 msgid "Branch '%s' does not exist."
 msgstr ""
 
-#: lib/checkout_op.tcl:206
+#: lib/checkout_op.tcl:193
+#, tcl-format
+msgid "Failed to configure simplified git-pull for '%s'."
+msgstr ""
+
+#: lib/checkout_op.tcl:228
 #, tcl-format
 msgid ""
 "Branch '%s' already exists.\n"
@@ -635,21 +851,21 @@ msgid ""
 "A merge is required."
 msgstr ""
 
-#: lib/checkout_op.tcl:220
+#: lib/checkout_op.tcl:242
 #, tcl-format
 msgid "Merge strategy '%s' not supported."
 msgstr ""
 
-#: lib/checkout_op.tcl:239
+#: lib/checkout_op.tcl:261
 #, tcl-format
 msgid "Failed to update '%s'."
 msgstr ""
 
-#: lib/checkout_op.tcl:251
+#: lib/checkout_op.tcl:273
 msgid "Staging area (index) is already locked."
 msgstr ""
 
-#: lib/checkout_op.tcl:266
+#: lib/checkout_op.tcl:288
 msgid ""
 "Last scanned state does not match repository state.\n"
 "\n"
@@ -659,21 +875,30 @@ msgid ""
 "The rescan will be automatically started now.\n"
 msgstr ""
 
-#: lib/checkout_op.tcl:353
+#: lib/checkout_op.tcl:344
+#, tcl-format
+msgid "Updating working directory to '%s'..."
+msgstr ""
+
+#: lib/checkout_op.tcl:345
+msgid "files checked out"
+msgstr ""
+
+#: lib/checkout_op.tcl:375
 #, tcl-format
 msgid "Aborted checkout of '%s' (file level merging is required)."
 msgstr ""
 
-#: lib/checkout_op.tcl:354
+#: lib/checkout_op.tcl:376
 msgid "File level merge required."
 msgstr ""
 
-#: lib/checkout_op.tcl:358
+#: lib/checkout_op.tcl:380
 #, tcl-format
 msgid "Staying on branch '%s'."
 msgstr ""
 
-#: lib/checkout_op.tcl:429
+#: lib/checkout_op.tcl:451
 msgid ""
 "You are no longer on a local branch.\n"
 "\n"
@@ -681,25 +906,30 @@ msgid ""
 "Checkout'."
 msgstr ""
 
-#: lib/checkout_op.tcl:478
+#: lib/checkout_op.tcl:468 lib/checkout_op.tcl:472
 #, tcl-format
-msgid "Resetting '%s' to '%s' will lose the following commits:"
+msgid "Checked out '%s'."
 msgstr ""
 
 #: lib/checkout_op.tcl:500
+#, tcl-format
+msgid "Resetting '%s' to '%s' will lose the following commits:"
+msgstr ""
+
+#: lib/checkout_op.tcl:522
 msgid "Recovering lost commits may not be easy."
 msgstr ""
 
-#: lib/checkout_op.tcl:505
+#: lib/checkout_op.tcl:527
 #, tcl-format
 msgid "Reset '%s'?"
 msgstr ""
 
-#: lib/checkout_op.tcl:510 lib/merge.tcl:164
+#: lib/checkout_op.tcl:532 lib/merge.tcl:164 lib/tools_dlg.tcl:343
 msgid "Visualize"
 msgstr ""
 
-#: lib/checkout_op.tcl:578
+#: lib/checkout_op.tcl:600
 #, tcl-format
 msgid ""
 "Failed to set current branch.\n"
@@ -710,165 +940,456 @@ msgid ""
 "This should not have occurred.  %s will now close and give up."
 msgstr ""
 
-#: lib/choose_rev.tcl:53
-msgid "This Detached Checkout"
+#: lib/choose_font.tcl:39
+msgid "Select"
 msgstr ""
 
-#: lib/choose_rev.tcl:60
-msgid "Revision Expression:"
+#: lib/choose_font.tcl:53
+msgid "Font Family"
 msgstr ""
 
-#: lib/choose_rev.tcl:74
-msgid "Local Branch"
+#: lib/choose_font.tcl:74
+msgid "Font Size"
 msgstr ""
 
-#: lib/choose_rev.tcl:79
-msgid "Tracking Branch"
+#: lib/choose_font.tcl:91
+msgid "Font Example"
 msgstr ""
 
-#: lib/choose_rev.tcl:84
-msgid "Tag"
+#: lib/choose_font.tcl:103
+msgid ""
+"This is example text.\n"
+"If you like this text, it can be your font."
 msgstr ""
 
-#: lib/choose_rev.tcl:317
-#, tcl-format
-msgid "Invalid revision: %s"
+#: lib/choose_repository.tcl:28
+msgid "Git Gui"
 msgstr ""
 
-#: lib/choose_rev.tcl:338
-msgid "No revision selected."
+#: lib/choose_repository.tcl:87 lib/choose_repository.tcl:382
+msgid "Create New Repository"
 msgstr ""
 
-#: lib/choose_rev.tcl:346
-msgid "Revision expression is empty."
+#: lib/choose_repository.tcl:93
+msgid "New..."
 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/choose_repository.tcl:100 lib/choose_repository.tcl:465
+msgid "Clone Existing Repository"
 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/choose_repository.tcl:106
+msgid "Clone..."
 msgstr ""
 
-#: lib/commit.tcl:49
-msgid "Error loading commit data for amend:"
+#: lib/choose_repository.tcl:113 lib/choose_repository.tcl:983
+msgid "Open Existing Repository"
 msgstr ""
 
-#: lib/commit.tcl:76
-msgid "Unable to obtain your identity:"
+#: lib/choose_repository.tcl:119
+msgid "Open..."
 msgstr ""
 
-#: lib/commit.tcl:81
-msgid "Invalid GIT_COMMITTER_IDENT:"
+#: lib/choose_repository.tcl:132
+msgid "Recent Repositories"
 msgstr ""
 
-#: lib/commit.tcl:133
-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/choose_repository.tcl:138
+msgid "Open Recent Repository:"
 msgstr ""
 
-#: lib/commit.tcl:154
+#: lib/choose_repository.tcl:302 lib/choose_repository.tcl:309
+#: lib/choose_repository.tcl:316
 #, 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 "Failed to create repository %s:"
 msgstr ""
 
-#: lib/commit.tcl:162
-#, tcl-format
-msgid ""
-"Unknown file state %s detected.\n"
-"\n"
-"File %s cannot be committed by this program.\n"
+#: lib/choose_repository.tcl:387
+msgid "Directory:"
 msgstr ""
 
-#: lib/commit.tcl:170
-msgid ""
-"No changes to commit.\n"
-"\n"
-"You must stage at least 1 file before you can commit.\n"
+#: lib/choose_repository.tcl:417 lib/choose_repository.tcl:544
+#: lib/choose_repository.tcl:1017
+msgid "Git Repository"
 msgstr ""
 
-#: lib/commit.tcl:183
-msgid ""
-"Please supply a commit message.\n"
-"\n"
-"A good commit message has the following format:\n"
-"\n"
-"- First line: Describe in one sentance what you did.\n"
-"- Second line: Blank\n"
-"- Remaining lines: Describe why this change is good.\n"
+#: lib/choose_repository.tcl:442
+#, tcl-format
+msgid "Directory %s already exists."
 msgstr ""
 
-#: lib/commit.tcl:257
-msgid "write-tree failed:"
+#: lib/choose_repository.tcl:446
+#, tcl-format
+msgid "File %s already exists."
 msgstr ""
 
-#: lib/commit.tcl:279
-msgid ""
-"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"
+#: lib/choose_repository.tcl:460
+msgid "Clone"
 msgstr ""
 
-#: lib/commit.tcl:286
-msgid "No changes to commit."
+#: lib/choose_repository.tcl:473
+msgid "Source Location:"
 msgstr ""
 
-#: lib/commit.tcl:317
-msgid "commit-tree failed:"
+#: lib/choose_repository.tcl:484
+msgid "Target Directory:"
 msgstr ""
 
-#: lib/commit.tcl:339
-msgid "update-ref failed:"
+#: lib/choose_repository.tcl:496
+msgid "Clone Type:"
 msgstr ""
 
-#: lib/commit.tcl:430
-#, tcl-format
-msgid "Created commit %s: %s"
+#: lib/choose_repository.tcl:502
+msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
 msgstr ""
 
-#: lib/console.tcl:55
-msgid "Working... please wait..."
+#: lib/choose_repository.tcl:508
+msgid "Full Copy (Slower, Redundant Backup)"
 msgstr ""
 
-#: lib/console.tcl:184
-msgid "Success"
+#: lib/choose_repository.tcl:514
+msgid "Shared (Fastest, Not Recommended, No Backup)"
 msgstr ""
 
-#: lib/console.tcl:194
-msgid "Error: Command Failed"
+#: lib/choose_repository.tcl:550 lib/choose_repository.tcl:597
+#: lib/choose_repository.tcl:743 lib/choose_repository.tcl:813
+#: lib/choose_repository.tcl:1023 lib/choose_repository.tcl:1031
+#, tcl-format
+msgid "Not a Git repository: %s"
 msgstr ""
 
-#: lib/database.tcl:43
-msgid "Number of loose objects"
+#: lib/choose_repository.tcl:586
+msgid "Standard only available for local repository."
 msgstr ""
 
-#: lib/database.tcl:44
-msgid "Disk space used by loose objects"
+#: lib/choose_repository.tcl:590
+msgid "Shared only available for local repository."
 msgstr ""
 
-#: lib/database.tcl:45
-msgid "Number of packed objects"
+#: lib/choose_repository.tcl:611
+#, tcl-format
+msgid "Location %s already exists."
+msgstr ""
+
+#: lib/choose_repository.tcl:622
+msgid "Failed to configure origin"
+msgstr ""
+
+#: lib/choose_repository.tcl:634
+msgid "Counting objects"
+msgstr ""
+
+#: lib/choose_repository.tcl:635
+msgid "buckets"
+msgstr ""
+
+#: lib/choose_repository.tcl:659
+#, tcl-format
+msgid "Unable to copy objects/info/alternates: %s"
+msgstr ""
+
+#: lib/choose_repository.tcl:695
+#, tcl-format
+msgid "Nothing to clone from %s."
+msgstr ""
+
+#: lib/choose_repository.tcl:697 lib/choose_repository.tcl:911
+#: lib/choose_repository.tcl:923
+msgid "The 'master' branch has not been initialized."
+msgstr ""
+
+#: lib/choose_repository.tcl:710
+msgid "Hardlinks are unavailable.  Falling back to copying."
+msgstr ""
+
+#: lib/choose_repository.tcl:722
+#, tcl-format
+msgid "Cloning from %s"
+msgstr ""
+
+#: lib/choose_repository.tcl:753
+msgid "Copying objects"
+msgstr ""
+
+#: lib/choose_repository.tcl:754
+msgid "KiB"
+msgstr ""
+
+#: lib/choose_repository.tcl:778
+#, tcl-format
+msgid "Unable to copy object: %s"
+msgstr ""
+
+#: lib/choose_repository.tcl:788
+msgid "Linking objects"
+msgstr ""
+
+#: lib/choose_repository.tcl:789
+msgid "objects"
+msgstr ""
+
+#: lib/choose_repository.tcl:797
+#, tcl-format
+msgid "Unable to hardlink object: %s"
+msgstr ""
+
+#: lib/choose_repository.tcl:852
+msgid "Cannot fetch branches and objects.  See console output for details."
+msgstr ""
+
+#: lib/choose_repository.tcl:863
+msgid "Cannot fetch tags.  See console output for details."
+msgstr ""
+
+#: lib/choose_repository.tcl:887
+msgid "Cannot determine HEAD.  See console output for details."
+msgstr ""
+
+#: lib/choose_repository.tcl:896
+#, tcl-format
+msgid "Unable to cleanup %s"
+msgstr ""
+
+#: lib/choose_repository.tcl:902
+msgid "Clone failed."
+msgstr ""
+
+#: lib/choose_repository.tcl:909
+msgid "No default branch obtained."
+msgstr ""
+
+#: lib/choose_repository.tcl:920
+#, tcl-format
+msgid "Cannot resolve %s as a commit."
+msgstr ""
+
+#: lib/choose_repository.tcl:932
+msgid "Creating working directory"
+msgstr ""
+
+#: lib/choose_repository.tcl:933 lib/index.tcl:65 lib/index.tcl:128
+#: lib/index.tcl:196
+msgid "files"
+msgstr ""
+
+#: lib/choose_repository.tcl:962
+msgid "Initial file checkout failed."
+msgstr ""
+
+#: lib/choose_repository.tcl:978
+msgid "Open"
+msgstr ""
+
+#: lib/choose_repository.tcl:988
+msgid "Repository:"
+msgstr ""
+
+#: lib/choose_repository.tcl:1037
+#, tcl-format
+msgid "Failed to open repository %s:"
+msgstr ""
+
+#: lib/choose_rev.tcl:53
+msgid "This Detached Checkout"
+msgstr ""
+
+#: lib/choose_rev.tcl:60
+msgid "Revision Expression:"
+msgstr ""
+
+#: lib/choose_rev.tcl:74
+msgid "Local Branch"
+msgstr ""
+
+#: lib/choose_rev.tcl:79
+msgid "Tracking Branch"
+msgstr ""
+
+#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:538
+msgid "Tag"
+msgstr ""
+
+#: lib/choose_rev.tcl:317
+#, tcl-format
+msgid "Invalid revision: %s"
+msgstr ""
+
+#: lib/choose_rev.tcl:338
+msgid "No revision selected."
+msgstr ""
+
+#: lib/choose_rev.tcl:346
+msgid "Revision expression is empty."
+msgstr ""
+
+#: lib/choose_rev.tcl:531
+msgid "Updated"
+msgstr ""
+
+#: lib/choose_rev.tcl:559
+msgid "URL"
+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"
+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"
+msgstr ""
+
+#: lib/commit.tcl:48
+msgid "Error loading commit data for amend:"
+msgstr ""
+
+#: lib/commit.tcl:75
+msgid "Unable to obtain your identity:"
+msgstr ""
+
+#: lib/commit.tcl:80
+msgid "Invalid GIT_COMMITTER_IDENT:"
+msgstr ""
+
+#: lib/commit.tcl:132
+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"
+msgstr ""
+
+#: lib/commit.tcl:155
+#, 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"
+msgstr ""
+
+#: lib/commit.tcl:163
+#, tcl-format
+msgid ""
+"Unknown file state %s detected.\n"
+"\n"
+"File %s cannot be committed by this program.\n"
+msgstr ""
+
+#: lib/commit.tcl:171
+msgid ""
+"No changes to commit.\n"
+"\n"
+"You must stage at least 1 file before you can commit.\n"
+msgstr ""
+
+#: lib/commit.tcl:186
+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/commit.tcl:210
+#, tcl-format
+msgid "warning: Tcl does not support encoding '%s'."
+msgstr ""
+
+#: lib/commit.tcl:226
+msgid "Calling pre-commit hook..."
+msgstr ""
+
+#: lib/commit.tcl:241
+msgid "Commit declined by pre-commit hook."
+msgstr ""
+
+#: lib/commit.tcl:264
+msgid "Calling commit-msg hook..."
+msgstr ""
+
+#: lib/commit.tcl:279
+msgid "Commit declined by commit-msg hook."
+msgstr ""
+
+#: lib/commit.tcl:292
+msgid "Committing changes..."
+msgstr ""
+
+#: lib/commit.tcl:308
+msgid "write-tree failed:"
+msgstr ""
+
+#: lib/commit.tcl:309 lib/commit.tcl:353 lib/commit.tcl:373
+msgid "Commit failed."
+msgstr ""
+
+#: lib/commit.tcl:326
+#, tcl-format
+msgid "Commit %s appears to be corrupt"
+msgstr ""
+
+#: lib/commit.tcl:331
+msgid ""
+"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/commit.tcl:338
+msgid "No changes to commit."
+msgstr ""
+
+#: lib/commit.tcl:352
+msgid "commit-tree failed:"
+msgstr ""
+
+#: lib/commit.tcl:372
+msgid "update-ref failed:"
+msgstr ""
+
+#: lib/commit.tcl:460
+#, tcl-format
+msgid "Created commit %s: %s"
+msgstr ""
+
+#: lib/console.tcl:59
+msgid "Working... please wait..."
+msgstr ""
+
+#: lib/console.tcl:186
+msgid "Success"
+msgstr ""
+
+#: lib/console.tcl:200
+msgid "Error: Command Failed"
+msgstr ""
+
+#: lib/database.tcl:43
+msgid "Number of loose objects"
+msgstr ""
+
+#: lib/database.tcl:44
+msgid "Disk space used by loose objects"
+msgstr ""
+
+#: lib/database.tcl:45
+msgid "Number of packed objects"
 msgstr ""
 
 #: lib/database.tcl:46
@@ -895,7 +1416,23 @@ msgstr ""
 msgid "Verifying the object database with fsck-objects"
 msgstr ""
 
-#: lib/diff.tcl:42
+#: lib/database.tcl:108
+#, 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"
+"\n"
+"Compress the database now?"
+msgstr ""
+
+#: lib/date.tcl:25
+#, tcl-format
+msgid "Invalid date from Git: %s"
+msgstr ""
+
+#: lib/diff.tcl:59
 #, tcl-format
 msgid ""
 "No differences detected.\n"
@@ -909,52 +1446,167 @@ msgid ""
 "the same state."
 msgstr ""
 
-#: lib/diff.tcl:97
+#: lib/diff.tcl:99
+#, tcl-format
+msgid "Loading diff of %s..."
+msgstr ""
+
+#: lib/diff.tcl:120
+msgid ""
+"LOCAL: deleted\n"
+"REMOTE:\n"
+msgstr ""
+
+#: lib/diff.tcl:125
+msgid ""
+"REMOTE: deleted\n"
+"LOCAL:\n"
+msgstr ""
+
+#: lib/diff.tcl:132
+msgid "LOCAL:\n"
+msgstr ""
+
+#: lib/diff.tcl:135
+msgid "REMOTE:\n"
+msgstr ""
+
+#: lib/diff.tcl:197 lib/diff.tcl:296
+#, tcl-format
+msgid "Unable to display %s"
+msgstr ""
+
+#: lib/diff.tcl:198
 msgid "Error loading file:"
 msgstr ""
 
-#: lib/diff.tcl:162
-msgid "Error loading diff:"
+#: lib/diff.tcl:205
+msgid "Git Repository (subproject)"
 msgstr ""
 
-#: lib/diff.tcl:278
+#: lib/diff.tcl:217
+msgid "* Binary file (not showing content)."
+msgstr ""
+
+#: lib/diff.tcl:222
+#, tcl-format
+msgid ""
+"* Untracked file is %d bytes.\n"
+"* Showing only first %d bytes.\n"
+msgstr ""
+
+#: lib/diff.tcl:228
+#, tcl-format
+msgid ""
+"\n"
+"* Untracked file clipped here by %s.\n"
+"* To see the entire file, use an external editor.\n"
+msgstr ""
+
+#: lib/diff.tcl:436
 msgid "Failed to unstage selected hunk."
 msgstr ""
 
-#: lib/diff.tcl:285
+#: lib/diff.tcl:443
 msgid "Failed to stage selected hunk."
 msgstr ""
 
-#: lib/error.tcl:12 lib/error.tcl:102
+#: lib/diff.tcl:509
+msgid "Failed to unstage selected line."
+msgstr ""
+
+#: lib/diff.tcl:517
+msgid "Failed to stage selected line."
+msgstr ""
+
+#: lib/encoding.tcl:443
+msgid "Default"
+msgstr ""
+
+#: lib/encoding.tcl:448
+#, tcl-format
+msgid "System (%s)"
+msgstr ""
+
+#: lib/encoding.tcl:459 lib/encoding.tcl:465
+msgid "Other"
+msgstr ""
+
+#: lib/error.tcl:20 lib/error.tcl:114
 msgid "error"
 msgstr ""
 
-#: lib/error.tcl:28
+#: lib/error.tcl:36
 msgid "warning"
 msgstr ""
 
-#: lib/error.tcl:81
+#: lib/error.tcl:94
 msgid "You must correct the above errors before committing."
 msgstr ""
 
-#: lib/index.tcl:364
+#: lib/index.tcl:6
+msgid "Unable to unlock the index."
+msgstr ""
+
+#: lib/index.tcl:15
+msgid "Index Error"
+msgstr ""
+
+#: lib/index.tcl:21
+msgid ""
+"Updating the Git index failed.  A rescan will be automatically started to "
+"resynchronize git-gui."
+msgstr ""
+
+#: lib/index.tcl:27
+msgid "Continue"
+msgstr ""
+
+#: lib/index.tcl:31
+msgid "Unlock Index"
+msgstr ""
+
+#: lib/index.tcl:287
+#, tcl-format
+msgid "Unstaging %s from commit"
+msgstr ""
+
+#: lib/index.tcl:326
+msgid "Ready to commit."
+msgstr ""
+
+#: lib/index.tcl:339
+#, tcl-format
+msgid "Adding %s"
+msgstr ""
+
+#: lib/index.tcl:396
 #, tcl-format
 msgid "Revert changes in file %s?"
 msgstr ""
 
-#: lib/index.tcl:366
+#: lib/index.tcl:398
 #, tcl-format
 msgid "Revert changes in these %i files?"
 msgstr ""
 
-#: lib/index.tcl:372
+#: lib/index.tcl:406
 msgid "Any unstaged changes will be permanently lost by the revert."
 msgstr ""
 
-#: lib/index.tcl:375
+#: lib/index.tcl:409
 msgid "Do Nothing"
 msgstr ""
 
+#: lib/index.tcl:427
+msgid "Reverting selected files"
+msgstr ""
+
+#: lib/index.tcl:431
+#, tcl-format
+msgid "Reverting %s"
+msgstr ""
+
 #: lib/merge.tcl:13
 msgid ""
 "Cannot merge while amending.\n"
@@ -972,7 +1624,7 @@ msgid ""
 "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"
@@ -983,7 +1635,7 @@ msgid ""
 "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"
@@ -994,14 +1646,14 @@ msgid ""
 "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 ""
 
-#: lib/merge.tcl:119
+#: lib/merge.tcl:120
 #, tcl-format
-msgid "Merging %s and %s"
+msgid "Merging %s and %s..."
 msgstr ""
 
 #: lib/merge.tcl:131
@@ -1050,93 +1702,321 @@ msgstr ""
 msgid "Aborting"
 msgstr ""
 
-#: lib/merge.tcl:266
+#: lib/merge.tcl:239
+msgid "files reset"
+msgstr ""
+
+#: lib/merge.tcl:267
 msgid "Abort failed."
 msgstr ""
 
-#: lib/merge.tcl:268
+#: lib/merge.tcl:269
 msgid "Abort completed.  Ready."
 msgstr ""
 
-#: lib/option.tcl:77
-msgid "git-gui - a graphical user interface for Git."
+#: 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/option.tcl:164
+#: 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 ""
 
-#: lib/option.tcl:168
+#: lib/option.tcl:121
 msgid "Save"
 msgstr ""
 
-#: lib/option.tcl:178
+#: lib/option.tcl:131
 #, tcl-format
 msgid "%s Repository"
 msgstr ""
 
-#: lib/option.tcl:179
+#: lib/option.tcl:132
 msgid "Global (All Repositories)"
 msgstr ""
 
-#: lib/option.tcl:185
+#: lib/option.tcl:138
 msgid "User Name"
 msgstr ""
 
-#: lib/option.tcl:186
+#: lib/option.tcl:139
 msgid "Email Address"
 msgstr ""
 
-#: lib/option.tcl:188
+#: lib/option.tcl:141
 msgid "Summarize Merge Commits"
 msgstr ""
 
-#: lib/option.tcl:189
+#: lib/option.tcl:142
 msgid "Merge Verbosity"
 msgstr ""
 
-#: lib/option.tcl:190
+#: lib/option.tcl:143
 msgid "Show Diffstat After Merge"
 msgstr ""
 
-#: lib/option.tcl:192
+#: lib/option.tcl:144
+msgid "Use Merge Tool"
+msgstr ""
+
+#: lib/option.tcl:146
 msgid "Trust File Modification Timestamps"
 msgstr ""
 
-#: lib/option.tcl:193
+#: lib/option.tcl:147
 msgid "Prune Tracking Branches During Fetch"
 msgstr ""
 
-#: lib/option.tcl:194
+#: lib/option.tcl:148
 msgid "Match Tracking Branches"
 msgstr ""
 
-#: lib/option.tcl:195
+#: 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 ""
 
-#: lib/option.tcl:196
+#: lib/option.tcl:153
+msgid "Commit Message Text Width"
+msgstr ""
+
+#: lib/option.tcl:154
 msgid "New Branch Name Template"
 msgstr ""
 
-#: lib/option.tcl:305
+#: lib/option.tcl:155
+msgid "Default File Contents Encoding"
+msgstr ""
+
+#: lib/option.tcl:203
+msgid "Change"
+msgstr ""
+
+#: lib/option.tcl:230
+msgid "Spelling Dictionary:"
+msgstr ""
+
+#: lib/option.tcl:254
+msgid "Change Font"
+msgstr ""
+
+#: lib/option.tcl:258
+#, tcl-format
+msgid "Choose %s"
+msgstr ""
+
+#: lib/option.tcl:264
+msgid "pt."
+msgstr ""
+
+#: lib/option.tcl:278
+msgid "Preferences"
+msgstr ""
+
+#: lib/option.tcl:314
 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
-msgid "Delete Remote Branch"
+msgid "Delete Branch Remotely"
 msgstr ""
 
 #: lib/remote_branch_delete.tcl:47
 msgid "From Repository"
 msgstr ""
 
-#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:118
+#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:134
 msgid "Remote:"
 msgstr ""
 
-#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:133
-msgid "Arbitrary URL:"
+#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:149
+msgid "Arbitrary Location:"
 msgstr ""
 
 #: lib/remote_branch_delete.tcl:84
@@ -1159,6 +2039,14 @@ msgstr ""
 msgid "A branch is required for 'Merged Into'."
 msgstr ""
 
+#: lib/remote_branch_delete.tcl:184
+#, tcl-format
+msgid ""
+"The following branches are not completely merged into %s:\n"
+"\n"
+" - %s"
+msgstr ""
+
 #: lib/remote_branch_delete.tcl:189
 #, tcl-format
 msgid ""
@@ -1191,32 +2079,235 @@ msgstr ""
 msgid "Scanning %s..."
 msgstr ""
 
-#: lib/remote.tcl:162
+#: lib/search.tcl:21
+msgid "Find:"
+msgstr ""
+
+#: lib/search.tcl:23
+msgid "Next"
+msgstr ""
+
+#: lib/search.tcl:24
+msgid "Prev"
+msgstr ""
+
+#: lib/search.tcl:25
+msgid "Case-Sensitive"
+msgstr ""
+
+#: lib/shortcut.tcl:20 lib/shortcut.tcl:61
+msgid "Cannot write shortcut:"
+msgstr ""
+
+#: lib/shortcut.tcl:136
+msgid "Cannot write icon:"
+msgstr ""
+
+#: lib/spellcheck.tcl:57
+msgid "Unsupported spell checker"
+msgstr ""
+
+#: lib/spellcheck.tcl:65
+msgid "Spell checking is unavailable"
+msgstr ""
+
+#: lib/spellcheck.tcl:68
+msgid "Invalid spell checking configuration"
+msgstr ""
+
+#: lib/spellcheck.tcl:70
+#, tcl-format
+msgid "Reverting dictionary to %s."
+msgstr ""
+
+#: lib/spellcheck.tcl:73
+msgid "Spell checker silently failed on startup"
+msgstr ""
+
+#: lib/spellcheck.tcl:80
+msgid "Unrecognized spell checker"
+msgstr ""
+
+#: lib/spellcheck.tcl:186
+msgid "No Suggestions"
+msgstr ""
+
+#: lib/spellcheck.tcl:388
+msgid "Unexpected EOF from spell checker"
+msgstr ""
+
+#: lib/spellcheck.tcl:392
+msgid "Spell Checker Failed"
+msgstr ""
+
+#: lib/sshkey.tcl:31
+msgid "No keys found."
+msgstr ""
+
+#: lib/sshkey.tcl:34
+#, tcl-format
+msgid "Found a public key in: %s"
+msgstr ""
+
+#: lib/sshkey.tcl:40
+msgid "Generate Key"
+msgstr ""
+
+#: lib/sshkey.tcl:56
+msgid "Copy To Clipboard"
+msgstr ""
+
+#: lib/sshkey.tcl:70
+msgid "Your OpenSSH Public Key"
+msgstr ""
+
+#: lib/sshkey.tcl:78
+msgid "Generating..."
+msgstr ""
+
+#: lib/sshkey.tcl:84
 #, tcl-format
-msgid "Fetch from %s..."
+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/remote.tcl:172
+#: lib/sshkey.tcl:121
 #, tcl-format
-msgid "Prune from %s..."
+msgid "Your key is in: %s"
 msgstr ""
 
-#: lib/remote.tcl:206
+#: lib/status_bar.tcl:83
 #, tcl-format
-msgid "Push to %s..."
+msgid "%s ... %*i of %*i %s (%3i%%)"
 msgstr ""
 
-#: lib/shortcut.tcl:26 lib/shortcut.tcl:74
-msgid "Cannot write script:"
+#: lib/tools.tcl:75
+#, tcl-format
+msgid "Running %s requires a selected file."
 msgstr ""
 
-#: lib/shortcut.tcl:149
-msgid "Cannot write icon:"
+#: lib/tools.tcl:90
+#, tcl-format
+msgid "Are you sure you want to run %s?"
 msgstr ""
 
-#: lib/status_bar.tcl:58
+#: lib/tools.tcl:110
 #, tcl-format
-msgid "%s ... %i of %i %s (%2i%%)"
+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
@@ -1224,6 +2315,11 @@ msgstr ""
 msgid "Fetching new changes from %s"
 msgstr ""
 
+#: lib/transport.tcl:18
+#, tcl-format
+msgid "remote prune %s"
+msgstr ""
+
 #: lib/transport.tcl:19
 #, tcl-format
 msgid "Pruning tracking branches deleted from %s"
@@ -1234,31 +2330,40 @@ msgstr ""
 msgid "Pushing changes to %s"
 msgstr ""
 
-#: lib/transport.tcl:68
+#: lib/transport.tcl:64
+#, tcl-format
+msgid "Mirroring to %s"
+msgstr ""
+
+#: lib/transport.tcl:82
 #, tcl-format
 msgid "Pushing %s %s to %s"
 msgstr ""
 
-#: lib/transport.tcl:84
+#: lib/transport.tcl:100
 msgid "Push Branches"
 msgstr ""
 
-#: lib/transport.tcl:98
+#: lib/transport.tcl:114
 msgid "Source Branches"
 msgstr ""
 
-#: lib/transport.tcl:115
+#: lib/transport.tcl:131
 msgid "Destination Repository"
 msgstr ""
 
-#: lib/transport.tcl:153
+#: lib/transport.tcl:169
 msgid "Transfer Options"
 msgstr ""
 
-#: lib/transport.tcl:155
+#: lib/transport.tcl:171
+msgid "Force overwrite existing branch (may discard changes)"
+msgstr ""
+
+#: lib/transport.tcl:175
 msgid "Use thin pack (for slow network connections)"
 msgstr ""
 
-#: lib/transport.tcl:159
+#: lib/transport.tcl:179
 msgid "Include tags"
 msgstr ""