diff --git a/git-gui/Makefile b/git-gui/Makefile
index 818a0ab45c..2ad8846198 100644
--- a/git-gui/Makefile
+++ b/git-gui/Makefile
@@ -126,6 +126,10 @@ ifeq ($(uname_S),Darwin)
 		GITGUI_MACOSXAPP := YesPlease
 	endif
 endif
+ifneq (,$(findstring MINGW,$(uname_S)))
+	NO_MSGFMT=1
+	GITGUI_WINDOWS_WRAPPER := YesPlease
+endif
 
 ifdef GITGUI_MACOSXAPP
 GITGUI_MAIN := git-gui.tcl
@@ -165,6 +169,13 @@ Git\ Gui.app: GIT-VERSION-FILE GIT-GUI-VARS \
 	mv '$@'+ '$@'
 endif
 
+ifdef GITGUI_WINDOWS_WRAPPER
+GITGUI_MAIN := git-gui.tcl
+
+git-gui: windows/git-gui.sh
+	cp $< $@
+endif
+
 $(GITGUI_MAIN): git-gui.sh GIT-VERSION-FILE GIT-GUI-VARS
 	$(QUIET_GEN)rm -f $@ $@+ && \
 	sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
@@ -230,12 +241,18 @@ GIT-GUI-VARS: .FORCE-GIT-GUI-VARS
 ifdef GITGUI_MACOSXAPP
 all:: git-gui Git\ Gui.app
 endif
+ifdef GITGUI_WINDOWS_WRAPPER
+all:: git-gui
+endif
 all:: $(GITGUI_MAIN) lib/tclIndex $(ALL_MSGFILES)
 
 install: all
 	$(QUIET)$(INSTALL_D0)'$(DESTDIR_SQ)$(gitexecdir_SQ)' $(INSTALL_D1)
 	$(QUIET)$(INSTALL_X0)git-gui $(INSTALL_X1) '$(DESTDIR_SQ)$(gitexecdir_SQ)'
 	$(QUIET)$(foreach p,$(GITGUI_BUILT_INS), $(INSTALL_L0)'$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' $(INSTALL_L1)'$(DESTDIR_SQ)$(gitexecdir_SQ)/git-gui' $(INSTALL_L2)'$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' $(INSTALL_L3) &&) true
+ifdef GITGUI_WINDOWS_WRAPPER
+	$(QUIET)$(INSTALL_R0)git-gui.tcl $(INSTALL_R1) '$(DESTDIR_SQ)$(gitexecdir_SQ)'
+endif
 	$(QUIET)$(INSTALL_D0)'$(DESTDIR_SQ)$(libdir_SQ)' $(INSTALL_D1)
 	$(QUIET)$(INSTALL_R0)lib/tclIndex $(INSTALL_R1) '$(DESTDIR_SQ)$(libdir_SQ)'
 	$(QUIET)$(INSTALL_R0)lib/git-gui.ico $(INSTALL_R1) '$(DESTDIR_SQ)$(libdir_SQ)'
@@ -251,6 +268,9 @@ uninstall:
 	$(QUIET)$(CLEAN_DST) '$(DESTDIR_SQ)$(gitexecdir_SQ)'
 	$(QUIET)$(REMOVE_F0)'$(DESTDIR_SQ)$(gitexecdir_SQ)'/git-gui $(REMOVE_F1)
 	$(QUIET)$(foreach p,$(GITGUI_BUILT_INS), $(REMOVE_F0)'$(DESTDIR_SQ)$(gitexecdir_SQ)'/$p $(REMOVE_F1) &&) true
+ifdef GITGUI_WINDOWS_WRAPPER
+	$(QUIET)$(REMOVE_F0)'$(DESTDIR_SQ)$(gitexecdir_SQ)'/git-gui.tcl $(REMOVE_F1)
+endif
 	$(QUIET)$(CLEAN_DST) '$(DESTDIR_SQ)$(libdir_SQ)'
 	$(QUIET)$(REMOVE_F0)'$(DESTDIR_SQ)$(libdir_SQ)'/tclIndex $(REMOVE_F1)
 	$(QUIET)$(REMOVE_F0)'$(DESTDIR_SQ)$(libdir_SQ)'/git-gui.ico $(REMOVE_F1)
@@ -276,6 +296,9 @@ clean::
 ifdef GITGUI_MACOSXAPP
 	$(RM_RF) 'Git Gui.app'* git-gui
 endif
+ifdef GITGUI_WINDOWS_WRAPPER
+	$(RM_RF) git-gui
+endif
 
 .PHONY: all install uninstall dist-version clean
 .PHONY: .FORCE-GIT-VERSION-FILE
diff --git a/git-gui/git-gui.pot b/git-gui/git-gui.pot
index b352302572..00f0f5922a 100644
--- a/git-gui/git-gui.pot
+++ b/git-gui/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: 2007-10-10 04:04-0400\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:634 git-gui.sh:648 git-gui.sh:661 git-gui.sh:744
+#: git-gui.sh:763
+msgid "git-gui: fatal error"
+msgstr ""
+
+#: git-gui.sh:595
+#, tcl-format
+msgid "Invalid font specified in %s:"
+msgstr ""
+
+#: git-gui.sh:620
+msgid "Main Font"
+msgstr ""
+
+#: git-gui.sh:621
+msgid "Diff/Console Font"
+msgstr ""
+
+#: git-gui.sh:635
 msgid "Cannot find git in PATH."
 msgstr ""
 
-#: git-gui.sh:550
+#: git-gui.sh:662
 msgid "Cannot parse Git version string:"
 msgstr ""
 
-#: git-gui.sh:567
+#: git-gui.sh:680
 #, tcl-format
 msgid ""
 "Git version cannot be determined.\n"
@@ -36,79 +54,79 @@ msgid ""
 "Assume '%s' is version 1.5.0?\n"
 msgstr ""
 
-#: git-gui.sh:689
-msgid "Cannot find the git directory:"
-msgstr ""
-
-#: git-gui.sh:697
+#: git-gui.sh:853
 msgid "Git directory not found:"
 msgstr ""
 
-#: git-gui.sh:703
+#: git-gui.sh:860
+msgid "Cannot move to top of working directory:"
+msgstr ""
+
+#: git-gui.sh:867
 msgid "Cannot use funny .git directory:"
 msgstr ""
 
-#: git-gui.sh:708
+#: git-gui.sh:872
 msgid "No working directory"
 msgstr ""
 
-#: git-gui.sh:854
+#: git-gui.sh:1019
 msgid "Refreshing file status..."
 msgstr ""
 
-#: git-gui.sh:891
+#: git-gui.sh:1084
 msgid "Scanning for modified files ..."
 msgstr ""
 
-#: git-gui.sh:1057 lib/browser.tcl:247
+#: git-gui.sh:1259 lib/browser.tcl:245
 msgid "Ready."
 msgstr ""
 
-#: git-gui.sh:1322
+#: git-gui.sh:1525
 msgid "Unmodified"
 msgstr ""
 
-#: git-gui.sh:1324
+#: git-gui.sh:1527
 msgid "Modified, not staged"
 msgstr ""
 
-#: git-gui.sh:1325 git-gui.sh:1330
+#: git-gui.sh:1528 git-gui.sh:1533
 msgid "Staged for commit"
 msgstr ""
 
-#: git-gui.sh:1326 git-gui.sh:1331
+#: git-gui.sh:1529 git-gui.sh:1534
 msgid "Portions staged for commit"
 msgstr ""
 
-#: git-gui.sh:1327 git-gui.sh:1332
+#: git-gui.sh:1530 git-gui.sh:1535
 msgid "Staged for commit, missing"
 msgstr ""
 
-#: git-gui.sh:1329
+#: git-gui.sh:1532
 msgid "Untracked, not staged"
 msgstr ""
 
-#: git-gui.sh:1334
+#: git-gui.sh:1537
 msgid "Missing"
 msgstr ""
 
-#: git-gui.sh:1335
+#: git-gui.sh:1538
 msgid "Staged for removal"
 msgstr ""
 
-#: git-gui.sh:1336
+#: git-gui.sh:1539
 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:1541 git-gui.sh:1542 git-gui.sh:1543 git-gui.sh:1544
 msgid "Requires merge resolution"
 msgstr ""
 
-#: git-gui.sh:1383
+#: git-gui.sh:1579
 msgid "Starting gitk... please wait..."
 msgstr ""
 
-#: git-gui.sh:1392
+#: git-gui.sh:1588
 #, tcl-format
 msgid ""
 "Unable to start gitk:\n"
@@ -116,293 +134,327 @@ msgid ""
 "%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"
-msgstr ""
-
-#: git-gui.sh:1649
+#: git-gui.sh:1788 lib/choose_repository.tcl:32
 msgid "Repository"
 msgstr ""
 
-#: git-gui.sh:1650
+#: git-gui.sh:1789
 msgid "Edit"
 msgstr ""
 
-#: git-gui.sh:1652
+#: git-gui.sh:1791 lib/choose_rev.tcl:560
 msgid "Branch"
 msgstr ""
 
-#: git-gui.sh:1655 git-gui.sh:1842 git-gui.sh:2152
-msgid "Commit"
+#: git-gui.sh:1794 lib/choose_rev.tcl:547
+msgid "Commit@@noun"
 msgstr ""
 
-#: git-gui.sh:1658 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168
+#: git-gui.sh:1797 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168
 msgid "Merge"
 msgstr ""
 
-#: git-gui.sh:1659
-msgid "Fetch"
+#: git-gui.sh:1798 lib/choose_rev.tcl:556
+msgid "Remote"
 msgstr ""
 
-#: git-gui.sh:1660 git-gui.sh:2158 lib/transport.tcl:88 lib/transport.tcl:172
-msgid "Push"
-msgstr ""
-
-#: git-gui.sh:1669
+#: git-gui.sh:1807
 msgid "Browse Current Branch's Files"
 msgstr ""
 
-#: git-gui.sh:1673
+#: git-gui.sh:1811
 msgid "Browse Branch Files..."
 msgstr ""
 
-#: git-gui.sh:1678
+#: git-gui.sh:1816
 msgid "Visualize Current Branch's History"
 msgstr ""
 
-#: git-gui.sh:1682
+#: git-gui.sh:1820
 msgid "Visualize All Branch History"
 msgstr ""
 
-#: git-gui.sh:1689
+#: git-gui.sh:1827
 #, tcl-format
 msgid "Browse %s's Files"
 msgstr ""
 
-#: git-gui.sh:1691
+#: git-gui.sh:1829
 #, tcl-format
 msgid "Visualize %s's History"
 msgstr ""
 
-#: git-gui.sh:1696 lib/database.tcl:27 lib/database.tcl:67
+#: git-gui.sh:1834 lib/database.tcl:27 lib/database.tcl:67
 msgid "Database Statistics"
 msgstr ""
 
-#: git-gui.sh:1699 lib/database.tcl:34
+#: git-gui.sh:1837 lib/database.tcl:34
 msgid "Compress Database"
 msgstr ""
 
-#: git-gui.sh:1702
+#: git-gui.sh:1840
 msgid "Verify Database"
 msgstr ""
 
-#: git-gui.sh:1709 git-gui.sh:1713 git-gui.sh:1717 lib/shortcut.tcl:9
+#: git-gui.sh:1847 git-gui.sh:1851 git-gui.sh:1855 lib/shortcut.tcl:9
 #: lib/shortcut.tcl:45 lib/shortcut.tcl:84
 msgid "Create Desktop Icon"
 msgstr ""
 
-#: git-gui.sh:1722
+#: git-gui.sh:1860 lib/choose_repository.tcl:36 lib/choose_repository.tcl:95
 msgid "Quit"
 msgstr ""
 
-#: git-gui.sh:1729
+#: git-gui.sh:1867
 msgid "Undo"
 msgstr ""
 
-#: git-gui.sh:1732
+#: git-gui.sh:1870
 msgid "Redo"
 msgstr ""
 
-#: git-gui.sh:1736 git-gui.sh:2222
+#: git-gui.sh:1874 git-gui.sh:2366
 msgid "Cut"
 msgstr ""
 
-#: git-gui.sh:1739 git-gui.sh:2225 git-gui.sh:2296 git-gui.sh:2368
-#: lib/console.tcl:69
+#: git-gui.sh:1877 git-gui.sh:2369 git-gui.sh:2440 git-gui.sh:2512
+#: lib/console.tcl:67
 msgid "Copy"
 msgstr ""
 
-#: git-gui.sh:1742 git-gui.sh:2228
+#: git-gui.sh:1880 git-gui.sh:2372
 msgid "Paste"
 msgstr ""
 
-#: git-gui.sh:1745 git-gui.sh:2231 lib/branch_delete.tcl:26
+#: git-gui.sh:1883 git-gui.sh:2375 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:1887 git-gui.sh:2379 git-gui.sh:2516 lib/console.tcl:69
 msgid "Select All"
 msgstr ""
 
-#: git-gui.sh:1758
+#: git-gui.sh:1896
 msgid "Create..."
 msgstr ""
 
-#: git-gui.sh:1764
+#: git-gui.sh:1902
 msgid "Checkout..."
 msgstr ""
 
-#: git-gui.sh:1770
+#: git-gui.sh:1908
 msgid "Rename..."
 msgstr ""
 
-#: git-gui.sh:1775 git-gui.sh:1873
+#: git-gui.sh:1913 git-gui.sh:2012
 msgid "Delete..."
 msgstr ""
 
-#: git-gui.sh:1780
+#: git-gui.sh:1918
 msgid "Reset..."
 msgstr ""
 
-#: git-gui.sh:1792 git-gui.sh:2169
+#: git-gui.sh:1930 git-gui.sh:2313
 msgid "New Commit"
 msgstr ""
 
-#: git-gui.sh:1800 git-gui.sh:2176
+#: git-gui.sh:1938 git-gui.sh:2320
 msgid "Amend Last Commit"
 msgstr ""
 
-#: git-gui.sh:1809 git-gui.sh:2136 lib/remote_branch_delete.tcl:99
+#: git-gui.sh:1947 git-gui.sh:2280 lib/remote_branch_delete.tcl:99
 msgid "Rescan"
 msgstr ""
 
-#: git-gui.sh:1815
+#: git-gui.sh:1953
 msgid "Stage To Commit"
 msgstr ""
 
-#: git-gui.sh:1820
+#: git-gui.sh:1958
 msgid "Stage Changed Files To Commit"
 msgstr ""
 
-#: git-gui.sh:1826
+#: git-gui.sh:1964
 msgid "Unstage From Commit"
 msgstr ""
 
-#: git-gui.sh:1831 lib/index.tcl:376
+#: git-gui.sh:1969 lib/index.tcl:352
 msgid "Revert Changes"
 msgstr ""
 
-#: git-gui.sh:1838 git-gui.sh:2148 git-gui.sh:2246
+#: git-gui.sh:1976 git-gui.sh:2292 git-gui.sh:2390
 msgid "Sign Off"
 msgstr ""
 
-#: git-gui.sh:1853
+#: git-gui.sh:1980 git-gui.sh:2296
+msgid "Commit@@verb"
+msgstr ""
+
+#: git-gui.sh:1991
 msgid "Local Merge..."
 msgstr ""
 
-#: git-gui.sh:1858
+#: git-gui.sh:1996
 msgid "Abort Merge..."
 msgstr ""
 
-#: git-gui.sh:1870
+#: git-gui.sh:2008
 msgid "Push..."
 msgstr ""
 
-#: git-gui.sh:1880
+#: git-gui.sh:2019 lib/choose_repository.tcl:41
 msgid "Apple"
 msgstr ""
 
-#: git-gui.sh:1883 git-gui.sh:1901 lib/option.tcl:65
+#: git-gui.sh:2022 git-gui.sh:2044 lib/about.tcl:13
+#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:50
 #, tcl-format
 msgid "About %s"
 msgstr ""
 
-#: git-gui.sh:1885 git-gui.sh:1891 git-gui.sh:2414
+#: git-gui.sh:2026
+msgid "Preferences..."
+msgstr ""
+
+#: git-gui.sh:2034 git-gui.sh:2558
 msgid "Options..."
 msgstr ""
 
-#: git-gui.sh:1897
+#: git-gui.sh:2040 lib/choose_repository.tcl:47
 msgid "Help"
 msgstr ""
 
-#: git-gui.sh:1938
+#: git-gui.sh:2081
 msgid "Online Documentation"
 msgstr ""
 
-#: git-gui.sh:2054
+#: git-gui.sh:2165
+#, tcl-format
+msgid "fatal: cannot stat path %s: No such file or directory"
+msgstr ""
+
+#: git-gui.sh:2198
 msgid "Current Branch:"
 msgstr ""
 
-#: git-gui.sh:2075
-msgid "Staged Changes (Will Be Committed)"
+#: git-gui.sh:2219
+msgid "Staged Changes (Will Commit)"
 msgstr ""
 
-#: git-gui.sh:2095
-msgid "Unstaged Changes (Will Not Be Committed)"
+#: git-gui.sh:2239
+msgid "Unstaged Changes"
 msgstr ""
 
-#: git-gui.sh:2142
+#: git-gui.sh:2286
 msgid "Stage Changed"
 msgstr ""
 
-#: git-gui.sh:2188
+#: git-gui.sh:2302 lib/transport.tcl:93 lib/transport.tcl:182
+msgid "Push"
+msgstr ""
+
+#: git-gui.sh:2332
 msgid "Initial Commit Message:"
 msgstr ""
 
-#: git-gui.sh:2189
+#: git-gui.sh:2333
 msgid "Amended Commit Message:"
 msgstr ""
 
-#: git-gui.sh:2190
+#: git-gui.sh:2334
 msgid "Amended Initial Commit Message:"
 msgstr ""
 
-#: git-gui.sh:2191
+#: git-gui.sh:2335
 msgid "Amended Merge Commit Message:"
 msgstr ""
 
-#: git-gui.sh:2192
+#: git-gui.sh:2336
 msgid "Merge Commit Message:"
 msgstr ""
 
-#: git-gui.sh:2193
+#: git-gui.sh:2337
 msgid "Commit Message:"
 msgstr ""
 
-#: git-gui.sh:2238 git-gui.sh:2376 lib/console.tcl:73
+#: git-gui.sh:2382 git-gui.sh:2520 lib/console.tcl:71
 msgid "Copy All"
 msgstr ""
 
-#: git-gui.sh:2262 lib/blame.tcl:104
+#: git-gui.sh:2406 lib/blame.tcl:104
 msgid "File:"
 msgstr ""
 
-#: git-gui.sh:2364
+#: git-gui.sh:2508
 msgid "Refresh"
 msgstr ""
 
-#: git-gui.sh:2385
+#: git-gui.sh:2529
 msgid "Apply/Reverse Hunk"
 msgstr ""
 
-#: git-gui.sh:2391
+#: git-gui.sh:2535
 msgid "Decrease Font Size"
 msgstr ""
 
-#: git-gui.sh:2395
+#: git-gui.sh:2539
 msgid "Increase Font Size"
 msgstr ""
 
-#: git-gui.sh:2400
+#: git-gui.sh:2544
 msgid "Show Less Context"
 msgstr ""
 
-#: git-gui.sh:2407
+#: git-gui.sh:2551
 msgid "Show More Context"
 msgstr ""
 
-#: git-gui.sh:2422
+#: git-gui.sh:2565
 msgid "Unstage Hunk From Commit"
 msgstr ""
 
-#: git-gui.sh:2426 git-gui.sh:2430
+#: git-gui.sh:2567
 msgid "Stage Hunk For Commit"
 msgstr ""
 
-#: git-gui.sh:2440
+#: git-gui.sh:2586
 msgid "Initializing..."
 msgstr ""
 
+#: git-gui.sh:2677
+#, 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:2707
+msgid ""
+"\n"
+"This is due to a known issue with the\n"
+"Tcl binary distributed by Cygwin."
+msgstr ""
+
+#: git-gui.sh:2712
+#, 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:25
+msgid "git-gui - a graphical user interface for Git."
+msgstr ""
+
 #: lib/blame.tcl:77
 msgid "File Viewer"
 msgstr ""
@@ -420,6 +472,50 @@ msgstr ""
 msgid "Reading %s..."
 msgstr ""
 
+#: lib/blame.tcl:473
+msgid "Loading copy/move tracking annotations..."
+msgstr ""
+
+#: lib/blame.tcl:493
+msgid "lines annotated"
+msgstr ""
+
+#: lib/blame.tcl:674
+msgid "Loading original location annotations..."
+msgstr ""
+
+#: lib/blame.tcl:677
+msgid "Annotation complete."
+msgstr ""
+
+#: lib/blame.tcl:731
+msgid "Loading annotation..."
+msgstr ""
+
+#: lib/blame.tcl:787
+msgid "Author:"
+msgstr ""
+
+#: lib/blame.tcl:791
+msgid "Committer:"
+msgstr ""
+
+#: lib/blame.tcl:796
+msgid "Original File:"
+msgstr ""
+
+#: lib/blame.tcl:910
+msgid "Originally By:"
+msgstr ""
+
+#: lib/blame.tcl:916
+msgid "In File:"
+msgstr ""
+
+#: lib/blame.tcl:921
+msgid "Copied Or Moved Here By:"
+msgstr ""
+
 #: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19
 msgid "Checkout Branch"
 msgstr ""
@@ -429,18 +525,17 @@ 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:281
+#: lib/checkout_op.tcl:522 lib/choose_font.tcl:43 lib/merge.tcl:172
+#: lib/option.tcl:90 lib/remote_branch_delete.tcl:42 lib/transport.tcl:97
 msgid "Cancel"
 msgstr ""
 
-#: lib/branch_checkout.tcl:32 lib/browser.tcl:288
+#: lib/branch_checkout.tcl:32 lib/browser.tcl:286
 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:202
 msgid "Options"
 msgstr ""
 
@@ -460,7 +555,7 @@ msgstr ""
 msgid "Create New Branch"
 msgstr ""
 
-#: lib/branch_create.tcl:31
+#: lib/branch_create.tcl:31 lib/choose_repository.tcl:199
 msgid "Create"
 msgstr ""
 
@@ -595,20 +690,22 @@ msgstr ""
 msgid "File Browser"
 msgstr ""
 
-#: lib/browser.tcl:127 lib/browser.tcl:144
+#: lib/browser.tcl:125 lib/browser.tcl:142
 #, tcl-format
 msgid "Loading %s..."
 msgstr ""
 
-#: lib/browser.tcl:188
+#: lib/browser.tcl:186
 msgid "[Up To Parent]"
 msgstr ""
 
-#: lib/browser.tcl:268 lib/browser.tcl:274
+#: lib/browser.tcl:266 lib/browser.tcl:272
 msgid "Browse Branch Files"
 msgstr ""
 
-#: lib/browser.tcl:279
+#: lib/browser.tcl:277 lib/choose_repository.tcl:215
+#: lib/choose_repository.tcl:305 lib/choose_repository.tcl:315
+#: lib/choose_repository.tcl:811
 msgid "Browse"
 msgstr ""
 
@@ -617,7 +714,12 @@ msgstr ""
 msgid "Fetching %s from %s"
 msgstr ""
 
-#: lib/checkout_op.tcl:140 lib/console.tcl:81 lib/database.tcl:31
+#: lib/checkout_op.tcl:127
+#, tcl-format
+msgid "fatal: Cannot resolve %s"
+msgstr ""
+
+#: lib/checkout_op.tcl:140 lib/console.tcl:79 lib/database.tcl:31
 msgid "Close"
 msgstr ""
 
@@ -659,6 +761,11 @@ msgid ""
 "The rescan will be automatically started now.\n"
 msgstr ""
 
+#: lib/checkout_op.tcl:322
+#, tcl-format
+msgid "Updating working directory to '%s'..."
+msgstr ""
+
 #: lib/checkout_op.tcl:353
 #, tcl-format
 msgid "Aborted checkout of '%s' (file level merging is required)."
@@ -681,6 +788,11 @@ msgid ""
 "Checkout'."
 msgstr ""
 
+#: lib/checkout_op.tcl:446
+#, tcl-format
+msgid "Checked out '%s'."
+msgstr ""
+
 #: lib/checkout_op.tcl:478
 #, tcl-format
 msgid "Resetting '%s' to '%s' will lose the following commits:"
@@ -710,6 +822,235 @@ msgid ""
 "This should not have occurred.  %s will now close and give up."
 msgstr ""
 
+#: lib/choose_font.tcl:39
+msgid "Select"
+msgstr ""
+
+#: lib/choose_font.tcl:53
+msgid "Font Family"
+msgstr ""
+
+#: lib/choose_font.tcl:73
+msgid "Font Size"
+msgstr ""
+
+#: lib/choose_font.tcl:90
+msgid "Font Example"
+msgstr ""
+
+#: lib/choose_font.tcl:101
+msgid ""
+"This is example text.\n"
+"If you like this text, it can be your font."
+msgstr ""
+
+#: lib/choose_repository.tcl:25
+msgid "Git Gui"
+msgstr ""
+
+#: lib/choose_repository.tcl:69 lib/choose_repository.tcl:204
+msgid "Create New Repository"
+msgstr ""
+
+#: lib/choose_repository.tcl:74 lib/choose_repository.tcl:291
+msgid "Clone Existing Repository"
+msgstr ""
+
+#: lib/choose_repository.tcl:79 lib/choose_repository.tcl:800
+msgid "Open Existing Repository"
+msgstr ""
+
+#: lib/choose_repository.tcl:91
+msgid "Next >"
+msgstr ""
+
+#: lib/choose_repository.tcl:152
+#, tcl-format
+msgid "Location %s already exists."
+msgstr ""
+
+#: lib/choose_repository.tcl:158 lib/choose_repository.tcl:165
+#: lib/choose_repository.tcl:172
+#, tcl-format
+msgid "Failed to create repository %s:"
+msgstr ""
+
+#: lib/choose_repository.tcl:209 lib/choose_repository.tcl:309
+msgid "Directory:"
+msgstr ""
+
+#: lib/choose_repository.tcl:238 lib/choose_repository.tcl:363
+#: lib/choose_repository.tcl:834
+msgid "Git Repository"
+msgstr ""
+
+#: lib/choose_repository.tcl:253 lib/choose_repository.tcl:260
+#, tcl-format
+msgid "Directory %s already exists."
+msgstr ""
+
+#: lib/choose_repository.tcl:265
+#, tcl-format
+msgid "File %s already exists."
+msgstr ""
+
+#: lib/choose_repository.tcl:286
+msgid "Clone"
+msgstr ""
+
+#: lib/choose_repository.tcl:299
+msgid "URL:"
+msgstr ""
+
+#: lib/choose_repository.tcl:319
+msgid "Clone Type:"
+msgstr ""
+
+#: lib/choose_repository.tcl:325
+msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
+msgstr ""
+
+#: lib/choose_repository.tcl:331
+msgid "Full Copy (Slower, Redundant Backup)"
+msgstr ""
+
+#: lib/choose_repository.tcl:337
+msgid "Shared (Fastest, Not Recommended, No Backup)"
+msgstr ""
+
+#: lib/choose_repository.tcl:369 lib/choose_repository.tcl:418
+#: lib/choose_repository.tcl:560 lib/choose_repository.tcl:630
+#: lib/choose_repository.tcl:840 lib/choose_repository.tcl:848
+#, tcl-format
+msgid "Not a Git repository: %s"
+msgstr ""
+
+#: lib/choose_repository.tcl:405
+msgid "Standard only available for local repository."
+msgstr ""
+
+#: lib/choose_repository.tcl:409
+msgid "Shared only available for local repository."
+msgstr ""
+
+#: lib/choose_repository.tcl:439
+msgid "Failed to configure origin"
+msgstr ""
+
+#: lib/choose_repository.tcl:451
+msgid "Counting objects"
+msgstr ""
+
+#: lib/choose_repository.tcl:452
+msgid "buckets"
+msgstr ""
+
+#: lib/choose_repository.tcl:476
+#, tcl-format
+msgid "Unable to copy objects/info/alternates: %s"
+msgstr ""
+
+#: lib/choose_repository.tcl:512
+#, tcl-format
+msgid "Nothing to clone from %s."
+msgstr ""
+
+#: lib/choose_repository.tcl:514 lib/choose_repository.tcl:728
+#: lib/choose_repository.tcl:740
+msgid "The 'master' branch has not been initialized."
+msgstr ""
+
+#: lib/choose_repository.tcl:527
+msgid "Hardlinks are unavailable.  Falling back to copying."
+msgstr ""
+
+#: lib/choose_repository.tcl:539
+#, tcl-format
+msgid "Cloning from %s"
+msgstr ""
+
+#: lib/choose_repository.tcl:570
+msgid "Copying objects"
+msgstr ""
+
+#: lib/choose_repository.tcl:571
+msgid "KiB"
+msgstr ""
+
+#: lib/choose_repository.tcl:595
+#, tcl-format
+msgid "Unable to copy object: %s"
+msgstr ""
+
+#: lib/choose_repository.tcl:605
+msgid "Linking objects"
+msgstr ""
+
+#: lib/choose_repository.tcl:606
+msgid "objects"
+msgstr ""
+
+#: lib/choose_repository.tcl:614
+#, tcl-format
+msgid "Unable to hardlink object: %s"
+msgstr ""
+
+#: lib/choose_repository.tcl:669
+msgid "Cannot fetch branches and objects.  See console output for details."
+msgstr ""
+
+#: lib/choose_repository.tcl:680
+msgid "Cannot fetch tags.  See console output for details."
+msgstr ""
+
+#: lib/choose_repository.tcl:704
+msgid "Cannot determine HEAD.  See console output for details."
+msgstr ""
+
+#: lib/choose_repository.tcl:713
+#, tcl-format
+msgid "Unable to cleanup %s"
+msgstr ""
+
+#: lib/choose_repository.tcl:719
+msgid "Clone failed."
+msgstr ""
+
+#: lib/choose_repository.tcl:726
+msgid "No default branch obtained."
+msgstr ""
+
+#: lib/choose_repository.tcl:737
+#, tcl-format
+msgid "Cannot resolve %s as a commit."
+msgstr ""
+
+#: lib/choose_repository.tcl:749
+msgid "Creating working directory"
+msgstr ""
+
+#: lib/choose_repository.tcl:750 lib/index.tcl:15 lib/index.tcl:80
+#: lib/index.tcl:149
+msgid "files"
+msgstr ""
+
+#: lib/choose_repository.tcl:779
+msgid "Initial file checkout failed."
+msgstr ""
+
+#: lib/choose_repository.tcl:795
+msgid "Open"
+msgstr ""
+
+#: lib/choose_repository.tcl:805
+msgid "Repository:"
+msgstr ""
+
+#: lib/choose_repository.tcl:854
+#, tcl-format
+msgid "Failed to open repository %s:"
+msgstr ""
+
 #: lib/choose_rev.tcl:53
 msgid "This Detached Checkout"
 msgstr ""
@@ -726,7 +1067,7 @@ msgstr ""
 msgid "Tracking Branch"
 msgstr ""
 
-#: lib/choose_rev.tcl:84
+#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:537
 msgid "Tag"
 msgstr ""
 
@@ -743,6 +1084,14 @@ msgstr ""
 msgid "Revision expression is empty."
 msgstr ""
 
+#: lib/choose_rev.tcl:530
+msgid "Updated"
+msgstr ""
+
+#: lib/choose_rev.tcl:558
+msgid "URL"
+msgstr ""
+
 #: lib/commit.tcl:9
 msgid ""
 "There is nothing to amend.\n"
@@ -821,6 +1170,11 @@ msgstr ""
 msgid "write-tree failed:"
 msgstr ""
 
+#: lib/commit.tcl:275
+#, tcl-format
+msgid "Commit %s appears to be corrupt"
+msgstr ""
+
 #: lib/commit.tcl:279
 msgid ""
 "No changes to commit.\n"
@@ -834,6 +1188,11 @@ msgstr ""
 msgid "No changes to commit."
 msgstr ""
 
+#: lib/commit.tcl:303
+#, tcl-format
+msgid "warning: Tcl does not support encoding '%s'."
+msgstr ""
+
 #: lib/commit.tcl:317
 msgid "commit-tree failed:"
 msgstr ""
@@ -847,15 +1206,15 @@ msgstr ""
 msgid "Created commit %s: %s"
 msgstr ""
 
-#: lib/console.tcl:55
+#: lib/console.tcl:57
 msgid "Working... please wait..."
 msgstr ""
 
-#: lib/console.tcl:184
+#: lib/console.tcl:183
 msgid "Success"
 msgstr ""
 
-#: lib/console.tcl:194
+#: lib/console.tcl:196
 msgid "Error: Command Failed"
 msgstr ""
 
@@ -895,6 +1254,22 @@ msgstr ""
 msgid "Verifying the object database with fsck-objects"
 msgstr ""
 
+#: 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:42
 #, tcl-format
 msgid ""
@@ -909,19 +1284,37 @@ msgid ""
 "the same state."
 msgstr ""
 
-#: lib/diff.tcl:97
+#: lib/diff.tcl:81
+#, tcl-format
+msgid "Loading diff of %s..."
+msgstr ""
+
+#: lib/diff.tcl:114 lib/diff.tcl:184
+#, tcl-format
+msgid "Unable to display %s"
+msgstr ""
+
+#: lib/diff.tcl:115
 msgid "Error loading file:"
 msgstr ""
 
-#: lib/diff.tcl:162
+#: lib/diff.tcl:122
+msgid "Git Repository (subproject)"
+msgstr ""
+
+#: lib/diff.tcl:134
+msgid "* Binary file (not showing content)."
+msgstr ""
+
+#: lib/diff.tcl:185
 msgid "Error loading diff:"
 msgstr ""
 
-#: lib/diff.tcl:278
+#: lib/diff.tcl:302
 msgid "Failed to unstage selected hunk."
 msgstr ""
 
-#: lib/diff.tcl:285
+#: lib/diff.tcl:309
 msgid "Failed to stage selected hunk."
 msgstr ""
 
@@ -937,21 +1330,31 @@ msgstr ""
 msgid "You must correct the above errors before committing."
 msgstr ""
 
-#: lib/index.tcl:364
+#: lib/index.tcl:241
+#, tcl-format
+msgid "Unstaging %s from commit"
+msgstr ""
+
+#: lib/index.tcl:285
+#, tcl-format
+msgid "Adding %s"
+msgstr ""
+
+#: lib/index.tcl:340
 #, tcl-format
 msgid "Revert changes in file %s?"
 msgstr ""
 
-#: lib/index.tcl:366
+#: lib/index.tcl:342
 #, tcl-format
 msgid "Revert changes in these %i files?"
 msgstr ""
 
-#: lib/index.tcl:372
+#: lib/index.tcl:348
 msgid "Any unstaged changes will be permanently lost by the revert."
 msgstr ""
 
-#: lib/index.tcl:375
+#: lib/index.tcl:351
 msgid "Do Nothing"
 msgstr ""
 
@@ -1058,71 +1461,96 @@ msgstr ""
 msgid "Abort completed.  Ready."
 msgstr ""
 
-#: lib/option.tcl:77
-msgid "git-gui - a graphical user interface for Git."
-msgstr ""
-
-#: lib/option.tcl:164
+#: lib/option.tcl:82
 msgid "Restore Defaults"
 msgstr ""
 
-#: lib/option.tcl:168
+#: lib/option.tcl:86
 msgid "Save"
 msgstr ""
 
-#: lib/option.tcl:178
+#: lib/option.tcl:96
 #, tcl-format
 msgid "%s Repository"
 msgstr ""
 
-#: lib/option.tcl:179
+#: lib/option.tcl:97
 msgid "Global (All Repositories)"
 msgstr ""
 
-#: lib/option.tcl:185
+#: lib/option.tcl:103
 msgid "User Name"
 msgstr ""
 
-#: lib/option.tcl:186
+#: lib/option.tcl:104
 msgid "Email Address"
 msgstr ""
 
-#: lib/option.tcl:188
+#: lib/option.tcl:106
 msgid "Summarize Merge Commits"
 msgstr ""
 
-#: lib/option.tcl:189
+#: lib/option.tcl:107
 msgid "Merge Verbosity"
 msgstr ""
 
-#: lib/option.tcl:190
+#: lib/option.tcl:108
 msgid "Show Diffstat After Merge"
 msgstr ""
 
-#: lib/option.tcl:192
+#: lib/option.tcl:110
 msgid "Trust File Modification Timestamps"
 msgstr ""
 
-#: lib/option.tcl:193
+#: lib/option.tcl:111
 msgid "Prune Tracking Branches During Fetch"
 msgstr ""
 
-#: lib/option.tcl:194
+#: lib/option.tcl:112
 msgid "Match Tracking Branches"
 msgstr ""
 
-#: lib/option.tcl:195
+#: lib/option.tcl:113
 msgid "Number of Diff Context Lines"
 msgstr ""
 
-#: lib/option.tcl:196
+#: lib/option.tcl:114
 msgid "New Branch Name Template"
 msgstr ""
 
-#: lib/option.tcl:305
+#: lib/option.tcl:176
+msgid "Change Font"
+msgstr ""
+
+#: lib/option.tcl:180
+#, tcl-format
+msgid "Choose %s"
+msgstr ""
+
+#: lib/option.tcl:186
+msgid "pt."
+msgstr ""
+
+#: lib/option.tcl:200
+msgid "Preferences"
+msgstr ""
+
+#: lib/option.tcl:235
 msgid "Failed to completely save options:"
 msgstr ""
 
+#: lib/remote.tcl:165
+msgid "Prune from"
+msgstr ""
+
+#: lib/remote.tcl:170
+msgid "Fetch from"
+msgstr ""
+
+#: lib/remote.tcl:213
+msgid "Push to"
+msgstr ""
+
 #: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34
 msgid "Delete Remote Branch"
 msgstr ""
@@ -1131,11 +1559,11 @@ msgstr ""
 msgid "From Repository"
 msgstr ""
 
-#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:118
+#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:123
 msgid "Remote:"
 msgstr ""
 
-#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:133
+#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:138
 msgid "Arbitrary URL:"
 msgstr ""
 
@@ -1159,6 +1587,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,21 +1627,6 @@ msgstr ""
 msgid "Scanning %s..."
 msgstr ""
 
-#: lib/remote.tcl:162
-#, tcl-format
-msgid "Fetch from %s..."
-msgstr ""
-
-#: lib/remote.tcl:172
-#, tcl-format
-msgid "Prune from %s..."
-msgstr ""
-
-#: lib/remote.tcl:206
-#, tcl-format
-msgid "Push to %s..."
-msgstr ""
-
 #: lib/shortcut.tcl:26 lib/shortcut.tcl:74
 msgid "Cannot write script:"
 msgstr ""
@@ -1214,51 +1635,70 @@ msgstr ""
 msgid "Cannot write icon:"
 msgstr ""
 
-#: lib/status_bar.tcl:58
+#: lib/status_bar.tcl:83
 #, tcl-format
 msgid "%s ... %*i of %*i %s (%3i%%)"
 msgstr ""
 
+#: lib/transport.tcl:6
+#, tcl-format
+msgid "fetch %s"
+msgstr ""
+
 #: lib/transport.tcl:7
 #, tcl-format
 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"
 msgstr ""
 
+#: lib/transport.tcl:25 lib/transport.tcl:71
+#, tcl-format
+msgid "push %s"
+msgstr ""
+
 #: lib/transport.tcl:26
 #, tcl-format
 msgid "Pushing changes to %s"
 msgstr ""
 
-#: lib/transport.tcl:68
+#: lib/transport.tcl:72
 #, tcl-format
 msgid "Pushing %s %s to %s"
 msgstr ""
 
-#: lib/transport.tcl:84
+#: lib/transport.tcl:89
 msgid "Push Branches"
 msgstr ""
 
-#: lib/transport.tcl:98
+#: lib/transport.tcl:103
 msgid "Source Branches"
 msgstr ""
 
-#: lib/transport.tcl:115
+#: lib/transport.tcl:120
 msgid "Destination Repository"
 msgstr ""
 
-#: lib/transport.tcl:153
+#: lib/transport.tcl:158
 msgid "Transfer Options"
 msgstr ""
 
-#: lib/transport.tcl:155
+#: lib/transport.tcl:160
+msgid "Force overwrite existing branch (may discard changes)"
+msgstr ""
+
+#: lib/transport.tcl:164
 msgid "Use thin pack (for slow network connections)"
 msgstr ""
 
-#: lib/transport.tcl:159
+#: lib/transport.tcl:168
 msgid "Include tags"
 msgstr ""
diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh
index 3f5927fb29..6b7bdbca21 100755
--- a/git-gui/git-gui.sh
+++ b/git-gui/git-gui.sh
@@ -343,6 +343,9 @@ proc _which {what} {
 				$env(PATH)] {;}]
 			set _search_exe .exe
 		} elseif {[is_Windows]} {
+			set gitguidir [file dirname [info script]]
+			regsub -all ";" $gitguidir "\\;" gitguidir
+			set env(PATH) "$gitguidir;$env(PATH)"
 			set _search_path [split $env(PATH) {;}]
 			set _search_exe .exe
 		} else {
@@ -665,6 +668,7 @@ regsub -- {-dirty$} $_git_version {} _git_version
 regsub {\.[0-9]+\.g[0-9a-f]+$} $_git_version {} _git_version
 regsub {\.rc[0-9]+$} $_git_version {} _git_version
 regsub {\.GIT$} $_git_version {} _git_version
+regsub {\.[a-zA-Z]+\.[0-9]+$} $_git_version {} _git_version
 
 if {![regexp {^[1-9]+(\.[0-9]+)+$} $_git_version]} {
 	catch {wm withdraw .}
@@ -1791,8 +1795,7 @@ if {[is_enabled multicommit] || [is_enabled singlecommit]} {
 }
 if {[is_enabled transport]} {
 	.mbar add cascade -label [mc Merge] -menu .mbar.merge
-	.mbar add cascade -label [mc Fetch] -menu .mbar.fetch
-	.mbar add cascade -label [mc Push] -menu .mbar.push
+	.mbar add cascade -label [mc Remote] -menu .mbar.remote
 }
 . configure -menu .mbar
 
@@ -1999,13 +2002,14 @@ if {[is_enabled branch]} {
 # -- Transport Menu
 #
 if {[is_enabled transport]} {
-	menu .mbar.fetch
+	menu .mbar.remote
 
-	menu .mbar.push
-	.mbar.push add command -label [mc "Push..."] \
+	.mbar.remote add command \
+		-label [mc "Push..."] \
 		-command do_push_anywhere \
 		-accelerator $M1T-P
-	.mbar.push add command -label [mc "Delete..."] \
+	.mbar.remote add command \
+		-label [mc "Delete..."] \
 		-command remote_branch_delete::dialog
 }
 
@@ -2017,8 +2021,12 @@ if {[is_MacOSX]} {
 
 	.mbar.apple add command -label [mc "About %s" [appname]] \
 		-command do_about
-	.mbar.apple add command -label [mc "Options..."] \
-		-command do_options
+	.mbar.apple add separator
+	.mbar.apple add command \
+		-label [mc "Preferences..."] \
+		-command do_options \
+		-accelerator $M1T-,
+	bind . <$M1B-,> do_options
 } else {
 	# -- Edit Menu
 	#
@@ -2208,7 +2216,7 @@ pack .vpane -anchor n -side top -fill both -expand 1
 # -- Index File List
 #
 frame .vpane.files.index -height 100 -width 200
-label .vpane.files.index.title -text [mc "Staged Changes (Will Be Committed)"] \
+label .vpane.files.index.title -text [mc "Staged Changes (Will Commit)"] \
 	-background lightgreen
 text $ui_index -background white -borderwidth 0 \
 	-width 20 -height 10 \
@@ -2228,7 +2236,7 @@ pack $ui_index -side left -fill both -expand 1
 # -- Working Directory File List
 #
 frame .vpane.files.workdir -height 100 -width 200
-label .vpane.files.workdir.title -text [mc "Unstaged Changes (Will Not Be Committed)"] \
+label .vpane.files.workdir.title -text [mc "Unstaged Changes"] \
 	-background lightsalmon
 text $ui_workdir -background white -borderwidth 0 \
 	-width 20 -height 10 \
@@ -2719,8 +2727,14 @@ user.email settings into your personal
 if {[is_enabled transport]} {
 	load_all_remotes
 
-	populate_fetch_menu
+	set n [.mbar.remote index end]
 	populate_push_menu
+	populate_fetch_menu
+	set n [expr {[.mbar.remote index end] - $n}]
+	if {$n > 0} {
+		.mbar.remote insert $n separator
+	}
+	unset n
 }
 
 if {[winfo exists $ui_comm]} {
diff --git a/git-gui/glossary/de.po b/git-gui/glossary/de.po
index aab3b22f50..054cf4df5a 100644
--- a/git-gui/glossary/de.po
+++ b/git-gui/glossary/de.po
@@ -6,7 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: git-gui glossary\n"
-"PO-Revision-Date: 2007-07-26 14:45+0200\n"
+"POT-Creation-Date: 2007-10-05 22:30+0200\n"
+"PO-Revision-Date: 2007-10-05 22:32+0200\n"
 "Last-Translator: Christian Stimming <stimming@tuhh.de>\n"
 "Language-Team: German \n"
 "MIME-Version: 1.0\n"
@@ -19,11 +20,17 @@ msgid ""
 msgstr ""
 "Deutsche Übersetzung.\n"
 "Andere deutsche SCM:\n"
-"  http://tortoisesvn.net/docs/release/TortoiseSVN_de/index.html und http://tortoisesvn.tigris.org/svn/tortoisesvn/trunk/Languages/Tortoise_de.po (username=guest, password empty, gut),\n"
-"  http://msdn.microsoft.com/de-de/library/ms181038(vs.80).aspx (MS Visual Source Safe, kommerziell),\n"
-"  http://cvsbook.red-bean.com/translations/german/Kap_06.html (mittelmäßig),\n"
-"  http://tortoisecvs.cvs.sourceforge.net/tortoisecvs/po/TortoiseCVS/de_DE.po?view=markup (mittelmäßig),\n"
-"  http://rapidsvn.tigris.org/svn/rapidsvn/trunk/src/locale/de/rapidsvn.po (username=guest, password empty, schlecht)"
+"  http://tortoisesvn.net/docs/release/TortoiseSVN_de/index.html und http://"
+"tortoisesvn.tigris.org/svn/tortoisesvn/trunk/Languages/Tortoise_de.po "
+"(username=guest, password empty, gut),\n"
+"  http://msdn.microsoft.com/de-de/library/ms181038(vs.80).aspx (MS Visual "
+"Source Safe, kommerziell),\n"
+"  http://cvsbook.red-bean.com/translations/german/Kap_06.html "
+"(mittelmäßig),\n"
+"  http://tortoisecvs.cvs.sourceforge.net/tortoisecvs/po/TortoiseCVS/de_DE.po?"
+"view=markup (mittelmäßig),\n"
+"  http://rapidsvn.tigris.org/svn/rapidsvn/trunk/src/locale/de/rapidsvn.po "
+"(username=guest, password empty, schlecht)"
 
 #. ""
 msgid "amend"
@@ -43,19 +50,31 @@ msgstr "verzweigen"
 
 #. ""
 msgid "checkout [noun]"
-msgstr "Auscheck? Ausspielung? Abruf? (Source Safe: Auscheckvorgang)"
+msgstr ""
+"Arbeitskopie (Erstellung einer Arbeitskopie; Auscheck? Ausspielung? Abruf? "
+"Source Safe: Auscheckvorgang)"
 
 #. "The action of updating the working tree to a revision which was stored in the object database."
 msgid "checkout [verb]"
-msgstr "auschecken? ausspielen? abrufen? (Source Safe: auschecken)"
+msgstr ""
+"Arbeitskopie erstellen; Zweig umstellen [checkout a branch] (auschecken? "
+"ausspielen? abrufen? Source Safe: auschecken)"
+
+#. ""
+msgid "clone [verb]"
+msgstr "kopieren"
 
 #. "A single point in the git history."
 msgid "commit [noun]"
-msgstr "Übertragung (Sendung?, Übergabe?, Einspielung?, Ablagevorgang?)"
+msgstr ""
+"Version; Eintragung; Änderung (Buchung?, Eintragung?, Übertragung?, "
+"Sendung?, Übergabe?, Einspielung?, Ablagevorgang?)"
 
 #. "The action of storing a new snapshot of the project's state in the git history."
 msgid "commit [verb]"
-msgstr "übertragen (TortoiseSVN: übertragen; Source Safe: einchecken; senden?, übergeben?, einspielen?, einpflegen?, ablegen?)"
+msgstr ""
+"eintragen (TortoiseSVN: übertragen; Source Safe: einchecken; senden?, "
+"übergeben?, einspielen?, einpflegen?, ablegen?)"
 
 #. ""
 msgid "diff [noun]"
@@ -87,7 +106,11 @@ msgstr "zusammenführen"
 
 #. ""
 msgid "message"
-msgstr "Meldung (Nachricht?; Source Safe: Kommentar)"
+msgstr "Beschreibung (Meldung?, Nachricht?; Source Safe: Kommentar)"
+
+#. ""
+msgid "prune"
+msgstr "löschen"
 
 #. "Pulling a branch means to fetch it and merge it."
 msgid "pull"
diff --git a/git-gui/glossary/git-gui-glossary.pot b/git-gui/glossary/git-gui-glossary.pot
index c955b46744..a2e5c73bbd 100644
--- a/git-gui/glossary/git-gui-glossary.pot
+++ b/git-gui/glossary/git-gui-glossary.pot
@@ -6,12 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2007-07-27 19:21+0200\n"
+"POT-Creation-Date: 2007-10-05 22:30+0200\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"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
 #. "English Definition (Dear translator: This file will never be visible to the user! It should only serve as a tool for you, the translator. Nothing more.)"
@@ -42,6 +42,10 @@ msgstr ""
 msgid "checkout [verb]"
 msgstr ""
 
+#. ""
+msgid "clone [verb]"
+msgstr ""
+
 #. "A single point in the git history."
 msgid "commit [noun]"
 msgstr ""
@@ -82,6 +86,10 @@ msgstr ""
 msgid "message"
 msgstr ""
 
+#. ""
+msgid "prune"
+msgstr ""
+
 #. "Pulling a branch means to fetch it and merge it."
 msgid "pull"
 msgstr ""
diff --git a/git-gui/glossary/git-gui-glossary.txt b/git-gui/glossary/git-gui-glossary.txt
index bb55aa827d..b53740d48c 100644
--- a/git-gui/glossary/git-gui-glossary.txt
+++ b/git-gui/glossary/git-gui-glossary.txt
@@ -5,6 +5,7 @@
 "branch [verb]"	""
 "checkout [noun]"	""
 "checkout [verb]"	"The action of updating the working tree to a revision which was stored in the object database."
+"clone [verb]"	""
 "commit [noun]"	"A single point in the git history."
 "commit [verb]"	"The action of storing a new snapshot of the project's state in the git history."
 "diff [noun]"	""
@@ -15,6 +16,7 @@
 "merge [noun]"	"A successful merge results in the creation of a new commit representing the result of the merge."
 "merge [verb]"	"To bring the contents of another branch into the current branch."
 "message"	""
+"prune"	""
 "pull"	"Pulling a branch means to fetch it and merge it."
 "push"	"Pushing a branch means to get the branch's head ref from a remote repository, and ... (well, can someone please explain it for mere mortals?)"
 "redo"	""
diff --git a/git-gui/lib/about.tcl b/git-gui/lib/about.tcl
new file mode 100644
index 0000000000..719fc547b3
--- /dev/null
+++ b/git-gui/lib/about.tcl
@@ -0,0 +1,81 @@
+# git-gui about git-gui dialog
+# Copyright (C) 2006, 2007 Shawn Pearce
+
+proc do_about {} {
+	global appvers copyright oguilib
+	global tcl_patchLevel tk_patchLevel
+
+	set w .about_dialog
+	toplevel $w
+	wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
+
+	pack [git_logo $w.git_logo] -side left -fill y -padx 10 -pady 10
+	label $w.header -text [mc "About %s" [appname]] \
+		-font font_uibold
+	pack $w.header -side top -fill x
+
+	frame $w.buttons
+	button $w.buttons.close -text {Close} \
+		-default active \
+		-command [list destroy $w]
+	pack $w.buttons.close -side right
+	pack $w.buttons -side bottom -fill x -pady 10 -padx 10
+
+	label $w.desc \
+		-text "[mc "git-gui - a graphical user interface for Git."]\n$copyright" \
+		-padx 5 -pady 5 \
+		-justify left \
+		-anchor w \
+		-borderwidth 1 \
+		-relief solid
+	pack $w.desc -side top -fill x -padx 5 -pady 5
+
+	set v {}
+	append v "git-gui version $appvers\n"
+	append v "[git version]\n"
+	append v "\n"
+	if {$tcl_patchLevel eq $tk_patchLevel} {
+		append v "Tcl/Tk version $tcl_patchLevel"
+	} else {
+		append v "Tcl version $tcl_patchLevel"
+		append v ", Tk version $tk_patchLevel"
+	}
+
+	set d {}
+	append d "git wrapper: $::_git\n"
+	append d "git exec dir: [gitexec]\n"
+	append d "git-gui lib: $oguilib"
+
+	label $w.vers \
+		-text $v \
+		-padx 5 -pady 5 \
+		-justify left \
+		-anchor w \
+		-borderwidth 1 \
+		-relief solid
+	pack $w.vers -side top -fill x -padx 5 -pady 5
+
+	label $w.dirs \
+		-text $d \
+		-padx 5 -pady 5 \
+		-justify left \
+		-anchor w \
+		-borderwidth 1 \
+		-relief solid
+	pack $w.dirs -side top -fill x -padx 5 -pady 5
+
+	menu $w.ctxm -tearoff 0
+	$w.ctxm add command \
+		-label {Copy} \
+		-command "
+		clipboard clear
+		clipboard append -format STRING -type STRING -- \[$w.vers cget -text\]
+	"
+
+	bind $w <Visibility> "grab $w; focus $w.buttons.close"
+	bind $w <Key-Escape> "destroy $w"
+	bind $w <Key-Return> "destroy $w"
+	bind_button3 $w.vers "tk_popup $w.ctxm %X %Y; grab $w; focus $w"
+	wm title $w "About [appname]"
+	tkwait window $w
+}
diff --git a/git-gui/lib/choose_repository.tcl b/git-gui/lib/choose_repository.tcl
index 16bf67c34f..5d5bc81ad0 100644
--- a/git-gui/lib/choose_repository.tcl
+++ b/git-gui/lib/choose_repository.tcl
@@ -3,38 +3,6 @@
 
 class choose_repository {
 
-# Henrik Nyh's alternative Git logo, from his blog post
-# http://henrik.nyh.se/2007/06/alternative-git-logo-and-favicon
-#
-image create photo ::choose_repository::git_logo -data {
-R0lGODdhYQC8AIQbAGZmZtg4LW9vb3l5eYKCgoyMjEC/TOJpYZWVlZ+fn2/PeKmpqbKysry8vMXF
-xZ/fpc/Pz7fnvPXNytnZ2eLi4s/v0vja1+zs7Of36fX19f3z8v///////////////////ywAAAAA
-YQC8AAAF/uAmjmRpnmiqrmzrvq4hz3RtGw+s7zx5/7dcb0hUAY8zYXHJRCKVzGjPeYRKry8q0Irt
-GrVBr3gFDo/PprKNix6ra+y2902Ly7H05L2dl9n3UX04gGeCf4RFhohiiotdjY5XkJGBfYeUOpOY
-iZablXmXURgPpKWmp6ipqYIKqq6vqREjFYK1trUKs7e7vFq5IrS9wsM0vxvBxMm8xsjKzqy6z9J5
-zNPWatXX2k7Z29433d/iMuHj3+Xm2+jp1+vs0+7vz/HyyvT1xPf4wvr7y9H+pBkbBasgLFYGE8ba
-o8nTlE4OOYGKKJFOKIopGmLMAnHjDo0eWYAM+WUiSRgj/k+eSKmyBMuWI17C3CATZs2WN1XmPLmT
-ZM+QPz0G3VihqNGjSJNWwDCzqdOnUKPu0SChqtWrWLNq3cq1q9evYCVYGCEhgNmzaNOqXcu2rdu3
-cOMGOEBWrt27ePPCpSuirN6/gAO35bvBr+DDiPMSNpy4sWO2ix9Lnmw2MuXLiS1j3gxYM+fPdz2D
-Hv1WNOnTak2jXj23LuvXlV3DZq16Nujatjnjzo15N2/Kvn9LDi7cMfHimaUqX868ufPn0KPPpOCA
-AQMWCQBo3869u/fv4MNrd3DlQoMC3QlkSJFdvPv38LVDWJLBAYHwE1LE38+/+/UhGTAggHv5odDf
-gfv9/seDgPAVeAKCELqnIAwU3BefgyZEqOF3E7rAQH8YlrDhiNt1uEIG6IGoH4kjmpjCBRaqaCCL
-G7p4AgUDIhgiCTTW2AKOEe44Qo8a2khCBgNoKKQIREZopAgZxAjhkhs0CeGTG7Sn5IpW9vekAyRS
-2eWBRl6Q44ZijhlfAQlQmeKIaarpHZsMTHABCxDQGKec3JH3QpIs7snndn6yAKaeXA7aZwuABppo
-fAws0GiEhaKQJ40F3DkjfwVC8CaCAlCgAgIkJjDfCgdiOMGn/Q2w3gkZtPgqC6ma0ECECaBwa4QE
-aOpCrSYAqeMJpEKYqw7ABnsmfwQ8aCwPySqLYKUb/kwAYbPQyoiCtQcOUMKHBwrgK7LaogBuuaxC
-OkS0KEwa37EiLBufALPuwO4Jh/InwAixkknEvSe4C9+p3PY3rr3lpnDufguIcCmzRQAc7IHYLhxf
-w/8mnILA74lg8cARa4xCsZxusMCBomZccgsfv0deuh2HvLKh/sLs3hJSvieuCwUzvIHN4tGXc3ih
-vtDzmj8fSNLR8BWQdH9LH+g00OFF3d/UBx4cUcvuOc21eFRiouV+Xvvr0dDvlX21R/2uzTR89TqU
-L3+5UoBgAxtRHd5/CHpLkd13i4D2e3hHRLKMY+9Hr0Nvx/fq3Pw57cng7/m9wQVObnIyhAiQwHF8
-/tQS8nDgI2wOYeh3CAvhuIBHiDEgqvdtwudkaz3GBPKaTcKuGgqAJRMZmK6h1hnk3ncDcUvhgPFS
-o5B476ZKQcECzCN4qgmYN4lAncmzcAEEkhJp+QlfkyhAAdtbN8H67FvHQAF6b4g6v9UryqfkKkBu
-v/0prxD//kR63YnqB8AeqcdoBRxU/1zAuwRaaX4reJ4DSSRAHUhwgrgqwgUx2B94EWGDHISPBzUY
-QgSNcAn6K6F4fscDCtBOhdoRwPW6kIHDwZA7vWoDBF44Qd/tIUAEBCACbIeG4AXxfmFrQ4B4OCYE
-JBEQELChmgbAACJioj4JOCKCCLCABZ6EAg1IHwDlyLYAB1gRJhSYgHUQAD9WnQ9+CWBAA+wknTpC
-JwQAOw==
-}
-
 field top
 field w
 field w_body      ; # Widget holding the center content
@@ -92,12 +60,7 @@ constructor pick {} {
 		bind $top <Key-Escape> [list destroy $top]
 	}
 
-	label $w.git_logo \
-		-borderwidth 1 \
-		-relief sunken \
-		-background white \
-		-image ::choose_repository::git_logo
-	pack $w.git_logo -side left -fill y -padx 10 -pady 10
+	pack [git_logo $w.git_logo] -side left -fill y -padx 10 -pady 10
 
 	set w_body $w.body
 	frame $w_body
diff --git a/git-gui/lib/index.tcl b/git-gui/lib/index.tcl
index 47255261d2..9e04f2b682 100644
--- a/git-gui/lib/index.tcl
+++ b/git-gui/lib/index.tcl
@@ -12,12 +12,7 @@ proc update_indexinfo {msg pathList after} {
 	set batch [expr {int($totalCnt * .01) + 1}]
 	if {$batch > 25} {set batch 25}
 
-	ui_status [format \
-		"%s... %i/%i files (%.2f%%)" \
-		$msg \
-		$update_index_cp \
-		$totalCnt \
-		0.0]
+	$::main_status start $msg [mc "files"]
 	set fd [git_write update-index -z --index-info]
 	fconfigure $fd \
 		-blocking 0 \
@@ -31,18 +26,18 @@ proc update_indexinfo {msg pathList after} {
 		$pathList \
 		$totalCnt \
 		$batch \
-		$msg \
 		$after \
 		]
 }
 
-proc write_update_indexinfo {fd pathList totalCnt batch msg after} {
+proc write_update_indexinfo {fd pathList totalCnt batch after} {
 	global update_index_cp
 	global file_states current_diff_path
 
 	if {$update_index_cp >= $totalCnt} {
 		close $fd
 		unlock_index
+		$::main_status stop
 		uplevel #0 $after
 		return
 	}
@@ -68,12 +63,7 @@ proc write_update_indexinfo {fd pathList totalCnt batch msg after} {
 		display_file $path $new
 	}
 
-	ui_status [format \
-		"%s... %i/%i files (%.2f%%)" \
-		$msg \
-		$update_index_cp \
-		$totalCnt \
-		[expr {100.0 * $update_index_cp / $totalCnt}]]
+	$::main_status update $update_index_cp $totalCnt
 }
 
 proc update_index {msg pathList after} {
@@ -87,12 +77,7 @@ proc update_index {msg pathList after} {
 	set batch [expr {int($totalCnt * .01) + 1}]
 	if {$batch > 25} {set batch 25}
 
-	ui_status [format \
-		"%s... %i/%i files (%.2f%%)" \
-		$msg \
-		$update_index_cp \
-		$totalCnt \
-		0.0]
+	$::main_status start $msg [mc "files"]
 	set fd [git_write update-index --add --remove -z --stdin]
 	fconfigure $fd \
 		-blocking 0 \
@@ -106,18 +91,18 @@ proc update_index {msg pathList after} {
 		$pathList \
 		$totalCnt \
 		$batch \
-		$msg \
 		$after \
 		]
 }
 
-proc write_update_index {fd pathList totalCnt batch msg after} {
+proc write_update_index {fd pathList totalCnt batch after} {
 	global update_index_cp
 	global file_states current_diff_path
 
 	if {$update_index_cp >= $totalCnt} {
 		close $fd
 		unlock_index
+		$::main_status stop
 		uplevel #0 $after
 		return
 	}
@@ -147,12 +132,7 @@ proc write_update_index {fd pathList totalCnt batch msg after} {
 		display_file $path $new
 	}
 
-	ui_status [format \
-		"%s... %i/%i files (%.2f%%)" \
-		$msg \
-		$update_index_cp \
-		$totalCnt \
-		[expr {100.0 * $update_index_cp / $totalCnt}]]
+	$::main_status update $update_index_cp $totalCnt
 }
 
 proc checkout_index {msg pathList after} {
@@ -166,12 +146,7 @@ proc checkout_index {msg pathList after} {
 	set batch [expr {int($totalCnt * .01) + 1}]
 	if {$batch > 25} {set batch 25}
 
-	ui_status [format \
-		"%s... %i/%i files (%.2f%%)" \
-		$msg \
-		$update_index_cp \
-		$totalCnt \
-		0.0]
+	$::main_status start $msg [mc "files"]
 	set fd [git_write checkout-index \
 		--index \
 		--quiet \
@@ -191,18 +166,18 @@ proc checkout_index {msg pathList after} {
 		$pathList \
 		$totalCnt \
 		$batch \
-		$msg \
 		$after \
 		]
 }
 
-proc write_checkout_index {fd pathList totalCnt batch msg after} {
+proc write_checkout_index {fd pathList totalCnt batch after} {
 	global update_index_cp
 	global file_states current_diff_path
 
 	if {$update_index_cp >= $totalCnt} {
 		close $fd
 		unlock_index
+		$::main_status stop
 		uplevel #0 $after
 		return
 	}
@@ -222,12 +197,7 @@ proc write_checkout_index {fd pathList totalCnt batch msg after} {
 		}
 	}
 
-	ui_status [format \
-		"%s... %i/%i files (%.2f%%)" \
-		$msg \
-		$update_index_cp \
-		$totalCnt \
-		[expr {100.0 * $update_index_cp / $totalCnt}]]
+	$::main_status update $update_index_cp $totalCnt
 }
 
 proc unstage_helper {txt paths} {
diff --git a/git-gui/lib/logo.tcl b/git-gui/lib/logo.tcl
new file mode 100644
index 0000000000..5ff76692f5
--- /dev/null
+++ b/git-gui/lib/logo.tcl
@@ -0,0 +1,43 @@
+# git-gui Git Gui logo
+# Copyright (C) 2007 Shawn Pearce
+
+# Henrik Nyh's alternative Git logo, from his blog post
+# http://henrik.nyh.se/2007/06/alternative-git-logo-and-favicon
+#
+image create photo ::git_logo_data -data {
+R0lGODdhYQC8AIQbAGZmZtg4LW9vb3l5eYKCgoyMjEC/TOJpYZWVlZ+fn2/PeKmpqbKysry8vMXF
+xZ/fpc/Pz7fnvPXNytnZ2eLi4s/v0vja1+zs7Of36fX19f3z8v///////////////////ywAAAAA
+YQC8AAAF/uAmjmRpnmiqrmzrvq4hz3RtGw+s7zx5/7dcb0hUAY8zYXHJRCKVzGjPeYRKry8q0Irt
+GrVBr3gFDo/PprKNix6ra+y2902Ly7H05L2dl9n3UX04gGeCf4RFhohiiotdjY5XkJGBfYeUOpOY
+iZablXmXURgPpKWmp6ipqYIKqq6vqREjFYK1trUKs7e7vFq5IrS9wsM0vxvBxMm8xsjKzqy6z9J5
+zNPWatXX2k7Z29433d/iMuHj3+Xm2+jp1+vs0+7vz/HyyvT1xPf4wvr7y9H+pBkbBasgLFYGE8ba
+o8nTlE4OOYGKKJFOKIopGmLMAnHjDo0eWYAM+WUiSRgj/k+eSKmyBMuWI17C3CATZs2WN1XmPLmT
+ZM+QPz0G3VihqNGjSJNWwDCzqdOnUKPu0SChqtWrWLNq3cq1q9evYCVYGCEhgNmzaNOqXcu2rdu3
+cOMGOEBWrt27ePPCpSuirN6/gAO35bvBr+DDiPMSNpy4sWO2ix9Lnmw2MuXLiS1j3gxYM+fPdz2D
+Hv1WNOnTak2jXj23LuvXlV3DZq16Nujatjnjzo15N2/Kvn9LDi7cMfHimaUqX868ufPn0KPPpOCA
+AQMWCQBo3869u/fv4MNrd3DlQoMC3QlkSJFdvPv38LVDWJLBAYHwE1LE38+/+/UhGTAggHv5odDf
+gfv9/seDgPAVeAKCELqnIAwU3BefgyZEqOF3E7rAQH8YlrDhiNt1uEIG6IGoH4kjmpjCBRaqaCCL
+G7p4AgUDIhgiCTTW2AKOEe44Qo8a2khCBgNoKKQIREZopAgZxAjhkhs0CeGTG7Sn5IpW9vekAyRS
+2eWBRl6Q44ZijhlfAQlQmeKIaarpHZsMTHABCxDQGKec3JH3QpIs7snndn6yAKaeXA7aZwuABppo
+fAws0GiEhaKQJ40F3DkjfwVC8CaCAlCgAgIkJjDfCgdiOMGn/Q2w3gkZtPgqC6ma0ECECaBwa4QE
+aOpCrSYAqeMJpEKYqw7ABnsmfwQ8aCwPySqLYKUb/kwAYbPQyoiCtQcOUMKHBwrgK7LaogBuuaxC
+OkS0KEwa37EiLBufALPuwO4Jh/InwAixkknEvSe4C9+p3PY3rr3lpnDufguIcCmzRQAc7IHYLhxf
+w/8mnILA74lg8cARa4xCsZxusMCBomZccgsfv0deuh2HvLKh/sLs3hJSvieuCwUzvIHN4tGXc3ih
+vtDzmj8fSNLR8BWQdH9LH+g00OFF3d/UBx4cUcvuOc21eFRiouV+Xvvr0dDvlX21R/2uzTR89TqU
+L3+5UoBgAxtRHd5/CHpLkd13i4D2e3hHRLKMY+9Hr0Nvx/fq3Pw57cng7/m9wQVObnIyhAiQwHF8
+/tQS8nDgI2wOYeh3CAvhuIBHiDEgqvdtwudkaz3GBPKaTcKuGgqAJRMZmK6h1hnk3ncDcUvhgPFS
+o5B476ZKQcECzCN4qgmYN4lAncmzcAEEkhJp+QlfkyhAAdtbN8H67FvHQAF6b4g6v9UryqfkKkBu
+v/0prxD//kR63YnqB8AeqcdoBRxU/1zAuwRaaX4reJ4DSSRAHUhwgrgqwgUx2B94EWGDHISPBzUY
+QgSNcAn6K6F4fscDCtBOhdoRwPW6kIHDwZA7vWoDBF44Qd/tIUAEBCACbIeG4AXxfmFrQ4B4OCYE
+JBEQELChmgbAACJioj4JOCKCCLCABZ6EAg1IHwDlyLYAB1gRJhSYgHUQAD9WnQ9+CWBAA+wknTpC
+JwQAOw==
+}
+
+proc git_logo {w} {
+	label $w \
+		-borderwidth 1 \
+		-relief sunken \
+		-background white \
+		-image ::git_logo_data
+	return $w
+}
diff --git a/git-gui/lib/option.tcl b/git-gui/lib/option.tcl
index 12e297971a..f812e5e89a 100644
--- a/git-gui/lib/option.tcl
+++ b/git-gui/lib/option.tcl
@@ -54,84 +54,6 @@ proc save_config {} {
 	}
 }
 
-proc do_about {} {
-	global appvers copyright oguilib
-	global tcl_patchLevel tk_patchLevel
-
-	set w .about_dialog
-	toplevel $w
-	wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
-
-	label $w.header -text [mc "About %s" [appname]] \
-		-font font_uibold
-	pack $w.header -side top -fill x
-
-	frame $w.buttons
-	button $w.buttons.close -text {Close} \
-		-default active \
-		-command [list destroy $w]
-	pack $w.buttons.close -side right
-	pack $w.buttons -side bottom -fill x -pady 10 -padx 10
-
-	label $w.desc \
-		-text "[mc "git-gui - a graphical user interface for Git."]\n$copyright" \
-		-padx 5 -pady 5 \
-		-justify left \
-		-anchor w \
-		-borderwidth 1 \
-		-relief solid
-	pack $w.desc -side top -fill x -padx 5 -pady 5
-
-	set v {}
-	append v "git-gui version $appvers\n"
-	append v "[git version]\n"
-	append v "\n"
-	if {$tcl_patchLevel eq $tk_patchLevel} {
-		append v "Tcl/Tk version $tcl_patchLevel"
-	} else {
-		append v "Tcl version $tcl_patchLevel"
-		append v ", Tk version $tk_patchLevel"
-	}
-
-	set d {}
-	append d "git wrapper: $::_git\n"
-	append d "git exec dir: [gitexec]\n"
-	append d "git-gui lib: $oguilib"
-
-	label $w.vers \
-		-text $v \
-		-padx 5 -pady 5 \
-		-justify left \
-		-anchor w \
-		-borderwidth 1 \
-		-relief solid
-	pack $w.vers -side top -fill x -padx 5 -pady 5
-
-	label $w.dirs \
-		-text $d \
-		-padx 5 -pady 5 \
-		-justify left \
-		-anchor w \
-		-borderwidth 1 \
-		-relief solid
-	pack $w.dirs -side top -fill x -padx 5 -pady 5
-
-	menu $w.ctxm -tearoff 0
-	$w.ctxm add command \
-		-label {Copy} \
-		-command "
-		clipboard clear
-		clipboard append -format STRING -type STRING -- \[$w.vers cget -text\]
-	"
-
-	bind $w <Visibility> "grab $w; focus $w.buttons.close"
-	bind $w <Key-Escape> "destroy $w"
-	bind $w <Key-Return> "destroy $w"
-	bind_button3 $w.vers "tk_popup $w.ctxm %X %Y; grab $w; focus $w"
-	wm title $w "About [appname]"
-	tkwait window $w
-}
-
 proc do_options {} {
 	global repo_config global_config font_descs
 	global repo_config_new global_config_new
@@ -156,10 +78,6 @@ proc do_options {} {
 	toplevel $w
 	wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
 
-	label $w.header -text [mc "Options"] \
-		-font font_uibold
-	pack $w.header -side top -fill x
-
 	frame $w.buttons
 	button $w.buttons.restore -text [mc "Restore Defaults"] \
 		-default normal \
@@ -277,7 +195,13 @@ proc do_options {} {
 	bind $w <Visibility> "grab $w; focus $w.buttons.save"
 	bind $w <Key-Escape> "destroy $w"
 	bind $w <Key-Return> [list do_save_config $w]
-	wm title $w [append "[appname] ([reponame]): " [mc "Options"]]
+
+	if {[is_MacOSX]} {
+		set t [mc "Preferences"]
+	} else {
+		set t [mc "Options"]
+	}
+	wm title $w "[appname] ([reponame]): $t"
 	tkwait window $w
 }
 
diff --git a/git-gui/lib/remote.tcl b/git-gui/lib/remote.tcl
index aba6eb8343..0e86ddac09 100644
--- a/git-gui/lib/remote.tcl
+++ b/git-gui/lib/remote.tcl
@@ -135,8 +135,10 @@ proc load_all_remotes {} {
 proc populate_fetch_menu {} {
 	global all_remotes repo_config
 
-	set m .mbar.fetch
-	set prune_list [list]
+	set remote_m .mbar.remote
+	set fetch_m $remote_m.fetch
+	set prune_m $remote_m.prune
+
 	foreach r $all_remotes {
 		set enable 0
 		if {![catch {set a $repo_config(remote.$r.url)}]} {
@@ -157,28 +159,34 @@ proc populate_fetch_menu {} {
 		}
 
 		if {$enable} {
-			lappend prune_list $r
-			$m add command \
-				-label [mc "Fetch from %s" $r] \
-				-command [list fetch_from $r]
-		}
-	}
+			if {![winfo exists $fetch_m]} {
+				menu $prune_m
+				$remote_m insert 0 cascade \
+					-label [mc "Prune from"] \
+					-menu $prune_m
 
-	if {$prune_list ne {}} {
-		$m add separator
-	}
-	foreach r $prune_list {
-		$m add command \
-			-label [mc "Prune from %s" $r] \
-			-command [list prune_from $r]
+				menu $fetch_m
+				$remote_m insert 0 cascade \
+					-label [mc "Fetch from"] \
+					-menu $fetch_m
+			}
+
+			$fetch_m add command \
+				-label $r \
+				-command [list fetch_from $r]
+			$prune_m add command \
+				-label $r \
+				-command [list prune_from $r]
+		}
 	}
 }
 
 proc populate_push_menu {} {
 	global all_remotes repo_config
 
-	set m .mbar.push
-	set fast_count 0
+	set remote_m .mbar.remote
+	set push_m $remote_m.push
+
 	foreach r $all_remotes {
 		set enable 0
 		if {![catch {set a $repo_config(remote.$r.url)}]} {
@@ -199,13 +207,16 @@ proc populate_push_menu {} {
 		}
 
 		if {$enable} {
-			if {!$fast_count} {
-				$m add separator
+			if {![winfo exists $push_m]} {
+				menu $push_m
+				$remote_m insert 0 cascade \
+					-label [mc "Push to"] \
+					-menu $push_m
 			}
-			$m add command \
-				-label [mc "Push to %s" $r] \
+
+			$push_m add command \
+				-label $r \
 				-command [list push_to $r]
-			incr fast_count
 		}
 	}
 }
diff --git a/git-gui/po/de.po b/git-gui/po/de.po
index 94b7463ca3..4ba2fbee51 100644
--- a/git-gui/po/de.po
+++ b/git-gui/po/de.po
@@ -7,23 +7,41 @@ msgid ""
 msgstr ""
 "Project-Id-Version: git-gui\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-11 17:28+0200\n"
-"PO-Revision-Date: 2007-08-11 17:37+0200\n"
+"POT-Creation-Date: 2007-10-10 04:04-0400\n"
+"PO-Revision-Date: 2007-10-05 22:27+0200\n"
 "Last-Translator: Christian Stimming <stimming@tuhh.de>\n"
 "Language-Team: German\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: git-gui.sh:531
+#: git-gui.sh:41 git-gui.sh:634 git-gui.sh:648 git-gui.sh:661 git-gui.sh:744
+#: git-gui.sh:763
+msgid "git-gui: fatal error"
+msgstr "git-gui: Programmfehler"
+
+#: git-gui.sh:595
+#, tcl-format
+msgid "Invalid font specified in %s:"
+msgstr "Ungültige Zeichensatz-Angabe in %s:"
+
+#: git-gui.sh:620
+msgid "Main Font"
+msgstr "Programmschriftart"
+
+#: git-gui.sh:621
+msgid "Diff/Console Font"
+msgstr "Vergleich-Schriftart"
+
+#: git-gui.sh:635
 msgid "Cannot find git in PATH."
 msgstr "Git kann im PATH nicht gefunden werden."
 
-#: git-gui.sh:550
+#: git-gui.sh:662
 msgid "Cannot parse Git version string:"
 msgstr "Git Versionsangabe kann nicht erkannt werden:"
 
-#: git-gui.sh:567
+#: git-gui.sh:680
 #, tcl-format
 msgid ""
 "Git version cannot be determined.\n"
@@ -42,79 +60,81 @@ msgstr ""
 "\n"
 "Soll angenommen werden, »%s« sei Version 1.5.0?\n"
 
-#: git-gui.sh:689
-msgid "Cannot find the git directory:"
-msgstr "Git-Verzeichnis kann nicht gefunden werden:"
-
-#: git-gui.sh:697
+#: git-gui.sh:853
 msgid "Git directory not found:"
 msgstr "Git-Verzeichnis nicht gefunden:"
 
-#: git-gui.sh:703
+#: git-gui.sh:860
+msgid "Cannot move to top of working directory:"
+msgstr ""
+"Es konnte nicht in das oberste Verzeichnis der Arbeitskopie gewechselt "
+"werden:"
+
+#: git-gui.sh:867
 msgid "Cannot use funny .git directory:"
 msgstr "Unerwartete Struktur des .git Verzeichnis:"
 
-#: git-gui.sh:708
+#: git-gui.sh:872
 msgid "No working directory"
 msgstr "Kein Arbeitsverzeichnis"
 
-#: git-gui.sh:854
+#: git-gui.sh:1019
 msgid "Refreshing file status..."
 msgstr "Dateistatus aktualisieren..."
 
-#: git-gui.sh:891
+#: git-gui.sh:1084
 msgid "Scanning for modified files ..."
 msgstr "Nach geänderten Dateien suchen..."
 
-#: git-gui.sh:1057 lib/browser.tcl:247
+#: git-gui.sh:1259 lib/browser.tcl:245
 msgid "Ready."
 msgstr "Bereit."
 
-#: git-gui.sh:1322
+#: git-gui.sh:1525
 msgid "Unmodified"
 msgstr "Unverändert"
 
-#: git-gui.sh:1324
+#: git-gui.sh:1527
 msgid "Modified, not staged"
 msgstr "Verändert, nicht bereitgestellt"
 
-#: git-gui.sh:1325 git-gui.sh:1330
+#: git-gui.sh:1528 git-gui.sh:1533
 msgid "Staged for commit"
-msgstr "Bereitgestellt zur Übertragung"
+msgstr "Bereitgestellt zum Eintragen"
 
-#: git-gui.sh:1326 git-gui.sh:1331
+#: git-gui.sh:1529 git-gui.sh:1534
 msgid "Portions staged for commit"
-msgstr "Teilweise bereitgestellt zur Übertragung"
+msgstr "Teilweise bereitgestellt zum Eintragen"
 
-#: git-gui.sh:1327 git-gui.sh:1332
+#: git-gui.sh:1530 git-gui.sh:1535
 msgid "Staged for commit, missing"
-msgstr "Bereitgestellt zur Übertragung, fehlend"
+msgstr "Bereitgestellt zum Eintragen, fehlend"
 
-#: git-gui.sh:1329
+#: git-gui.sh:1532
 msgid "Untracked, not staged"
 msgstr "Nicht unter Versionskontrolle, nicht bereitgestellt"
 
-#: git-gui.sh:1334
+#: git-gui.sh:1537
 msgid "Missing"
 msgstr "Fehlend"
 
-#: git-gui.sh:1335
+#: git-gui.sh:1538
 msgid "Staged for removal"
 msgstr "Bereitgestellt zum Löschen"
 
-#: git-gui.sh:1336
+#: git-gui.sh:1539
 msgid "Staged for removal, still present"
 msgstr "Bereitgestellt zum Löschen, trotzdem vorhanden"
 
-#: git-gui.sh:1338 git-gui.sh:1339 git-gui.sh:1340 git-gui.sh:1341
+#: git-gui.sh:1541 git-gui.sh:1542 git-gui.sh:1543 git-gui.sh:1544
 msgid "Requires merge resolution"
 msgstr "Konfliktauflösung nötig"
 
-#: git-gui.sh:1383
+#: git-gui.sh:1579
 msgid "Starting gitk... please wait..."
 msgstr "Gitk wird gestartet... bitte warten."
 
-#: git-gui.sh:1392
+#: git-gui.sh:1588
 #, tcl-format
 msgid ""
 "Unable to start gitk:\n"
@@ -125,331 +145,410 @@ msgstr ""
 "\n"
 "%s existiert nicht"
 
-#: git-gui.sh:1609
-#, tcl-format
-msgid "Invalid font specified in gui.%s:"
-msgstr "Ungültige Zeichensatz-Angabe in gui.%s:"
-
-#: git-gui.sh:1634
-msgid "Main Font"
-msgstr "Programmschriftart"
-
-#: git-gui.sh:1635
-msgid "Diff/Console Font"
-msgstr "Vergleich-Schriftart"
-
-#: git-gui.sh:1649
+#: git-gui.sh:1788 lib/choose_repository.tcl:32
 msgid "Repository"
 msgstr "Projektarchiv"
 
-#: git-gui.sh:1650
+#: git-gui.sh:1789
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: git-gui.sh:1652
+#: git-gui.sh:1791 lib/choose_rev.tcl:560
 msgid "Branch"
 msgstr "Zweig"
 
-#: git-gui.sh:1655 git-gui.sh:1842 git-gui.sh:2152
-msgid "Commit"
-msgstr "Übertragen"
+#: git-gui.sh:1794 lib/choose_rev.tcl:547
+msgid "Commit@@noun"
+msgstr "Version"
 
-#: git-gui.sh:1658 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168
+#: git-gui.sh:1797 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168
 msgid "Merge"
 msgstr "Zusammenführen"
 
-#: git-gui.sh:1659
-msgid "Fetch"
-msgstr "Anfordern"
+#: git-gui.sh:1798 lib/choose_rev.tcl:556
+msgid "Remote"
+msgstr "Gegenseite"
 
-#: git-gui.sh:1660 git-gui.sh:2158 lib/transport.tcl:88 lib/transport.tcl:172
-msgid "Push"
-msgstr "Ausliefern"
-
-#: git-gui.sh:1669
+#: git-gui.sh:1807
 msgid "Browse Current Branch's Files"
 msgstr "Aktuellen Zweig durchblättern"
 
-#: git-gui.sh:1673
+#: git-gui.sh:1811
 msgid "Browse Branch Files..."
 msgstr "Einen Zweig durchblättern..."
 
-#: git-gui.sh:1678
+#: git-gui.sh:1816
 msgid "Visualize Current Branch's History"
 msgstr "Aktuellen Zweig darstellen"
 
-#: git-gui.sh:1682
+#: git-gui.sh:1820
 msgid "Visualize All Branch History"
 msgstr "Alle Zweige darstellen"
 
-#: git-gui.sh:1689
+#: git-gui.sh:1827
 #, tcl-format
 msgid "Browse %s's Files"
 msgstr "Zweig »%s« durchblättern"
 
-#: git-gui.sh:1691
+#: git-gui.sh:1829
 #, tcl-format
 msgid "Visualize %s's History"
 msgstr "Historie von »%s« darstellen"
 
-#: git-gui.sh:1696 lib/database.tcl:27 lib/database.tcl:67
+#: git-gui.sh:1834 lib/database.tcl:27 lib/database.tcl:67
 msgid "Database Statistics"
 msgstr "Datenbankstatistik"
 
-#: git-gui.sh:1699 lib/database.tcl:34
+#: git-gui.sh:1837 lib/database.tcl:34
 msgid "Compress Database"
 msgstr "Datenbank komprimieren"
 
-#: git-gui.sh:1702
+#: git-gui.sh:1840
 msgid "Verify Database"
 msgstr "Datenbank überprüfen"
 
-#: git-gui.sh:1709 git-gui.sh:1713 git-gui.sh:1717 lib/shortcut.tcl:9
+#: git-gui.sh:1847 git-gui.sh:1851 git-gui.sh:1855 lib/shortcut.tcl:9
 #: lib/shortcut.tcl:45 lib/shortcut.tcl:84
 msgid "Create Desktop Icon"
 msgstr "Desktop-Icon erstellen"
 
-#: git-gui.sh:1722
+#: git-gui.sh:1860 lib/choose_repository.tcl:36 lib/choose_repository.tcl:95
 msgid "Quit"
 msgstr "Beenden"
 
-#: git-gui.sh:1729
+#: git-gui.sh:1867
 msgid "Undo"
 msgstr "Rückgängig"
 
-#: git-gui.sh:1732
+#: git-gui.sh:1870
 msgid "Redo"
 msgstr "Wiederholen"
 
-#: git-gui.sh:1736 git-gui.sh:2222
+#: git-gui.sh:1874 git-gui.sh:2366
 msgid "Cut"
 msgstr "Ausschneiden"
 
-#: git-gui.sh:1739 git-gui.sh:2225 git-gui.sh:2296 git-gui.sh:2368
-#: lib/console.tcl:69
+#: git-gui.sh:1877 git-gui.sh:2369 git-gui.sh:2440 git-gui.sh:2512
+#: lib/console.tcl:67
 msgid "Copy"
 msgstr "Kopieren"
 
-#: git-gui.sh:1742 git-gui.sh:2228
+#: git-gui.sh:1880 git-gui.sh:2372
 msgid "Paste"
 msgstr "Einfügen"
 
-#: git-gui.sh:1745 git-gui.sh:2231 lib/branch_delete.tcl:26
+#: git-gui.sh:1883 git-gui.sh:2375 lib/branch_delete.tcl:26
 #: lib/remote_branch_delete.tcl:38
 msgid "Delete"
 msgstr "Löschen"
 
-#: git-gui.sh:1749 git-gui.sh:2235 git-gui.sh:2372 lib/console.tcl:71
+#: git-gui.sh:1887 git-gui.sh:2379 git-gui.sh:2516 lib/console.tcl:69
 msgid "Select All"
 msgstr "Alle auswählen"
 
-#: git-gui.sh:1758
+#: git-gui.sh:1896
 msgid "Create..."
 msgstr "Erstellen..."
 
-#: git-gui.sh:1764
+#: git-gui.sh:1902
 msgid "Checkout..."
-msgstr "Auschecken..."
+msgstr "Umstellen..."
 
-#: git-gui.sh:1770
+#: git-gui.sh:1908
 msgid "Rename..."
 msgstr "Umbenennen..."
 
-#: git-gui.sh:1775 git-gui.sh:1873
+#: git-gui.sh:1913 git-gui.sh:2012
 msgid "Delete..."
 msgstr "Löschen..."
 
-#: git-gui.sh:1780
+#: git-gui.sh:1918
 msgid "Reset..."
 msgstr "Zurücksetzen..."
 
-#: git-gui.sh:1792 git-gui.sh:2169
+#: git-gui.sh:1930 git-gui.sh:2313
 msgid "New Commit"
-msgstr "Neu übertragen"
+msgstr "Neue Version"
 
-#: git-gui.sh:1800 git-gui.sh:2176
+#: git-gui.sh:1938 git-gui.sh:2320
 msgid "Amend Last Commit"
-msgstr "Letzte Übertragung nachbessern"
+msgstr "Letzte Version nachbessern"
 
-#: git-gui.sh:1809 git-gui.sh:2136 lib/remote_branch_delete.tcl:99
+#: git-gui.sh:1947 git-gui.sh:2280 lib/remote_branch_delete.tcl:99
 msgid "Rescan"
 msgstr "Neu laden"
 
-#: git-gui.sh:1815
+#: git-gui.sh:1953
 msgid "Stage To Commit"
-msgstr "Zur Übertragung bereitstellen"
+msgstr "Zum Eintragen bereitstellen"
 
-#: git-gui.sh:1820
+#: git-gui.sh:1958
 msgid "Stage Changed Files To Commit"
-msgstr "Geänderte Dateien zur Übertragung bereitstellen"
+msgstr "Geänderte Dateien zum Eintragen bereitstellen"
 
-#: git-gui.sh:1826
+#: git-gui.sh:1964
 msgid "Unstage From Commit"
 msgstr "Aus der Bereitstellung herausnehmen"
 
-#: git-gui.sh:1831 lib/index.tcl:376
+#: git-gui.sh:1969 lib/index.tcl:352
 msgid "Revert Changes"
 msgstr "Änderungen revidieren"
 
-#: git-gui.sh:1838 git-gui.sh:2148 git-gui.sh:2246
+#: git-gui.sh:1976 git-gui.sh:2292 git-gui.sh:2390
 msgid "Sign Off"
 msgstr "Abzeichnen"
 
-#: git-gui.sh:1853
+#: git-gui.sh:1980 git-gui.sh:2296
+msgid "Commit@@verb"
+msgstr "Eintragen"
+
+#: git-gui.sh:1991
 msgid "Local Merge..."
 msgstr "Lokales Zusammenführen..."
 
-#: git-gui.sh:1858
+#: git-gui.sh:1996
 msgid "Abort Merge..."
 msgstr "Zusammenführen abbrechen..."
 
-#: git-gui.sh:1870
+#: git-gui.sh:2008
 msgid "Push..."
 msgstr "Ausliefern..."
 
-#: git-gui.sh:1880
+#: git-gui.sh:2019 lib/choose_repository.tcl:41
 msgid "Apple"
 msgstr "Apple"
 
-#: git-gui.sh:1883 git-gui.sh:1901 lib/option.tcl:65
+#: git-gui.sh:2022 git-gui.sh:2044 lib/about.tcl:13
+#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:50
 #, tcl-format
 msgid "About %s"
 msgstr "Über %s"
 
-#: git-gui.sh:1885 git-gui.sh:1891 git-gui.sh:2414
+#: git-gui.sh:2026
+msgid "Preferences..."
+msgstr ""
+
+#: git-gui.sh:2034 git-gui.sh:2558
 msgid "Options..."
 msgstr "Optionen..."
 
-#: git-gui.sh:1897
+#: git-gui.sh:2040 lib/choose_repository.tcl:47
 msgid "Help"
 msgstr "Hilfe"
 
-#: git-gui.sh:1938
+#: git-gui.sh:2081
 msgid "Online Documentation"
 msgstr "Online-Dokumentation"
 
-#: git-gui.sh:2054
+#: git-gui.sh:2165
+#, tcl-format
+msgid "fatal: cannot stat path %s: No such file or directory"
+msgstr ""
+
+#: git-gui.sh:2198
 msgid "Current Branch:"
 msgstr "Aktueller Zweig:"
 
-#: git-gui.sh:2075
-msgid "Staged Changes (Will Be Committed)"
-msgstr "Bereitgestellte Änderungen (werden übertragen)"
+#: git-gui.sh:2219
+#, fuzzy
+msgid "Staged Changes (Will Commit)"
+msgstr "Bereitgestellte Änderungen (werden eingetragen)"
 
-#: git-gui.sh:2095
-msgid "Unstaged Changes (Will Not Be Committed)"
-msgstr "Nicht bereitgestellte Änderungen (werden nicht übertragen)"
+#: git-gui.sh:2239
+#, fuzzy
+msgid "Unstaged Changes"
+msgstr "Geänderte bereitstellen"
 
-#: git-gui.sh:2142
+#: git-gui.sh:2286
 msgid "Stage Changed"
 msgstr "Geänderte bereitstellen"
 
-#: git-gui.sh:2188
+#: git-gui.sh:2302 lib/transport.tcl:93 lib/transport.tcl:182
+msgid "Push"
+msgstr "Ausliefern"
+
+#: git-gui.sh:2332
 msgid "Initial Commit Message:"
-msgstr "Erstmalige Übertragungsmeldung"
+msgstr "Beschreibung der ersten Version:"
 
-#: git-gui.sh:2189
+#: git-gui.sh:2333
 msgid "Amended Commit Message:"
-msgstr "Übertragungsmeldung mit Nachbesserung:"
+msgstr "Beschreibung der nachgebesserten Version:"
 
-#: git-gui.sh:2190
+#: git-gui.sh:2334
 msgid "Amended Initial Commit Message:"
-msgstr "Erstmalige Übertragungsmeldung mit Nachbesserung:"
+msgstr "Beschreibung der nachgebesserten ersten Version:"
 
-#: git-gui.sh:2191
+#: git-gui.sh:2335
 msgid "Amended Merge Commit Message:"
-msgstr "Zusammenführungs-Übertragungsmeldung mit Nachbesserung"
+msgstr "Beschreibung der nachgebesserten Zusammenführungs-Version:"
 
-#: git-gui.sh:2192
+#: git-gui.sh:2336
 msgid "Merge Commit Message:"
-msgstr "Übertragungsmeldung Zusammenführung:"
+msgstr "Beschreibung der Zusammenführungs-Version:"
 
-#: git-gui.sh:2193
+#: git-gui.sh:2337
 msgid "Commit Message:"
-msgstr "Übertragungsmeldung:"
+msgstr "Versionsbeschreibung:"
 
-#: git-gui.sh:2238 git-gui.sh:2376 lib/console.tcl:73
+#: git-gui.sh:2382 git-gui.sh:2520 lib/console.tcl:71
 msgid "Copy All"
 msgstr "Alle kopieren"
 
-#: git-gui.sh:2262 lib/blame.tcl:104
+#: git-gui.sh:2406 lib/blame.tcl:104
 msgid "File:"
 msgstr "Datei:"
 
-#: git-gui.sh:2364
+#: git-gui.sh:2508
 msgid "Refresh"
 msgstr "Aktualisieren"
 
-#: git-gui.sh:2385
+#: git-gui.sh:2529
 msgid "Apply/Reverse Hunk"
 msgstr "Änderung anwenden/umkehren"
 
-#: git-gui.sh:2391
+#: git-gui.sh:2535
 msgid "Decrease Font Size"
 msgstr "Schriftgröße verkleinern"
 
-#: git-gui.sh:2395
+#: git-gui.sh:2539
 msgid "Increase Font Size"
 msgstr "Schriftgröße vergrößern"
 
-#: git-gui.sh:2400
+#: git-gui.sh:2544
 msgid "Show Less Context"
 msgstr "Weniger Kontext anzeigen"
 
-#: git-gui.sh:2407
+#: git-gui.sh:2551
 msgid "Show More Context"
 msgstr "Mehr Kontext anzeigen"
 
-#: git-gui.sh:2422
+#: git-gui.sh:2565
 msgid "Unstage Hunk From Commit"
 msgstr "Aus der Bereitstellung herausnehmen"
 
-#: git-gui.sh:2426 git-gui.sh:2430
+#: git-gui.sh:2567
 msgid "Stage Hunk For Commit"
 msgstr "In die Bereitstellung hinzufügen"
 
-#: git-gui.sh:2440
+#: git-gui.sh:2586
 msgid "Initializing..."
 msgstr "Initialisieren..."
 
+#: git-gui.sh:2677
+#, 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:2707
+msgid ""
+"\n"
+"This is due to a known issue with the\n"
+"Tcl binary distributed by Cygwin."
+msgstr ""
+
+#: git-gui.sh:2712
+#, 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:25
+msgid "git-gui - a graphical user interface for Git."
+msgstr "git-gui - eine grafische Oberfläche für Git."
+
 #: lib/blame.tcl:77
 msgid "File Viewer"
 msgstr "Datei-Browser"
 
 #: lib/blame.tcl:81
 msgid "Commit:"
-msgstr "Übertragung:"
+msgstr "Version:"
 
 #: lib/blame.tcl:249
 msgid "Copy Commit"
-msgstr "Übertragung kopieren"
+msgstr "Version kopieren"
 
 #: lib/blame.tcl:369
 #, tcl-format
 msgid "Reading %s..."
 msgstr "%s lesen..."
 
+#: lib/blame.tcl:473
+msgid "Loading copy/move tracking annotations..."
+msgstr ""
+
+#: lib/blame.tcl:493
+msgid "lines annotated"
+msgstr ""
+
+#: lib/blame.tcl:674
+msgid "Loading original location annotations..."
+msgstr ""
+
+#: lib/blame.tcl:677
+msgid "Annotation complete."
+msgstr ""
+
+#: lib/blame.tcl:731
+msgid "Loading annotation..."
+msgstr "Annotierung laden..."
+
+#: lib/blame.tcl:787
+msgid "Author:"
+msgstr "Autor:"
+
+#: lib/blame.tcl:791
+msgid "Committer:"
+msgstr "Eintragender:"
+
+#: lib/blame.tcl:796
+msgid "Original File:"
+msgstr ""
+
+#: lib/blame.tcl:910
+msgid "Originally By:"
+msgstr ""
+
+#: lib/blame.tcl:916
+msgid "In File:"
+msgstr "In Datei:"
+
+#: lib/blame.tcl:921
+msgid "Copied Or Moved Here By:"
+msgstr ""
+
 #: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19
 msgid "Checkout Branch"
-msgstr "Zweig auschecken"
+msgstr "Zweig umstellen"
 
 #: lib/branch_checkout.tcl:23
 msgid "Checkout"
-msgstr "Auschecken"
+msgstr "Umstellen"
 
 #: 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:281
+#: lib/checkout_op.tcl:522 lib/choose_font.tcl:43 lib/merge.tcl:172
+#: lib/option.tcl:90 lib/remote_branch_delete.tcl:42 lib/transport.tcl:97
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: lib/branch_checkout.tcl:32 lib/browser.tcl:288
+#: lib/branch_checkout.tcl:32 lib/browser.tcl:286
 msgid "Revision"
 msgstr "Version"
 
-#: 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:202
 msgid "Options"
 msgstr "Optionen"
 
@@ -469,7 +568,7 @@ msgstr "Zweig erstellen"
 msgid "Create New Branch"
 msgstr "Neuen Zweig erstellen"
 
-#: lib/branch_create.tcl:31
+#: lib/branch_create.tcl:31 lib/choose_repository.tcl:199
 msgid "Create"
 msgstr "Erstellen"
 
@@ -507,7 +606,7 @@ msgstr "Zurücksetzen"
 
 #: lib/branch_create.tcl:97
 msgid "Checkout After Creation"
-msgstr "Auschecken nach Erstellen"
+msgstr "Arbeitskopie umstellen nach Erstellen"
 
 #: lib/branch_create.tcl:131
 msgid "Please select a tracking branch."
@@ -609,20 +708,22 @@ msgstr "Starten..."
 msgid "File Browser"
 msgstr "Datei-Browser"
 
-#: lib/browser.tcl:127 lib/browser.tcl:144
+#: lib/browser.tcl:125 lib/browser.tcl:142
 #, tcl-format
 msgid "Loading %s..."
 msgstr "%s laden..."
 
-#: lib/browser.tcl:188
+#: lib/browser.tcl:186
 msgid "[Up To Parent]"
 msgstr "[Nach oben]"
 
-#: lib/browser.tcl:268 lib/browser.tcl:274
+#: lib/browser.tcl:266 lib/browser.tcl:272
 msgid "Browse Branch Files"
 msgstr "Dateien des Zweigs durchblättern"
 
-#: lib/browser.tcl:279
+#: lib/browser.tcl:277 lib/choose_repository.tcl:215
+#: lib/choose_repository.tcl:305 lib/choose_repository.tcl:315
+#: lib/choose_repository.tcl:811
 msgid "Browse"
 msgstr "Blättern"
 
@@ -631,7 +732,12 @@ msgstr "Blättern"
 msgid "Fetching %s from %s"
 msgstr "Änderungen »%s« von »%s« anfordern"
 
-#: lib/checkout_op.tcl:140 lib/console.tcl:81 lib/database.tcl:31
+#: lib/checkout_op.tcl:127
+#, tcl-format
+msgid "fatal: Cannot resolve %s"
+msgstr ""
+
+#: lib/checkout_op.tcl:140 lib/console.tcl:79 lib/database.tcl:31
 msgid "Close"
 msgstr "Schließen"
 
@@ -683,11 +789,17 @@ msgstr ""
 "\n"
 "Es wird gleich neu geladen.\n"
 
+#: lib/checkout_op.tcl:322
+#, tcl-format
+msgid "Updating working directory to '%s'..."
+msgstr "Arbeitskopie umstellen auf »%s«..."
+
 #: lib/checkout_op.tcl:353
 #, tcl-format
 msgid "Aborted checkout of '%s' (file level merging is required)."
 msgstr ""
-"Auschecken von »%s« abgebrochen (Zusammenführen der Dateien ist notwendig)."
+"Zweig umstellen von »%s« abgebrochen (Zusammenführen der Dateien ist "
+"notwendig)."
 
 #: lib/checkout_op.tcl:354
 msgid "File level merge required."
@@ -707,8 +819,13 @@ msgid ""
 msgstr ""
 "Die Arbeitskopie ist nicht auf einem lokalen Zweig.\n"
 "\n"
-"Wenn Sie auf einem Zwei arbeiten möchten, erstellen Sie bitte jetzt einen "
-"Zweig mit der Auswahl »Abgetrennte Auscheck-Version«."
+"Wenn Sie auf einem Zweig arbeiten möchten, erstellen Sie bitte jetzt einen "
+"Zweig mit der Auswahl »Abgetrennte Arbeitskopie-Version«."
+
+#: lib/checkout_op.tcl:446
+#, tcl-format
+msgid "Checked out '%s'."
+msgstr "Umgestellt auf »%s«."
 
 #: lib/checkout_op.tcl:478
 #, tcl-format
@@ -748,9 +865,240 @@ msgstr ""
 "\n"
 "Dies ist ein interner Programmfehler von %s. Programm wird jetzt abgebrochen."
 
+#: lib/choose_font.tcl:39
+msgid "Select"
+msgstr "Auswählen"
+
+#: lib/choose_font.tcl:53
+msgid "Font Family"
+msgstr "Schriftfamilie"
+
+#: lib/choose_font.tcl:73
+msgid "Font Size"
+msgstr "Schriftgröße"
+
+#: lib/choose_font.tcl:90
+msgid "Font Example"
+msgstr "Schriftbeispiel"
+
+#: lib/choose_font.tcl:101
+msgid ""
+"This is example text.\n"
+"If you like this text, it can be your font."
+msgstr ""
+"Dies ist ein Beispieltext.\n"
+"Wenn Ihnen dieser Text gefällt, sollten Sie diese Schriftart wählen."
+
+#: lib/choose_repository.tcl:25
+msgid "Git Gui"
+msgstr "Git Gui"
+
+#: lib/choose_repository.tcl:69 lib/choose_repository.tcl:204
+msgid "Create New Repository"
+msgstr "Neues Projektarchiv"
+
+#: lib/choose_repository.tcl:74 lib/choose_repository.tcl:291
+msgid "Clone Existing Repository"
+msgstr "Projektarchiv kopieren"
+
+#: lib/choose_repository.tcl:79 lib/choose_repository.tcl:800
+msgid "Open Existing Repository"
+msgstr "Projektarchiv öffnen"
+
+#: lib/choose_repository.tcl:91
+msgid "Next >"
+msgstr "Weiter >"
+
+#: lib/choose_repository.tcl:152
+#, tcl-format
+msgid "Location %s already exists."
+msgstr "Projektarchiv »%s« existiert bereits."
+
+#: lib/choose_repository.tcl:158 lib/choose_repository.tcl:165
+#: lib/choose_repository.tcl:172
+#, tcl-format
+msgid "Failed to create repository %s:"
+msgstr "Projektarchiv »%s« konnte nicht erstellt werden:"
+
+#: lib/choose_repository.tcl:209 lib/choose_repository.tcl:309
+msgid "Directory:"
+msgstr "Verzeichnis:"
+
+#: lib/choose_repository.tcl:238 lib/choose_repository.tcl:363
+#: lib/choose_repository.tcl:834
+msgid "Git Repository"
+msgstr "Git Projektarchiv"
+
+#: lib/choose_repository.tcl:253 lib/choose_repository.tcl:260
+#, tcl-format
+msgid "Directory %s already exists."
+msgstr "Verzeichnis »%s« existiert bereits."
+
+#: lib/choose_repository.tcl:265
+#, tcl-format
+msgid "File %s already exists."
+msgstr "Datei »%s« existiert bereits."
+
+#: lib/choose_repository.tcl:286
+msgid "Clone"
+msgstr "Kopieren"
+
+#: lib/choose_repository.tcl:299
+msgid "URL:"
+msgstr "URL:"
+
+#: lib/choose_repository.tcl:319
+msgid "Clone Type:"
+msgstr "Art der Kopie:"
+
+#: lib/choose_repository.tcl:325
+msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
+msgstr ""
+
+#: lib/choose_repository.tcl:331
+msgid "Full Copy (Slower, Redundant Backup)"
+msgstr ""
+
+#: lib/choose_repository.tcl:337
+msgid "Shared (Fastest, Not Recommended, No Backup)"
+msgstr ""
+
+#: lib/choose_repository.tcl:369 lib/choose_repository.tcl:418
+#: lib/choose_repository.tcl:560 lib/choose_repository.tcl:630
+#: lib/choose_repository.tcl:840 lib/choose_repository.tcl:848
+#, tcl-format
+msgid "Not a Git repository: %s"
+msgstr "Kein Git-Projektarchiv in »%s« gefunden."
+
+#: lib/choose_repository.tcl:405
+msgid "Standard only available for local repository."
+msgstr ""
+
+#: lib/choose_repository.tcl:409
+msgid "Shared only available for local repository."
+msgstr ""
+
+#: lib/choose_repository.tcl:439
+msgid "Failed to configure origin"
+msgstr ""
+
+#: lib/choose_repository.tcl:451
+msgid "Counting objects"
+msgstr ""
+
+#: lib/choose_repository.tcl:452
+msgid "buckets"
+msgstr ""
+
+#: lib/choose_repository.tcl:476
+#, tcl-format
+msgid "Unable to copy objects/info/alternates: %s"
+msgstr ""
+
+#: lib/choose_repository.tcl:512
+#, tcl-format
+msgid "Nothing to clone from %s."
+msgstr "Von »%s« konnte nichts kopiert werden."
+
+#: lib/choose_repository.tcl:514 lib/choose_repository.tcl:728
+#: lib/choose_repository.tcl:740
+msgid "The 'master' branch has not been initialized."
+msgstr ""
+
+#: lib/choose_repository.tcl:527
+msgid "Hardlinks are unavailable.  Falling back to copying."
+msgstr ""
+
+#: lib/choose_repository.tcl:539
+#, tcl-format
+msgid "Cloning from %s"
+msgstr "Kopieren von »%s«"
+
+#: lib/choose_repository.tcl:570
+msgid "Copying objects"
+msgstr "Objektdatenbank kopieren"
+
+#: lib/choose_repository.tcl:571
+msgid "KiB"
+msgstr "KB"
+
+#: lib/choose_repository.tcl:595
+#, tcl-format
+msgid "Unable to copy object: %s"
+msgstr "Objekt kann nicht kopiert werden: %s"
+
+#: lib/choose_repository.tcl:605
+msgid "Linking objects"
+msgstr "Objekte verlinken"
+
+#: lib/choose_repository.tcl:606
+msgid "objects"
+msgstr "Objekte"
+
+#: lib/choose_repository.tcl:614
+#, tcl-format
+msgid "Unable to hardlink object: %s"
+msgstr "Objekt kann nicht hartverlinkt werden: %s"
+
+#: lib/choose_repository.tcl:669
+msgid "Cannot fetch branches and objects.  See console output for details."
+msgstr ""
+
+#: lib/choose_repository.tcl:680
+msgid "Cannot fetch tags.  See console output for details."
+msgstr ""
+
+#: lib/choose_repository.tcl:704
+msgid "Cannot determine HEAD.  See console output for details."
+msgstr ""
+
+#: lib/choose_repository.tcl:713
+#, tcl-format
+msgid "Unable to cleanup %s"
+msgstr ""
+
+#: lib/choose_repository.tcl:719
+msgid "Clone failed."
+msgstr "Kopieren fehlgeschlagen."
+
+#: lib/choose_repository.tcl:726
+msgid "No default branch obtained."
+msgstr ""
+
+#: lib/choose_repository.tcl:737
+#, tcl-format
+msgid "Cannot resolve %s as a commit."
+msgstr ""
+
+#: lib/choose_repository.tcl:749
+msgid "Creating working directory"
+msgstr "Arbeitskopie erstellen"
+
+#: lib/choose_repository.tcl:750 lib/index.tcl:15 lib/index.tcl:80
+#: lib/index.tcl:149
+msgid "files"
+msgstr "Dateien"
+
+#: lib/choose_repository.tcl:779
+msgid "Initial file checkout failed."
+msgstr ""
+
+#: lib/choose_repository.tcl:795
+msgid "Open"
+msgstr "Öffnen"
+
+#: lib/choose_repository.tcl:805
+msgid "Repository:"
+msgstr "Projektarchiv:"
+
+#: lib/choose_repository.tcl:854
+#, tcl-format
+msgid "Failed to open repository %s:"
+msgstr "Projektarchiv »%s« konnte nicht geöffnet werden."
+
 #: lib/choose_rev.tcl:53
 msgid "This Detached Checkout"
-msgstr "Abgetrennte Auscheck-Version"
+msgstr "Abgetrennte Arbeitskopie-Version"
 
 #: lib/choose_rev.tcl:60
 msgid "Revision Expression:"
@@ -764,7 +1112,7 @@ msgstr "Lokaler Zweig"
 msgid "Tracking Branch"
 msgstr "Übernahmezweig"
 
-#: lib/choose_rev.tcl:84
+#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:537
 msgid "Tag"
 msgstr "Markierung"
 
@@ -781,6 +1129,14 @@ msgstr "Keine Version ausgewählt."
 msgid "Revision expression is empty."
 msgstr "Versions-Ausdruck ist leer."
 
+#: lib/choose_rev.tcl:530
+msgid "Updated"
+msgstr "Aktualisiert"
+
+#: lib/choose_rev.tcl:558
+msgid "URL"
+msgstr "URL"
+
 #: lib/commit.tcl:9
 msgid ""
 "There is nothing to amend.\n"
@@ -832,7 +1188,7 @@ msgstr ""
 "Der letzte geladene Status stimmt nicht mehr mit dem Projektarchiv überein.\n"
 "\n"
 "Ein anderes Git-Programm hat das Projektarchiv seit dem letzten Laden "
-"geändert.  Vor einer neuen Übertragung muss neu geladen werden.\n"
+"geändert.  Vor dem Eintragen einer neuen Version muss neu geladen werden.\n"
 "\n"
 "Es wird gleich neu geladen.\n"
 
@@ -844,10 +1200,10 @@ msgid ""
 "File %s has merge conflicts.  You must resolve them and stage the file "
 "before committing.\n"
 msgstr ""
-"Nicht zusammengeführte Dateien können nicht übertragen werden.\n"
+"Nicht zusammengeführte Dateien können nicht eingetragen werden.\n"
 "\n"
-"Die Datei %s hat noch nicht aufgelöste Zusammenführungs-Konflikte. Sie "
-"müssen diese Konflikte auflösen, bevor Sie übertragen können.\n"
+"Die Datei »%s« hat noch nicht aufgelöste Zusammenführungs-Konflikte. Sie "
+"müssen diese Konflikte auflösen, bevor Sie eintragen können.\n"
 
 #: lib/commit.tcl:162
 #, tcl-format
@@ -858,7 +1214,7 @@ msgid ""
 msgstr ""
 "Unbekannter Dateizustand »%s«.\n"
 "\n"
-"Datei »%s« kann nicht übertragen werden.\n"
+"Datei »%s« kann nicht eingetragen werden.\n"
 
 #: lib/commit.tcl:170
 msgid ""
@@ -866,10 +1222,9 @@ msgid ""
 "\n"
 "You must stage at least 1 file before you can commit.\n"
 msgstr ""
-"Keine Änderungen vorhanden, die übertragen werden könnten.\n"
+"Keine Änderungen vorhanden, die eingetragen werden könnten.\n"
 "\n"
-"Sie müssen mindestens eine Datei bereitstellen, bevor Sie übertragen "
-"können.\n"
+"Sie müssen mindestens eine Datei bereitstellen, bevor Sie eintragen können.\n"
 
 #: lib/commit.tcl:183
 msgid ""
@@ -881,21 +1236,25 @@ msgid ""
 "- Second line: Blank\n"
 "- Remaining lines: Describe why this change is good.\n"
 msgstr ""
-"Bitte geben Sie eine Übertragungsmeldung ein.\n"
+"Bitte geben Sie eine Versionsbeschreibung ein.\n"
 "\n"
-"Eine gute Übertragungsmeldung enthält folgende Abschnitte:\n"
+"Eine gute Versionsbeschreibung enthält folgende Abschnitte:\n"
 "\n"
 "- Erste Zeile: Eine Zusammenfassung, was man gemacht hat.\n"
 "\n"
 "- Zweite Zeile: Leerzeile\n"
 "\n"
-"- Rest der Meldung: Eine ausführliche Beschreibung, warum diese Änderung "
-"hilfreich ist.\n"
+"- Rest: Eine ausführliche Beschreibung, warum diese Änderung hilfreich ist.\n"
 
 #: lib/commit.tcl:257
 msgid "write-tree failed:"
 msgstr "write-tree fehlgeschlagen:"
 
+#: lib/commit.tcl:275
+#, tcl-format
+msgid "Commit %s appears to be corrupt"
+msgstr "Version »%s« scheint beschädigt zu sein"
+
 #: lib/commit.tcl:279
 msgid ""
 "No changes to commit.\n"
@@ -904,16 +1263,21 @@ msgid ""
 "\n"
 "A rescan will be automatically started now.\n"
 msgstr ""
-"Keine Änderungen zu übertragen.\n"
+"Keine Änderungen einzutragen.\n"
 "\n"
-"Es gibt keine geänderte Datei bei dieser Übertragung und es wurde auch "
-"nichts zusammengeführt.\n"
+"Es gibt keine geänderte Datei bei dieser Version und es wurde auch nichts "
+"zusammengeführt.\n"
 "\n"
 "Das Arbeitsverzeichnis wird daher jetzt neu geladen.\n"
 
 #: lib/commit.tcl:286
 msgid "No changes to commit."
-msgstr "Keine Änderungen, die übertragen werden können."
+msgstr "Keine Änderungen, die eingetragen werden können."
+
+#: lib/commit.tcl:303
+#, tcl-format
+msgid "warning: Tcl does not support encoding '%s'."
+msgstr ""
 
 #: lib/commit.tcl:317
 msgid "commit-tree failed:"
@@ -928,15 +1292,15 @@ msgstr "update-ref fehlgeschlagen:"
 msgid "Created commit %s: %s"
 msgstr "Version %s übertragen: %s"
 
-#: lib/console.tcl:55
+#: lib/console.tcl:57
 msgid "Working... please wait..."
 msgstr "Verarbeitung. Bitte warten..."
 
-#: lib/console.tcl:184
+#: lib/console.tcl:183
 msgid "Success"
 msgstr "Erfolgreich"
 
-#: lib/console.tcl:194
+#: lib/console.tcl:196
 msgid "Error: Command Failed"
 msgstr "Fehler: Kommando fehlgeschlagen"
 
@@ -976,6 +1340,29 @@ msgstr "Objektdatenbank komprimieren"
 msgid "Verifying the object database with fsck-objects"
 msgstr "Die Objektdatenbank durch »fsck-objects« überprüfen lassen"
 
+#: 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 ""
+"Dieses Projektarchiv enthält ungefähr %i nicht verknüpfte Objekte.\n"
+"\n"
+"Für eine optimale Performance wird empfohlen, die Datenbank des "
+"Projektarchivs zu komprimieren, sobald mehr als %i nicht verknüpfte Objekte "
+"vorliegen.\n"
+"\n"
+"Soll die Datenbank jetzt komprimiert werden?"
+
+#: lib/date.tcl:25
+#, tcl-format
+msgid "Invalid date from Git: %s"
+msgstr "Ungültiges Datum von Git: %s"
+
 #: lib/diff.tcl:42
 #, tcl-format
 msgid ""
@@ -998,19 +1385,37 @@ msgstr ""
 "Das Arbeitsverzeichnis wird jetzt neu geladen, um diese Änderung bei allen "
 "Dateien zu prüfen."
 
-#: lib/diff.tcl:97
+#: lib/diff.tcl:81
+#, tcl-format
+msgid "Loading diff of %s..."
+msgstr "Vergleich von »%s« laden..."
+
+#: lib/diff.tcl:114 lib/diff.tcl:184
+#, tcl-format
+msgid "Unable to display %s"
+msgstr "Datei »%s« kann nicht angezeigt werden"
+
+#: lib/diff.tcl:115
 msgid "Error loading file:"
 msgstr "Fehler beim Laden der Datei:"
 
-#: lib/diff.tcl:162
+#: lib/diff.tcl:122
+msgid "Git Repository (subproject)"
+msgstr "Git-Projektarchiv (Unterprojekt)"
+
+#: lib/diff.tcl:134
+msgid "* Binary file (not showing content)."
+msgstr "* Binärdatei (Inhalt wird nicht angezeigt)"
+
+#: lib/diff.tcl:185
 msgid "Error loading diff:"
 msgstr "Fehler beim Laden des Vergleichs:"
 
-#: lib/diff.tcl:278
+#: lib/diff.tcl:302
 msgid "Failed to unstage selected hunk."
 msgstr "Fehler beim Herausnehmen der gewählten Dateien aus der Bereitstellung."
 
-#: lib/diff.tcl:285
+#: lib/diff.tcl:309
 msgid "Failed to stage selected hunk."
 msgstr "Fehler beim Bereitstellen der gewählten Dateien."
 
@@ -1025,24 +1430,34 @@ msgstr "Warnung"
 #: lib/error.tcl:81
 msgid "You must correct the above errors before committing."
 msgstr ""
-"Sie müssen die obigen Fehler zuerst beheben, bevor Sie übertragen können."
+"Sie müssen die obigen Fehler zuerst beheben, bevor Sie eintragen können."
 
-#: lib/index.tcl:364
+#: lib/index.tcl:241
+#, tcl-format
+msgid "Unstaging %s from commit"
+msgstr "Datei »%s« aus der Bereitstellung herausnehmen"
+
+#: lib/index.tcl:285
+#, tcl-format
+msgid "Adding %s"
+msgstr "»%s« hinzufügen..."
+
+#: lib/index.tcl:340
 #, tcl-format
 msgid "Revert changes in file %s?"
 msgstr "Änderungen in Datei »%s« revidieren?"
 
-#: lib/index.tcl:366
+#: lib/index.tcl:342
 #, tcl-format
 msgid "Revert changes in these %i files?"
 msgstr "Änderungen in den gewählten %i Dateien revidieren?"
 
-#: lib/index.tcl:372
+#: lib/index.tcl:348
 msgid "Any unstaged changes will be permanently lost by the revert."
 msgstr ""
 "Alle nicht bereitgestellten Änderungen werden beim Revidieren verloren gehen."
 
-#: lib/index.tcl:375
+#: lib/index.tcl:351
 msgid "Do Nothing"
 msgstr "Nichts tun"
 
@@ -1054,7 +1469,7 @@ msgid ""
 msgstr ""
 "Zusammenführen kann nicht gleichzeitig mit Nachbessern durchgeführt werden.\n"
 "\n"
-"Sie müssen zuerst die Nachbesserungs-Übertragung abschließen, bevor Sie "
+"Sie müssen zuerst die Nachbesserungs-Version abschließen, bevor Sie "
 "zusammenführen können.\n"
 
 #: lib/merge.tcl:27
@@ -1087,7 +1502,7 @@ msgstr ""
 "\n"
 "Die Datei »%s« enthält Konflikte beim Zusammenführen. Sie müssen diese "
 "Konflikte per Hand auflösen. Anschließend müssen Sie die Datei wieder "
-"bereitstellen und übertragen, um die Zusammenführung abzuschließen. Erst "
+"bereitstellen und eintragen, um die Zusammenführung abzuschließen. Erst "
 "danach kann eine neue Zusammenführung begonnen werden.\n"
 
 #: lib/merge.tcl:54
@@ -1103,9 +1518,9 @@ msgstr ""
 "Es liegen Änderungen vor.\n"
 "\n"
 "Die Datei »%s« wurde geändert.  Sie sollten zuerst die bereitgestellte "
-"Übertragung abschließen, bevor Sie eine Zusammenführung beginnen.  Mit "
-"dieser Reihenfolge können Sie mögliche Konflikte beim Zusammenführen "
-"wesentlich einfacher beheben oder abbrechen.\n"
+"Version abschließen, bevor Sie eine Zusammenführung beginnen.  Mit dieser "
+"Reihenfolge können Sie mögliche Konflikte beim Zusammenführen wesentlich "
+"einfacher beheben oder abbrechen.\n"
 
 #: lib/merge.tcl:106
 #, tcl-format
@@ -1142,7 +1557,7 @@ msgid ""
 msgstr ""
 "Abbruch der Nachbesserung ist nicht möglich.\n"
 "\n"
-"Sie müssen die Nachbesserung der Übertragung abschließen.\n"
+"Sie müssen die Nachbesserung der Version abschließen.\n"
 
 #: lib/merge.tcl:222
 msgid ""
@@ -1154,7 +1569,8 @@ msgid ""
 msgstr ""
 "Zusammenführen abbrechen?\n"
 "\n"
-"Wenn Sie abbrechen, gehen alle noch nicht übertragenen Änderungen verloren.\n"
+"Wenn Sie abbrechen, gehen alle noch nicht eingetragenen Änderungen "
+"verloren.\n"
 "\n"
 "Zusammenführen jetzt abbrechen?"
 
@@ -1168,7 +1584,7 @@ msgid ""
 msgstr ""
 "Änderungen zurücksetzen?\n"
 "\n"
-"Wenn Sie zurücksetzen, gehen alle noch nicht übertragenen Änderungen "
+"Wenn Sie zurücksetzen, gehen alle noch nicht eingetragenen Änderungen "
 "verloren.\n"
 "\n"
 "Änderungen jetzt zurücksetzen?"
@@ -1185,71 +1601,99 @@ msgstr "Abbruch fehlgeschlagen."
 msgid "Abort completed.  Ready."
 msgstr "Abbruch durchgeführt. Bereit."
 
-#: lib/option.tcl:77
-msgid "git-gui - a graphical user interface for Git."
-msgstr "git-gui - eine grafische Oberfläche für Git."
-
-#: lib/option.tcl:164
+#: lib/option.tcl:82
 msgid "Restore Defaults"
 msgstr "Voreinstellungen wiederherstellen"
 
-#: lib/option.tcl:168
+#: lib/option.tcl:86
 msgid "Save"
 msgstr "Speichern"
 
-#: lib/option.tcl:178
+#: lib/option.tcl:96
 #, tcl-format
 msgid "%s Repository"
 msgstr "Projektarchiv %s"
 
-#: lib/option.tcl:179
+#: lib/option.tcl:97
 msgid "Global (All Repositories)"
 msgstr "Global (Alle Projektarchive)"
 
-#: lib/option.tcl:185
+#: lib/option.tcl:103
 msgid "User Name"
 msgstr "Benutzername"
 
-#: lib/option.tcl:186
+#: lib/option.tcl:104
 msgid "Email Address"
 msgstr "E-Mail-Adresse"
 
-#: lib/option.tcl:188
+#: lib/option.tcl:106
 msgid "Summarize Merge Commits"
-msgstr "Zusammenführungs-Übertragungen zusammenfassen"
+msgstr "Zusammenführungs-Versionen zusammenfassen"
 
-#: lib/option.tcl:189
+#: lib/option.tcl:107
 msgid "Merge Verbosity"
 msgstr "Ausführlichkeit der Zusammenführen-Meldungen"
 
-#: lib/option.tcl:190
+#: lib/option.tcl:108
 msgid "Show Diffstat After Merge"
 msgstr "Vergleichsstatistik nach Zusammenführen anzeigen"
 
-#: lib/option.tcl:192
+#: lib/option.tcl:110
 msgid "Trust File Modification Timestamps"
 msgstr "Auf Dateiänderungsdatum verlassen"
 
-#: lib/option.tcl:193
+#: lib/option.tcl:111
 msgid "Prune Tracking Branches During Fetch"
 msgstr "Übernahmezweige löschen während Anforderung"
 
-#: lib/option.tcl:194
+#: lib/option.tcl:112
 msgid "Match Tracking Branches"
 msgstr "Passend zu Übernahmezweig"
 
-#: lib/option.tcl:195
+#: lib/option.tcl:113
 msgid "Number of Diff Context Lines"
 msgstr "Anzahl der Kontextzeilen beim Vergleich"
 
-#: lib/option.tcl:196
+#: lib/option.tcl:114
 msgid "New Branch Name Template"
 msgstr "Namensvorschlag für neue Zweige"
 
-#: lib/option.tcl:305
+#: lib/option.tcl:176
+msgid "Change Font"
+msgstr "Schriftart ändern"
+
+#: lib/option.tcl:180
+#, tcl-format
+msgid "Choose %s"
+msgstr "%s wählen"
+
+#: lib/option.tcl:186
+msgid "pt."
+msgstr "pt."
+
+#: lib/option.tcl:200
+msgid "Preferences"
+msgstr ""
+
+#: lib/option.tcl:235
 msgid "Failed to completely save options:"
 msgstr "Optionen konnten nicht gespeichert werden:"
 
+#: lib/remote.tcl:165
+#, fuzzy
+msgid "Prune from"
+msgstr "Löschen von »%s«"
+
+#: lib/remote.tcl:170
+#, fuzzy
+msgid "Fetch from"
+msgstr "Von »%s« anfordern"
+
+#: lib/remote.tcl:213
+#, fuzzy
+msgid "Push to"
+msgstr "Nach »%s« ausliefern"
+
 #: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34
 msgid "Delete Remote Branch"
 msgstr "Zweig im Projektarchiv der Gegenseite löschen"
@@ -1258,11 +1702,11 @@ msgstr "Zweig im Projektarchiv der Gegenseite löschen"
 msgid "From Repository"
 msgstr "Von Projektarchiv"
 
-#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:118
+#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:123
 msgid "Remote:"
 msgstr "Gegenseite:"
 
-#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:133
+#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:138
 msgid "Arbitrary URL:"
 msgstr "Kommunikation mit URL:"
 
@@ -1286,6 +1730,17 @@ msgstr "Immer (Keine Zusammenführungsprüfung)"
 msgid "A branch is required for 'Merged Into'."
 msgstr "Für »Zusammenführen mit« muss ein Zweig angegeben werden."
 
+#: lib/remote_branch_delete.tcl:184
+#, tcl-format
+msgid ""
+"The following branches are not completely merged into %s:\n"
+"\n"
+" - %s"
+msgstr ""
+"Folgende Zweige sind noch nicht mit »%s« zusammengeführt:\n"
+"\n"
+" - %s"
+
 #: lib/remote_branch_delete.tcl:189
 #, tcl-format
 msgid ""
@@ -1323,22 +1778,7 @@ msgstr "Kein Projektarchiv ausgewählt."
 #: lib/remote_branch_delete.tcl:291
 #, tcl-format
 msgid "Scanning %s..."
-msgstr "%s laden..."
-
-#: lib/remote.tcl:162
-#, tcl-format
-msgid "Fetch from %s..."
-msgstr "Von »%s« anfordern..."
-
-#: lib/remote.tcl:172
-#, tcl-format
-msgid "Prune from %s..."
-msgstr "Löschen von »%s«..."
-
-#: lib/remote.tcl:206
-#, tcl-format
-msgid "Push to %s..."
-msgstr "Nach %s ausliefern..."
+msgstr "»%s« laden..."
 
 #: lib/shortcut.tcl:26 lib/shortcut.tcl:74
 msgid "Cannot write script:"
@@ -1348,51 +1788,77 @@ msgstr "Fehler beim Schreiben des Scripts:"
 msgid "Cannot write icon:"
 msgstr "Fehler beim Erstellen des Icons:"
 
-#: lib/status_bar.tcl:58
+#: lib/status_bar.tcl:83
 #, tcl-format
 msgid "%s ... %*i of %*i %s (%3i%%)"
 msgstr "%s ... %*i von %*i %s (%3i%%)"
 
+#: lib/transport.tcl:6
+#, tcl-format
+msgid "fetch %s"
+msgstr "»%s« anfordern"
+
 #: lib/transport.tcl:7
 #, tcl-format
 msgid "Fetching new changes from %s"
 msgstr "Neue Änderungen von »%s« holen"
 
+#: lib/transport.tcl:18
+#, tcl-format
+msgid "remote prune %s"
+msgstr ""
+
 #: lib/transport.tcl:19
 #, tcl-format
 msgid "Pruning tracking branches deleted from %s"
 msgstr "Übernahmezweige löschen, die in »%s« gelöscht wurden"
 
+#: lib/transport.tcl:25 lib/transport.tcl:71
+#, tcl-format
+msgid "push %s"
+msgstr "»%s« ausliefern..."
+
 #: lib/transport.tcl:26
 #, tcl-format
 msgid "Pushing changes to %s"
-msgstr "Änderungen nach %s ausliefern"
+msgstr "Änderungen nach »%s« ausliefern"
 
-#: lib/transport.tcl:68
+#: lib/transport.tcl:72
 #, tcl-format
 msgid "Pushing %s %s to %s"
 msgstr "%s %s nach %s ausliefern"
 
-#: lib/transport.tcl:84
+#: lib/transport.tcl:89
 msgid "Push Branches"
 msgstr "Zweige ausliefern"
 
-#: lib/transport.tcl:98
+#: lib/transport.tcl:103
 msgid "Source Branches"
 msgstr "Herkunftszweige"
 
-#: lib/transport.tcl:115
+#: lib/transport.tcl:120
 msgid "Destination Repository"
 msgstr "Ziel-Projektarchiv"
 
-#: lib/transport.tcl:153
+#: lib/transport.tcl:158
 msgid "Transfer Options"
 msgstr "Netzwerk-Einstellungen"
 
-#: lib/transport.tcl:155
+#: lib/transport.tcl:160
+msgid "Force overwrite existing branch (may discard changes)"
+msgstr ""
+"Überschreiben von existierenden Zweigen erzwingen (könnte Änderungen löschen)"
+
+#: lib/transport.tcl:164
 msgid "Use thin pack (for slow network connections)"
 msgstr "Kompaktes Datenformat benutzen (für langsame Netzverbindungen)"
 
-#: lib/transport.tcl:159
+#: lib/transport.tcl:168
 msgid "Include tags"
 msgstr "Mit Markierungen übertragen"
+
+#~ msgid "Fetch"
+#~ msgstr "Anfordern"
+
+#~ msgid "Unstaged Changes (Will Not Be Committed)"
+#~ msgstr "Nicht bereitgestellte Änderungen (werden nicht eingetragen)"
diff --git a/git-gui/po/hu.po b/git-gui/po/hu.po
index 1e189b6086..e8c04f7aea 100644
--- a/git-gui/po/hu.po
+++ b/git-gui/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: git-gui-i 18n\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-11 17:28+0200\n"
+"POT-Creation-Date: 2007-10-10 04:04-0400\n"
 "PO-Revision-Date: 2007-07-27 13:15+0200\n"
 "Last-Translator: Miklos Vajna <vmiklos@frugalware.org>\n"
 "Language-Team: Hungarian\n"
@@ -16,15 +16,33 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: git-gui.sh:531
+#: git-gui.sh:41 git-gui.sh:634 git-gui.sh:648 git-gui.sh:661 git-gui.sh:744
+#: git-gui.sh:763
+msgid "git-gui: fatal error"
+msgstr ""
+
+#: git-gui.sh:595
+#, fuzzy, tcl-format
+msgid "Invalid font specified in %s:"
+msgstr "Érvénytelen font lett megadva a grafikus felületben.%s:"
+
+#: git-gui.sh:620
+msgid "Main Font"
+msgstr "Fő betűtípus"
+
+#: git-gui.sh:621
+msgid "Diff/Console Font"
+msgstr "Diff/konzol betűtípus"
+
+#: git-gui.sh:635
 msgid "Cannot find git in PATH."
 msgstr "A git nem található a PATH-ban."
 
-#: git-gui.sh:550
+#: git-gui.sh:662
 msgid "Cannot parse Git version string:"
 msgstr "Nem értelmezhető a Git verzió sztring:"
 
-#: git-gui.sh:567
+#: git-gui.sh:680
 #, tcl-format
 msgid ""
 "Git version cannot be determined.\n"
@@ -43,79 +61,80 @@ msgstr ""
 "\n"
 "Feltételezhetjük, hogy a(z) '%s' verziója legalább 1.5.0?\n"
 
-#: git-gui.sh:689
-msgid "Cannot find the git directory:"
-msgstr "Nem található a git könyvtár:"
-
-#: git-gui.sh:697
+#: git-gui.sh:853
 msgid "Git directory not found:"
 msgstr "A Git könyvtár nem található:"
 
-#: git-gui.sh:703
+#: git-gui.sh:860
+#, fuzzy
+msgid "Cannot move to top of working directory:"
+msgstr "Nem használható vicces .git könyvtár:"
+
+#: git-gui.sh:867
 msgid "Cannot use funny .git directory:"
 msgstr "Nem használható vicces .git könyvtár:"
 
-#: git-gui.sh:708
+#: git-gui.sh:872
 msgid "No working directory"
 msgstr "Nincs munkakönyvtár"
 
-#: git-gui.sh:854
+#: git-gui.sh:1019
 msgid "Refreshing file status..."
 msgstr "A fájlok státuszának frissítése..."
 
-#: git-gui.sh:891
+#: git-gui.sh:1084
 msgid "Scanning for modified files ..."
 msgstr "Módosított fájlok keresése ..."
 
-#: git-gui.sh:1057 lib/browser.tcl:247
+#: git-gui.sh:1259 lib/browser.tcl:245
 msgid "Ready."
 msgstr "Kész."
 
-#: git-gui.sh:1322
+#: git-gui.sh:1525
 msgid "Unmodified"
 msgstr "Nem módosított"
 
-#: git-gui.sh:1324
+#: git-gui.sh:1527
 msgid "Modified, not staged"
 msgstr "Módosított, de nem kiválasztott"
 
-#: git-gui.sh:1325 git-gui.sh:1330
+#: git-gui.sh:1528 git-gui.sh:1533
 msgid "Staged for commit"
 msgstr "Kiválasztva commitolásra"
 
-#: git-gui.sh:1326 git-gui.sh:1331
+#: git-gui.sh:1529 git-gui.sh:1534
 msgid "Portions staged for commit"
 msgstr "Részek kiválasztva commitolásra"
 
-#: git-gui.sh:1327 git-gui.sh:1332
+#: git-gui.sh:1530 git-gui.sh:1535
 msgid "Staged for commit, missing"
 msgstr "Kiválasztva commitolásra, hiányzó"
 
-#: git-gui.sh:1329
+#: git-gui.sh:1532
 msgid "Untracked, not staged"
 msgstr "Nem követett, nem kiválasztott"
 
-#: git-gui.sh:1334
+#: git-gui.sh:1537
 msgid "Missing"
 msgstr "Hiányzó"
 
-#: git-gui.sh:1335
+#: git-gui.sh:1538
 msgid "Staged for removal"
 msgstr "Kiválasztva eltávolításra"
 
-#: git-gui.sh:1336
+#: git-gui.sh:1539
 msgid "Staged for removal, still present"
 msgstr "Kiválasztva eltávolításra, jelenleg is elérhető"
 
-#: git-gui.sh:1338 git-gui.sh:1339 git-gui.sh:1340 git-gui.sh:1341
+#: git-gui.sh:1541 git-gui.sh:1542 git-gui.sh:1543 git-gui.sh:1544
 msgid "Requires merge resolution"
 msgstr "Merge feloldás szükséges"
 
-#: git-gui.sh:1383
+#: git-gui.sh:1579
 msgid "Starting gitk... please wait..."
 msgstr "A gitk indítása... várjunk..."
 
-#: git-gui.sh:1392
+#: git-gui.sh:1588
 #, tcl-format
 msgid ""
 "Unable to start gitk:\n"
@@ -126,293 +145,332 @@ msgstr ""
 "\n"
 "A(z) %s nem létezik"
 
-#: git-gui.sh:1609
-#, tcl-format
-msgid "Invalid font specified in gui.%s:"
-msgstr "Érvénytelen font lett megadva a grafikus felületben.%s:"
-
-#: git-gui.sh:1634
-msgid "Main Font"
-msgstr "Fő betűtípus"
-
-#: git-gui.sh:1635
-msgid "Diff/Console Font"
-msgstr "Diff/konzol betűtípus"
-
-#: git-gui.sh:1649
+#: git-gui.sh:1788 lib/choose_repository.tcl:32
 msgid "Repository"
 msgstr "Repó"
 
-#: git-gui.sh:1650
+#: git-gui.sh:1789
 msgid "Edit"
 msgstr "Szerkesztés"
 
-#: git-gui.sh:1652
+#: git-gui.sh:1791 lib/choose_rev.tcl:560
 msgid "Branch"
 msgstr "Branch"
 
-#: git-gui.sh:1655 git-gui.sh:1842 git-gui.sh:2152
-msgid "Commit"
+#: git-gui.sh:1794 lib/choose_rev.tcl:547
+#, fuzzy
+msgid "Commit@@noun"
 msgstr "Commit"
 
-#: git-gui.sh:1658 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168
+#: git-gui.sh:1797 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168
 msgid "Merge"
 msgstr "Merge"
 
-#: git-gui.sh:1659
-msgid "Fetch"
-msgstr "Letöltés"
+#: git-gui.sh:1798 lib/choose_rev.tcl:556
+#, fuzzy
+msgid "Remote"
+msgstr "Távoli:"
 
-#: git-gui.sh:1660 git-gui.sh:2158 lib/transport.tcl:88 lib/transport.tcl:172
-msgid "Push"
-msgstr "Push"
-
-#: git-gui.sh:1669
+#: git-gui.sh:1807
 msgid "Browse Current Branch's Files"
 msgstr "A jelenlegi branch fájljainak böngészése"
 
-#: git-gui.sh:1673
+#: git-gui.sh:1811
 msgid "Browse Branch Files..."
 msgstr "A branch fájljainak böngészése..."
 
-#: git-gui.sh:1678
+#: git-gui.sh:1816
 msgid "Visualize Current Branch's History"
 msgstr "A jelenlegi branch történetének vizualizálása"
 
-#: git-gui.sh:1682
+#: git-gui.sh:1820
 msgid "Visualize All Branch History"
 msgstr "Az összes branch történetének vizualizálása"
 
-#: git-gui.sh:1689
+#: git-gui.sh:1827
 #, tcl-format
 msgid "Browse %s's Files"
 msgstr "A(z) %s branch fájljainak böngészése"
 
-#: git-gui.sh:1691
+#: git-gui.sh:1829
 #, tcl-format
 msgid "Visualize %s's History"
 msgstr "A(z) %s branch történetének vizualizálása"
 
-#: git-gui.sh:1696 lib/database.tcl:27 lib/database.tcl:67
+#: git-gui.sh:1834 lib/database.tcl:27 lib/database.tcl:67
 msgid "Database Statistics"
 msgstr "Adatbázis statisztikák"
 
-#: git-gui.sh:1699 lib/database.tcl:34
+#: git-gui.sh:1837 lib/database.tcl:34
 msgid "Compress Database"
 msgstr "Adatbázis tömörítése"
 
-#: git-gui.sh:1702
+#: git-gui.sh:1840
 msgid "Verify Database"
 msgstr "Adatbázis ellenőrzése"
 
-#: git-gui.sh:1709 git-gui.sh:1713 git-gui.sh:1717 lib/shortcut.tcl:9
+#: git-gui.sh:1847 git-gui.sh:1851 git-gui.sh:1855 lib/shortcut.tcl:9
 #: lib/shortcut.tcl:45 lib/shortcut.tcl:84
 msgid "Create Desktop Icon"
 msgstr "Asztal ikon létrehozása"
 
-#: git-gui.sh:1722
+#: git-gui.sh:1860 lib/choose_repository.tcl:36 lib/choose_repository.tcl:95
 msgid "Quit"
 msgstr "Kilépés"
 
-#: git-gui.sh:1729
+#: git-gui.sh:1867
 msgid "Undo"
 msgstr "Visszavonás"
 
-#: git-gui.sh:1732
+#: git-gui.sh:1870
 msgid "Redo"
 msgstr "Mégis"
 
-#: git-gui.sh:1736 git-gui.sh:2222
+#: git-gui.sh:1874 git-gui.sh:2366
 msgid "Cut"
 msgstr "Kivágás"
 
-#: git-gui.sh:1739 git-gui.sh:2225 git-gui.sh:2296 git-gui.sh:2368
-#: lib/console.tcl:69
+#: git-gui.sh:1877 git-gui.sh:2369 git-gui.sh:2440 git-gui.sh:2512
+#: lib/console.tcl:67
 msgid "Copy"
 msgstr "Másolás"
 
-#: git-gui.sh:1742 git-gui.sh:2228
+#: git-gui.sh:1880 git-gui.sh:2372
 msgid "Paste"
 msgstr "Beillesztés"
 
-#: git-gui.sh:1745 git-gui.sh:2231 lib/branch_delete.tcl:26
+#: git-gui.sh:1883 git-gui.sh:2375 lib/branch_delete.tcl:26
 #: lib/remote_branch_delete.tcl:38
 msgid "Delete"
 msgstr "Törlés"
 
-#: git-gui.sh:1749 git-gui.sh:2235 git-gui.sh:2372 lib/console.tcl:71
+#: git-gui.sh:1887 git-gui.sh:2379 git-gui.sh:2516 lib/console.tcl:69
 msgid "Select All"
 msgstr "Mindent kiválaszt"
 
-#: git-gui.sh:1758
+#: git-gui.sh:1896
 msgid "Create..."
 msgstr "Létrehozás..."
 
-#: git-gui.sh:1764
+#: git-gui.sh:1902
 msgid "Checkout..."
 msgstr "Checkout..."
 
-#: git-gui.sh:1770
+#: git-gui.sh:1908
 msgid "Rename..."
 msgstr "Átnevezés..."
 
-#: git-gui.sh:1775 git-gui.sh:1873
+#: git-gui.sh:1913 git-gui.sh:2012
 msgid "Delete..."
 msgstr "Törlés..."
 
-#: git-gui.sh:1780
+#: git-gui.sh:1918
 msgid "Reset..."
 msgstr "Visszaállítás..."
 
-#: git-gui.sh:1792 git-gui.sh:2169
+#: git-gui.sh:1930 git-gui.sh:2313
 msgid "New Commit"
 msgstr "Új commit"
 
-#: git-gui.sh:1800 git-gui.sh:2176
+#: git-gui.sh:1938 git-gui.sh:2320
 msgid "Amend Last Commit"
 msgstr "Utolsó commit javítása"
 
-#: git-gui.sh:1809 git-gui.sh:2136 lib/remote_branch_delete.tcl:99
+#: git-gui.sh:1947 git-gui.sh:2280 lib/remote_branch_delete.tcl:99
 msgid "Rescan"
 msgstr "Keresés újra"
 
-#: git-gui.sh:1815
+#: git-gui.sh:1953
 msgid "Stage To Commit"
 msgstr "Kiválasztás commitolásra"
 
-#: git-gui.sh:1820
+#: git-gui.sh:1958
 msgid "Stage Changed Files To Commit"
 msgstr "Módosított fájlok kiválasztása commitolásra"
 
-#: git-gui.sh:1826
+#: git-gui.sh:1964
 msgid "Unstage From Commit"
 msgstr "Commitba való kiválasztás visszavonása"
 
-#: git-gui.sh:1831 lib/index.tcl:376
+#: git-gui.sh:1969 lib/index.tcl:352
 msgid "Revert Changes"
 msgstr "Változtatások visszaállítása"
 
-#: git-gui.sh:1838 git-gui.sh:2148 git-gui.sh:2246
+#: git-gui.sh:1976 git-gui.sh:2292 git-gui.sh:2390
 msgid "Sign Off"
 msgstr "Aláír"
 
-#: git-gui.sh:1853
+#: git-gui.sh:1980 git-gui.sh:2296
+#, fuzzy
+msgid "Commit@@verb"
+msgstr "Commit"
+
+#: git-gui.sh:1991
 msgid "Local Merge..."
 msgstr "Helyi merge..."
 
-#: git-gui.sh:1858
+#: git-gui.sh:1996
 msgid "Abort Merge..."
 msgstr "Merge megszakítása..."
 
-#: git-gui.sh:1870
+#: git-gui.sh:2008
 msgid "Push..."
 msgstr "Push..."
 
-#: git-gui.sh:1880
+#: git-gui.sh:2019 lib/choose_repository.tcl:41
 msgid "Apple"
 msgstr "Apple"
 
-#: git-gui.sh:1883 git-gui.sh:1901 lib/option.tcl:65
+#: git-gui.sh:2022 git-gui.sh:2044 lib/about.tcl:13
+#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:50
 #, tcl-format
 msgid "About %s"
 msgstr "Névjegy: %s"
 
-#: git-gui.sh:1885 git-gui.sh:1891 git-gui.sh:2414
+#: git-gui.sh:2026
+msgid "Preferences..."
+msgstr ""
+
+#: git-gui.sh:2034 git-gui.sh:2558
 msgid "Options..."
 msgstr "Opciók..."
 
-#: git-gui.sh:1897
+#: git-gui.sh:2040 lib/choose_repository.tcl:47
 msgid "Help"
 msgstr "Segítség"
 
-#: git-gui.sh:1938
+#: git-gui.sh:2081
 msgid "Online Documentation"
 msgstr "Online dokumentáció"
 
-#: git-gui.sh:2054
+#: git-gui.sh:2165
+#, tcl-format
+msgid "fatal: cannot stat path %s: No such file or directory"
+msgstr ""
+
+#: git-gui.sh:2198
 msgid "Current Branch:"
 msgstr "Jelenlegi branch:"
 
-#: git-gui.sh:2075
-msgid "Staged Changes (Will Be Committed)"
+#: git-gui.sh:2219
+#, fuzzy
+msgid "Staged Changes (Will Commit)"
 msgstr "Kiválasztott változtatások (commitolva lesz)"
 
-#: git-gui.sh:2095
-msgid "Unstaged Changes (Will Not Be Committed)"
-msgstr "Nem kiválasztott változtatások (nem lesz commitolva)"
+#: git-gui.sh:2239
+#, fuzzy
+msgid "Unstaged Changes"
+msgstr "Változtatások kiválasztása"
 
-#: git-gui.sh:2142
+#: git-gui.sh:2286
 msgid "Stage Changed"
 msgstr "Változtatások kiválasztása"
 
-#: git-gui.sh:2188
+#: git-gui.sh:2302 lib/transport.tcl:93 lib/transport.tcl:182
+msgid "Push"
+msgstr "Push"
+
+#: git-gui.sh:2332
 msgid "Initial Commit Message:"
 msgstr "Kezdeti commit üzenet:"
 
-#: git-gui.sh:2189
+#: git-gui.sh:2333
 msgid "Amended Commit Message:"
 msgstr "Javító commit üzenet:"
 
-#: git-gui.sh:2190
+#: git-gui.sh:2334
 msgid "Amended Initial Commit Message:"
 msgstr "Kezdeti javító commit üzenet:"
 
-#: git-gui.sh:2191
+#: git-gui.sh:2335
 msgid "Amended Merge Commit Message:"
 msgstr "Javító merge commit üzenet:"
 
-#: git-gui.sh:2192
+#: git-gui.sh:2336
 msgid "Merge Commit Message:"
 msgstr "Merge commit üzenet:"
 
-#: git-gui.sh:2193
+#: git-gui.sh:2337
 msgid "Commit Message:"
 msgstr "Commit üzenet:"
 
-#: git-gui.sh:2238 git-gui.sh:2376 lib/console.tcl:73
+#: git-gui.sh:2382 git-gui.sh:2520 lib/console.tcl:71
 msgid "Copy All"
 msgstr "Összes másolása"
 
-#: git-gui.sh:2262 lib/blame.tcl:104
+#: git-gui.sh:2406 lib/blame.tcl:104
 msgid "File:"
 msgstr "Fájl:"
 
-#: git-gui.sh:2364
+#: git-gui.sh:2508
 msgid "Refresh"
 msgstr "Frissítés"
 
-#: git-gui.sh:2385
+#: git-gui.sh:2529
 msgid "Apply/Reverse Hunk"
 msgstr "Hunk alkalmazása/visszaállítása"
 
-#: git-gui.sh:2391
+#: git-gui.sh:2535
 msgid "Decrease Font Size"
 msgstr "Font méret csökkentése"
 
-#: git-gui.sh:2395
+#: git-gui.sh:2539
 msgid "Increase Font Size"
 msgstr "Fönt méret növelése"
 
-#: git-gui.sh:2400
+#: git-gui.sh:2544
 msgid "Show Less Context"
 msgstr "Kevesebb környezet mutatása"
 
-#: git-gui.sh:2407
+#: git-gui.sh:2551
 msgid "Show More Context"
 msgstr "Több környezet mutatása"
 
-#: git-gui.sh:2422
+#: git-gui.sh:2565
 msgid "Unstage Hunk From Commit"
 msgstr "Hunk törlése commitból"
 
-#: git-gui.sh:2426 git-gui.sh:2430
+#: git-gui.sh:2567
 msgid "Stage Hunk For Commit"
 msgstr "Hunk kiválasztása commitba"
 
-#: git-gui.sh:2440
+#: git-gui.sh:2586
 msgid "Initializing..."
 msgstr "Inicializálás..."
 
+#: git-gui.sh:2677
+#, 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:2707
+msgid ""
+"\n"
+"This is due to a known issue with the\n"
+"Tcl binary distributed by Cygwin."
+msgstr ""
+
+#: git-gui.sh:2712
+#, 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:25
+msgid "git-gui - a graphical user interface for Git."
+msgstr "git-gui - egy grafikus felület a Githez."
+
 #: lib/blame.tcl:77
 msgid "File Viewer"
 msgstr "Fájl néző"
@@ -430,6 +488,53 @@ msgstr "Commit másolása"
 msgid "Reading %s..."
 msgstr "A(z) %s olvasása..."
 
+#: lib/blame.tcl:473
+msgid "Loading copy/move tracking annotations..."
+msgstr ""
+
+#: lib/blame.tcl:493
+msgid "lines annotated"
+msgstr ""
+
+#: lib/blame.tcl:674
+msgid "Loading original location annotations..."
+msgstr ""
+
+#: lib/blame.tcl:677
+msgid "Annotation complete."
+msgstr ""
+
+#: lib/blame.tcl:731
+#, fuzzy
+msgid "Loading annotation..."
+msgstr "A(z) %s betöltése..."
+
+#: lib/blame.tcl:787
+msgid "Author:"
+msgstr ""
+
+#: lib/blame.tcl:791
+#, fuzzy
+msgid "Committer:"
+msgstr "Commit:"
+
+#: lib/blame.tcl:796
+msgid "Original File:"
+msgstr ""
+
+#: lib/blame.tcl:910
+msgid "Originally By:"
+msgstr ""
+
+#: lib/blame.tcl:916
+#, fuzzy
+msgid "In File:"
+msgstr "Fájl:"
+
+#: lib/blame.tcl:921
+msgid "Copied Or Moved Here By:"
+msgstr ""
+
 #: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19
 msgid "Checkout Branch"
 msgstr "Branch checkoutolása"
@@ -439,18 +544,17 @@ msgid "Checkout"
 msgstr "Checkout"
 
 #: 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:281
+#: lib/checkout_op.tcl:522 lib/choose_font.tcl:43 lib/merge.tcl:172
+#: lib/option.tcl:90 lib/remote_branch_delete.tcl:42 lib/transport.tcl:97
 msgid "Cancel"
 msgstr "Mégsem"
 
-#: lib/branch_checkout.tcl:32 lib/browser.tcl:288
+#: lib/branch_checkout.tcl:32 lib/browser.tcl:286
 msgid "Revision"
 msgstr "Revízió"
 
-#: 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:202
 msgid "Options"
 msgstr "Opciók"
 
@@ -470,7 +574,7 @@ msgstr "Branch létrehozása"
 msgid "Create New Branch"
 msgstr "Új branch létrehozása"
 
-#: lib/branch_create.tcl:31
+#: lib/branch_create.tcl:31 lib/choose_repository.tcl:199
 msgid "Create"
 msgstr "Létrehozás"
 
@@ -610,20 +714,22 @@ msgstr "Indítás..."
 msgid "File Browser"
 msgstr "Fájl böngésző"
 
-#: lib/browser.tcl:127 lib/browser.tcl:144
+#: lib/browser.tcl:125 lib/browser.tcl:142
 #, tcl-format
 msgid "Loading %s..."
 msgstr "A(z) %s betöltése..."
 
-#: lib/browser.tcl:188
+#: lib/browser.tcl:186
 msgid "[Up To Parent]"
 msgstr "[Fel a szülőhöz]"
 
-#: lib/browser.tcl:268 lib/browser.tcl:274
+#: lib/browser.tcl:266 lib/browser.tcl:272
 msgid "Browse Branch Files"
 msgstr "A branch fájljainak böngészése"
 
-#: lib/browser.tcl:279
+#: lib/browser.tcl:277 lib/choose_repository.tcl:215
+#: lib/choose_repository.tcl:305 lib/choose_repository.tcl:315
+#: lib/choose_repository.tcl:811
 msgid "Browse"
 msgstr "Böngészés"
 
@@ -632,7 +738,12 @@ msgstr "Böngészés"
 msgid "Fetching %s from %s"
 msgstr "A(z) %s letöltése innen: %s"
 
-#: lib/checkout_op.tcl:140 lib/console.tcl:81 lib/database.tcl:31
+#: lib/checkout_op.tcl:127
+#, tcl-format
+msgid "fatal: Cannot resolve %s"
+msgstr ""
+
+#: lib/checkout_op.tcl:140 lib/console.tcl:79 lib/database.tcl:31
 msgid "Close"
 msgstr "Bezárás"
 
@@ -685,6 +796,11 @@ msgstr ""
 "\n"
 "Az újrakeresés most automatikusan el fog indulni.\n"
 
+#: lib/checkout_op.tcl:322
+#, fuzzy, tcl-format
+msgid "Updating working directory to '%s'..."
+msgstr "Nincs munkakönyvtár"
+
 #: lib/checkout_op.tcl:353
 #, tcl-format
 msgid "Aborted checkout of '%s' (file level merging is required)."
@@ -711,6 +827,11 @@ msgstr ""
 "Ha egy branchen szeretnénk lenni, hozzunk létre egyet az 'Ez a leválasztott "
 "checkout'-ból."
 
+#: lib/checkout_op.tcl:446
+#, fuzzy, tcl-format
+msgid "Checked out '%s'."
+msgstr "Checkout..."
+
 #: lib/checkout_op.tcl:478
 #, tcl-format
 msgid "Resetting '%s' to '%s' will lose the following commits:"
@@ -747,6 +868,246 @@ msgstr ""
 "\n"
 "Ennek nem szabad megtörténnie.  A(z) %s most kilép és feladja."
 
+#: lib/choose_font.tcl:39
+#, fuzzy
+msgid "Select"
+msgstr "Mindent kiválaszt"
+
+#: lib/choose_font.tcl:53
+msgid "Font Family"
+msgstr ""
+
+#: lib/choose_font.tcl:73
+#, fuzzy
+msgid "Font Size"
+msgstr "Font méret csökkentése"
+
+#: lib/choose_font.tcl:90
+msgid "Font Example"
+msgstr ""
+
+#: lib/choose_font.tcl:101
+msgid ""
+"This is example text.\n"
+"If you like this text, it can be your font."
+msgstr ""
+
+#: lib/choose_repository.tcl:25
+msgid "Git Gui"
+msgstr ""
+
+#: lib/choose_repository.tcl:69 lib/choose_repository.tcl:204
+#, fuzzy
+msgid "Create New Repository"
+msgstr "Forrás repó"
+
+#: lib/choose_repository.tcl:74 lib/choose_repository.tcl:291
+#, fuzzy
+msgid "Clone Existing Repository"
+msgstr "Cél repó"
+
+#: lib/choose_repository.tcl:79 lib/choose_repository.tcl:800
+#, fuzzy
+msgid "Open Existing Repository"
+msgstr "Cél repó"
+
+#: lib/choose_repository.tcl:91
+msgid "Next >"
+msgstr ""
+
+#: lib/choose_repository.tcl:152
+#, fuzzy, tcl-format
+msgid "Location %s already exists."
+msgstr "A(z) '%s' branch már létezik."
+
+#: lib/choose_repository.tcl:158 lib/choose_repository.tcl:165
+#: lib/choose_repository.tcl:172
+#, fuzzy, tcl-format
+msgid "Failed to create repository %s:"
+msgstr "Nem sikerült teljesen elmenteni a beállításokat:"
+
+#: lib/choose_repository.tcl:209 lib/choose_repository.tcl:309
+msgid "Directory:"
+msgstr ""
+
+#: lib/choose_repository.tcl:238 lib/choose_repository.tcl:363
+#: lib/choose_repository.tcl:834
+#, fuzzy
+msgid "Git Repository"
+msgstr "Repó"
+
+#: lib/choose_repository.tcl:253 lib/choose_repository.tcl:260
+#, fuzzy, tcl-format
+msgid "Directory %s already exists."
+msgstr "A(z) '%s' branch már létezik."
+
+#: lib/choose_repository.tcl:265
+#, fuzzy, tcl-format
+msgid "File %s already exists."
+msgstr "A(z) '%s' branch már létezik."
+
+#: lib/choose_repository.tcl:286
+#, fuzzy
+msgid "Clone"
+msgstr "Bezárás"
+
+#: lib/choose_repository.tcl:299
+msgid "URL:"
+msgstr ""
+
+#: lib/choose_repository.tcl:319
+msgid "Clone Type:"
+msgstr ""
+
+#: lib/choose_repository.tcl:325
+msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
+msgstr ""
+
+#: lib/choose_repository.tcl:331
+msgid "Full Copy (Slower, Redundant Backup)"
+msgstr ""
+
+#: lib/choose_repository.tcl:337
+msgid "Shared (Fastest, Not Recommended, No Backup)"
+msgstr ""
+
+#: lib/choose_repository.tcl:369 lib/choose_repository.tcl:418
+#: lib/choose_repository.tcl:560 lib/choose_repository.tcl:630
+#: lib/choose_repository.tcl:840 lib/choose_repository.tcl:848
+#, fuzzy, tcl-format
+msgid "Not a Git repository: %s"
+msgstr "Nincs kiválasztott repó."
+
+#: lib/choose_repository.tcl:405
+msgid "Standard only available for local repository."
+msgstr ""
+
+#: lib/choose_repository.tcl:409
+msgid "Shared only available for local repository."
+msgstr ""
+
+#: lib/choose_repository.tcl:439
+msgid "Failed to configure origin"
+msgstr ""
+
+#: lib/choose_repository.tcl:451
+msgid "Counting objects"
+msgstr ""
+
+#: lib/choose_repository.tcl:452
+msgid "buckets"
+msgstr ""
+
+#: lib/choose_repository.tcl:476
+#, tcl-format
+msgid "Unable to copy objects/info/alternates: %s"
+msgstr ""
+
+#: lib/choose_repository.tcl:512
+#, fuzzy, tcl-format
+msgid "Nothing to clone from %s."
+msgstr "Új változások letöltése innen: %s"
+
+#: lib/choose_repository.tcl:514 lib/choose_repository.tcl:728
+#: lib/choose_repository.tcl:740
+msgid "The 'master' branch has not been initialized."
+msgstr ""
+
+#: lib/choose_repository.tcl:527
+msgid "Hardlinks are unavailable.  Falling back to copying."
+msgstr ""
+
+#: lib/choose_repository.tcl:539
+#, fuzzy, tcl-format
+msgid "Cloning from %s"
+msgstr "A(z) %s letöltése innen: %s"
+
+#: lib/choose_repository.tcl:570
+#, fuzzy
+msgid "Copying objects"
+msgstr "Az objektum adatbázis tömörítése"
+
+#: lib/choose_repository.tcl:571
+msgid "KiB"
+msgstr ""
+
+#: lib/choose_repository.tcl:595
+#, tcl-format
+msgid "Unable to copy object: %s"
+msgstr ""
+
+#: lib/choose_repository.tcl:605
+msgid "Linking objects"
+msgstr ""
+
+#: lib/choose_repository.tcl:606
+msgid "objects"
+msgstr ""
+
+#: lib/choose_repository.tcl:614
+#, tcl-format
+msgid "Unable to hardlink object: %s"
+msgstr ""
+
+#: lib/choose_repository.tcl:669
+msgid "Cannot fetch branches and objects.  See console output for details."
+msgstr ""
+
+#: lib/choose_repository.tcl:680
+msgid "Cannot fetch tags.  See console output for details."
+msgstr ""
+
+#: lib/choose_repository.tcl:704
+msgid "Cannot determine HEAD.  See console output for details."
+msgstr ""
+
+#: lib/choose_repository.tcl:713
+#, tcl-format
+msgid "Unable to cleanup %s"
+msgstr ""
+
+#: lib/choose_repository.tcl:719
+#, fuzzy
+msgid "Clone failed."
+msgstr "A félbeszakítás nem sikerült."
+
+#: lib/choose_repository.tcl:726
+msgid "No default branch obtained."
+msgstr ""
+
+#: lib/choose_repository.tcl:737
+#, tcl-format
+msgid "Cannot resolve %s as a commit."
+msgstr ""
+
+#: lib/choose_repository.tcl:749
+#, fuzzy
+msgid "Creating working directory"
+msgstr "Nincs munkakönyvtár"
+
+#: lib/choose_repository.tcl:750 lib/index.tcl:15 lib/index.tcl:80
+#: lib/index.tcl:149
+msgid "files"
+msgstr ""
+
+#: lib/choose_repository.tcl:779
+msgid "Initial file checkout failed."
+msgstr ""
+
+#: lib/choose_repository.tcl:795
+msgid "Open"
+msgstr ""
+
+#: lib/choose_repository.tcl:805
+#, fuzzy
+msgid "Repository:"
+msgstr "Repó"
+
+#: lib/choose_repository.tcl:854
+#, fuzzy, tcl-format
+msgid "Failed to open repository %s:"
+msgstr "Nem sikerült teljesen elmenteni a beállításokat:"
+
 #: lib/choose_rev.tcl:53
 msgid "This Detached Checkout"
 msgstr "Ez a leválasztott checkout"
@@ -763,7 +1124,7 @@ msgstr "Helyi branch"
 msgid "Tracking Branch"
 msgstr "Követő branch"
 
-#: lib/choose_rev.tcl:84
+#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:537
 msgid "Tag"
 msgstr "Tag"
 
@@ -780,6 +1141,14 @@ msgstr "Nincs kiválasztva revízió."
 msgid "Revision expression is empty."
 msgstr "A revízió kifejezés üres."
 
+#: lib/choose_rev.tcl:530
+msgid "Updated"
+msgstr ""
+
+#: lib/choose_rev.tcl:558
+msgid "URL"
+msgstr ""
+
 #: lib/commit.tcl:9
 msgid ""
 "There is nothing to amend.\n"
@@ -890,6 +1259,11 @@ msgstr ""
 msgid "write-tree failed:"
 msgstr "a write-tree sikertelen:"
 
+#: lib/commit.tcl:275
+#, tcl-format
+msgid "Commit %s appears to be corrupt"
+msgstr ""
+
 #: lib/commit.tcl:279
 msgid ""
 "No changes to commit.\n"
@@ -908,6 +1282,11 @@ msgstr ""
 msgid "No changes to commit."
 msgstr "Nincs commitolandó változtatás."
 
+#: lib/commit.tcl:303
+#, tcl-format
+msgid "warning: Tcl does not support encoding '%s'."
+msgstr ""
+
 #: lib/commit.tcl:317
 msgid "commit-tree failed:"
 msgstr "a commit-tree sikertelen:"
@@ -921,15 +1300,15 @@ msgstr "az update-ref sikertelen:"
 msgid "Created commit %s: %s"
 msgstr "Létrejött a %s commit: %s"
 
-#: lib/console.tcl:55
+#: lib/console.tcl:57
 msgid "Working... please wait..."
 msgstr "Munka folyamatban.. Várjunk..."
 
-#: lib/console.tcl:184
+#: lib/console.tcl:183
 msgid "Success"
 msgstr "Siker"
 
-#: lib/console.tcl:194
+#: lib/console.tcl:196
 msgid "Error: Command Failed"
 msgstr "Hiba: a parancs sikertelen"
 
@@ -969,6 +1348,22 @@ msgstr "Az objektum adatbázis tömörítése"
 msgid "Verifying the object database with fsck-objects"
 msgstr "Az objektum adatbázis ellenőrzése az fsck-objects használatával"
 
+#: 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
+#, fuzzy, tcl-format
+msgid "Invalid date from Git: %s"
+msgstr "Érvénytelen revízió: %s"
+
 #: lib/diff.tcl:42
 #, tcl-format
 msgid ""
@@ -991,19 +1386,37 @@ msgstr ""
 "\n"
 "Egy újrakeresés fog indulni a hasonló állapotú fájlok megtalálása érdekében."
 
-#: lib/diff.tcl:97
+#: lib/diff.tcl:81
+#, fuzzy, tcl-format
+msgid "Loading diff of %s..."
+msgstr "A(z) %s betöltése..."
+
+#: lib/diff.tcl:114 lib/diff.tcl:184
+#, tcl-format
+msgid "Unable to display %s"
+msgstr ""
+
+#: lib/diff.tcl:115
 msgid "Error loading file:"
 msgstr "Hiba a fájl betöltése közben:"
 
-#: lib/diff.tcl:162
+#: lib/diff.tcl:122
+msgid "Git Repository (subproject)"
+msgstr ""
+
+#: lib/diff.tcl:134
+msgid "* Binary file (not showing content)."
+msgstr ""
+
+#: lib/diff.tcl:185
 msgid "Error loading diff:"
 msgstr "Hiba a diff betöltése közben:"
 
-#: lib/diff.tcl:278
+#: lib/diff.tcl:302
 msgid "Failed to unstage selected hunk."
 msgstr "Nem visszavonni a hunk kiválasztását."
 
-#: lib/diff.tcl:285
+#: lib/diff.tcl:309
 msgid "Failed to stage selected hunk."
 msgstr "Nem sikerült kiválasztani a hunkot."
 
@@ -1019,23 +1432,33 @@ msgstr "figyelmeztetés"
 msgid "You must correct the above errors before committing."
 msgstr "Ki kell javítanunk a fenti hibákat commit előtt."
 
-#: lib/index.tcl:364
+#: lib/index.tcl:241
+#, fuzzy, tcl-format
+msgid "Unstaging %s from commit"
+msgstr "Commitba való kiválasztás visszavonása"
+
+#: lib/index.tcl:285
+#, fuzzy, tcl-format
+msgid "Adding %s"
+msgstr "A(z) %s olvasása..."
+
+#: lib/index.tcl:340
 #, tcl-format
 msgid "Revert changes in file %s?"
 msgstr "Visszaállítja a változtatásokat a(z) %s fájlban?"
 
-#: lib/index.tcl:366
+#: lib/index.tcl:342
 #, tcl-format
 msgid "Revert changes in these %i files?"
 msgstr "Visszaállítja a változtatásokat ebben e %i fájlban?"
 
-#: lib/index.tcl:372
+#: lib/index.tcl:348
 msgid "Any unstaged changes will be permanently lost by the revert."
 msgstr ""
 "Minden nem kiválasztott változtatás el fog veszni ezáltal a visszaállítás "
 "által."
 
-#: lib/index.tcl:375
+#: lib/index.tcl:351
 msgid "Do Nothing"
 msgstr "Ne csináljunk semmit"
 
@@ -1180,71 +1603,101 @@ msgstr "A félbeszakítás nem sikerült."
 msgid "Abort completed.  Ready."
 msgstr "A megkeszakítás befejeződött. Kész."
 
-#: lib/option.tcl:77
-msgid "git-gui - a graphical user interface for Git."
-msgstr "git-gui - egy grafikus felület a Githez."
-
-#: lib/option.tcl:164
+#: lib/option.tcl:82
 msgid "Restore Defaults"
 msgstr "Alapértelmezés visszaállítása"
 
-#: lib/option.tcl:168
+#: lib/option.tcl:86
 msgid "Save"
 msgstr "Mentés"
 
-#: lib/option.tcl:178
+#: lib/option.tcl:96
 #, tcl-format
 msgid "%s Repository"
 msgstr "%s Repó"
 
-#: lib/option.tcl:179
+#: lib/option.tcl:97
 msgid "Global (All Repositories)"
 msgstr "Globális (minden repó)"
 
-#: lib/option.tcl:185
+#: lib/option.tcl:103
 msgid "User Name"
 msgstr "Felhasználónév"
 
-#: lib/option.tcl:186
+#: lib/option.tcl:104
 msgid "Email Address"
 msgstr "Email cím"
 
-#: lib/option.tcl:188
+#: lib/option.tcl:106
 msgid "Summarize Merge Commits"
 msgstr "A merge commitok összegzése"
 
-#: lib/option.tcl:189
+#: lib/option.tcl:107
 msgid "Merge Verbosity"
 msgstr "Merge beszédesség"
 
-#: lib/option.tcl:190
+#: lib/option.tcl:108
 msgid "Show Diffstat After Merge"
 msgstr "Diffstat mutatása merge után"
 
-#: lib/option.tcl:192
+#: lib/option.tcl:110
 msgid "Trust File Modification Timestamps"
 msgstr "A fájl módosítási dátumok megbízhatóak"
 
-#: lib/option.tcl:193
+#: lib/option.tcl:111
 msgid "Prune Tracking Branches During Fetch"
 msgstr "A követő branchek eltávolítása letöltés alatt"
 
-#: lib/option.tcl:194
+#: lib/option.tcl:112
 msgid "Match Tracking Branches"
 msgstr "A követő branchek egyeztetése"
 
-#: lib/option.tcl:195
+#: lib/option.tcl:113
 msgid "Number of Diff Context Lines"
 msgstr "A diff környezeti sorok száma"
 
-#: lib/option.tcl:196
+#: lib/option.tcl:114
 msgid "New Branch Name Template"
 msgstr "Új branch név sablon"
 
-#: lib/option.tcl:305
+#: lib/option.tcl:176
+#, fuzzy
+msgid "Change Font"
+msgstr "Fő betűtípus"
+
+#: lib/option.tcl:180
+#, tcl-format
+msgid "Choose %s"
+msgstr ""
+
+#: lib/option.tcl:186
+msgid "pt."
+msgstr ""
+
+#: lib/option.tcl:200
+msgid "Preferences"
+msgstr ""
+
+#: lib/option.tcl:235
 msgid "Failed to completely save options:"
 msgstr "Nem sikerült teljesen elmenteni a beállításokat:"
 
+#: lib/remote.tcl:165
+#, fuzzy
+msgid "Prune from"
+msgstr "Törlés innen: %s..."
+
+# tcl-format
+#: lib/remote.tcl:170
+#, fuzzy
+msgid "Fetch from"
+msgstr "Letöltés innen: %s..."
+
+#: lib/remote.tcl:213
+#, fuzzy
+msgid "Push to"
+msgstr "Push"
+
 #: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34
 msgid "Delete Remote Branch"
 msgstr "Távoli branch törlése"
@@ -1253,11 +1706,11 @@ msgstr "Távoli branch törlése"
 msgid "From Repository"
 msgstr "Forrás repó"
 
-#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:118
+#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:123
 msgid "Remote:"
 msgstr "Távoli:"
 
-#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:133
+#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:138
 msgid "Arbitrary URL:"
 msgstr "Tetszőleges URL:"
 
@@ -1281,6 +1734,14 @@ msgstr "Mindig (Ne végezzen merge vizsgálatokat)"
 msgid "A branch is required for 'Merged Into'."
 msgstr "Egy branch szükséges a 'Merge-ölt a következőbe'-hez."
 
+#: lib/remote_branch_delete.tcl:184
+#, fuzzy, tcl-format
+msgid ""
+"The following branches are not completely merged into %s:\n"
+"\n"
+" - %s"
+msgstr "A következő branchek nem teljesen lettek merge-ölve ebbe: %s:"
+
 #: lib/remote_branch_delete.tcl:189
 #, tcl-format
 msgid ""
@@ -1318,22 +1779,6 @@ msgstr "Nincs kiválasztott repó."
 msgid "Scanning %s..."
 msgstr "Keresés itt: %s..."
 
-# tcl-format
-#: lib/remote.tcl:162
-#, tcl-format
-msgid "Fetch from %s..."
-msgstr "Letöltés innen: %s..."
-
-#: lib/remote.tcl:172
-#, tcl-format
-msgid "Prune from %s..."
-msgstr "Törlés innen: %s..."
-
-#: lib/remote.tcl:206
-#, tcl-format
-msgid "Push to %s..."
-msgstr "Pusholás ide: %s..."
-
 #: lib/shortcut.tcl:26 lib/shortcut.tcl:74
 msgid "Cannot write script:"
 msgstr "Nem sikerült írni a scriptet:"
@@ -1342,55 +1787,83 @@ msgstr "Nem sikerült írni a scriptet:"
 msgid "Cannot write icon:"
 msgstr "Nem sikerült írni az ikont:"
 
-#: lib/status_bar.tcl:58
+#: lib/status_bar.tcl:83
 #, tcl-format
 msgid "%s ... %*i of %*i %s (%3i%%)"
 msgstr "%s ... %*i / %*i %s (%3i%%)"
 
+#: lib/transport.tcl:6
+#, fuzzy, tcl-format
+msgid "fetch %s"
+msgstr "Letöltés"
+
 #: lib/transport.tcl:7
 #, tcl-format
 msgid "Fetching new changes from %s"
 msgstr "Új változások letöltése innen: %s"
 
+#: lib/transport.tcl:18
+#, tcl-format
+msgid "remote prune %s"
+msgstr ""
+
 #: lib/transport.tcl:19
 #, tcl-format
 msgid "Pruning tracking branches deleted from %s"
 msgstr "A %s repóból törölt követő branchek törlése"
 
+#: lib/transport.tcl:25 lib/transport.tcl:71
+#, tcl-format
+msgid "push %s"
+msgstr ""
+
 #: lib/transport.tcl:26
 #, tcl-format
 msgid "Pushing changes to %s"
 msgstr "Változások pusholása ide: %s"
 
-#: lib/transport.tcl:68
+#: lib/transport.tcl:72
 #, tcl-format
 msgid "Pushing %s %s to %s"
 msgstr "Pusholás: %s %s, ide: %s"
 
-#: lib/transport.tcl:84
+#: lib/transport.tcl:89
 msgid "Push Branches"
 msgstr "Branchek pusholása"
 
-#: lib/transport.tcl:98
+#: lib/transport.tcl:103
 msgid "Source Branches"
 msgstr "Forrás branchek"
 
-#: lib/transport.tcl:115
+#: lib/transport.tcl:120
 msgid "Destination Repository"
 msgstr "Cél repó"
 
-#: lib/transport.tcl:153
+#: lib/transport.tcl:158
 msgid "Transfer Options"
 msgstr "Átviteli opciók"
 
-#: lib/transport.tcl:155
+#: lib/transport.tcl:160
+msgid "Force overwrite existing branch (may discard changes)"
+msgstr ""
+
+#: lib/transport.tcl:164
 msgid "Use thin pack (for slow network connections)"
 msgstr "Vékony csomagok használata (lassú hálózati kapcsolatok számára)"
 
-#: lib/transport.tcl:159
+#: lib/transport.tcl:168
 msgid "Include tags"
 msgstr "Tageket is"
 
+#~ msgid "Cannot find the git directory:"
+#~ msgstr "Nem található a git könyvtár:"
+
+#~ msgid "Unstaged Changes (Will Not Be Committed)"
+#~ msgstr "Nem kiválasztott változtatások (nem lesz commitolva)"
+
+#~ msgid "Push to %s..."
+#~ msgstr "Pusholás ide: %s..."
+
 #~ msgid "Add To Commit"
 #~ msgstr "Hozzáadás a commithoz"
 
diff --git a/git-gui/po/it.po b/git-gui/po/it.po
index ad5cd9e5da..d959019aab 100644
--- a/git-gui/po/it.po
+++ b/git-gui/po/it.po
@@ -9,23 +9,41 @@ msgid ""
 msgstr ""
 "Project-Id-Version: git-gui\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-11 17:28+0200\n"
+"POT-Creation-Date: 2007-10-10 04:04-0400\n"
 "PO-Revision-Date: 2007-08-09 00:27+0200\n"
 "Last-Translator: Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
 
-#: git-gui.sh:531
+#: git-gui.sh:41 git-gui.sh:634 git-gui.sh:648 git-gui.sh:661 git-gui.sh:744
+#: git-gui.sh:763
+msgid "git-gui: fatal error"
+msgstr ""
+
+#: git-gui.sh:595
+#, fuzzy, tcl-format
+msgid "Invalid font specified in %s:"
+msgstr "Caratteri non validi specificati nella gui.%s:"
+
+#: git-gui.sh:620
+msgid "Main Font"
+msgstr "Caratteri principali"
+
+#: git-gui.sh:621
+msgid "Diff/Console Font"
+msgstr "Caratteri per confronti e terminale"
+
+#: git-gui.sh:635
 msgid "Cannot find git in PATH."
 msgstr "Impossibile trovare git nel PATH"
 
-#: git-gui.sh:550
+#: git-gui.sh:662
 msgid "Cannot parse Git version string:"
 msgstr "Impossibile determinare la versione di Git:"
 
-#: git-gui.sh:567
+#: git-gui.sh:680
 #, tcl-format
 msgid ""
 "Git version cannot be determined.\n"
@@ -44,79 +62,80 @@ msgstr ""
 "\n"
 "Assumere che '%s' sia alla versione 1.5.0?\n"
 
-#: git-gui.sh:689
-msgid "Cannot find the git directory:"
-msgstr "Non posso trovare la directory di git:"
-
-#: git-gui.sh:697
+#: git-gui.sh:853
 msgid "Git directory not found:"
 msgstr "Non trovo la directory di git: "
 
-#: git-gui.sh:703
+#: git-gui.sh:860
+#, fuzzy
+msgid "Cannot move to top of working directory:"
+msgstr "Impossibile usare una .git directory strana:"
+
+#: git-gui.sh:867
 msgid "Cannot use funny .git directory:"
 msgstr "Impossibile usare una .git directory strana:"
 
-#: git-gui.sh:708
+#: git-gui.sh:872
 msgid "No working directory"
 msgstr "Nessuna directory di lavoro"
 
-#: git-gui.sh:854
+#: git-gui.sh:1019
 msgid "Refreshing file status..."
 msgstr "Controllo dello stato dei file in corso..."
 
-#: git-gui.sh:891
+#: git-gui.sh:1084
 msgid "Scanning for modified files ..."
 msgstr "Ricerca di file modificati in corso..."
 
-#: git-gui.sh:1057 lib/browser.tcl:247
+#: git-gui.sh:1259 lib/browser.tcl:245
 msgid "Ready."
 msgstr "Pronto."
 
-#: git-gui.sh:1322
+#: git-gui.sh:1525
 msgid "Unmodified"
 msgstr "Non modificato"
 
-#: git-gui.sh:1324
+#: git-gui.sh:1527
 msgid "Modified, not staged"
 msgstr "Modificato, non pronto per il commit"
 
-#: git-gui.sh:1325 git-gui.sh:1330
+#: git-gui.sh:1528 git-gui.sh:1533
 msgid "Staged for commit"
 msgstr "Pronto per il commit"
 
-#: git-gui.sh:1326 git-gui.sh:1331
+#: git-gui.sh:1529 git-gui.sh:1534
 msgid "Portions staged for commit"
 msgstr "Parti pronte per il commit"
 
-#: git-gui.sh:1327 git-gui.sh:1332
+#: git-gui.sh:1530 git-gui.sh:1535
 msgid "Staged for commit, missing"
 msgstr "Pronto per il commit, mancante"
 
-#: git-gui.sh:1329
+#: git-gui.sh:1532
 msgid "Untracked, not staged"
 msgstr "Non tracciato, non pronto per il commit"
 
-#: git-gui.sh:1334
+#: git-gui.sh:1537
 msgid "Missing"
 msgstr "Mancante"
 
-#: git-gui.sh:1335
+#: git-gui.sh:1538
 msgid "Staged for removal"
 msgstr "Pronto per la rimozione"
 
-#: git-gui.sh:1336
+#: git-gui.sh:1539
 msgid "Staged for removal, still present"
 msgstr "Pronto alla rimozione, ancora presente"
 
-#: git-gui.sh:1338 git-gui.sh:1339 git-gui.sh:1340 git-gui.sh:1341
+#: git-gui.sh:1541 git-gui.sh:1542 git-gui.sh:1543 git-gui.sh:1544
 msgid "Requires merge resolution"
 msgstr "Richiede risoluzione dei conflitti"
 
-#: git-gui.sh:1383
+#: git-gui.sh:1579
 msgid "Starting gitk... please wait..."
 msgstr "Avvio di gitk... attendere..."
 
-#: git-gui.sh:1392
+#: git-gui.sh:1588
 #, tcl-format
 msgid ""
 "Unable to start gitk:\n"
@@ -127,293 +146,332 @@ msgstr ""
 "\n"
 "%s non esiste"
 
-#: git-gui.sh:1609
-#, tcl-format
-msgid "Invalid font specified in gui.%s:"
-msgstr "Caratteri non validi specificati nella gui.%s:"
-
-#: git-gui.sh:1634
-msgid "Main Font"
-msgstr "Caratteri principali"
-
-#: git-gui.sh:1635
-msgid "Diff/Console Font"
-msgstr "Caratteri per confronti e terminale"
-
-#: git-gui.sh:1649
+#: git-gui.sh:1788 lib/choose_repository.tcl:32
 msgid "Repository"
 msgstr "Archivio"
 
-#: git-gui.sh:1650
+#: git-gui.sh:1789
 msgid "Edit"
 msgstr "Modifica"
 
-#: git-gui.sh:1652
+#: git-gui.sh:1791 lib/choose_rev.tcl:560
 msgid "Branch"
 msgstr "Ramo"
 
-#: git-gui.sh:1655 git-gui.sh:1842 git-gui.sh:2152
-msgid "Commit"
+#: git-gui.sh:1794 lib/choose_rev.tcl:547
+#, fuzzy
+msgid "Commit@@noun"
 msgstr "Commit"
 
-#: git-gui.sh:1658 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168
+#: git-gui.sh:1797 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168
 msgid "Merge"
 msgstr "Fusione (Merge)"
 
-#: git-gui.sh:1659
-msgid "Fetch"
-msgstr "Preleva (Fetch)"
+#: git-gui.sh:1798 lib/choose_rev.tcl:556
+#, fuzzy
+msgid "Remote"
+msgstr "Remoto:"
 
-#: git-gui.sh:1660 git-gui.sh:2158 lib/transport.tcl:88 lib/transport.tcl:172
-msgid "Push"
-msgstr "Propaga (Push)"
-
-#: git-gui.sh:1669
+#: git-gui.sh:1807
 msgid "Browse Current Branch's Files"
 msgstr "Esplora i file del ramo corrente"
 
-#: git-gui.sh:1673
+#: git-gui.sh:1811
 msgid "Browse Branch Files..."
 msgstr "Esplora i file del ramo..."
 
-#: git-gui.sh:1678
+#: git-gui.sh:1816
 msgid "Visualize Current Branch's History"
 msgstr "Visualizza la cronologia del ramo corrente"
 
-#: git-gui.sh:1682
+#: git-gui.sh:1820
 msgid "Visualize All Branch History"
 msgstr "Visualizza la cronologia di tutti i rami"
 
-#: git-gui.sh:1689
+#: git-gui.sh:1827
 #, tcl-format
 msgid "Browse %s's Files"
 msgstr "Esplora i file di %s"
 
-#: git-gui.sh:1691
+#: git-gui.sh:1829
 #, tcl-format
 msgid "Visualize %s's History"
 msgstr "Visualizza la cronologia di %s"
 
-#: git-gui.sh:1696 lib/database.tcl:27 lib/database.tcl:67
+#: git-gui.sh:1834 lib/database.tcl:27 lib/database.tcl:67
 msgid "Database Statistics"
 msgstr "Statistiche del database"
 
-#: git-gui.sh:1699 lib/database.tcl:34
+#: git-gui.sh:1837 lib/database.tcl:34
 msgid "Compress Database"
 msgstr "Comprimi il database"
 
-#: git-gui.sh:1702
+#: git-gui.sh:1840
 msgid "Verify Database"
 msgstr "Verifica il database"
 
-#: git-gui.sh:1709 git-gui.sh:1713 git-gui.sh:1717 lib/shortcut.tcl:9
+#: git-gui.sh:1847 git-gui.sh:1851 git-gui.sh:1855 lib/shortcut.tcl:9
 #: lib/shortcut.tcl:45 lib/shortcut.tcl:84
 msgid "Create Desktop Icon"
 msgstr "Crea icona desktop"
 
-#: git-gui.sh:1722
+#: git-gui.sh:1860 lib/choose_repository.tcl:36 lib/choose_repository.tcl:95
 msgid "Quit"
 msgstr "Esci"
 
-#: git-gui.sh:1729
+#: git-gui.sh:1867
 msgid "Undo"
 msgstr "Annulla"
 
-#: git-gui.sh:1732
+#: git-gui.sh:1870
 msgid "Redo"
 msgstr "Ripeti"
 
-#: git-gui.sh:1736 git-gui.sh:2222
+#: git-gui.sh:1874 git-gui.sh:2366
 msgid "Cut"
 msgstr "Taglia"
 
-#: git-gui.sh:1739 git-gui.sh:2225 git-gui.sh:2296 git-gui.sh:2368
-#: lib/console.tcl:69
+#: git-gui.sh:1877 git-gui.sh:2369 git-gui.sh:2440 git-gui.sh:2512
+#: lib/console.tcl:67
 msgid "Copy"
 msgstr "Copia"
 
-#: git-gui.sh:1742 git-gui.sh:2228
+#: git-gui.sh:1880 git-gui.sh:2372
 msgid "Paste"
 msgstr "Incolla"
 
-#: git-gui.sh:1745 git-gui.sh:2231 lib/branch_delete.tcl:26
+#: git-gui.sh:1883 git-gui.sh:2375 lib/branch_delete.tcl:26
 #: lib/remote_branch_delete.tcl:38
 msgid "Delete"
 msgstr "Elimina"
 
-#: git-gui.sh:1749 git-gui.sh:2235 git-gui.sh:2372 lib/console.tcl:71
+#: git-gui.sh:1887 git-gui.sh:2379 git-gui.sh:2516 lib/console.tcl:69
 msgid "Select All"
 msgstr "Seleziona tutto"
 
-#: git-gui.sh:1758
+#: git-gui.sh:1896
 msgid "Create..."
 msgstr "Crea..."
 
-#: git-gui.sh:1764
+#: git-gui.sh:1902
 msgid "Checkout..."
 msgstr "Checkout..."
 
-#: git-gui.sh:1770
+#: git-gui.sh:1908
 msgid "Rename..."
 msgstr "Rinomina"
 
-#: git-gui.sh:1775 git-gui.sh:1873
+#: git-gui.sh:1913 git-gui.sh:2012
 msgid "Delete..."
 msgstr "Elimina..."
 
-#: git-gui.sh:1780
+#: git-gui.sh:1918
 msgid "Reset..."
 msgstr "Ripristina..."
 
-#: git-gui.sh:1792 git-gui.sh:2169
+#: git-gui.sh:1930 git-gui.sh:2313
 msgid "New Commit"
 msgstr "Nuovo commit"
 
-#: git-gui.sh:1800 git-gui.sh:2176
+#: git-gui.sh:1938 git-gui.sh:2320
 msgid "Amend Last Commit"
 msgstr "Correggi l'ultimo commit"
 
-#: git-gui.sh:1809 git-gui.sh:2136 lib/remote_branch_delete.tcl:99
+#: git-gui.sh:1947 git-gui.sh:2280 lib/remote_branch_delete.tcl:99
 msgid "Rescan"
 msgstr "Analizza nuovamente"
 
-#: git-gui.sh:1815
+#: git-gui.sh:1953
 msgid "Stage To Commit"
 msgstr "Prepara per il commit"
 
-#: git-gui.sh:1820
+#: git-gui.sh:1958
 msgid "Stage Changed Files To Commit"
 msgstr "Prepara per il commit i file modificati"
 
-#: git-gui.sh:1826
+#: git-gui.sh:1964
 msgid "Unstage From Commit"
 msgstr "Non pronto per il commit"
 
-#: git-gui.sh:1831 lib/index.tcl:376
+#: git-gui.sh:1969 lib/index.tcl:352
 msgid "Revert Changes"
 msgstr "Annulla modifiche"
 
-#: git-gui.sh:1838 git-gui.sh:2148 git-gui.sh:2246
+#: git-gui.sh:1976 git-gui.sh:2292 git-gui.sh:2390
 msgid "Sign Off"
 msgstr "Sign Off"
 
-#: git-gui.sh:1853
+#: git-gui.sh:1980 git-gui.sh:2296
+#, fuzzy
+msgid "Commit@@verb"
+msgstr "Commit"
+
+#: git-gui.sh:1991
 msgid "Local Merge..."
 msgstr "Fusione locale"
 
-#: git-gui.sh:1858
+#: git-gui.sh:1996
 msgid "Abort Merge..."
 msgstr "Interrompi fusione"
 
-#: git-gui.sh:1870
+#: git-gui.sh:2008
 msgid "Push..."
 msgstr "Propaga..."
 
-#: git-gui.sh:1880
+#: git-gui.sh:2019 lib/choose_repository.tcl:41
 msgid "Apple"
 msgstr "Apple"
 
-#: git-gui.sh:1883 git-gui.sh:1901 lib/option.tcl:65
+#: git-gui.sh:2022 git-gui.sh:2044 lib/about.tcl:13
+#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:50
 #, tcl-format
 msgid "About %s"
 msgstr "Informazioni su %s"
 
-#: git-gui.sh:1885 git-gui.sh:1891 git-gui.sh:2414
+#: git-gui.sh:2026
+msgid "Preferences..."
+msgstr ""
+
+#: git-gui.sh:2034 git-gui.sh:2558
 msgid "Options..."
 msgstr "Opzioni..."
 
-#: git-gui.sh:1897
+#: git-gui.sh:2040 lib/choose_repository.tcl:47
 msgid "Help"
 msgstr "Aiuto"
 
-#: git-gui.sh:1938
+#: git-gui.sh:2081
 msgid "Online Documentation"
 msgstr "Documentazione sul web"
 
-#: git-gui.sh:2054
+#: git-gui.sh:2165
+#, tcl-format
+msgid "fatal: cannot stat path %s: No such file or directory"
+msgstr ""
+
+#: git-gui.sh:2198
 msgid "Current Branch:"
 msgstr "Ramo attuale:"
 
-#: git-gui.sh:2075
-msgid "Staged Changes (Will Be Committed)"
+#: git-gui.sh:2219
+#, fuzzy
+msgid "Staged Changes (Will Commit)"
 msgstr "Modifiche preparate (ne verrà effettuato il commit)"
 
-#: git-gui.sh:2095
-msgid "Unstaged Changes (Will Not Be Committed)"
-msgstr "Modifiche non preparate (non ne verrà effettuato il commit)"
+#: git-gui.sh:2239
+#, fuzzy
+msgid "Unstaged Changes"
+msgstr "Prepara modificati"
 
-#: git-gui.sh:2142
+#: git-gui.sh:2286
 msgid "Stage Changed"
 msgstr "Prepara modificati"
 
-#: git-gui.sh:2188
+#: git-gui.sh:2302 lib/transport.tcl:93 lib/transport.tcl:182
+msgid "Push"
+msgstr "Propaga (Push)"
+
+#: git-gui.sh:2332
 msgid "Initial Commit Message:"
 msgstr "Messaggio di commit iniziale:"
 
-#: git-gui.sh:2189
+#: git-gui.sh:2333
 msgid "Amended Commit Message:"
 msgstr "Messaggio di commit corretto:"
 
-#: git-gui.sh:2190
+#: git-gui.sh:2334
 msgid "Amended Initial Commit Message:"
 msgstr "Messaggio iniziale di commit corretto:"
 
-#: git-gui.sh:2191
+#: git-gui.sh:2335
 msgid "Amended Merge Commit Message:"
 msgstr "Messaggio di fusione corretto:"
 
-#: git-gui.sh:2192
+#: git-gui.sh:2336
 msgid "Merge Commit Message:"
 msgstr "Messaggio di fusione:"
 
-#: git-gui.sh:2193
+#: git-gui.sh:2337
 msgid "Commit Message:"
 msgstr "Messaggio di commit:"
 
-#: git-gui.sh:2238 git-gui.sh:2376 lib/console.tcl:73
+#: git-gui.sh:2382 git-gui.sh:2520 lib/console.tcl:71
 msgid "Copy All"
 msgstr "Copia tutto"
 
-#: git-gui.sh:2262 lib/blame.tcl:104
+#: git-gui.sh:2406 lib/blame.tcl:104
 msgid "File:"
 msgstr "File:"
 
-#: git-gui.sh:2364
+#: git-gui.sh:2508
 msgid "Refresh"
 msgstr "Rinfresca"
 
-#: git-gui.sh:2385
+#: git-gui.sh:2529
 msgid "Apply/Reverse Hunk"
 msgstr "Applica/Inverti sezione"
 
-#: git-gui.sh:2391
+#: git-gui.sh:2535
 msgid "Decrease Font Size"
 msgstr "Diminuisci dimensione caratteri"
 
-#: git-gui.sh:2395
+#: git-gui.sh:2539
 msgid "Increase Font Size"
 msgstr "Aumenta dimensione caratteri"
 
-#: git-gui.sh:2400
+#: git-gui.sh:2544
 msgid "Show Less Context"
 msgstr "Mostra meno contesto"
 
-#: git-gui.sh:2407
+#: git-gui.sh:2551
 msgid "Show More Context"
 msgstr "Mostra più contesto"
 
-#: git-gui.sh:2422
+#: git-gui.sh:2565
 msgid "Unstage Hunk From Commit"
 msgstr "Sezione non pronta per il commit"
 
-#: git-gui.sh:2426 git-gui.sh:2430
+#: git-gui.sh:2567
 msgid "Stage Hunk For Commit"
 msgstr "Prepara sezione per il commit"
 
-#: git-gui.sh:2440
+#: git-gui.sh:2586
 msgid "Initializing..."
 msgstr "Inizializzazione..."
 
+#: git-gui.sh:2677
+#, 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:2707
+msgid ""
+"\n"
+"This is due to a known issue with the\n"
+"Tcl binary distributed by Cygwin."
+msgstr ""
+
+#: git-gui.sh:2712
+#, 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:25
+msgid "git-gui - a graphical user interface for Git."
+msgstr "git-gui - un'interfaccia grafica per Git."
+
 #: lib/blame.tcl:77
 msgid "File Viewer"
 msgstr "Mostra file"
@@ -431,6 +489,53 @@ msgstr "Copia commit"
 msgid "Reading %s..."
 msgstr "Lettura di %s..."
 
+#: lib/blame.tcl:473
+msgid "Loading copy/move tracking annotations..."
+msgstr ""
+
+#: lib/blame.tcl:493
+msgid "lines annotated"
+msgstr ""
+
+#: lib/blame.tcl:674
+msgid "Loading original location annotations..."
+msgstr ""
+
+#: lib/blame.tcl:677
+msgid "Annotation complete."
+msgstr ""
+
+#: lib/blame.tcl:731
+#, fuzzy
+msgid "Loading annotation..."
+msgstr "Caricamento %s..."
+
+#: lib/blame.tcl:787
+msgid "Author:"
+msgstr ""
+
+#: lib/blame.tcl:791
+#, fuzzy
+msgid "Committer:"
+msgstr "Commit:"
+
+#: lib/blame.tcl:796
+msgid "Original File:"
+msgstr ""
+
+#: lib/blame.tcl:910
+msgid "Originally By:"
+msgstr ""
+
+#: lib/blame.tcl:916
+#, fuzzy
+msgid "In File:"
+msgstr "File:"
+
+#: lib/blame.tcl:921
+msgid "Copied Or Moved Here By:"
+msgstr ""
+
 #: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19
 msgid "Checkout Branch"
 msgstr "Checkout ramo"
@@ -440,18 +545,17 @@ msgid "Checkout"
 msgstr "Checkout"
 
 #: 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:281
+#: lib/checkout_op.tcl:522 lib/choose_font.tcl:43 lib/merge.tcl:172
+#: lib/option.tcl:90 lib/remote_branch_delete.tcl:42 lib/transport.tcl:97
 msgid "Cancel"
 msgstr "Annulla"
 
-#: lib/branch_checkout.tcl:32 lib/browser.tcl:288
+#: lib/branch_checkout.tcl:32 lib/browser.tcl:286
 msgid "Revision"
 msgstr "Revisione"
 
-#: 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:202
 msgid "Options"
 msgstr "Opzioni"
 
@@ -471,7 +575,7 @@ msgstr "Crea ramo"
 msgid "Create New Branch"
 msgstr "Crea nuovo ramo"
 
-#: lib/branch_create.tcl:31
+#: lib/branch_create.tcl:31 lib/choose_repository.tcl:199
 msgid "Create"
 msgstr "Crea"
 
@@ -611,20 +715,22 @@ msgstr "Avvio in corso..."
 msgid "File Browser"
 msgstr "File browser"
 
-#: lib/browser.tcl:127 lib/browser.tcl:144
+#: lib/browser.tcl:125 lib/browser.tcl:142
 #, tcl-format
 msgid "Loading %s..."
 msgstr "Caricamento %s..."
 
-#: lib/browser.tcl:188
+#: lib/browser.tcl:186
 msgid "[Up To Parent]"
 msgstr "[Directory superiore]"
 
-#: lib/browser.tcl:268 lib/browser.tcl:274
+#: lib/browser.tcl:266 lib/browser.tcl:272
 msgid "Browse Branch Files"
 msgstr "Esplora i file del ramo"
 
-#: lib/browser.tcl:279
+#: lib/browser.tcl:277 lib/choose_repository.tcl:215
+#: lib/choose_repository.tcl:305 lib/choose_repository.tcl:315
+#: lib/choose_repository.tcl:811
 msgid "Browse"
 msgstr "Sfoglia"
 
@@ -633,7 +739,12 @@ msgstr "Sfoglia"
 msgid "Fetching %s from %s"
 msgstr "Recupero %s da %s"
 
-#: lib/checkout_op.tcl:140 lib/console.tcl:81 lib/database.tcl:31
+#: lib/checkout_op.tcl:127
+#, tcl-format
+msgid "fatal: Cannot resolve %s"
+msgstr ""
+
+#: lib/checkout_op.tcl:140 lib/console.tcl:79 lib/database.tcl:31
 msgid "Close"
 msgstr "Chiudi"
 
@@ -649,7 +760,8 @@ msgid ""
 "\n"
 "It cannot fast-forward to %s.\n"
 "A merge is required."
-msgstr "Il ramo '%s' esiste già.\n"
+msgstr ""
+"Il ramo '%s' esiste già.\n"
 "\n"
 "Non può effettuare un 'fast-forward' a %s.\n"
 "E' necessaria una fusione."
@@ -685,6 +797,11 @@ msgstr ""
 "\n"
 "La nuova analisi comincerà ora.\n"
 
+#: lib/checkout_op.tcl:322
+#, fuzzy, tcl-format
+msgid "Updating working directory to '%s'..."
+msgstr "Nessuna directory di lavoro"
+
 #: lib/checkout_op.tcl:353
 #, tcl-format
 msgid "Aborted checkout of '%s' (file level merging is required)."
@@ -708,8 +825,13 @@ msgid ""
 msgstr ""
 "Non si è più su un ramo locale\n"
 "\n"
-"Se si vuole rimanere su un ramo, crearne uno ora a partire da 'Questo checkout "
-"staccato'."
+"Se si vuole rimanere su un ramo, crearne uno ora a partire da 'Questo "
+"checkout staccato'."
+
+#: lib/checkout_op.tcl:446
+#, fuzzy, tcl-format
+msgid "Checked out '%s'."
+msgstr "Checkout..."
 
 #: lib/checkout_op.tcl:478
 #, tcl-format
@@ -741,12 +863,252 @@ msgid ""
 msgstr ""
 "Preparazione ramo corrente fallita.\n"
 "\n"
-"Questa directory di lavoro è stata convertita solo parzialmente. I file "
-"sono stati aggiornati correttamente, ma l'aggiornamento di un file di Git ha "
+"Questa directory di lavoro è stata convertita solo parzialmente. I file sono "
+"stati aggiornati correttamente, ma l'aggiornamento di un file di Git ha "
 "prodotto degli errori.\n"
 "\n"
 "Questo non sarebbe dovuto succedere.  %s ora terminerà senza altre azioni."
 
+#: lib/choose_font.tcl:39
+#, fuzzy
+msgid "Select"
+msgstr "Seleziona tutto"
+
+#: lib/choose_font.tcl:53
+msgid "Font Family"
+msgstr ""
+
+#: lib/choose_font.tcl:73
+#, fuzzy
+msgid "Font Size"
+msgstr "Diminuisci dimensione caratteri"
+
+#: lib/choose_font.tcl:90
+msgid "Font Example"
+msgstr ""
+
+#: lib/choose_font.tcl:101
+msgid ""
+"This is example text.\n"
+"If you like this text, it can be your font."
+msgstr ""
+
+#: lib/choose_repository.tcl:25
+msgid "Git Gui"
+msgstr ""
+
+#: lib/choose_repository.tcl:69 lib/choose_repository.tcl:204
+#, fuzzy
+msgid "Create New Repository"
+msgstr "Da archivio"
+
+#: lib/choose_repository.tcl:74 lib/choose_repository.tcl:291
+#, fuzzy
+msgid "Clone Existing Repository"
+msgstr "Archivio di destinazione"
+
+#: lib/choose_repository.tcl:79 lib/choose_repository.tcl:800
+#, fuzzy
+msgid "Open Existing Repository"
+msgstr "Archivio di destinazione"
+
+#: lib/choose_repository.tcl:91
+msgid "Next >"
+msgstr ""
+
+#: lib/choose_repository.tcl:152
+#, fuzzy, tcl-format
+msgid "Location %s already exists."
+msgstr "Il ramo '%s' esiste già"
+
+#: lib/choose_repository.tcl:158 lib/choose_repository.tcl:165
+#: lib/choose_repository.tcl:172
+#, fuzzy, tcl-format
+msgid "Failed to create repository %s:"
+msgstr "Fallimento nel salvataggio completo delle opzioni:"
+
+#: lib/choose_repository.tcl:209 lib/choose_repository.tcl:309
+msgid "Directory:"
+msgstr ""
+
+#: lib/choose_repository.tcl:238 lib/choose_repository.tcl:363
+#: lib/choose_repository.tcl:834
+#, fuzzy
+msgid "Git Repository"
+msgstr "Archivio"
+
+#: lib/choose_repository.tcl:253 lib/choose_repository.tcl:260
+#, fuzzy, tcl-format
+msgid "Directory %s already exists."
+msgstr "Il ramo '%s' esiste già"
+
+#: lib/choose_repository.tcl:265
+#, fuzzy, tcl-format
+msgid "File %s already exists."
+msgstr "Il ramo '%s' esiste già"
+
+#: lib/choose_repository.tcl:286
+#, fuzzy
+msgid "Clone"
+msgstr "Chiudi"
+
+#: lib/choose_repository.tcl:299
+msgid "URL:"
+msgstr ""
+
+#: lib/choose_repository.tcl:319
+msgid "Clone Type:"
+msgstr ""
+
+#: lib/choose_repository.tcl:325
+msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
+msgstr ""
+
+#: lib/choose_repository.tcl:331
+msgid "Full Copy (Slower, Redundant Backup)"
+msgstr ""
+
+#: lib/choose_repository.tcl:337
+msgid "Shared (Fastest, Not Recommended, No Backup)"
+msgstr ""
+
+#: lib/choose_repository.tcl:369 lib/choose_repository.tcl:418
+#: lib/choose_repository.tcl:560 lib/choose_repository.tcl:630
+#: lib/choose_repository.tcl:840 lib/choose_repository.tcl:848
+#, fuzzy, tcl-format
+msgid "Not a Git repository: %s"
+msgstr "Nessun archivio selezionato."
+
+#: lib/choose_repository.tcl:405
+msgid "Standard only available for local repository."
+msgstr ""
+
+#: lib/choose_repository.tcl:409
+msgid "Shared only available for local repository."
+msgstr ""
+
+#: lib/choose_repository.tcl:439
+msgid "Failed to configure origin"
+msgstr ""
+
+#: lib/choose_repository.tcl:451
+msgid "Counting objects"
+msgstr ""
+
+#: lib/choose_repository.tcl:452
+msgid "buckets"
+msgstr ""
+
+#: lib/choose_repository.tcl:476
+#, tcl-format
+msgid "Unable to copy objects/info/alternates: %s"
+msgstr ""
+
+#: lib/choose_repository.tcl:512
+#, fuzzy, tcl-format
+msgid "Nothing to clone from %s."
+msgstr "Recupero nuove modifiche da %s"
+
+#: lib/choose_repository.tcl:514 lib/choose_repository.tcl:728
+#: lib/choose_repository.tcl:740
+msgid "The 'master' branch has not been initialized."
+msgstr ""
+
+#: lib/choose_repository.tcl:527
+msgid "Hardlinks are unavailable.  Falling back to copying."
+msgstr ""
+
+#: lib/choose_repository.tcl:539
+#, fuzzy, tcl-format
+msgid "Cloning from %s"
+msgstr "Recupero %s da %s"
+
+#: lib/choose_repository.tcl:570
+#, fuzzy
+msgid "Copying objects"
+msgstr "Compressione del database in corso"
+
+#: lib/choose_repository.tcl:571
+msgid "KiB"
+msgstr ""
+
+#: lib/choose_repository.tcl:595
+#, tcl-format
+msgid "Unable to copy object: %s"
+msgstr ""
+
+#: lib/choose_repository.tcl:605
+msgid "Linking objects"
+msgstr ""
+
+#: lib/choose_repository.tcl:606
+msgid "objects"
+msgstr ""
+
+#: lib/choose_repository.tcl:614
+#, tcl-format
+msgid "Unable to hardlink object: %s"
+msgstr ""
+
+#: lib/choose_repository.tcl:669
+msgid "Cannot fetch branches and objects.  See console output for details."
+msgstr ""
+
+#: lib/choose_repository.tcl:680
+msgid "Cannot fetch tags.  See console output for details."
+msgstr ""
+
+#: lib/choose_repository.tcl:704
+msgid "Cannot determine HEAD.  See console output for details."
+msgstr ""
+
+#: lib/choose_repository.tcl:713
+#, tcl-format
+msgid "Unable to cleanup %s"
+msgstr ""
+
+#: lib/choose_repository.tcl:719
+#, fuzzy
+msgid "Clone failed."
+msgstr "Interruzione fallita."
+
+#: lib/choose_repository.tcl:726
+msgid "No default branch obtained."
+msgstr ""
+
+#: lib/choose_repository.tcl:737
+#, tcl-format
+msgid "Cannot resolve %s as a commit."
+msgstr ""
+
+#: lib/choose_repository.tcl:749
+#, fuzzy
+msgid "Creating working directory"
+msgstr "Nessuna directory di lavoro"
+
+#: lib/choose_repository.tcl:750 lib/index.tcl:15 lib/index.tcl:80
+#: lib/index.tcl:149
+msgid "files"
+msgstr ""
+
+#: lib/choose_repository.tcl:779
+msgid "Initial file checkout failed."
+msgstr ""
+
+#: lib/choose_repository.tcl:795
+msgid "Open"
+msgstr ""
+
+#: lib/choose_repository.tcl:805
+#, fuzzy
+msgid "Repository:"
+msgstr "Archivio"
+
+#: lib/choose_repository.tcl:854
+#, fuzzy, tcl-format
+msgid "Failed to open repository %s:"
+msgstr "Fallimento nel salvataggio completo delle opzioni:"
+
 #: lib/choose_rev.tcl:53
 msgid "This Detached Checkout"
 msgstr "Questo checkout staccato"
@@ -763,7 +1125,7 @@ msgstr "Ramo locale"
 msgid "Tracking Branch"
 msgstr "Ramo in 'tracking'"
 
-#: lib/choose_rev.tcl:84
+#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:537
 msgid "Tag"
 msgstr "Etichetta"
 
@@ -780,6 +1142,14 @@ msgstr "Nessuna revisione selezionata."
 msgid "Revision expression is empty."
 msgstr "L'espressione di revisione è vuota."
 
+#: lib/choose_rev.tcl:530
+msgid "Updated"
+msgstr ""
+
+#: lib/choose_rev.tcl:558
+msgid "URL"
+msgstr ""
+
 #: lib/commit.tcl:9
 msgid ""
 "There is nothing to amend.\n"
@@ -844,8 +1214,8 @@ msgid ""
 msgstr ""
 "Non è possibile effettuare il commit di file non sottoposti a fusione.\n"
 "\n"
-"Il file %s presenta dei conflitti. Devi risolverli e preparare il file "
-"per il commit prima di effettuare questa azione.\n"
+"Il file %s presenta dei conflitti. Devi risolverli e preparare il file per "
+"il commit prima di effettuare questa azione.\n"
 
 #: lib/commit.tcl:162
 #, tcl-format
@@ -866,7 +1236,8 @@ msgid ""
 msgstr ""
 "Nessuna modifica per la quale effettuare il commit.\n"
 "\n"
-"Devi preparare per il commit almeno 1 file prima di effettuare questa operazione.\n"
+"Devi preparare per il commit almeno 1 file prima di effettuare questa "
+"operazione.\n"
 
 #: lib/commit.tcl:183
 msgid ""
@@ -890,6 +1261,11 @@ msgstr ""
 msgid "write-tree failed:"
 msgstr "write-tree fallito:"
 
+#: lib/commit.tcl:275
+#, tcl-format
+msgid "Commit %s appears to be corrupt"
+msgstr ""
+
 #: lib/commit.tcl:279
 msgid ""
 "No changes to commit.\n"
@@ -908,6 +1284,11 @@ msgstr ""
 msgid "No changes to commit."
 msgstr "Nessuna modifica pronta per il commit."
 
+#: lib/commit.tcl:303
+#, tcl-format
+msgid "warning: Tcl does not support encoding '%s'."
+msgstr ""
+
 #: lib/commit.tcl:317
 msgid "commit-tree failed:"
 msgstr "commit-tree fallito:"
@@ -921,15 +1302,15 @@ msgstr "update-ref fallito:"
 msgid "Created commit %s: %s"
 msgstr "Creato commit %s: %s"
 
-#: lib/console.tcl:55
+#: lib/console.tcl:57
 msgid "Working... please wait..."
 msgstr "Elaborazione in corso... attendere..."
 
-#: lib/console.tcl:184
+#: lib/console.tcl:183
 msgid "Success"
 msgstr "Successo"
 
-#: lib/console.tcl:194
+#: lib/console.tcl:196
 msgid "Error: Command Failed"
 msgstr "Errore: comando fallito"
 
@@ -969,6 +1350,22 @@ msgstr "Compressione del database in corso"
 msgid "Verifying the object database with fsck-objects"
 msgstr "Verifica dell'archivio con fsck-objects in corso"
 
+#: 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
+#, fuzzy, tcl-format
+msgid "Invalid date from Git: %s"
+msgstr "Revisione non valida: %s"
+
 #: lib/diff.tcl:42
 #, tcl-format
 msgid ""
@@ -992,19 +1389,37 @@ msgstr ""
 "Si procederà automaticamente ad una nuova analisi per trovare altri file che "
 "potrebbero avere lo stesso stato."
 
-#: lib/diff.tcl:97
+#: lib/diff.tcl:81
+#, fuzzy, tcl-format
+msgid "Loading diff of %s..."
+msgstr "Caricamento %s..."
+
+#: lib/diff.tcl:114 lib/diff.tcl:184
+#, tcl-format
+msgid "Unable to display %s"
+msgstr ""
+
+#: lib/diff.tcl:115
 msgid "Error loading file:"
 msgstr "Errore nel caricamento del file:"
 
-#: lib/diff.tcl:162
+#: lib/diff.tcl:122
+msgid "Git Repository (subproject)"
+msgstr ""
+
+#: lib/diff.tcl:134
+msgid "* Binary file (not showing content)."
+msgstr ""
+
+#: lib/diff.tcl:185
 msgid "Error loading diff:"
 msgstr "Errore nel caricamento delle differenze:"
 
-#: lib/diff.tcl:278
+#: lib/diff.tcl:302
 msgid "Failed to unstage selected hunk."
 msgstr "La sezione scelta è ancora pronta per il commit."
 
-#: lib/diff.tcl:285
+#: lib/diff.tcl:309
 msgid "Failed to stage selected hunk."
 msgstr "La sezione scelta non è ancora pronta per il commit."
 
@@ -1020,21 +1435,32 @@ msgstr "avviso"
 msgid "You must correct the above errors before committing."
 msgstr "Bisogna correggere gli errori suddetti prima di effettuare un commit."
 
-#: lib/index.tcl:364
+#: lib/index.tcl:241
+#, fuzzy, tcl-format
+msgid "Unstaging %s from commit"
+msgstr "Non pronto per il commit"
+
+#: lib/index.tcl:285
+#, fuzzy, tcl-format
+msgid "Adding %s"
+msgstr "Lettura di %s..."
+
+#: lib/index.tcl:340
 #, tcl-format
 msgid "Revert changes in file %s?"
 msgstr "Annullare le modifiche nel file %s?"
 
-#: lib/index.tcl:366
+#: lib/index.tcl:342
 #, tcl-format
 msgid "Revert changes in these %i files?"
 msgstr "Annullare le modifiche in questi %i file?"
 
-#: lib/index.tcl:372
+#: lib/index.tcl:348
 msgid "Any unstaged changes will be permanently lost by the revert."
-msgstr "Tutte le modifiche non preparate per il commit saranno perse per sempre."
+msgstr ""
+"Tutte le modifiche non preparate per il commit saranno perse per sempre."
 
-#: lib/index.tcl:375
+#: lib/index.tcl:351
 msgid "Do Nothing"
 msgstr "Non fare niente"
 
@@ -1080,9 +1506,8 @@ msgstr ""
 "Il file %s ha dei conflitti.\n"
 "\n"
 "Bisogna risolvere i conflitti, preparare il file per il commit ed infine "
-"effettuare un commit "
-"per completare la fusione corrente. Solo a questo punto potrai iniziare "
-"un'altra fusione.\n"
+"effettuare un commit per completare la fusione corrente. Solo a questo punto "
+"potrai iniziare un'altra fusione.\n"
 
 #: lib/merge.tcl:54
 #, tcl-format
@@ -1164,8 +1589,8 @@ msgid ""
 msgstr ""
 "Annullare le modifiche?\n"
 "\n"
-"L'annullamento delle modifiche causerà la perdita di *TUTTE* le "
-"modifiche non ancora presenti nei commit.\n"
+"L'annullamento delle modifiche causerà la perdita di *TUTTE* le modifiche "
+"non ancora presenti nei commit.\n"
 "\n"
 "Continuare con l'annullamento delle modifiche correnti?"
 
@@ -1181,71 +1606,100 @@ msgstr "Interruzione fallita."
 msgid "Abort completed.  Ready."
 msgstr "Interruzione completata. Pronto."
 
-#: lib/option.tcl:77
-msgid "git-gui - a graphical user interface for Git."
-msgstr "git-gui - un'interfaccia grafica per Git."
-
-#: lib/option.tcl:164
+#: lib/option.tcl:82
 msgid "Restore Defaults"
 msgstr "Ripristina predefiniti"
 
-#: lib/option.tcl:168
+#: lib/option.tcl:86
 msgid "Save"
 msgstr "Salva"
 
-#: lib/option.tcl:178
+#: lib/option.tcl:96
 #, tcl-format
 msgid "%s Repository"
 msgstr "%s archivio"
 
-#: lib/option.tcl:179
+#: lib/option.tcl:97
 msgid "Global (All Repositories)"
 msgstr "Globale (Tutti i repository)"
 
-#: lib/option.tcl:185
+#: lib/option.tcl:103
 msgid "User Name"
 msgstr "Nome utente"
 
-#: lib/option.tcl:186
+#: lib/option.tcl:104
 msgid "Email Address"
 msgstr "Indirizzo Email"
 
-#: lib/option.tcl:188
+#: lib/option.tcl:106
 msgid "Summarize Merge Commits"
 msgstr "Riepilogo nei commit di fusione"
 
-#: lib/option.tcl:189
+#: lib/option.tcl:107
 msgid "Merge Verbosity"
 msgstr "Verbosità della fusione"
 
-#: lib/option.tcl:190
+#: lib/option.tcl:108
 msgid "Show Diffstat After Merge"
 msgstr "Mostra statistiche delle differenze dopo la fusione"
 
-#: lib/option.tcl:192
+#: lib/option.tcl:110
 msgid "Trust File Modification Timestamps"
 msgstr "Fidati delle date di modifica dei file"
 
-#: lib/option.tcl:193
+#: lib/option.tcl:111
 msgid "Prune Tracking Branches During Fetch"
 msgstr "Effettua potatura dei rami in 'tracking' durante il recupero"
 
-#: lib/option.tcl:194
+#: lib/option.tcl:112
 msgid "Match Tracking Branches"
 msgstr "Appaia rami in 'tracking'"
 
-#: lib/option.tcl:195
+#: lib/option.tcl:113
 msgid "Number of Diff Context Lines"
 msgstr "Numero di linee di contesto nelle differenze"
 
-#: lib/option.tcl:196
+#: lib/option.tcl:114
 msgid "New Branch Name Template"
 msgstr "Modello per il nome di un nuovo ramo"
 
-#: lib/option.tcl:305
+#: lib/option.tcl:176
+#, fuzzy
+msgid "Change Font"
+msgstr "Caratteri principali"
+
+#: lib/option.tcl:180
+#, tcl-format
+msgid "Choose %s"
+msgstr ""
+
+#: lib/option.tcl:186
+msgid "pt."
+msgstr ""
+
+#: lib/option.tcl:200
+msgid "Preferences"
+msgstr ""
+
+#: lib/option.tcl:235
 msgid "Failed to completely save options:"
 msgstr "Fallimento nel salvataggio completo delle opzioni:"
 
+#: lib/remote.tcl:165
+#, fuzzy
+msgid "Prune from"
+msgstr "Effettua potatura da %s..."
+
+#: lib/remote.tcl:170
+#, fuzzy
+msgid "Fetch from"
+msgstr "Preleva da %s..."
+
+#: lib/remote.tcl:213
+#, fuzzy
+msgid "Push to"
+msgstr "Propaga (Push)"
+
 #: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34
 msgid "Delete Remote Branch"
 msgstr "Cancella ramo remoto"
@@ -1254,11 +1708,11 @@ msgstr "Cancella ramo remoto"
 msgid "From Repository"
 msgstr "Da archivio"
 
-#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:118
+#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:123
 msgid "Remote:"
 msgstr "Remoto:"
 
-#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:133
+#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:138
 msgid "Arbitrary URL:"
 msgstr "URL arbitrario:"
 
@@ -1282,6 +1736,14 @@ msgstr "Sempre (Non effettuare controlli durante la fusione)"
 msgid "A branch is required for 'Merged Into'."
 msgstr "Si richiede un ramo per 'Fuso in'."
 
+#: lib/remote_branch_delete.tcl:184
+#, fuzzy, tcl-format
+msgid ""
+"The following branches are not completely merged into %s:\n"
+"\n"
+" - %s"
+msgstr "I rami seguenti non sono stati fusi completamente in %s:"
+
 #: lib/remote_branch_delete.tcl:189
 #, tcl-format
 msgid ""
@@ -1319,21 +1781,6 @@ msgstr "Nessun archivio selezionato."
 msgid "Scanning %s..."
 msgstr "Analisi in corso %s..."
 
-#: lib/remote.tcl:162
-#, tcl-format
-msgid "Fetch from %s..."
-msgstr "Preleva da %s..."
-
-#: lib/remote.tcl:172
-#, tcl-format
-msgid "Prune from %s..."
-msgstr "Effettua potatura da %s..."
-
-#: lib/remote.tcl:206
-#, tcl-format
-msgid "Push to %s..."
-msgstr "Propaga verso %s..."
-
 #: lib/shortcut.tcl:26 lib/shortcut.tcl:74
 msgid "Cannot write script:"
 msgstr "Impossibile scrivere script:"
@@ -1342,52 +1789,79 @@ msgstr "Impossibile scrivere script:"
 msgid "Cannot write icon:"
 msgstr "Impossibile scrivere icona:"
 
-#: lib/status_bar.tcl:58
+#: lib/status_bar.tcl:83
 #, tcl-format
 msgid "%s ... %*i of %*i %s (%3i%%)"
 msgstr "%s ... %*i di %*i %s (%3i%%)"
 
+#: lib/transport.tcl:6
+#, fuzzy, tcl-format
+msgid "fetch %s"
+msgstr "Preleva (Fetch)"
+
 #: lib/transport.tcl:7
 #, tcl-format
 msgid "Fetching new changes from %s"
 msgstr "Recupero nuove modifiche da %s"
 
+#: lib/transport.tcl:18
+#, tcl-format
+msgid "remote prune %s"
+msgstr ""
+
 #: lib/transport.tcl:19
 #, tcl-format
 msgid "Pruning tracking branches deleted from %s"
 msgstr "Effettua potatura dei rami in 'tracking' cancellati da %s"
 
+#: lib/transport.tcl:25 lib/transport.tcl:71
+#, tcl-format
+msgid "push %s"
+msgstr ""
+
 #: lib/transport.tcl:26
 #, tcl-format
 msgid "Pushing changes to %s"
 msgstr "Propagazione modifiche a %s"
 
-#: lib/transport.tcl:68
+#: lib/transport.tcl:72
 #, tcl-format
 msgid "Pushing %s %s to %s"
 msgstr "Propagazione %s %s a %s"
 
-#: lib/transport.tcl:84
+#: lib/transport.tcl:89
 msgid "Push Branches"
 msgstr "Propaga rami"
 
-#: lib/transport.tcl:98
+#: lib/transport.tcl:103
 msgid "Source Branches"
 msgstr "Rami di origine"
 
-#: lib/transport.tcl:115
+#: lib/transport.tcl:120
 msgid "Destination Repository"
 msgstr "Archivio di destinazione"
 
-#: lib/transport.tcl:153
+#: lib/transport.tcl:158
 msgid "Transfer Options"
 msgstr "Opzioni di trasferimento"
 
-#: lib/transport.tcl:155
+#: lib/transport.tcl:160
+msgid "Force overwrite existing branch (may discard changes)"
+msgstr ""
+
+#: lib/transport.tcl:164
 msgid "Use thin pack (for slow network connections)"
 msgstr "Utilizza 'thin pack' (per connessioni lente)"
 
-#: lib/transport.tcl:159
+#: lib/transport.tcl:168
 msgid "Include tags"
 msgstr "Includi etichette"
 
+#~ msgid "Cannot find the git directory:"
+#~ msgstr "Non posso trovare la directory di git:"
+
+#~ msgid "Unstaged Changes (Will Not Be Committed)"
+#~ msgstr "Modifiche non preparate (non ne verrà effettuato il commit)"
+
+#~ msgid "Push to %s..."
+#~ msgstr "Propaga verso %s..."
diff --git a/git-gui/po/ja.po b/git-gui/po/ja.po
index cdbc981ca5..f65e460686 100644
--- a/git-gui/po/ja.po
+++ b/git-gui/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: git-gui\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-11 17:28+0200\n"
+"POT-Creation-Date: 2007-10-10 04:04-0400\n"
 "PO-Revision-Date: 2007-08-14 18:49+0900\n"
 "Last-Translator: しらいし ななこ <nanako3@bluebottle.com>\n"
 "Language-Team: Japanese\n"
@@ -16,15 +16,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: git-gui.sh:531
+#: git-gui.sh:41 git-gui.sh:634 git-gui.sh:648 git-gui.sh:661 git-gui.sh:744
+#: git-gui.sh:763
+msgid "git-gui: fatal error"
+msgstr ""
+
+#: git-gui.sh:595
+#, fuzzy, tcl-format
+msgid "Invalid font specified in %s:"
+msgstr "gui.%s に無効なフォントが指定されています:"
+
+#: git-gui.sh:620
+msgid "Main Font"
+msgstr "主フォント"
+
+#: git-gui.sh:621
+msgid "Diff/Console Font"
+msgstr "diff/コンソール・フォント"
+
+#: git-gui.sh:635
 msgid "Cannot find git in PATH."
 msgstr "PATH 中に git が見つかりません"
 
-#: git-gui.sh:550
+#: git-gui.sh:662
 msgid "Cannot parse Git version string:"
 msgstr "Git バージョン名が理解できません:"
 
-#: git-gui.sh:567
+#: git-gui.sh:680
 #, tcl-format
 msgid ""
 "Git version cannot be determined.\n"
@@ -43,79 +61,80 @@ msgstr ""
 "\n"
 "'%s' はバージョン 1.5.0 と思って良いですか？\n"
 
-#: git-gui.sh:689
-msgid "Cannot find the git directory:"
-msgstr "git ディレクトリが見つかりません:"
-
-#: git-gui.sh:697
+#: git-gui.sh:853
 msgid "Git directory not found:"
 msgstr "Git ディレクトリが見つかりません:"
 
-#: git-gui.sh:703
+#: git-gui.sh:860
+#, fuzzy
+msgid "Cannot move to top of working directory:"
+msgstr "変な .git ディレクトリは使えません"
+
+#: git-gui.sh:867
 msgid "Cannot use funny .git directory:"
 msgstr "変な .git ディレクトリは使えません"
 
-#: git-gui.sh:708
+#: git-gui.sh:872
 msgid "No working directory"
 msgstr "作業ディレクトリがありません"
 
-#: git-gui.sh:854
+#: git-gui.sh:1019
 msgid "Refreshing file status..."
 msgstr "ファイル状態を更新しています…"
 
-#: git-gui.sh:891
+#: git-gui.sh:1084
 msgid "Scanning for modified files ..."
 msgstr "変更されたファイルをスキャンしています…"
 
-#: git-gui.sh:1057 lib/browser.tcl:247
+#: git-gui.sh:1259 lib/browser.tcl:245
 msgid "Ready."
 msgstr "準備完了"
 
-#: git-gui.sh:1322
+#: git-gui.sh:1525
 msgid "Unmodified"
 msgstr "変更無し"
 
-#: git-gui.sh:1324
+#: git-gui.sh:1527
 msgid "Modified, not staged"
 msgstr "変更あり、コミット未予定"
 
-#: git-gui.sh:1325 git-gui.sh:1330
+#: git-gui.sh:1528 git-gui.sh:1533
 msgid "Staged for commit"
 msgstr "コミット予定済"
 
-#: git-gui.sh:1326 git-gui.sh:1331
+#: git-gui.sh:1529 git-gui.sh:1534
 msgid "Portions staged for commit"
 msgstr "部分的にコミット予定済"
 
-#: git-gui.sh:1327 git-gui.sh:1332
+#: git-gui.sh:1530 git-gui.sh:1535
 msgid "Staged for commit, missing"
 msgstr "コミット予定済、ファイル無し"
 
-#: git-gui.sh:1329
+#: git-gui.sh:1532
 msgid "Untracked, not staged"
 msgstr "管理外、コミット未予定"
 
-#: git-gui.sh:1334
+#: git-gui.sh:1537
 msgid "Missing"
 msgstr "ファイル無し"
 
-#: git-gui.sh:1335
+#: git-gui.sh:1538
 msgid "Staged for removal"
 msgstr "削除予定済"
 
-#: git-gui.sh:1336
+#: git-gui.sh:1539
 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:1541 git-gui.sh:1542 git-gui.sh:1543 git-gui.sh:1544
 msgid "Requires merge resolution"
 msgstr "要マージ解決"
 
-#: git-gui.sh:1383
+#: git-gui.sh:1579
 msgid "Starting gitk... please wait..."
 msgstr "gitk を起動中…お待ち下さい…"
 
-#: git-gui.sh:1392
+#: git-gui.sh:1588
 #, tcl-format
 msgid ""
 "Unable to start gitk:\n"
@@ -126,293 +145,332 @@ msgstr ""
 "\n"
 "%s がありません"
 
-#: git-gui.sh:1609
-#, tcl-format
-msgid "Invalid font specified in gui.%s:"
-msgstr "gui.%s に無効なフォントが指定されています:"
-
-#: git-gui.sh:1634
-msgid "Main Font"
-msgstr "主フォント"
-
-#: git-gui.sh:1635
-msgid "Diff/Console Font"
-msgstr "diff/コンソール・フォント"
-
-#: git-gui.sh:1649
+#: git-gui.sh:1788 lib/choose_repository.tcl:32
 msgid "Repository"
 msgstr "リポジトリ"
 
-#: git-gui.sh:1650
+#: git-gui.sh:1789
 msgid "Edit"
 msgstr "編集"
 
-#: git-gui.sh:1652
+#: git-gui.sh:1791 lib/choose_rev.tcl:560
 msgid "Branch"
 msgstr "ブランチ"
 
-#: git-gui.sh:1655 git-gui.sh:1842 git-gui.sh:2152
-msgid "Commit"
+#: git-gui.sh:1794 lib/choose_rev.tcl:547
+#, fuzzy
+msgid "Commit@@noun"
 msgstr "コミット"
 
-#: git-gui.sh:1658 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168
+#: git-gui.sh:1797 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168
 msgid "Merge"
 msgstr "マージ"
 
-#: git-gui.sh:1659
-msgid "Fetch"
-msgstr "フェッチ"
+#: git-gui.sh:1798 lib/choose_rev.tcl:556
+#, fuzzy
+msgid "Remote"
+msgstr "リモート:"
 
-#: git-gui.sh:1660 git-gui.sh:2158 lib/transport.tcl:88 lib/transport.tcl:172
-msgid "Push"
-msgstr "プッシュ"
-
-#: git-gui.sh:1669
+#: git-gui.sh:1807
 msgid "Browse Current Branch's Files"
 msgstr "現在のブランチのファイルを見る"
 
-#: git-gui.sh:1673
+#: git-gui.sh:1811
 msgid "Browse Branch Files..."
 msgstr "ブランチのファイルを見る…"
 
-#: git-gui.sh:1678
+#: git-gui.sh:1816
 msgid "Visualize Current Branch's History"
 msgstr "現在のブランチの履歴を見る"
 
-#: git-gui.sh:1682
+#: git-gui.sh:1820
 msgid "Visualize All Branch History"
 msgstr "全てのブランチの履歴を見る"
 
-#: git-gui.sh:1689
+#: git-gui.sh:1827
 #, tcl-format
 msgid "Browse %s's Files"
 msgstr "ブランチ %s のファイルを見る"
 
-#: git-gui.sh:1691
+#: git-gui.sh:1829
 #, tcl-format
 msgid "Visualize %s's History"
 msgstr "ブランチ %s の履歴を見る"
 
-#: git-gui.sh:1696 lib/database.tcl:27 lib/database.tcl:67
+#: git-gui.sh:1834 lib/database.tcl:27 lib/database.tcl:67
 msgid "Database Statistics"
 msgstr "データベース統計"
 
-#: git-gui.sh:1699 lib/database.tcl:34
+#: git-gui.sh:1837 lib/database.tcl:34
 msgid "Compress Database"
 msgstr "データベース圧縮"
 
-#: git-gui.sh:1702
+#: git-gui.sh:1840
 msgid "Verify Database"
 msgstr "データベース検証"
 
-#: git-gui.sh:1709 git-gui.sh:1713 git-gui.sh:1717 lib/shortcut.tcl:9
+#: git-gui.sh:1847 git-gui.sh:1851 git-gui.sh:1855 lib/shortcut.tcl:9
 #: lib/shortcut.tcl:45 lib/shortcut.tcl:84
 msgid "Create Desktop Icon"
 msgstr "デスクトップ・アイコンを作る"
 
-#: git-gui.sh:1722
+#: git-gui.sh:1860 lib/choose_repository.tcl:36 lib/choose_repository.tcl:95
 msgid "Quit"
 msgstr "終了"
 
-#: git-gui.sh:1729
+#: git-gui.sh:1867
 msgid "Undo"
 msgstr "元に戻す"
 
-#: git-gui.sh:1732
+#: git-gui.sh:1870
 msgid "Redo"
 msgstr "やり直し"
 
-#: git-gui.sh:1736 git-gui.sh:2222
+#: git-gui.sh:1874 git-gui.sh:2366
 msgid "Cut"
 msgstr "切り取り"
 
-#: git-gui.sh:1739 git-gui.sh:2225 git-gui.sh:2296 git-gui.sh:2368
-#: lib/console.tcl:69
+#: git-gui.sh:1877 git-gui.sh:2369 git-gui.sh:2440 git-gui.sh:2512
+#: lib/console.tcl:67
 msgid "Copy"
 msgstr "コピー"
 
-#: git-gui.sh:1742 git-gui.sh:2228
+#: git-gui.sh:1880 git-gui.sh:2372
 msgid "Paste"
 msgstr "貼り付け"
 
-#: git-gui.sh:1745 git-gui.sh:2231 lib/branch_delete.tcl:26
+#: git-gui.sh:1883 git-gui.sh:2375 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:1887 git-gui.sh:2379 git-gui.sh:2516 lib/console.tcl:69
 msgid "Select All"
 msgstr "全て選択"
 
-#: git-gui.sh:1758
+#: git-gui.sh:1896
 msgid "Create..."
 msgstr "作成…"
 
-#: git-gui.sh:1764
+#: git-gui.sh:1902
 msgid "Checkout..."
 msgstr "チェックアウト"
 
-#: git-gui.sh:1770
+#: git-gui.sh:1908
 msgid "Rename..."
 msgstr "名前変更…"
 
-#: git-gui.sh:1775 git-gui.sh:1873
+#: git-gui.sh:1913 git-gui.sh:2012
 msgid "Delete..."
 msgstr "削除…"
 
-#: git-gui.sh:1780
+#: git-gui.sh:1918
 msgid "Reset..."
 msgstr "リセット…"
 
-#: git-gui.sh:1792 git-gui.sh:2169
+#: git-gui.sh:1930 git-gui.sh:2313
 msgid "New Commit"
 msgstr "新規コミット"
 
-#: git-gui.sh:1800 git-gui.sh:2176
+#: git-gui.sh:1938 git-gui.sh:2320
 msgid "Amend Last Commit"
 msgstr "最新コミットを訂正"
 
-#: git-gui.sh:1809 git-gui.sh:2136 lib/remote_branch_delete.tcl:99
+#: git-gui.sh:1947 git-gui.sh:2280 lib/remote_branch_delete.tcl:99
 msgid "Rescan"
 msgstr "再スキャン"
 
-#: git-gui.sh:1815
+#: git-gui.sh:1953
 msgid "Stage To Commit"
 msgstr "コミット予定する"
 
-#: git-gui.sh:1820
+#: git-gui.sh:1958
 msgid "Stage Changed Files To Commit"
 msgstr "変更されたファイルをコミット予定"
 
-#: git-gui.sh:1826
+#: git-gui.sh:1964
 msgid "Unstage From Commit"
 msgstr "コミットから降ろす"
 
-#: git-gui.sh:1831 lib/index.tcl:376
+#: git-gui.sh:1969 lib/index.tcl:352
 msgid "Revert Changes"
 msgstr "変更を元に戻す"
 
-#: git-gui.sh:1838 git-gui.sh:2148 git-gui.sh:2246
+#: git-gui.sh:1976 git-gui.sh:2292 git-gui.sh:2390
 msgid "Sign Off"
 msgstr "署名"
 
-#: git-gui.sh:1853
+#: git-gui.sh:1980 git-gui.sh:2296
+#, fuzzy
+msgid "Commit@@verb"
+msgstr "コミット"
+
+#: git-gui.sh:1991
 msgid "Local Merge..."
 msgstr "ローカル・マージ…"
 
-#: git-gui.sh:1858
+#: git-gui.sh:1996
 msgid "Abort Merge..."
 msgstr "マージ中止…"
 
-#: git-gui.sh:1870
+#: git-gui.sh:2008
 msgid "Push..."
 msgstr "プッシュ…"
 
-#: git-gui.sh:1880
+#: git-gui.sh:2019 lib/choose_repository.tcl:41
 msgid "Apple"
 msgstr "りんご"
 
-#: git-gui.sh:1883 git-gui.sh:1901 lib/option.tcl:65
+#: git-gui.sh:2022 git-gui.sh:2044 lib/about.tcl:13
+#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:50
 #, tcl-format
 msgid "About %s"
 msgstr "%s について"
 
-#: git-gui.sh:1885 git-gui.sh:1891 git-gui.sh:2414
+#: git-gui.sh:2026
+msgid "Preferences..."
+msgstr ""
+
+#: git-gui.sh:2034 git-gui.sh:2558
 msgid "Options..."
 msgstr "オプション…"
 
-#: git-gui.sh:1897
+#: git-gui.sh:2040 lib/choose_repository.tcl:47
 msgid "Help"
 msgstr "ヘルプ"
 
-#: git-gui.sh:1938
+#: git-gui.sh:2081
 msgid "Online Documentation"
 msgstr "オンライン・ドキュメント"
 
-#: git-gui.sh:2054
+#: git-gui.sh:2165
+#, tcl-format
+msgid "fatal: cannot stat path %s: No such file or directory"
+msgstr ""
+
+#: git-gui.sh:2198
 msgid "Current Branch:"
 msgstr "現在のブランチ"
 
-#: git-gui.sh:2075
-msgid "Staged Changes (Will Be Committed)"
+#: git-gui.sh:2219
+#, fuzzy
+msgid "Staged Changes (Will Commit)"
 msgstr "ステージングされた（コミット予定済の）変更"
 
-#: git-gui.sh:2095
-msgid "Unstaged Changes (Will Not Be Committed)"
-msgstr "ステージングされていない（コミット未予定の）変更"
+#: git-gui.sh:2239
+#, fuzzy
+msgid "Unstaged Changes"
+msgstr "変更をコミット予定に入れる"
 
-#: git-gui.sh:2142
+#: git-gui.sh:2286
 msgid "Stage Changed"
 msgstr "変更をコミット予定に入れる"
 
-#: git-gui.sh:2188
+#: git-gui.sh:2302 lib/transport.tcl:93 lib/transport.tcl:182
+msgid "Push"
+msgstr "プッシュ"
+
+#: git-gui.sh:2332
 msgid "Initial Commit Message:"
 msgstr "最初のコミットメッセージ:"
 
-#: git-gui.sh:2189
+#: git-gui.sh:2333
 msgid "Amended Commit Message:"
 msgstr "訂正したコミットメッセージ:"
 
-#: git-gui.sh:2190
+#: git-gui.sh:2334
 msgid "Amended Initial Commit Message:"
 msgstr "訂正した最初のコミットメッセージ:"
 
-#: git-gui.sh:2191
+#: git-gui.sh:2335
 msgid "Amended Merge Commit Message:"
 msgstr "訂正したマージコミットメッセージ:"
 
-#: git-gui.sh:2192
+#: git-gui.sh:2336
 msgid "Merge Commit Message:"
 msgstr "マージコミットメッセージ:"
 
-#: git-gui.sh:2193
+#: git-gui.sh:2337
 msgid "Commit Message:"
 msgstr "コミットメッセージ:"
 
-#: git-gui.sh:2238 git-gui.sh:2376 lib/console.tcl:73
+#: git-gui.sh:2382 git-gui.sh:2520 lib/console.tcl:71
 msgid "Copy All"
 msgstr "全てコピー"
 
-#: git-gui.sh:2262 lib/blame.tcl:104
+#: git-gui.sh:2406 lib/blame.tcl:104
 msgid "File:"
 msgstr "ファイル:"
 
-#: git-gui.sh:2364
+#: git-gui.sh:2508
 msgid "Refresh"
 msgstr "再読み込み"
 
-#: git-gui.sh:2385
+#: git-gui.sh:2529
 msgid "Apply/Reverse Hunk"
 msgstr "パッチを適用/取り消す"
 
-#: git-gui.sh:2391
+#: git-gui.sh:2535
 msgid "Decrease Font Size"
 msgstr "フォントを小さく"
 
-#: git-gui.sh:2395
+#: git-gui.sh:2539
 msgid "Increase Font Size"
 msgstr "フォントを大きく"
 
-#: git-gui.sh:2400
+#: git-gui.sh:2544
 msgid "Show Less Context"
 msgstr "文脈を少なく"
 
-#: git-gui.sh:2407
+#: git-gui.sh:2551
 msgid "Show More Context"
 msgstr "文脈を多く"
 
-#: git-gui.sh:2422
+#: git-gui.sh:2565
 msgid "Unstage Hunk From Commit"
 msgstr "パッチをコミット予定から外す"
 
-#: git-gui.sh:2426 git-gui.sh:2430
+#: git-gui.sh:2567
 msgid "Stage Hunk For Commit"
 msgstr "パッチをコミット予定に加える"
 
-#: git-gui.sh:2440
+#: git-gui.sh:2586
 msgid "Initializing..."
 msgstr "初期化しています…"
 
+#: git-gui.sh:2677
+#, 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:2707
+msgid ""
+"\n"
+"This is due to a known issue with the\n"
+"Tcl binary distributed by Cygwin."
+msgstr ""
+
+#: git-gui.sh:2712
+#, 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:25
+msgid "git-gui - a graphical user interface for Git."
+msgstr "Git のグラフィカルUI git-gui"
+
 #: lib/blame.tcl:77
 msgid "File Viewer"
 msgstr "ファイルピューワ"
@@ -430,6 +488,53 @@ msgstr "コミットをコピー"
 msgid "Reading %s..."
 msgstr "%s を読んでいます…"
 
+#: lib/blame.tcl:473
+msgid "Loading copy/move tracking annotations..."
+msgstr ""
+
+#: lib/blame.tcl:493
+msgid "lines annotated"
+msgstr ""
+
+#: lib/blame.tcl:674
+msgid "Loading original location annotations..."
+msgstr ""
+
+#: lib/blame.tcl:677
+msgid "Annotation complete."
+msgstr ""
+
+#: lib/blame.tcl:731
+#, fuzzy
+msgid "Loading annotation..."
+msgstr "%s をロード中…"
+
+#: lib/blame.tcl:787
+msgid "Author:"
+msgstr ""
+
+#: lib/blame.tcl:791
+#, fuzzy
+msgid "Committer:"
+msgstr "コミット:"
+
+#: lib/blame.tcl:796
+msgid "Original File:"
+msgstr ""
+
+#: lib/blame.tcl:910
+msgid "Originally By:"
+msgstr ""
+
+#: lib/blame.tcl:916
+#, fuzzy
+msgid "In File:"
+msgstr "ファイル:"
+
+#: lib/blame.tcl:921
+msgid "Copied Or Moved Here By:"
+msgstr ""
+
 #: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19
 msgid "Checkout Branch"
 msgstr "ブランチをチェックアウト"
@@ -439,18 +544,17 @@ 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:281
+#: lib/checkout_op.tcl:522 lib/choose_font.tcl:43 lib/merge.tcl:172
+#: lib/option.tcl:90 lib/remote_branch_delete.tcl:42 lib/transport.tcl:97
 msgid "Cancel"
 msgstr "中止"
 
-#: lib/branch_checkout.tcl:32 lib/browser.tcl:288
+#: lib/branch_checkout.tcl:32 lib/browser.tcl:286
 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:202
 msgid "Options"
 msgstr "オプション"
 
@@ -470,7 +574,7 @@ msgstr "ブランチを作成"
 msgid "Create New Branch"
 msgstr "ブランチを新規作成"
 
-#: lib/branch_create.tcl:31
+#: lib/branch_create.tcl:31 lib/choose_repository.tcl:199
 msgid "Create"
 msgstr "作成"
 
@@ -610,20 +714,22 @@ msgstr "起動中…"
 msgid "File Browser"
 msgstr "ファイル・ブラウザ"
 
-#: lib/browser.tcl:127 lib/browser.tcl:144
+#: lib/browser.tcl:125 lib/browser.tcl:142
 #, tcl-format
 msgid "Loading %s..."
 msgstr "%s をロード中…"
 
-#: lib/browser.tcl:188
+#: lib/browser.tcl:186
 msgid "[Up To Parent]"
 msgstr "[上位フォルダへ]"
 
-#: lib/browser.tcl:268 lib/browser.tcl:274
+#: lib/browser.tcl:266 lib/browser.tcl:272
 msgid "Browse Branch Files"
 msgstr "現在のブランチのファイルを見る"
 
-#: lib/browser.tcl:279
+#: lib/browser.tcl:277 lib/choose_repository.tcl:215
+#: lib/choose_repository.tcl:305 lib/choose_repository.tcl:315
+#: lib/choose_repository.tcl:811
 msgid "Browse"
 msgstr "ブラウズ"
 
@@ -632,7 +738,12 @@ msgstr "ブラウズ"
 msgid "Fetching %s from %s"
 msgstr "%s から %s をフェッチしています"
 
-#: lib/checkout_op.tcl:140 lib/console.tcl:81 lib/database.tcl:31
+#: lib/checkout_op.tcl:127
+#, tcl-format
+msgid "fatal: Cannot resolve %s"
+msgstr ""
+
+#: lib/checkout_op.tcl:140 lib/console.tcl:79 lib/database.tcl:31
 msgid "Close"
 msgstr "閉じる"
 
@@ -684,6 +795,11 @@ msgstr ""
 "\n"
 "自動的に再スキャンを開始します。\n"
 
+#: lib/checkout_op.tcl:322
+#, fuzzy, tcl-format
+msgid "Updating working directory to '%s'..."
+msgstr "作業ディレクトリがありません"
+
 #: lib/checkout_op.tcl:353
 #, tcl-format
 msgid "Aborted checkout of '%s' (file level merging is required)."
@@ -710,6 +826,11 @@ msgstr ""
 "ブランチ上に滞まりたいときは、この「分離されたチェックアウト」から新規ブラン"
 "チを開始してください。"
 
+#: lib/checkout_op.tcl:446
+#, fuzzy, tcl-format
+msgid "Checked out '%s'."
+msgstr "チェックアウト"
+
 #: lib/checkout_op.tcl:478
 #, tcl-format
 msgid "Resetting '%s' to '%s' will lose the following commits:"
@@ -744,6 +865,246 @@ msgstr ""
 "ましたが、 Git の内部データを更新できませんでした。\n"
 "起こるはずのないエラーです。あきらめて %s を終了します。"
 
+#: lib/choose_font.tcl:39
+#, fuzzy
+msgid "Select"
+msgstr "全て選択"
+
+#: lib/choose_font.tcl:53
+msgid "Font Family"
+msgstr ""
+
+#: lib/choose_font.tcl:73
+#, fuzzy
+msgid "Font Size"
+msgstr "フォントを小さく"
+
+#: lib/choose_font.tcl:90
+msgid "Font Example"
+msgstr ""
+
+#: lib/choose_font.tcl:101
+msgid ""
+"This is example text.\n"
+"If you like this text, it can be your font."
+msgstr ""
+
+#: lib/choose_repository.tcl:25
+msgid "Git Gui"
+msgstr ""
+
+#: lib/choose_repository.tcl:69 lib/choose_repository.tcl:204
+#, fuzzy
+msgid "Create New Repository"
+msgstr "元のリポジトリ"
+
+#: lib/choose_repository.tcl:74 lib/choose_repository.tcl:291
+#, fuzzy
+msgid "Clone Existing Repository"
+msgstr "送り先リポジトリ"
+
+#: lib/choose_repository.tcl:79 lib/choose_repository.tcl:800
+#, fuzzy
+msgid "Open Existing Repository"
+msgstr "送り先リポジトリ"
+
+#: lib/choose_repository.tcl:91
+msgid "Next >"
+msgstr ""
+
+#: lib/choose_repository.tcl:152
+#, fuzzy, tcl-format
+msgid "Location %s already exists."
+msgstr "'%s'というブランチは既に存在します。"
+
+#: lib/choose_repository.tcl:158 lib/choose_repository.tcl:165
+#: lib/choose_repository.tcl:172
+#, fuzzy, tcl-format
+msgid "Failed to create repository %s:"
+msgstr "完全にオプションを保存できません:"
+
+#: lib/choose_repository.tcl:209 lib/choose_repository.tcl:309
+msgid "Directory:"
+msgstr ""
+
+#: lib/choose_repository.tcl:238 lib/choose_repository.tcl:363
+#: lib/choose_repository.tcl:834
+#, fuzzy
+msgid "Git Repository"
+msgstr "リポジトリ"
+
+#: lib/choose_repository.tcl:253 lib/choose_repository.tcl:260
+#, fuzzy, tcl-format
+msgid "Directory %s already exists."
+msgstr "'%s'というブランチは既に存在します。"
+
+#: lib/choose_repository.tcl:265
+#, fuzzy, tcl-format
+msgid "File %s already exists."
+msgstr "'%s'というブランチは既に存在します。"
+
+#: lib/choose_repository.tcl:286
+#, fuzzy
+msgid "Clone"
+msgstr "閉じる"
+
+#: lib/choose_repository.tcl:299
+msgid "URL:"
+msgstr ""
+
+#: lib/choose_repository.tcl:319
+msgid "Clone Type:"
+msgstr ""
+
+#: lib/choose_repository.tcl:325
+msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
+msgstr ""
+
+#: lib/choose_repository.tcl:331
+msgid "Full Copy (Slower, Redundant Backup)"
+msgstr ""
+
+#: lib/choose_repository.tcl:337
+msgid "Shared (Fastest, Not Recommended, No Backup)"
+msgstr ""
+
+#: lib/choose_repository.tcl:369 lib/choose_repository.tcl:418
+#: lib/choose_repository.tcl:560 lib/choose_repository.tcl:630
+#: lib/choose_repository.tcl:840 lib/choose_repository.tcl:848
+#, fuzzy, tcl-format
+msgid "Not a Git repository: %s"
+msgstr "リポジトリが選択されていません。"
+
+#: lib/choose_repository.tcl:405
+msgid "Standard only available for local repository."
+msgstr ""
+
+#: lib/choose_repository.tcl:409
+msgid "Shared only available for local repository."
+msgstr ""
+
+#: lib/choose_repository.tcl:439
+msgid "Failed to configure origin"
+msgstr ""
+
+#: lib/choose_repository.tcl:451
+msgid "Counting objects"
+msgstr ""
+
+#: lib/choose_repository.tcl:452
+msgid "buckets"
+msgstr ""
+
+#: lib/choose_repository.tcl:476
+#, tcl-format
+msgid "Unable to copy objects/info/alternates: %s"
+msgstr ""
+
+#: lib/choose_repository.tcl:512
+#, fuzzy, tcl-format
+msgid "Nothing to clone from %s."
+msgstr "%s から新しい変更をフェッチしています"
+
+#: lib/choose_repository.tcl:514 lib/choose_repository.tcl:728
+#: lib/choose_repository.tcl:740
+msgid "The 'master' branch has not been initialized."
+msgstr ""
+
+#: lib/choose_repository.tcl:527
+msgid "Hardlinks are unavailable.  Falling back to copying."
+msgstr ""
+
+#: lib/choose_repository.tcl:539
+#, fuzzy, tcl-format
+msgid "Cloning from %s"
+msgstr "%s から %s をフェッチしています"
+
+#: lib/choose_repository.tcl:570
+#, fuzzy
+msgid "Copying objects"
+msgstr "データベース圧縮"
+
+#: lib/choose_repository.tcl:571
+msgid "KiB"
+msgstr ""
+
+#: lib/choose_repository.tcl:595
+#, tcl-format
+msgid "Unable to copy object: %s"
+msgstr ""
+
+#: lib/choose_repository.tcl:605
+msgid "Linking objects"
+msgstr ""
+
+#: lib/choose_repository.tcl:606
+msgid "objects"
+msgstr ""
+
+#: lib/choose_repository.tcl:614
+#, tcl-format
+msgid "Unable to hardlink object: %s"
+msgstr ""
+
+#: lib/choose_repository.tcl:669
+msgid "Cannot fetch branches and objects.  See console output for details."
+msgstr ""
+
+#: lib/choose_repository.tcl:680
+msgid "Cannot fetch tags.  See console output for details."
+msgstr ""
+
+#: lib/choose_repository.tcl:704
+msgid "Cannot determine HEAD.  See console output for details."
+msgstr ""
+
+#: lib/choose_repository.tcl:713
+#, tcl-format
+msgid "Unable to cleanup %s"
+msgstr ""
+
+#: lib/choose_repository.tcl:719
+#, fuzzy
+msgid "Clone failed."
+msgstr "中断に失敗しました。"
+
+#: lib/choose_repository.tcl:726
+msgid "No default branch obtained."
+msgstr ""
+
+#: lib/choose_repository.tcl:737
+#, tcl-format
+msgid "Cannot resolve %s as a commit."
+msgstr ""
+
+#: lib/choose_repository.tcl:749
+#, fuzzy
+msgid "Creating working directory"
+msgstr "作業ディレクトリがありません"
+
+#: lib/choose_repository.tcl:750 lib/index.tcl:15 lib/index.tcl:80
+#: lib/index.tcl:149
+msgid "files"
+msgstr ""
+
+#: lib/choose_repository.tcl:779
+msgid "Initial file checkout failed."
+msgstr ""
+
+#: lib/choose_repository.tcl:795
+msgid "Open"
+msgstr ""
+
+#: lib/choose_repository.tcl:805
+#, fuzzy
+msgid "Repository:"
+msgstr "リポジトリ"
+
+#: lib/choose_repository.tcl:854
+#, fuzzy, tcl-format
+msgid "Failed to open repository %s:"
+msgstr "完全にオプションを保存できません:"
+
 #: lib/choose_rev.tcl:53
 msgid "This Detached Checkout"
 msgstr "分離されたチェックアウト"
@@ -760,7 +1121,7 @@ msgstr "ローカル・ブランチ"
 msgid "Tracking Branch"
 msgstr "トラッキング・ブランチ"
 
-#: lib/choose_rev.tcl:84
+#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:537
 msgid "Tag"
 msgstr "タグ"
 
@@ -777,6 +1138,14 @@ msgstr "リビジョンが未選択です。"
 msgid "Revision expression is empty."
 msgstr "リビジョン式が空です。"
 
+#: lib/choose_rev.tcl:530
+msgid "Updated"
+msgstr ""
+
+#: lib/choose_rev.tcl:558
+msgid "URL"
+msgstr ""
+
 #: lib/commit.tcl:9
 msgid ""
 "There is nothing to amend.\n"
@@ -886,6 +1255,11 @@ msgstr ""
 msgid "write-tree failed:"
 msgstr "write-tree が失敗しました:"
 
+#: lib/commit.tcl:275
+#, tcl-format
+msgid "Commit %s appears to be corrupt"
+msgstr ""
+
 #: lib/commit.tcl:279
 msgid ""
 "No changes to commit.\n"
@@ -904,6 +1278,11 @@ msgstr ""
 msgid "No changes to commit."
 msgstr "コミットする変更がありません。"
 
+#: lib/commit.tcl:303
+#, tcl-format
+msgid "warning: Tcl does not support encoding '%s'."
+msgstr ""
+
 #: lib/commit.tcl:317
 msgid "commit-tree failed:"
 msgstr "commit-tree が失敗しました:"
@@ -917,15 +1296,15 @@ msgstr "update-ref が失敗しました:"
 msgid "Created commit %s: %s"
 msgstr "コミット %s を作成しました: %s"
 
-#: lib/console.tcl:55
+#: lib/console.tcl:57
 msgid "Working... please wait..."
 msgstr "実行中…お待ち下さい…"
 
-#: lib/console.tcl:184
+#: lib/console.tcl:183
 msgid "Success"
 msgstr "成功"
 
-#: lib/console.tcl:194
+#: lib/console.tcl:196
 msgid "Error: Command Failed"
 msgstr "エラー: コマンドが失敗しました"
 
@@ -965,6 +1344,22 @@ msgstr "データベース圧縮"
 msgid "Verifying the object database with fsck-objects"
 msgstr "fsck-objects でオブジェクト・データベースを検証しています"
 
+#: 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
+#, fuzzy, tcl-format
+msgid "Invalid date from Git: %s"
+msgstr "無効なリビジョン: %s"
+
 #: lib/diff.tcl:42
 #, tcl-format
 msgid ""
@@ -987,19 +1382,37 @@ msgstr ""
 "\n"
 "同様な状態のファイルを探すために、自動的に再スキャンを開始します。"
 
-#: lib/diff.tcl:97
+#: lib/diff.tcl:81
+#, fuzzy, tcl-format
+msgid "Loading diff of %s..."
+msgstr "%s をロード中…"
+
+#: lib/diff.tcl:114 lib/diff.tcl:184
+#, tcl-format
+msgid "Unable to display %s"
+msgstr ""
+
+#: lib/diff.tcl:115
 msgid "Error loading file:"
 msgstr "ファイルを読む際のエラーです:"
 
-#: lib/diff.tcl:162
+#: lib/diff.tcl:122
+msgid "Git Repository (subproject)"
+msgstr ""
+
+#: lib/diff.tcl:134
+msgid "* Binary file (not showing content)."
+msgstr ""
+
+#: lib/diff.tcl:185
 msgid "Error loading diff:"
 msgstr "diff を読む際のエラーです:"
 
-#: lib/diff.tcl:278
+#: lib/diff.tcl:302
 msgid "Failed to unstage selected hunk."
 msgstr "選択されたパッチをコミット予定から外せません。"
 
-#: lib/diff.tcl:285
+#: lib/diff.tcl:309
 msgid "Failed to stage selected hunk."
 msgstr "選択されたパッチをコミット予定に加えられません。"
 
@@ -1015,21 +1428,31 @@ msgstr "警告"
 msgid "You must correct the above errors before committing."
 msgstr "コミットする前に、以上のエラーを修正して下さい"
 
-#: lib/index.tcl:364
+#: lib/index.tcl:241
+#, fuzzy, tcl-format
+msgid "Unstaging %s from commit"
+msgstr "コミットから降ろす"
+
+#: lib/index.tcl:285
+#, fuzzy, tcl-format
+msgid "Adding %s"
+msgstr "%s を読んでいます…"
+
+#: lib/index.tcl:340
 #, tcl-format
 msgid "Revert changes in file %s?"
 msgstr "ファイル %s にした変更を元に戻しますか？"
 
-#: lib/index.tcl:366
+#: lib/index.tcl:342
 #, tcl-format
 msgid "Revert changes in these %i files?"
 msgstr "これら %i 個のファイルにした変更を元に戻しますか？"
 
-#: lib/index.tcl:372
+#: lib/index.tcl:348
 msgid "Any unstaged changes will be permanently lost by the revert."
 msgstr "変更を元に戻すとコミット予定していない変更は全て失われます。"
 
-#: lib/index.tcl:375
+#: lib/index.tcl:351
 msgid "Do Nothing"
 msgstr "何もしない"
 
@@ -1170,71 +1593,100 @@ msgstr "中断に失敗しました。"
 msgid "Abort completed.  Ready."
 msgstr "中断完了。"
 
-#: lib/option.tcl:77
-msgid "git-gui - a graphical user interface for Git."
-msgstr "Git のグラフィカルUI git-gui"
-
-#: lib/option.tcl:164
+#: lib/option.tcl:82
 msgid "Restore Defaults"
 msgstr "既定値に戻す"
 
-#: lib/option.tcl:168
+#: lib/option.tcl:86
 msgid "Save"
 msgstr "保存"
 
-#: lib/option.tcl:178
+#: lib/option.tcl:96
 #, tcl-format
 msgid "%s Repository"
 msgstr "%s リポジトリ"
 
-#: lib/option.tcl:179
+#: lib/option.tcl:97
 msgid "Global (All Repositories)"
 msgstr "大域（全てのリポジトリ）"
 
-#: lib/option.tcl:185
+#: lib/option.tcl:103
 msgid "User Name"
 msgstr "ユーザ名"
 
-#: lib/option.tcl:186
+#: lib/option.tcl:104
 msgid "Email Address"
 msgstr "電子メールアドレス"
 
-#: lib/option.tcl:188
+#: lib/option.tcl:106
 msgid "Summarize Merge Commits"
 msgstr "マージコミットの要約"
 
-#: lib/option.tcl:189
+#: lib/option.tcl:107
 msgid "Merge Verbosity"
 msgstr "マージの冗長度"
 
-#: lib/option.tcl:190
+#: lib/option.tcl:108
 msgid "Show Diffstat After Merge"
 msgstr "マージ後に diffstat を表示"
 
-#: lib/option.tcl:192
+#: lib/option.tcl:110
 msgid "Trust File Modification Timestamps"
 msgstr "ファイル変更時刻を信頼する"
 
-#: lib/option.tcl:193
+#: lib/option.tcl:111
 msgid "Prune Tracking Branches During Fetch"
 msgstr "フェッチ中にトラッキングブランチを刈る"
 
-#: lib/option.tcl:194
+#: lib/option.tcl:112
 msgid "Match Tracking Branches"
 msgstr "トラッキングブランチを合わせる"
 
-#: lib/option.tcl:195
+#: lib/option.tcl:113
 msgid "Number of Diff Context Lines"
 msgstr "diff の文脈行数"
 
-#: lib/option.tcl:196
+#: lib/option.tcl:114
 msgid "New Branch Name Template"
 msgstr "新しいブランチ名のテンプレート"
 
-#: lib/option.tcl:305
+#: lib/option.tcl:176
+#, fuzzy
+msgid "Change Font"
+msgstr "主フォント"
+
+#: lib/option.tcl:180
+#, tcl-format
+msgid "Choose %s"
+msgstr ""
+
+#: lib/option.tcl:186
+msgid "pt."
+msgstr ""
+
+#: lib/option.tcl:200
+msgid "Preferences"
+msgstr ""
+
+#: lib/option.tcl:235
 msgid "Failed to completely save options:"
 msgstr "完全にオプションを保存できません:"
 
+#: lib/remote.tcl:165
+#, fuzzy
+msgid "Prune from"
+msgstr "%s から刈る…"
+
+#: lib/remote.tcl:170
+#, fuzzy
+msgid "Fetch from"
+msgstr "%s からフェッチ…"
+
+#: lib/remote.tcl:213
+#, fuzzy
+msgid "Push to"
+msgstr "プッシュ"
+
 #: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34
 msgid "Delete Remote Branch"
 msgstr "リモート・ブランチを削除"
@@ -1243,11 +1695,11 @@ msgstr "リモート・ブランチを削除"
 msgid "From Repository"
 msgstr "元のリポジトリ"
 
-#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:118
+#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:123
 msgid "Remote:"
 msgstr "リモート:"
 
-#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:133
+#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:138
 msgid "Arbitrary URL:"
 msgstr "任意の URL:"
 
@@ -1271,6 +1723,14 @@ msgstr "無条件（マージ検査をしない）"
 msgid "A branch is required for 'Merged Into'."
 msgstr "'マージ先' にはブランチが必要です。"
 
+#: lib/remote_branch_delete.tcl:184
+#, fuzzy, tcl-format
+msgid ""
+"The following branches are not completely merged into %s:\n"
+"\n"
+" - %s"
+msgstr "以下のブランチは %s に完全にマージされていません:"
+
 #: lib/remote_branch_delete.tcl:189
 #, tcl-format
 msgid ""
@@ -1308,21 +1768,6 @@ msgstr "リポジトリが選択されていません。"
 msgid "Scanning %s..."
 msgstr "%s をスキャンしています…"
 
-#: lib/remote.tcl:162
-#, tcl-format
-msgid "Fetch from %s..."
-msgstr "%s からフェッチ…"
-
-#: lib/remote.tcl:172
-#, tcl-format
-msgid "Prune from %s..."
-msgstr "%s から刈る…"
-
-#: lib/remote.tcl:206
-#, tcl-format
-msgid "Push to %s..."
-msgstr "%s へプッシュ…"
-
 #: lib/shortcut.tcl:26 lib/shortcut.tcl:74
 msgid "Cannot write script:"
 msgstr "スクリプトが書けません:"
@@ -1331,51 +1776,79 @@ msgstr "スクリプトが書けません:"
 msgid "Cannot write icon:"
 msgstr "アイコンが書けません:"
 
-#: lib/status_bar.tcl:58
+#: lib/status_bar.tcl:83
 #, tcl-format
 msgid "%s ... %*i of %*i %s (%3i%%)"
 msgstr "%1$s ... %3$*i %4$s 中の %$2*i (%5$3i%%)"
 
+#: lib/transport.tcl:6
+#, fuzzy, tcl-format
+msgid "fetch %s"
+msgstr "フェッチ"
+
 #: lib/transport.tcl:7
 #, tcl-format
 msgid "Fetching new changes from %s"
 msgstr "%s から新しい変更をフェッチしています"
 
+#: lib/transport.tcl:18
+#, tcl-format
+msgid "remote prune %s"
+msgstr ""
+
 #: lib/transport.tcl:19
 #, tcl-format
 msgid "Pruning tracking branches deleted from %s"
 msgstr "%s から削除されたトラッキング・ブランチを刈っています"
 
+#: lib/transport.tcl:25 lib/transport.tcl:71
+#, tcl-format
+msgid "push %s"
+msgstr ""
+
 #: lib/transport.tcl:26
 #, tcl-format
 msgid "Pushing changes to %s"
 msgstr "%s へ変更をプッシュしています"
 
-#: lib/transport.tcl:68
+#: lib/transport.tcl:72
 #, tcl-format
 msgid "Pushing %s %s to %s"
 msgstr "%3$s へ %1$s %2$s をプッシュしています"
 
-#: lib/transport.tcl:84
+#: lib/transport.tcl:89
 msgid "Push Branches"
 msgstr "ブランチをプッシュ"
 
-#: lib/transport.tcl:98
+#: lib/transport.tcl:103
 msgid "Source Branches"
 msgstr "元のブランチ"
 
-#: lib/transport.tcl:115
+#: lib/transport.tcl:120
 msgid "Destination Repository"
 msgstr "送り先リポジトリ"
 
-#: lib/transport.tcl:153
+#: lib/transport.tcl:158
 msgid "Transfer Options"
 msgstr "通信オプション"
 
-#: lib/transport.tcl:155
+#: lib/transport.tcl:160
+msgid "Force overwrite existing branch (may discard changes)"
+msgstr ""
+
+#: lib/transport.tcl:164
 msgid "Use thin pack (for slow network connections)"
 msgstr "Thin Pack を使う（遅いネットワーク接続）"
 
-#: lib/transport.tcl:159
+#: lib/transport.tcl:168
 msgid "Include tags"
 msgstr "タグを含める"
+
+#~ msgid "Cannot find the git directory:"
+#~ msgstr "git ディレクトリが見つかりません:"
+
+#~ msgid "Unstaged Changes (Will Not Be Committed)"
+#~ msgstr "ステージングされていない（コミット未予定の）変更"
+
+#~ msgid "Push to %s..."
+#~ msgstr "%s へプッシュ…"
diff --git a/git-gui/po/ru.po b/git-gui/po/ru.po
index 20080338c8..3beaf9d52e 100644
--- a/git-gui/po/ru.po
+++ b/git-gui/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: git-gui\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-27 19:33+0200\n"
+"POT-Creation-Date: 2007-10-10 04:04-0400\n"
 "PO-Revision-Date: 2007-07-28 18:30+0200\n"
 "Last-Translator: Irina Riesen <irina.riesen@gmail.com>\n"
 "Language-Team: Russian Translation <git@vger.kernel.org>\n"
@@ -15,16 +15,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: git-gui.sh:531
+#: git-gui.sh:41 git-gui.sh:634 git-gui.sh:648 git-gui.sh:661 git-gui.sh:744
+#: git-gui.sh:763
+msgid "git-gui: fatal error"
+msgstr ""
+
+#: git-gui.sh:595
+#, fuzzy, tcl-format
+msgid "Invalid font specified in %s:"
+msgstr "В оболочке установлен неверный шрифт.%s:"
+
+#: git-gui.sh:620
+msgid "Main Font"
+msgstr "Шрифт интерфейса"
+
+#: git-gui.sh:621
+msgid "Diff/Console Font"
+msgstr "Шрифт в консоли diff"
+
+#: git-gui.sh:635
 msgid "Cannot find git in PATH."
 msgstr "git не найден в PATH."
 
-#: git-gui.sh:550
+#: git-gui.sh:662
 msgid "Cannot parse Git version string:"
-msgstr ""
-"Невозможно распознать строку версии Git: "
+msgstr "Невозможно распознать строку версии Git: "
 
-#: git-gui.sh:567
+#: git-gui.sh:680
 #, tcl-format
 msgid ""
 "Git version cannot be determined.\n"
@@ -36,85 +53,81 @@ msgid ""
 "Assume '%s' is version 1.5.0?\n"
 msgstr ""
 
-#: git-gui.sh:689
-msgid "Cannot find the git directory:"
-msgstr "Каталог Git не найден:"
-
-#: git-gui.sh:697
+#: git-gui.sh:853
 msgid "Git directory not found:"
 msgstr "Каталог Git не найден:"
 
-#: git-gui.sh:703
+#: git-gui.sh:860
+#, fuzzy
+msgid "Cannot move to top of working directory:"
+msgstr "Каталог.git испорчен: "
+
+#: git-gui.sh:867
 msgid "Cannot use funny .git directory:"
 msgstr "Каталог.git испорчен: "
 
-#: git-gui.sh:708
+#: git-gui.sh:872
 msgid "No working directory"
 msgstr "Отсутствует рабочий каталог"
 
-#: git-gui.sh:853
+#: git-gui.sh:1019
 msgid "Refreshing file status..."
 msgstr "Обновление состояния файлов проекта..."
 
-#: git-gui.sh:886
+#: git-gui.sh:1084
 msgid "Scanning for modified files ..."
 msgstr "Поиск измененных файлов..."
 
-#: git-gui.sh:1052 lib/browser.tcl:233
+#: git-gui.sh:1259 lib/browser.tcl:245
 msgid "Ready."
 msgstr "Готово."
 
-#: git-gui.sh:1343
+#: git-gui.sh:1525
 msgid "Unmodified"
 msgstr "Не изменено"
 
-#: git-gui.sh:1345
+#: git-gui.sh:1527
 msgid "Modified, not staged"
 msgstr "Изменено, но не включено"
 
-#: git-gui.sh:1346 git-gui.sh:1351
+#: git-gui.sh:1528 git-gui.sh:1533
 msgid "Staged for commit"
 msgstr "Подготовлено для сохранения"
 
-#: git-gui.sh:1347 git-gui.sh:1352
+#: git-gui.sh:1529 git-gui.sh:1534
 msgid "Portions staged for commit"
 msgstr "Части, подготовленные для сохранения"
 
-#: git-gui.sh:1348 git-gui.sh:1353
+#: git-gui.sh:1530 git-gui.sh:1535
 #, fuzzy
 msgid "Staged for commit, missing"
-msgstr ""
-"Подготовлено для сохранения, отсутствует"
+msgstr "Подготовлено для сохранения, отсутствует"
 
-#: git-gui.sh:1350
+#: git-gui.sh:1532
 msgid "Untracked, not staged"
 msgstr "Не отслеживается, не подготовлено"
 
-#: git-gui.sh:1355
+#: git-gui.sh:1537
 msgid "Missing"
 msgstr "Отсутствует"
 
-#: git-gui.sh:1356
+#: git-gui.sh:1538
 msgid "Staged for removal"
 msgstr "Подготовлено для удаления"
 
-#: git-gui.sh:1357
+#: git-gui.sh:1539
 msgid "Staged for removal, still present"
-msgstr ""
-"Подготовлено для удаления, но еще не "
-"удалено"
+msgstr "Подготовлено для удаления, но еще не удалено"
 
-#: git-gui.sh:1359 git-gui.sh:1360 git-gui.sh:1361 git-gui.sh:1362
+#: git-gui.sh:1541 git-gui.sh:1542 git-gui.sh:1543 git-gui.sh:1544
 msgid "Requires merge resolution"
-msgstr ""
-"Требуется разрешение конфликта при "
-"объединении"
+msgstr "Требуется разрешение конфликта при объединении"
 
-#: git-gui.sh:1404
+#: git-gui.sh:1579
 msgid "Starting gitk... please wait..."
 msgstr "Запускается gitk... пожалуйста, ждите..."
 
-#: git-gui.sh:1413
+#: git-gui.sh:1588
 #, tcl-format
 msgid ""
 "Unable to start gitk:\n"
@@ -125,308 +138,338 @@ msgstr ""
 "\n"
 "%s не существует"
 
-#: git-gui.sh:1630
-#, tcl-format
-msgid "Invalid font specified in gui.%s:"
-msgstr ""
-"В оболочке установлен неверный шрифт.%s:"
-
-#: git-gui.sh:1655
-msgid "Main Font"
-msgstr "Шрифт интерфейса"
-
-#: git-gui.sh:1656
-msgid "Diff/Console Font"
-msgstr "Шрифт в консоли diff"
-
-#: git-gui.sh:1670
+#: git-gui.sh:1788 lib/choose_repository.tcl:32
 msgid "Repository"
 msgstr "Репозиторий"
 
-#: git-gui.sh:1671
+#: git-gui.sh:1789
 msgid "Edit"
 msgstr "Редактировать"
 
-#: git-gui.sh:1673
+#: git-gui.sh:1791 lib/choose_rev.tcl:560
 msgid "Branch"
 msgstr "Ветвь"
 
-#: git-gui.sh:1676 git-gui.sh:1854 git-gui.sh:2193
-msgid "Commit"
+#: git-gui.sh:1794 lib/choose_rev.tcl:547
+#, fuzzy
+msgid "Commit@@noun"
 msgstr "Сохранить"
 
-#: git-gui.sh:1679 lib/merge.tcl:96 lib/merge.tcl:157 lib/merge.tcl:173
+#: git-gui.sh:1797 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168
 msgid "Merge"
 msgstr "Объединить"
 
-#: git-gui.sh:1680
-msgid "Fetch"
-msgstr "Получить"
+#: git-gui.sh:1798 lib/choose_rev.tcl:556
+#, fuzzy
+msgid "Remote"
+msgstr "внешний:"
 
-#: git-gui.sh:1681 git-gui.sh:2199 lib/transport.tcl:88 lib/transport.tcl:172
-msgid "Push"
-msgstr "Отправить"
-
-#: git-gui.sh:1690
+#: git-gui.sh:1807
 msgid "Browse Current Branch's Files"
 msgstr "Просмотреть файлы текущей ветви"
 
-#: git-gui.sh:1692
-#, fuzzy, tcl-format
-msgid "Browse %s's Files"
-msgstr "Показать файлы ветви"
-
-#: git-gui.sh:1694
+#: git-gui.sh:1811
 #, fuzzy
 msgid "Browse Branch Files..."
 msgstr "Показать файлы ветви"
 
-#: git-gui.sh:1699
+#: git-gui.sh:1816
 msgid "Visualize Current Branch's History"
 msgstr "История текущей ветви наглядно"
 
-#: git-gui.sh:1701
+#: git-gui.sh:1820
+msgid "Visualize All Branch History"
+msgstr "История всех ветвей наглядно"
+
+#: git-gui.sh:1827
+#, fuzzy, tcl-format
+msgid "Browse %s's Files"
+msgstr "Показать файлы ветви"
+
+#: git-gui.sh:1829
 #, fuzzy, tcl-format
 msgid "Visualize %s's History"
 msgstr "История всех ветвей наглядно"
 
-#: git-gui.sh:1703
-msgid "Visualize All Branch History"
-msgstr "История всех ветвей наглядно"
-
-#: git-gui.sh:1708 lib/database.tcl:27 lib/database.tcl:67
+#: git-gui.sh:1834 lib/database.tcl:27 lib/database.tcl:67
 msgid "Database Statistics"
 msgstr "Статистика базы данных"
 
-#: git-gui.sh:1711 lib/database.tcl:34
+#: git-gui.sh:1837 lib/database.tcl:34
 msgid "Compress Database"
 msgstr "Сжать базу данных"
 
-#: git-gui.sh:1714
+#: git-gui.sh:1840
 msgid "Verify Database"
 msgstr "Проверить базу данных"
 
-#: git-gui.sh:1721 git-gui.sh:1725 git-gui.sh:1729 lib/shortcut.tcl:9
+#: git-gui.sh:1847 git-gui.sh:1851 git-gui.sh:1855 lib/shortcut.tcl:9
 #: lib/shortcut.tcl:45 lib/shortcut.tcl:84
 msgid "Create Desktop Icon"
 msgstr "Создать ярлык на рабочем столе"
 
-#: git-gui.sh:1734
+#: git-gui.sh:1860 lib/choose_repository.tcl:36 lib/choose_repository.tcl:95
 msgid "Quit"
 msgstr "Выход"
 
-#: git-gui.sh:1741
+#: git-gui.sh:1867
 msgid "Undo"
 msgstr "Отменить"
 
-#: git-gui.sh:1744
+#: git-gui.sh:1870
 msgid "Redo"
 msgstr "Повторить"
 
-#: git-gui.sh:1748 git-gui.sh:2263
+#: git-gui.sh:1874 git-gui.sh:2366
 msgid "Cut"
 msgstr "Вырезать"
 
-#: git-gui.sh:1751 git-gui.sh:2266 git-gui.sh:2337 git-gui.sh:2409
-#: lib/console.tcl:69
+#: git-gui.sh:1877 git-gui.sh:2369 git-gui.sh:2440 git-gui.sh:2512
+#: lib/console.tcl:67
 msgid "Copy"
 msgstr "Копировать"
 
-#: git-gui.sh:1754 git-gui.sh:2269
+#: git-gui.sh:1880 git-gui.sh:2372
 msgid "Paste"
 msgstr "Вставить"
 
-#: git-gui.sh:1757 git-gui.sh:2272 lib/branch_delete.tcl:26
+#: git-gui.sh:1883 git-gui.sh:2375 lib/branch_delete.tcl:26
 #: lib/remote_branch_delete.tcl:38
 msgid "Delete"
 msgstr "Удалить"
 
-#: git-gui.sh:1761 git-gui.sh:2276 git-gui.sh:2413 lib/console.tcl:71
+#: git-gui.sh:1887 git-gui.sh:2379 git-gui.sh:2516 lib/console.tcl:69
 msgid "Select All"
 msgstr "Выделить все"
 
-#: git-gui.sh:1770
+#: git-gui.sh:1896
 msgid "Create..."
 msgstr "Создать..."
 
-#: git-gui.sh:1776
+#: git-gui.sh:1902
 msgid "Checkout..."
 msgstr "Перейти..."
 
-#: git-gui.sh:1782
+#: git-gui.sh:1908
 msgid "Rename..."
 msgstr "Переименовать..."
 
-#: git-gui.sh:1787 git-gui.sh:1885
+#: git-gui.sh:1913 git-gui.sh:2012
 msgid "Delete..."
 msgstr "Удалить..."
 
-#: git-gui.sh:1792
+#: git-gui.sh:1918
 msgid "Reset..."
 msgstr "Сбросить..."
 
-#: git-gui.sh:1804 git-gui.sh:2210
+#: git-gui.sh:1930 git-gui.sh:2313
 msgid "New Commit"
 msgstr "Новое состояние"
 
-#: git-gui.sh:1812 git-gui.sh:2217
+#: git-gui.sh:1938 git-gui.sh:2320
 msgid "Amend Last Commit"
 msgstr "Исправить последнее состояние"
 
-#: git-gui.sh:1821 git-gui.sh:2177 lib/remote_branch_delete.tcl:99
+#: git-gui.sh:1947 git-gui.sh:2280 lib/remote_branch_delete.tcl:99
 msgid "Rescan"
 msgstr "Перечитать"
 
-#: git-gui.sh:1827
-msgid "Add To Commit"
-msgstr "Подготовить к сохранению"
+#: git-gui.sh:1953
+#, fuzzy
+msgid "Stage To Commit"
+msgstr "Подготовлено для сохранения"
 
-#: git-gui.sh:1832
-msgid "Add Existing To Commit"
-msgstr ""
-"Подготовить имеющиеся файлы к сохранению"
+#: git-gui.sh:1958
+#, fuzzy
+msgid "Stage Changed Files To Commit"
+msgstr "Подготовлено (будет сохранено)"
 
-#: git-gui.sh:1838
+#: git-gui.sh:1964
 msgid "Unstage From Commit"
 msgstr "Убрать из подготовленного"
 
-#: git-gui.sh:1843 lib/index.tcl:376
+#: git-gui.sh:1969 lib/index.tcl:352
 msgid "Revert Changes"
 msgstr "Отменить изменения"
 
-#: git-gui.sh:1850 git-gui.sh:2189 git-gui.sh:2287
+#: git-gui.sh:1976 git-gui.sh:2292 git-gui.sh:2390
 msgid "Sign Off"
 msgstr "Подписать"
 
-#: git-gui.sh:1865
+#: git-gui.sh:1980 git-gui.sh:2296
+#, fuzzy
+msgid "Commit@@verb"
+msgstr "Сохранить"
+
+#: git-gui.sh:1991
 msgid "Local Merge..."
 msgstr "Локальное объединение..."
 
-#: git-gui.sh:1870
+#: git-gui.sh:1996
 msgid "Abort Merge..."
 msgstr "Прервать объединение..."
 
-#: git-gui.sh:1882
+#: git-gui.sh:2008
 msgid "Push..."
 msgstr "Отправить..."
 
-#: git-gui.sh:1892
+#: git-gui.sh:2019 lib/choose_repository.tcl:41
 msgid "Apple"
 msgstr ""
 
-#: git-gui.sh:1895 git-gui.sh:1942 lib/option.tcl:65
+#: git-gui.sh:2022 git-gui.sh:2044 lib/about.tcl:13
+#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:50
 #, tcl-format
 msgid "About %s"
 msgstr "О %s"
 
-#: git-gui.sh:1897 git-gui.sh:1903 git-gui.sh:2455
+#: git-gui.sh:2026
+msgid "Preferences..."
+msgstr ""
+
+#: git-gui.sh:2034 git-gui.sh:2558
 msgid "Options..."
 msgstr "Настройки..."
 
-#: git-gui.sh:1917
-msgid "Running miga..."
-msgstr ""
-
-#: git-gui.sh:1938
+#: git-gui.sh:2040 lib/choose_repository.tcl:47
 msgid "Help"
 msgstr "Помощь"
 
-#: git-gui.sh:1979
+#: git-gui.sh:2081
 msgid "Online Documentation"
 msgstr "Документация в интернете"
 
-#: git-gui.sh:2095
+#: git-gui.sh:2165
+#, tcl-format
+msgid "fatal: cannot stat path %s: No such file or directory"
+msgstr ""
+
+#: git-gui.sh:2198
 msgid "Current Branch:"
 msgstr "Текущая ветвь:"
 
-#: git-gui.sh:2116
-msgid "Staged Changes (Will Be Committed)"
+#: git-gui.sh:2219
+#, fuzzy
+msgid "Staged Changes (Will Commit)"
 msgstr "Подготовлено (будет сохранено)"
 
-#: git-gui.sh:2136
-msgid "Unstaged Changes (Will Not Be Committed)"
-msgstr "Изменено (не будет сохранено)"
+#: git-gui.sh:2239
+msgid "Unstaged Changes"
+msgstr ""
 
-#: git-gui.sh:2183
-msgid "Add Existing"
-msgstr "Добавить имеющиеся файлы"
+#: git-gui.sh:2286
+msgid "Stage Changed"
+msgstr ""
 
-#: git-gui.sh:2229
+#: git-gui.sh:2302 lib/transport.tcl:93 lib/transport.tcl:182
+msgid "Push"
+msgstr "Отправить"
+
+#: git-gui.sh:2332
 #, fuzzy
 msgid "Initial Commit Message:"
-msgstr ""
-"Первоначальный комментарий к состоянию:"
+msgstr "Первоначальный комментарий к состоянию:"
 
-#: git-gui.sh:2230
+#: git-gui.sh:2333
 #, fuzzy
 msgid "Amended Commit Message:"
 msgstr "Исправленный комментарий к состоянию:"
 
-#: git-gui.sh:2231
+#: git-gui.sh:2334
 #, fuzzy
 msgid "Amended Initial Commit Message:"
-msgstr ""
-"Первоначальный комментарий к "
-"исправленному состоянию:"
+msgstr "Первоначальный комментарий к исправленному состоянию:"
 
-#: git-gui.sh:2232
+#: git-gui.sh:2335
 #, fuzzy
 msgid "Amended Merge Commit Message:"
-msgstr ""
-"Комментарий к исправленному объединению:"
+msgstr "Комментарий к исправленному объединению:"
 
-#: git-gui.sh:2233
+#: git-gui.sh:2336
 msgid "Merge Commit Message:"
 msgstr "Комментарий к объединению:"
 
-#: git-gui.sh:2234
+#: git-gui.sh:2337
 msgid "Commit Message:"
 msgstr "Комментарий к состоянию:"
 
-#: git-gui.sh:2279 git-gui.sh:2417 lib/console.tcl:73
+#: git-gui.sh:2382 git-gui.sh:2520 lib/console.tcl:71
 msgid "Copy All"
 msgstr "Копировать все"
 
-#: git-gui.sh:2303 lib/blame.tcl:104
+#: git-gui.sh:2406 lib/blame.tcl:104
 msgid "File:"
 msgstr "Файл:"
 
-#: git-gui.sh:2405
+#: git-gui.sh:2508
 msgid "Refresh"
 msgstr "Обновить"
 
-#: git-gui.sh:2426
+#: git-gui.sh:2529
 msgid "Apply/Reverse Hunk"
 msgstr "Применить/Убрать изменение"
 
-#: git-gui.sh:2432
+#: git-gui.sh:2535
 msgid "Decrease Font Size"
 msgstr "Уменьшить размер шрифта"
 
-#: git-gui.sh:2436
+#: git-gui.sh:2539
 msgid "Increase Font Size"
 msgstr "Увеличить размер шрифта"
 
-#: git-gui.sh:2441
+#: git-gui.sh:2544
 msgid "Show Less Context"
 msgstr "Меньше контекста"
 
-#: git-gui.sh:2448
+#: git-gui.sh:2551
 msgid "Show More Context"
 msgstr "Больше контекста"
 
-#: git-gui.sh:2461
+#: git-gui.sh:2565
 msgid "Unstage Hunk From Commit"
 msgstr "Не сохранять часть"
 
-#: git-gui.sh:2463
+#: git-gui.sh:2567
 msgid "Stage Hunk For Commit"
 msgstr "Подготовить часть для сохранения"
 
-#: git-gui.sh:2473
+#: git-gui.sh:2586
 msgid "Initializing..."
 msgstr "Инициализация..."
 
+#: git-gui.sh:2677
+#, 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:2707
+msgid ""
+"\n"
+"This is due to a known issue with the\n"
+"Tcl binary distributed by Cygwin."
+msgstr ""
+
+#: git-gui.sh:2712
+#, 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:25
+msgid "git-gui - a graphical user interface for Git."
+msgstr "git-gui - графический пользовательский интерфейс к Git."
+
 #: lib/blame.tcl:77
 msgid "File Viewer"
 msgstr "Просмотр файла"
@@ -444,6 +487,53 @@ msgstr "Копировать сохраненное состояние"
 msgid "Reading %s..."
 msgstr "Чтение %s..."
 
+#: lib/blame.tcl:473
+msgid "Loading copy/move tracking annotations..."
+msgstr ""
+
+#: lib/blame.tcl:493
+msgid "lines annotated"
+msgstr ""
+
+#: lib/blame.tcl:674
+msgid "Loading original location annotations..."
+msgstr ""
+
+#: lib/blame.tcl:677
+msgid "Annotation complete."
+msgstr ""
+
+#: lib/blame.tcl:731
+#, fuzzy
+msgid "Loading annotation..."
+msgstr "Загрузка %s..."
+
+#: lib/blame.tcl:787
+msgid "Author:"
+msgstr ""
+
+#: lib/blame.tcl:791
+#, fuzzy
+msgid "Committer:"
+msgstr "Сохраненное состояние:"
+
+#: lib/blame.tcl:796
+msgid "Original File:"
+msgstr ""
+
+#: lib/blame.tcl:910
+msgid "Originally By:"
+msgstr ""
+
+#: lib/blame.tcl:916
+#, fuzzy
+msgid "In File:"
+msgstr "Файл:"
+
+#: lib/blame.tcl:921
+msgid "Copied Or Moved Here By:"
+msgstr ""
+
 #: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19
 msgid "Checkout Branch"
 msgstr "Перейти на ветвь"
@@ -453,18 +543,17 @@ 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:269
-#: lib/checkout_op.tcl:519 lib/merge.tcl:176 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:281
+#: lib/checkout_op.tcl:522 lib/choose_font.tcl:43 lib/merge.tcl:172
+#: lib/option.tcl:90 lib/remote_branch_delete.tcl:42 lib/transport.tcl:97
 msgid "Cancel"
 msgstr "Отменить"
 
-#: lib/branch_checkout.tcl:32 lib/browser.tcl:274
+#: lib/branch_checkout.tcl:32 lib/browser.tcl:286
 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:202
 msgid "Options"
 msgstr "Настройки"
 
@@ -484,7 +573,7 @@ msgstr "Создание ветви"
 msgid "Create New Branch"
 msgstr "Создать новую ветвь"
 
-#: lib/branch_create.tcl:31
+#: lib/branch_create.tcl:31 lib/choose_repository.tcl:199
 msgid "Create"
 msgstr "Создать"
 
@@ -516,7 +605,7 @@ msgstr "Нет"
 msgid "Fast Forward Only"
 msgstr "Только Fast Forward"
 
-#: lib/branch_create.tcl:85 lib/checkout_op.tcl:511
+#: lib/branch_create.tcl:85 lib/checkout_op.tcl:514
 msgid "Reset"
 msgstr "Сброс"
 
@@ -531,9 +620,7 @@ msgstr "Укажите ветвь слежения."
 #: lib/branch_create.tcl:140
 #, tcl-format
 msgid "Tracking branch %s is not a branch in the remote repository."
-msgstr ""
-"Ветвь слежения %s не является ветвью во "
-"внешнем репозитории."
+msgstr "Ветвь слежения %s не является ветвью во внешнем репозитории."
 
 #: lib/branch_create.tcl:153 lib/branch_rename.tcl:86
 msgid "Please supply a branch name."
@@ -558,22 +645,16 @@ msgstr "Локальные ветви"
 
 #: lib/branch_delete.tcl:52
 msgid "Delete Only If Merged Into"
-msgstr ""
-"Удалить только в случае, если было "
-"объединение с"
+msgstr "Удалить только в случае, если было объединение с"
 
 #: lib/branch_delete.tcl:54
 msgid "Always (Do not perform merge test.)"
-msgstr ""
-"Всегда (не выполнять проверку на "
-"объединение)"
+msgstr "Всегда (не выполнять проверку на объединение)"
 
 #: lib/branch_delete.tcl:103
 #, tcl-format
 msgid "The following branches are not completely merged into %s:"
-msgstr ""
-"Следующие ветви объединены с %s не "
-"полностью:"
+msgstr "Следующие ветви объединены с %s не полностью:"
 
 #: lib/branch_delete.tcl:115
 msgid ""
@@ -624,24 +705,30 @@ msgstr "Ветвь '%s' уже существует."
 msgid "Failed to rename '%s'."
 msgstr "Не удалось переименовать '%s'. "
 
-#: lib/browser.tcl:10
+#: lib/browser.tcl:17
 msgid "Starting..."
 msgstr "Запуск..."
 
-#: lib/browser.tcl:19
+#: lib/browser.tcl:26
 msgid "File Browser"
 msgstr "Просмотр списка файлов"
 
-#: lib/browser.tcl:120 lib/browser.tcl:137
+#: lib/browser.tcl:125 lib/browser.tcl:142
 #, tcl-format
 msgid "Loading %s..."
 msgstr "Загрузка %s..."
 
-#: lib/browser.tcl:254 lib/browser.tcl:260
+#: lib/browser.tcl:186
+msgid "[Up To Parent]"
+msgstr ""
+
+#: lib/browser.tcl:266 lib/browser.tcl:272
 msgid "Browse Branch Files"
 msgstr "Показать файлы ветви"
 
-#: lib/browser.tcl:265
+#: lib/browser.tcl:277 lib/choose_repository.tcl:215
+#: lib/choose_repository.tcl:305 lib/choose_repository.tcl:315
+#: lib/choose_repository.tcl:811
 msgid "Browse"
 msgstr "Показать"
 
@@ -650,7 +737,12 @@ msgstr "Показать"
 msgid "Fetching %s from %s"
 msgstr "Получение изменений из %s "
 
-#: lib/checkout_op.tcl:140 lib/console.tcl:81 lib/database.tcl:31
+#: lib/checkout_op.tcl:127
+#, tcl-format
+msgid "fatal: Cannot resolve %s"
+msgstr ""
+
+#: lib/checkout_op.tcl:140 lib/console.tcl:79 lib/database.tcl:31
 msgid "Close"
 msgstr "Закрыть"
 
@@ -659,7 +751,7 @@ msgstr "Закрыть"
 msgid "Branch '%s' does not exist."
 msgstr "Ветвь '%s' не существует "
 
-#: lib/checkout_op.tcl:205
+#: lib/checkout_op.tcl:206
 #, tcl-format
 msgid ""
 "Branch '%s' already exists.\n"
@@ -672,23 +764,22 @@ msgstr ""
 "Она не может быть прокручена(fast-forward) к %s.\n"
 "Требуется объединение."
 
-#: lib/checkout_op.tcl:219
+#: lib/checkout_op.tcl:220
 #, tcl-format
 msgid "Merge strategy '%s' not supported."
-msgstr ""
-"Операция объединения '%s' не "
-"поддерживается."
+msgstr "Операция объединения '%s' не поддерживается."
 
-#: lib/checkout_op.tcl:238
+#: lib/checkout_op.tcl:239
 #, tcl-format
 msgid "Failed to update '%s'."
 msgstr "Не удалось обновить '%s'."
 
-#: lib/checkout_op.tcl:250
-msgid "Index is already locked."
+#: lib/checkout_op.tcl:251
+#, fuzzy
+msgid "Staging area (index) is already locked."
 msgstr "Индекс заблокирован."
 
-#: lib/checkout_op.tcl:265
+#: lib/checkout_op.tcl:266
 msgid ""
 "Last scanned state does not match repository state.\n"
 "\n"
@@ -697,34 +788,33 @@ msgid ""
 "\n"
 "The rescan will be automatically started now.\n"
 msgstr ""
-"Последнее прочитанное состояние "
-"репозитория не соответствует текущему.\n"
+"Последнее прочитанное состояние репозитория не соответствует текущему.\n"
 "\n"
-"С момента последней проверки репозиторий "
-"был изменен другой программой "
-"Git.Необходимо перечитать репозиторий, "
-"прежде чем изменять текущую ветвь. \n"
+"С момента последней проверки репозиторий был изменен другой программой Git."
+"Необходимо перечитать репозиторий, прежде чем изменять текущую ветвь. \n"
 "\n"
 "Это будет сделано сейчас автоматически.\n"
 
-#: lib/checkout_op.tcl:352
-#, tcl-format
-msgid "Aborted checkout of '%s' (file level merging is required)."
-msgstr ""
-"Прерван переход на '%s' (требуется "
-"объединение на уровне файлов)"
+#: lib/checkout_op.tcl:322
+#, fuzzy, tcl-format
+msgid "Updating working directory to '%s'..."
+msgstr "Отсутствует рабочий каталог"
 
 #: lib/checkout_op.tcl:353
-msgid "File level merge required."
-msgstr ""
-"Требуется объединение на уровне файлов."
+#, tcl-format
+msgid "Aborted checkout of '%s' (file level merging is required)."
+msgstr "Прерван переход на '%s' (требуется объединение на уровне файлов)"
 
-#: lib/checkout_op.tcl:357
+#: lib/checkout_op.tcl:354
+msgid "File level merge required."
+msgstr "Требуется объединение на уровне файлов."
+
+#: lib/checkout_op.tcl:358
 #, tcl-format
 msgid "Staying on branch '%s'."
 msgstr "Ветвь '%s' остается текущей."
 
-#: lib/checkout_op.tcl:426
+#: lib/checkout_op.tcl:429
 msgid ""
 "You are no longer on a local branch.\n"
 "\n"
@@ -733,34 +823,33 @@ msgid ""
 msgstr ""
 "Вы находитесь не в локальной ветви.\n"
 "\n"
-"Если вы хотите снова вернуться к "
-"какой-нибудь ветви, создайте ее сейчас, "
-"начиная с 'Текущего отсоединенного "
-"состояния'."
+"Если вы хотите снова вернуться к какой-нибудь ветви, создайте ее сейчас, "
+"начиная с 'Текущего отсоединенного состояния'."
 
-#: lib/checkout_op.tcl:475
+#: lib/checkout_op.tcl:446
+#, fuzzy, tcl-format
+msgid "Checked out '%s'."
+msgstr "Перейти..."
+
+#: lib/checkout_op.tcl:478
 #, tcl-format
 msgid "Resetting '%s' to '%s' will lose the following commits:"
-msgstr ""
-"Сброс '%s' в '%s' приведет к потере следующих "
-"сохраненных состояний: "
+msgstr "Сброс '%s' в '%s' приведет к потере следующих сохраненных состояний: "
 
-#: lib/checkout_op.tcl:497
+#: lib/checkout_op.tcl:500
 msgid "Recovering lost commits may not be easy."
-msgstr ""
-"Восстановить потерянные сохраненные "
-"состояния будет сложно."
+msgstr "Восстановить потерянные сохраненные состояния будет сложно."
 
-#: lib/checkout_op.tcl:502
+#: lib/checkout_op.tcl:505
 #, tcl-format
 msgid "Reset '%s'?"
 msgstr "Сбросить '%s'?"
 
-#: lib/checkout_op.tcl:507 lib/merge.tcl:171
+#: lib/checkout_op.tcl:510 lib/merge.tcl:164
 msgid "Visualize"
 msgstr "Наглядно"
 
-#: lib/checkout_op.tcl:575
+#: lib/checkout_op.tcl:578
 #, tcl-format
 msgid ""
 "Failed to set current branch.\n"
@@ -772,46 +861,290 @@ msgid ""
 msgstr ""
 "Не удалось установить текущую ветвь.\n"
 "\n"
-"Ваш рабочий каталог обновлен только "
-"частично. Были обновлены все файлы кроме "
+"Ваш рабочий каталог обновлен только частично. Были обновлены все файлы кроме "
 "служебных файлов Git. \n"
 "\n"
-"Этого не должно было произойти. %s "
-"завершается."
+"Этого не должно было произойти. %s завершается."
 
-#: lib/choose_rev.tcl:35
+#: lib/choose_font.tcl:39
+#, fuzzy
+msgid "Select"
+msgstr "Выделить все"
+
+#: lib/choose_font.tcl:53
+msgid "Font Family"
+msgstr ""
+
+#: lib/choose_font.tcl:73
+#, fuzzy
+msgid "Font Size"
+msgstr "Уменьшить размер шрифта"
+
+#: lib/choose_font.tcl:90
+msgid "Font Example"
+msgstr ""
+
+#: lib/choose_font.tcl:101
+msgid ""
+"This is example text.\n"
+"If you like this text, it can be your font."
+msgstr ""
+
+#: lib/choose_repository.tcl:25
+msgid "Git Gui"
+msgstr ""
+
+#: lib/choose_repository.tcl:69 lib/choose_repository.tcl:204
+#, fuzzy
+msgid "Create New Repository"
+msgstr "Из репозитория"
+
+#: lib/choose_repository.tcl:74 lib/choose_repository.tcl:291
+#, fuzzy
+msgid "Clone Existing Repository"
+msgstr "Репозиторий назначения"
+
+#: lib/choose_repository.tcl:79 lib/choose_repository.tcl:800
+#, fuzzy
+msgid "Open Existing Repository"
+msgstr "Репозиторий назначения"
+
+#: lib/choose_repository.tcl:91
+msgid "Next >"
+msgstr ""
+
+#: lib/choose_repository.tcl:152
+#, fuzzy, tcl-format
+msgid "Location %s already exists."
+msgstr "Ветвь '%s' уже существует."
+
+#: lib/choose_repository.tcl:158 lib/choose_repository.tcl:165
+#: lib/choose_repository.tcl:172
+#, fuzzy, tcl-format
+msgid "Failed to create repository %s:"
+msgstr "Не удалось полностью сохранить настройки:"
+
+#: lib/choose_repository.tcl:209 lib/choose_repository.tcl:309
+msgid "Directory:"
+msgstr ""
+
+#: lib/choose_repository.tcl:238 lib/choose_repository.tcl:363
+#: lib/choose_repository.tcl:834
+#, fuzzy
+msgid "Git Repository"
+msgstr "Репозиторий"
+
+#: lib/choose_repository.tcl:253 lib/choose_repository.tcl:260
+#, fuzzy, tcl-format
+msgid "Directory %s already exists."
+msgstr "Ветвь '%s' уже существует."
+
+#: lib/choose_repository.tcl:265
+#, fuzzy, tcl-format
+msgid "File %s already exists."
+msgstr "Ветвь '%s' уже существует."
+
+#: lib/choose_repository.tcl:286
+#, fuzzy
+msgid "Clone"
+msgstr "Закрыть"
+
+#: lib/choose_repository.tcl:299
+msgid "URL:"
+msgstr ""
+
+#: lib/choose_repository.tcl:319
+msgid "Clone Type:"
+msgstr ""
+
+#: lib/choose_repository.tcl:325
+msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
+msgstr ""
+
+#: lib/choose_repository.tcl:331
+msgid "Full Copy (Slower, Redundant Backup)"
+msgstr ""
+
+#: lib/choose_repository.tcl:337
+msgid "Shared (Fastest, Not Recommended, No Backup)"
+msgstr ""
+
+#: lib/choose_repository.tcl:369 lib/choose_repository.tcl:418
+#: lib/choose_repository.tcl:560 lib/choose_repository.tcl:630
+#: lib/choose_repository.tcl:840 lib/choose_repository.tcl:848
+#, fuzzy, tcl-format
+msgid "Not a Git repository: %s"
+msgstr "Не указан репозиторий"
+
+#: lib/choose_repository.tcl:405
+msgid "Standard only available for local repository."
+msgstr ""
+
+#: lib/choose_repository.tcl:409
+msgid "Shared only available for local repository."
+msgstr ""
+
+#: lib/choose_repository.tcl:439
+msgid "Failed to configure origin"
+msgstr ""
+
+#: lib/choose_repository.tcl:451
+msgid "Counting objects"
+msgstr ""
+
+#: lib/choose_repository.tcl:452
+msgid "buckets"
+msgstr ""
+
+#: lib/choose_repository.tcl:476
+#, tcl-format
+msgid "Unable to copy objects/info/alternates: %s"
+msgstr ""
+
+#: lib/choose_repository.tcl:512
+#, fuzzy, tcl-format
+msgid "Nothing to clone from %s."
+msgstr "Получение изменений из %s "
+
+#: lib/choose_repository.tcl:514 lib/choose_repository.tcl:728
+#: lib/choose_repository.tcl:740
+msgid "The 'master' branch has not been initialized."
+msgstr ""
+
+#: lib/choose_repository.tcl:527
+msgid "Hardlinks are unavailable.  Falling back to copying."
+msgstr ""
+
+#: lib/choose_repository.tcl:539
+#, fuzzy, tcl-format
+msgid "Cloning from %s"
+msgstr "Получение изменений из %s "
+
+#: lib/choose_repository.tcl:570
+#, fuzzy
+msgid "Copying objects"
+msgstr "Сжатие базы объектов"
+
+#: lib/choose_repository.tcl:571
+msgid "KiB"
+msgstr ""
+
+#: lib/choose_repository.tcl:595
+#, tcl-format
+msgid "Unable to copy object: %s"
+msgstr ""
+
+#: lib/choose_repository.tcl:605
+msgid "Linking objects"
+msgstr ""
+
+#: lib/choose_repository.tcl:606
+msgid "objects"
+msgstr ""
+
+#: lib/choose_repository.tcl:614
+#, tcl-format
+msgid "Unable to hardlink object: %s"
+msgstr ""
+
+#: lib/choose_repository.tcl:669
+msgid "Cannot fetch branches and objects.  See console output for details."
+msgstr ""
+
+#: lib/choose_repository.tcl:680
+msgid "Cannot fetch tags.  See console output for details."
+msgstr ""
+
+#: lib/choose_repository.tcl:704
+msgid "Cannot determine HEAD.  See console output for details."
+msgstr ""
+
+#: lib/choose_repository.tcl:713
+#, tcl-format
+msgid "Unable to cleanup %s"
+msgstr ""
+
+#: lib/choose_repository.tcl:719
+msgid "Clone failed."
+msgstr ""
+
+#: lib/choose_repository.tcl:726
+msgid "No default branch obtained."
+msgstr ""
+
+#: lib/choose_repository.tcl:737
+#, tcl-format
+msgid "Cannot resolve %s as a commit."
+msgstr ""
+
+#: lib/choose_repository.tcl:749
+#, fuzzy
+msgid "Creating working directory"
+msgstr "Отсутствует рабочий каталог"
+
+#: lib/choose_repository.tcl:750 lib/index.tcl:15 lib/index.tcl:80
+#: lib/index.tcl:149
+msgid "files"
+msgstr ""
+
+#: lib/choose_repository.tcl:779
+msgid "Initial file checkout failed."
+msgstr ""
+
+#: lib/choose_repository.tcl:795
+msgid "Open"
+msgstr ""
+
+#: lib/choose_repository.tcl:805
+#, fuzzy
+msgid "Repository:"
+msgstr "Репозиторий"
+
+#: lib/choose_repository.tcl:854
+#, fuzzy, tcl-format
+msgid "Failed to open repository %s:"
+msgstr "Не удалось полностью сохранить настройки:"
+
+#: lib/choose_rev.tcl:53
 msgid "This Detached Checkout"
 msgstr "Текущее отсоединенное состояние"
 
-#: lib/choose_rev.tcl:42
+#: lib/choose_rev.tcl:60
 msgid "Revision Expression:"
 msgstr "Выражение для определения версии:"
 
-#: lib/choose_rev.tcl:56
+#: lib/choose_rev.tcl:74
 msgid "Local Branch"
 msgstr "Локальная ветвь:"
 
-#: lib/choose_rev.tcl:61
+#: lib/choose_rev.tcl:79
 msgid "Tracking Branch"
 msgstr "Ветвь слежения"
 
-#: lib/choose_rev.tcl:66
+#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:537
 msgid "Tag"
 msgstr "Метка"
 
-#: lib/choose_rev.tcl:227
+#: lib/choose_rev.tcl:317
 #, tcl-format
 msgid "Invalid revision: %s"
 msgstr "Неверная версия: %s"
 
-#: lib/choose_rev.tcl:248
+#: lib/choose_rev.tcl:338
 msgid "No revision selected."
 msgstr "Версия не указана."
 
-#: lib/choose_rev.tcl:256
+#: lib/choose_rev.tcl:346
 msgid "Revision expression is empty."
+msgstr "Пустое выражения для определения версии."
+
+#: lib/choose_rev.tcl:530
+msgid "Updated"
+msgstr ""
+
+#: lib/choose_rev.tcl:558
+msgid "URL"
 msgstr ""
-"Пустое выражения для определения версии."
 
 #: lib/commit.tcl:9
 msgid ""
@@ -822,8 +1155,7 @@ msgid ""
 msgstr ""
 "Отсутствует состояние для исправления.\n"
 "\n"
-"Вы можете создать начальное сохраненное "
-"состояние. Других состояний для "
+"Вы можете создать начальное сохраненное состояние. Других состояний для "
 "исправления нет.\n"
 
 #: lib/commit.tcl:18
@@ -834,25 +1166,18 @@ msgid ""
 "completed.  You cannot amend the prior commit unless you first abort the "
 "current merge activity.\n"
 msgstr ""
-"Невозможно исправить состояние во время "
-"объединения.\n"
+"Невозможно исправить состояние во время объединения.\n"
 "\n"
-"Текущее объединение не завершено. "
-"Невозможно исправить предыдущее "
-"сохраненное состояние не прерывая "
-"текущее объединение.\n"
+"Текущее объединение не завершено. Невозможно исправить предыдущее "
+"сохраненное состояние не прерывая текущее объединение.\n"
 
 #: lib/commit.tcl:49
 msgid "Error loading commit data for amend:"
-msgstr ""
-"Ошибка при загрузке данных для "
-"исправления сохраненного состояния:"
+msgstr "Ошибка при загрузке данных для исправления сохраненного состояния:"
 
 #: lib/commit.tcl:76
 msgid "Unable to obtain your identity:"
-msgstr ""
-"Невозможно получить информацию об "
-"авторстве:"
+msgstr "Невозможно получить информацию об авторстве:"
 
 #: lib/commit.tcl:81
 msgid "Invalid GIT_COMMITTER_IDENT:"
@@ -867,30 +1192,25 @@ msgid ""
 "\n"
 "The rescan will be automatically started now.\n"
 msgstr ""
-"Последнее прочитанное состояние "
-"репозитория не соответствует текущему.\n"
+"Последнее прочитанное состояние репозитория не соответствует текущему.\n"
 "\n"
-"С момента последней проверки репозиторий "
-"был изменен другой программой "
-"Git.Необходимо перечитать репозиторий, "
-"прежде чем изменять текущую ветвь. \n"
+"С момента последней проверки репозиторий был изменен другой программой Git."
+"Необходимо перечитать репозиторий, прежде чем изменять текущую ветвь. \n"
 "\n"
 "Это будет сделано сейчас автоматически.\n"
 
 #: lib/commit.tcl:154
-#, tcl-format
+#, fuzzy, tcl-format
 msgid ""
 "Unmerged files cannot be committed.\n"
 "\n"
-"File %s has merge conflicts.  You must resolve them and add the file before "
-"committing.\n"
+"File %s has merge conflicts.  You must resolve them and stage the file "
+"before committing.\n"
 msgstr ""
 "Нельзя сохранить необъединенные файлы.\n"
 "\n"
-"Для файла %s возник конфликт объединения. "
-"Разрешите конфликт и добавьте к "
-"подготовленным файлам перед "
-"сохранением.\n"
+"Для файла %s возник конфликт объединения. Разрешите конфликт и добавьте к "
+"подготовленным файлам перед сохранением.\n"
 
 #: lib/commit.tcl:162
 #, tcl-format
@@ -899,22 +1219,20 @@ msgid ""
 "\n"
 "File %s cannot be committed by this program.\n"
 msgstr ""
-"Обнаружено неизвестное состояние файла "
-"%s.\n"
+"Обнаружено неизвестное состояние файла %s.\n"
 "\n"
-"Файл %s не может быть сохранен данной "
-"программой.\n"
+"Файл %s не может быть сохранен данной программой.\n"
 
 #: lib/commit.tcl:170
+#, fuzzy
 msgid ""
 "No changes to commit.\n"
 "\n"
-"You must add at least 1 file before you can commit.\n"
+"You must stage at least 1 file before you can commit.\n"
 msgstr ""
 "Отсутствуют изменения для сохранения.\n"
 "\n"
-"Подготовьте хотя бы один файл до создания "
-"сохраненного состояния.\n"
+"Подготовьте хотя бы один файл до создания сохраненного состояния.\n"
 
 #: lib/commit.tcl:183
 msgid ""
@@ -926,22 +1244,22 @@ msgid ""
 "- Second line: Blank\n"
 "- Remaining lines: Describe why this change is good.\n"
 msgstr ""
-"Напишите комментарий к сохраненному "
-"состоянию.\n"
+"Напишите комментарий к сохраненному состоянию.\n"
 "\n"
-"Рекомендуется следующий формат "
-"комментария:\n"
+"Рекомендуется следующий формат комментария:\n"
 "\n"
-"- первая строка: краткое описание "
-"сделанных изменений.\n"
+"- первая строка: краткое описание сделанных изменений.\n"
 "- вторая строка пустая\n"
-"- оставшиеся строки: опишите, что дают "
-"ваши изменения.\n"
+"- оставшиеся строки: опишите, что дают ваши изменения.\n"
 
 #: lib/commit.tcl:257
 msgid "write-tree failed:"
+msgstr "Программа write-tree завершилась с ошибкой:"
+
+#: lib/commit.tcl:275
+#, tcl-format
+msgid "Commit %s appears to be corrupt"
 msgstr ""
-"Программа write-tree завершилась с ошибкой:"
 
 #: lib/commit.tcl:279
 msgid ""
@@ -953,40 +1271,41 @@ msgid ""
 msgstr ""
 "Отсутствуют изменения для сохранения.\n"
 "\n"
-"Ни один файл не был изменен и не было "
-"объединения.\n"
+"Ни один файл не был изменен и не было объединения.\n"
 "\n"
-"Сейчас автоматически запустится "
-"перечитывание репозитория.\n"
+"Сейчас автоматически запустится перечитывание репозитория.\n"
 
 #: lib/commit.tcl:286
 msgid "No changes to commit."
 msgstr "Отуствуют измения для сохранения."
 
+#: lib/commit.tcl:303
+#, tcl-format
+msgid "warning: Tcl does not support encoding '%s'."
+msgstr ""
+
 #: lib/commit.tcl:317
 msgid "commit-tree failed:"
-msgstr ""
-"Программа commit-tree завершилась с ошибкой:"
+msgstr "Программа commit-tree завершилась с ошибкой:"
 
 #: lib/commit.tcl:339
 msgid "update-ref failed:"
-msgstr ""
-"Программа update-ref завершилась с ошибкой:"
+msgstr "Программа update-ref завершилась с ошибкой:"
 
 #: lib/commit.tcl:430
 #, tcl-format
 msgid "Created commit %s: %s"
 msgstr "Создано состояние %s: %s "
 
-#: lib/console.tcl:55
+#: lib/console.tcl:57
 msgid "Working... please wait..."
 msgstr "В процессе... пожалуйста, ждите..."
 
-#: lib/console.tcl:184
+#: lib/console.tcl:183
 msgid "Success"
 msgstr "Процесс успешно завершен"
 
-#: lib/console.tcl:194
+#: lib/console.tcl:196
 msgid "Error: Command Failed"
 msgstr "Ошибка: не удалось выполнить команду"
 
@@ -996,9 +1315,7 @@ msgstr "Количество несвязанных объектов"
 
 #: lib/database.tcl:44
 msgid "Disk space used by loose objects"
-msgstr ""
-"Объем дискового пространства, занятый "
-"несвязанными объектами"
+msgstr "Объем дискового пространства, занятый несвязанными объектами"
 
 #: lib/database.tcl:45
 msgid "Number of packed objects"
@@ -1010,15 +1327,11 @@ msgstr "Количество pack-файлов"
 
 #: lib/database.tcl:47
 msgid "Disk space used by packed objects"
-msgstr ""
-"Объем дискового пространства, занятый "
-"упакованными объектами"
+msgstr "Объем дискового пространства, занятый упакованными объектами"
 
 #: lib/database.tcl:48
 msgid "Packed objects waiting for pruning"
-msgstr ""
-"Несвязанные объекты, которые можно "
-"удалить"
+msgstr "Несвязанные объекты, которые можно удалить"
 
 #: lib/database.tcl:49
 msgid "Garbage files"
@@ -1032,6 +1345,22 @@ msgstr "Сжатие базы объектов"
 msgid "Verifying the object database with fsck-objects"
 msgstr "Проверка базы объектов при помощи fsck"
 
+#: 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
+#, fuzzy, tcl-format
+msgid "Invalid date from Git: %s"
+msgstr "Неверная версия: %s"
+
 #: lib/diff.tcl:42
 #, tcl-format
 msgid ""
@@ -1049,30 +1378,44 @@ msgstr ""
 "\n"
 "в %s отутствуют изменения.\n"
 "\n"
-"Дата изменения файла была обновлена "
-"другой программой, но содержимое файла "
+"Дата изменения файла была обновлена другой программой, но содержимое файла "
 "осталось прежним.\n"
 "\n"
-"Сейчас будет запущено перечитывание "
-"репозитория, чтобы найти подобные файлы."
+"Сейчас будет запущено перечитывание репозитория, чтобы найти подобные файлы."
 
-#: lib/diff.tcl:97
+#: lib/diff.tcl:81
+#, fuzzy, tcl-format
+msgid "Loading diff of %s..."
+msgstr "Загрузка %s..."
+
+#: lib/diff.tcl:114 lib/diff.tcl:184
+#, tcl-format
+msgid "Unable to display %s"
+msgstr ""
+
+#: lib/diff.tcl:115
 msgid "Error loading file:"
 msgstr "Ошибка загрузки файла:"
 
-#: lib/diff.tcl:162
+#: lib/diff.tcl:122
+msgid "Git Repository (subproject)"
+msgstr ""
+
+#: lib/diff.tcl:134
+msgid "* Binary file (not showing content)."
+msgstr ""
+
+#: lib/diff.tcl:185
 msgid "Error loading diff:"
 msgstr "Ошибка загрузки diff:"
 
-#: lib/diff.tcl:278
+#: lib/diff.tcl:302
 msgid "Failed to unstage selected hunk."
 msgstr "Не удалось исключить выбранную часть"
 
-#: lib/diff.tcl:285
+#: lib/diff.tcl:309
 msgid "Failed to stage selected hunk."
-msgstr ""
-"Не удалось подготовить к сохранению "
-"выбранную часть"
+msgstr "Не удалось подготовить к сохранению выбранную часть"
 
 #: lib/error.tcl:12 lib/error.tcl:102
 msgid "error"
@@ -1084,47 +1427,53 @@ msgstr "предупреждение"
 
 #: lib/error.tcl:81
 msgid "You must correct the above errors before committing."
-msgstr ""
-"Прежде чем сохранить, исправьте "
-"вышеуказанные ошибки."
+msgstr "Прежде чем сохранить, исправьте вышеуказанные ошибки."
 
-#: lib/index.tcl:364
+#: lib/index.tcl:241
+#, fuzzy, tcl-format
+msgid "Unstaging %s from commit"
+msgstr "Убрать из подготовленного"
+
+#: lib/index.tcl:285
+#, fuzzy, tcl-format
+msgid "Adding %s"
+msgstr "Чтение %s..."
+
+#: lib/index.tcl:340
 #, fuzzy, tcl-format
 msgid "Revert changes in file %s?"
 msgstr "Отменить изменения"
 
-#: lib/index.tcl:366
+#: lib/index.tcl:342
 #, tcl-format
 msgid "Revert changes in these %i files?"
 msgstr "Отменить изменения в %i файле(-ах)?"
 
-#: lib/index.tcl:372
+#: lib/index.tcl:348
 #, fuzzy
-msgid "Any unadded changes will be permanently lost by the revert."
+msgid "Any unstaged changes will be permanently lost by the revert."
 msgstr ""
 "Отменить изменения в %s?\n"
 "\n"
-"Любые изменения, не подготовленные к "
-"сохранению, будут потеряны при данной "
+"Любые изменения, не подготовленные к сохранению, будут потеряны при данной "
 "операции."
 
-#: lib/index.tcl:375
+#: lib/index.tcl:351
 msgid "Do Nothing"
 msgstr "Ничего не делать"
 
-#: lib/merge.tcl:14
+#: 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 ""
-"Невозможно выполнить объединение во "
-"время исправления.\n"
+"Невозможно выполнить объединение во время исправления.\n"
 "\n"
-"Завершите исправление данного состояния "
-"перед выполнением операции объединения.\n"
+"Завершите исправление данного состояния перед выполнением операции "
+"объединения.\n"
 
-#: lib/merge.tcl:28
+#: lib/merge.tcl:27
 msgid ""
 "Last scanned state does not match repository state.\n"
 "\n"
@@ -1133,35 +1482,30 @@ msgid ""
 "\n"
 "The rescan will be automatically started now.\n"
 msgstr ""
-"Последнее прочитанное состояние "
-"репозитория не соответствует текущему.\n"
+"Последнее прочитанное состояние репозитория не соответствует текущему.\n"
 "\n"
-"С момента последней проверки репозиторий "
-"был изменен другой программой "
-"Git.Необходимо перечитать репозиторий, "
-"прежде чем изменять текущую ветвь. \n"
+"С момента последней проверки репозиторий был изменен другой программой Git."
+"Необходимо перечитать репозиторий, прежде чем изменять текущую ветвь. \n"
 "\n"
 "Это будет сделано сейчас автоматически.\n"
 
-#: lib/merge.tcl:45
-#, tcl-format
+#: lib/merge.tcl:44
+#, fuzzy, 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, add the file, and commit to complete the current "
+"You must resolve them, stage the file, and commit to complete the current "
 "merge.  Only then can you begin another merge.\n"
 msgstr ""
-"Предыдущее объединение не завершено "
-"из-за конфликта.\n"
+"Предыдущее объединение не завершено из-за конфликта.\n"
 "\n"
 "Для файла %s возник конфликт объединения.\n"
-"Разрешите конфликт, подготовьте файл и "
-"сохраните. Только после этого можно "
+"Разрешите конфликт, подготовьте файл и сохраните. Только после этого можно "
 "начать следующее объединение.\n"
 
-#: lib/merge.tcl:55
+#: lib/merge.tcl:54
 #, tcl-format
 msgid ""
 "You are in the middle of a change.\n"
@@ -1175,36 +1519,38 @@ msgstr ""
 "\n"
 "Файл  %s изменен.\n"
 "\n"
-"Подготовьте и сохраните измения перед "
-"началом объединения. В случае "
-"необходимости это позволит прервать "
-"операцию объединения.\n"
+"Подготовьте и сохраните измения перед началом объединения. В случае "
+"необходимости это позволит прервать операцию объединения.\n"
 
-#: lib/merge.tcl:94
+#: lib/merge.tcl:106
+#, tcl-format
+msgid "%s of %s"
+msgstr ""
+
+#: lib/merge.tcl:119
 #, tcl-format
 msgid "Merging %s and %s"
 msgstr "Объединение %s и %s"
 
-#: lib/merge.tcl:106
+#: lib/merge.tcl:131
 msgid "Merge completed successfully."
 msgstr "Объединение успешно завершено."
 
-#: lib/merge.tcl:108
+#: lib/merge.tcl:133
 msgid "Merge failed.  Conflict resolution is required."
-msgstr ""
-"Не удалось завершить объединение. "
-"Требуется разрешение конфликта."
+msgstr "Не удалось завершить объединение. Требуется разрешение конфликта."
 
-#: lib/merge.tcl:166
+#: lib/merge.tcl:158
 #, tcl-format
 msgid "Merge Into %s"
 msgstr "Объединить с %s"
 
-#: lib/merge.tcl:181 lib/transport.tcl:98
-msgid "Source Branches"
-msgstr "Исходные ветви"
+#: lib/merge.tcl:177
+#, fuzzy
+msgid "Revision To Merge"
+msgstr "Версия"
 
-#: lib/merge.tcl:240
+#: lib/merge.tcl:212
 msgid ""
 "Cannot abort while amending.\n"
 "\n"
@@ -1212,10 +1558,9 @@ msgid ""
 msgstr ""
 "Невозможно прервать исправление.\n"
 "\n"
-"Завершите текущее исправление "
-"сохраненного состояния.\n"
+"Завершите текущее исправление сохраненного состояния.\n"
 
-#: lib/merge.tcl:250
+#: lib/merge.tcl:222
 msgid ""
 "Abort merge?\n"
 "\n"
@@ -1224,113 +1569,129 @@ msgid ""
 "Continue with aborting the current merge?"
 msgstr ""
 "Прервать объединение?\n"
-"Прерывание объединения приведет к потере "
-"*ВСЕХ* несохраненных изменений.\n"
+"Прерывание объединения приведет к потере *ВСЕХ* несохраненных изменений.\n"
 "\n"
 "Продолжить?"
 
-#: lib/merge.tcl:256
+#: lib/merge.tcl:228
+#, fuzzy
 msgid ""
-"Abort commit?\n"
+"Reset changes?\n"
 "\n"
-"Aborting the current commit will cause *ALL* uncommitted changes to be "
-"lost.\n"
+"Resetting the changes will cause *ALL* uncommitted changes to be lost.\n"
 "\n"
-"Continue with aborting the current commit?"
+"Continue with resetting the current changes?"
 msgstr ""
-"Отменить изменения?\n"
-"\n"
-"Вызванная операция приведет к потере "
-"*ВСЕХ* несохраненных изменений.\n"
+"Прервать объединение?\n"
+"Прерывание объединения приведет к потере *ВСЕХ* несохраненных изменений.\n"
 "\n"
 "Продолжить?"
 
-#: lib/merge.tcl:267
-msgid "Aborting... please wait..."
+#: lib/merge.tcl:239
+msgid "Aborting"
 msgstr ""
-"Прерывание выполнения... Пожалуйста, "
-"ждите..."
 
-#: lib/merge.tcl:290
+#: lib/merge.tcl:266
+msgid "Abort failed."
+msgstr ""
+
+#: lib/merge.tcl:268
 msgid "Abort completed.  Ready."
 msgstr "Прервано."
 
-#: lib/option.tcl:77
-msgid "git-gui - a graphical user interface for Git."
-msgstr ""
-"git-gui - графический пользовательский "
-"интерфейс к Git."
-
-#: lib/option.tcl:164
+#: lib/option.tcl:82
 msgid "Restore Defaults"
 msgstr "Восстановить настройки по умолчанию"
 
-#: lib/option.tcl:168
+#: lib/option.tcl:86
 msgid "Save"
 msgstr "Сохранить"
 
-#: lib/option.tcl:178
+#: lib/option.tcl:96
 #, tcl-format
 msgid "%s Repository"
 msgstr "для репозитория %s "
 
-#: lib/option.tcl:179
+#: lib/option.tcl:97
 msgid "Global (All Repositories)"
 msgstr "Общие (для всех репозиториев)"
 
-#: lib/option.tcl:185
+#: lib/option.tcl:103
 msgid "User Name"
 msgstr "Имя пользователя"
 
-#: lib/option.tcl:186
+#: lib/option.tcl:104
 msgid "Email Address"
 msgstr "Адес электронной почты"
 
-#: lib/option.tcl:188
+#: lib/option.tcl:106
 msgid "Summarize Merge Commits"
-msgstr ""
-"Суммарный комментарий при объединении"
+msgstr "Суммарный комментарий при объединении"
 
-#: lib/option.tcl:189
+#: lib/option.tcl:107
 msgid "Merge Verbosity"
-msgstr ""
-"Уровень детальности сообщений при "
-"объединении"
+msgstr "Уровень детальности сообщений при объединении"
 
-#: lib/option.tcl:190
+#: lib/option.tcl:108
 msgid "Show Diffstat After Merge"
-msgstr ""
-"Показать отчет об изменениях после "
-"объединения"
+msgstr "Показать отчет об изменениях после объединения"
 
-#: lib/option.tcl:192
+#: lib/option.tcl:110
 msgid "Trust File Modification Timestamps"
 msgstr "Доверять времени модификации файла"
 
-#: lib/option.tcl:193
+#: lib/option.tcl:111
 msgid "Prune Tracking Branches During Fetch"
-msgstr ""
-"Чистка ветвей слежения при получении "
-"изменений"
+msgstr "Чистка ветвей слежения при получении изменений"
 
-#: lib/option.tcl:194
+#: lib/option.tcl:112
 msgid "Match Tracking Branches"
-msgstr ""
-"Имя новой ветви взять из имен ветвей "
-"слежения"
+msgstr "Имя новой ветви взять из имен ветвей слежения"
 
-#: lib/option.tcl:195
+#: lib/option.tcl:113
 msgid "Number of Diff Context Lines"
 msgstr "Число строк в контексте diff"
 
-#: lib/option.tcl:196
+#: lib/option.tcl:114
 msgid "New Branch Name Template"
 msgstr "Шаблон для имени новой ветви"
 
-#: lib/option.tcl:305
-msgid "Failed to completely save options:"
+#: lib/option.tcl:176
+#, fuzzy
+msgid "Change Font"
+msgstr "Шрифт интерфейса"
+
+#: lib/option.tcl:180
+#, tcl-format
+msgid "Choose %s"
 msgstr ""
-"Не удалось полностью сохранить настройки:"
+
+#: lib/option.tcl:186
+msgid "pt."
+msgstr ""
+
+#: lib/option.tcl:200
+msgid "Preferences"
+msgstr ""
+
+#: lib/option.tcl:235
+msgid "Failed to completely save options:"
+msgstr "Не удалось полностью сохранить настройки:"
+
+#: lib/remote.tcl:165
+#, fuzzy
+msgid "Prune from"
+msgstr "Чистка %s... "
+
+#: lib/remote.tcl:170
+#, fuzzy
+msgid "Fetch from"
+msgstr "Чистка %s... "
+
+#: lib/remote.tcl:213
+#, fuzzy
+msgid "Push to"
+msgstr "Отправить"
 
 #: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34
 msgid "Delete Remote Branch"
@@ -1340,11 +1701,11 @@ msgstr "Удалить внешнюю ветвь"
 msgid "From Repository"
 msgstr "Из репозитория"
 
-#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:118
+#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:123
 msgid "Remote:"
 msgstr "внешний:"
 
-#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:133
+#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:138
 msgid "Arbitrary URL:"
 msgstr "по указанному URL:"
 
@@ -1362,15 +1723,19 @@ msgstr "Объединено с:"
 
 #: lib/remote_branch_delete.tcl:119
 msgid "Always (Do not perform merge checks)"
-msgstr ""
-"Всегда (не выполнять проверку "
-"объединений)"
+msgstr "Всегда (не выполнять проверку объединений)"
 
 #: lib/remote_branch_delete.tcl:152
 msgid "A branch is required for 'Merged Into'."
-msgstr ""
-"Для опции 'Объединено с' требуется "
-"указать ветвь."
+msgstr "Для опции 'Объединено с' требуется указать ветвь."
+
+#: lib/remote_branch_delete.tcl:184
+#, fuzzy, tcl-format
+msgid ""
+"The following branches are not completely merged into %s:\n"
+"\n"
+" - %s"
+msgstr "Следующие ветви объединены с %s не полностью:"
 
 #: lib/remote_branch_delete.tcl:189
 #, tcl-format
@@ -1381,9 +1746,7 @@ msgstr ""
 
 #: lib/remote_branch_delete.tcl:207
 msgid "Please select one or more branches to delete."
-msgstr ""
-"Укажите одну или несколько ветвей для "
-"удаления."
+msgstr "Укажите одну или несколько ветвей для удаления."
 
 #: lib/remote_branch_delete.tcl:216
 msgid ""
@@ -1409,21 +1772,6 @@ msgstr "Не указан репозиторий"
 msgid "Scanning %s..."
 msgstr "Перечитывание %s... "
 
-#: lib/remote.tcl:156
-#, fuzzy, tcl-format
-msgid "Fetch from %s..."
-msgstr "Чистка %s... "
-
-#: lib/remote.tcl:166
-#, tcl-format
-msgid "Prune from %s..."
-msgstr "Чистка %s... "
-
-#: lib/remote.tcl:200
-#, tcl-format
-msgid "Push to %s..."
-msgstr "Отправка в %s..."
-
 #: lib/shortcut.tcl:26 lib/shortcut.tcl:74
 msgid "Cannot write script:"
 msgstr "Невозможно записать скрипт:"
@@ -1432,49 +1780,105 @@ msgstr "Невозможно записать скрипт:"
 msgid "Cannot write icon:"
 msgstr "Невозможно записать значок:"
 
-#: lib/status_bar.tcl:58
+#: lib/status_bar.tcl:83
 #, tcl-format
 msgid "%s ... %*i of %*i %s (%3i%%)"
 msgstr "%s ... %*i из %*i %s (%3i%%)"
 
+#: lib/transport.tcl:6
+#, fuzzy, tcl-format
+msgid "fetch %s"
+msgstr "Получить"
+
 #: lib/transport.tcl:7
 #, tcl-format
 msgid "Fetching new changes from %s"
 msgstr "Получение изменений из %s "
 
+#: lib/transport.tcl:18
+#, tcl-format
+msgid "remote prune %s"
+msgstr ""
+
 #: lib/transport.tcl:19
 #, tcl-format
 msgid "Pruning tracking branches deleted from %s"
 msgstr "Чистка ветвей слежения, удаленных из %s"
 
+#: lib/transport.tcl:25 lib/transport.tcl:71
+#, tcl-format
+msgid "push %s"
+msgstr ""
+
 #: lib/transport.tcl:26
 #, tcl-format
 msgid "Pushing changes to %s"
 msgstr "Отправка изменений в %s "
 
-#: lib/transport.tcl:68
+#: lib/transport.tcl:72
 #, tcl-format
 msgid "Pushing %s %s to %s"
 msgstr "Отправка %s %s в %s"
 
-#: lib/transport.tcl:84
+#: lib/transport.tcl:89
 msgid "Push Branches"
 msgstr "Отправить изменения"
 
-#: lib/transport.tcl:115
+#: lib/transport.tcl:103
+msgid "Source Branches"
+msgstr "Исходные ветви"
+
+#: lib/transport.tcl:120
 msgid "Destination Repository"
 msgstr "Репозиторий назначения"
 
-#: lib/transport.tcl:153
+#: lib/transport.tcl:158
 msgid "Transfer Options"
 msgstr "Настройки передачи"
 
-#: lib/transport.tcl:155
-msgid "Use thin pack (for slow network connections)"
+#: lib/transport.tcl:160
+msgid "Force overwrite existing branch (may discard changes)"
 msgstr ""
-"Использовать thin pack (для медленных сетевых "
-"подключений)"
 
-#: lib/transport.tcl:159
+#: lib/transport.tcl:164
+msgid "Use thin pack (for slow network connections)"
+msgstr "Использовать thin pack (для медленных сетевых подключений)"
+
+#: lib/transport.tcl:168
 msgid "Include tags"
 msgstr "Включить метки"
+
+#~ msgid "Cannot find the git directory:"
+#~ msgstr "Каталог Git не найден:"
+
+#~ msgid "Add To Commit"
+#~ msgstr "Подготовить к сохранению"
+
+#~ msgid "Add Existing To Commit"
+#~ msgstr "Подготовить имеющиеся файлы к сохранению"
+
+#~ msgid "Unstaged Changes (Will Not Be Committed)"
+#~ msgstr "Изменено (не будет сохранено)"
+
+#~ msgid "Add Existing"
+#~ msgstr "Добавить имеющиеся файлы"
+
+#~ msgid ""
+#~ "Abort commit?\n"
+#~ "\n"
+#~ "Aborting the current commit will cause *ALL* uncommitted changes to be "
+#~ "lost.\n"
+#~ "\n"
+#~ "Continue with aborting the current commit?"
+#~ msgstr ""
+#~ "Отменить изменения?\n"
+#~ "\n"
+#~ "Вызванная операция приведет к потере *ВСЕХ* несохраненных изменений.\n"
+#~ "\n"
+#~ "Продолжить?"
+
+#~ msgid "Aborting... please wait..."
+#~ msgstr "Прерывание выполнения... Пожалуйста, ждите..."
+
+#~ msgid "Push to %s..."
+#~ msgstr "Отправка в %s..."
diff --git a/git-gui/po/zh_cn.po b/git-gui/po/zh_cn.po
index d1ed94f8a9..621c9479b2 100644
--- a/git-gui/po/zh_cn.po
+++ b/git-gui/po/zh_cn.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: git-gui\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-27 19:33+0200\n"
+"POT-Creation-Date: 2007-10-10 04:04-0400\n"
 "PO-Revision-Date: 2007-07-21 01:23-0700\n"
 "Last-Translator: Xudong Guan <xudong.guan@gmail.com>\n"
 "Language-Team: Chinese\n"
@@ -16,15 +16,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: git-gui.sh:531
+#: git-gui.sh:41 git-gui.sh:634 git-gui.sh:648 git-gui.sh:661 git-gui.sh:744
+#: git-gui.sh:763
+msgid "git-gui: fatal error"
+msgstr ""
+
+#: git-gui.sh:595
+#, tcl-format
+msgid "Invalid font specified in %s:"
+msgstr ""
+
+#: git-gui.sh:620
+msgid "Main Font"
+msgstr ""
+
+#: git-gui.sh:621
+msgid "Diff/Console Font"
+msgstr ""
+
+#: git-gui.sh:635
 msgid "Cannot find git in PATH."
 msgstr ""
 
-#: git-gui.sh:550
+#: git-gui.sh:662
 msgid "Cannot parse Git version string:"
 msgstr ""
 
-#: git-gui.sh:567
+#: git-gui.sh:680
 #, tcl-format
 msgid ""
 "Git version cannot be determined.\n"
@@ -36,82 +54,82 @@ msgid ""
 "Assume '%s' is version 1.5.0?\n"
 msgstr ""
 
-#: git-gui.sh:689
-msgid "Cannot find the git directory:"
-msgstr ""
-
-#: git-gui.sh:697
+#: git-gui.sh:853
 msgid "Git directory not found:"
 msgstr ""
 
-#: git-gui.sh:703
+#: git-gui.sh:860
+msgid "Cannot move to top of working directory:"
+msgstr ""
+
+#: git-gui.sh:867
 msgid "Cannot use funny .git directory:"
 msgstr ""
 
-#: git-gui.sh:708
+#: git-gui.sh:872
 msgid "No working directory"
 msgstr ""
 
-#: git-gui.sh:853
+#: git-gui.sh:1019
 msgid "Refreshing file status..."
 msgstr ""
 
-#: git-gui.sh:886
+#: git-gui.sh:1084
 msgid "Scanning for modified files ..."
 msgstr ""
 
-#: git-gui.sh:1052 lib/browser.tcl:233
+#: git-gui.sh:1259 lib/browser.tcl:245
 #, fuzzy
 msgid "Ready."
 msgstr "重做"
 
-#: git-gui.sh:1343
+#: git-gui.sh:1525
 msgid "Unmodified"
 msgstr ""
 
-#: git-gui.sh:1345
+#: git-gui.sh:1527
 msgid "Modified, not staged"
 msgstr ""
 
-#: git-gui.sh:1346 git-gui.sh:1351
+#: git-gui.sh:1528 git-gui.sh:1533
 #, fuzzy
 msgid "Staged for commit"
 msgstr "从本次提交移除"
 
-#: git-gui.sh:1347 git-gui.sh:1352
+#: git-gui.sh:1529 git-gui.sh:1534
 #, fuzzy
 msgid "Portions staged for commit"
 msgstr "从本次提交移除"
 
-#: git-gui.sh:1348 git-gui.sh:1353
+#: git-gui.sh:1530 git-gui.sh:1535
 msgid "Staged for commit, missing"
 msgstr ""
 
-#: git-gui.sh:1350
+#: git-gui.sh:1532
 msgid "Untracked, not staged"
 msgstr ""
 
-#: git-gui.sh:1355
+#: git-gui.sh:1537
 msgid "Missing"
 msgstr ""
 
-#: git-gui.sh:1356
+#: git-gui.sh:1538
 msgid "Staged for removal"
 msgstr ""
 
-#: git-gui.sh:1357
+#: git-gui.sh:1539
 msgid "Staged for removal, still present"
 msgstr ""
 
-#: git-gui.sh:1359 git-gui.sh:1360 git-gui.sh:1361 git-gui.sh:1362
+#: git-gui.sh:1541 git-gui.sh:1542 git-gui.sh:1543 git-gui.sh:1544
 msgid "Requires merge resolution"
 msgstr ""
 
-#: git-gui.sh:1404
+#: git-gui.sh:1579
 msgid "Starting gitk... please wait..."
 msgstr ""
 
-#: git-gui.sh:1413
+#: git-gui.sh:1588
 #, tcl-format
 msgid ""
 "Unable to start gitk:\n"
@@ -119,300 +137,336 @@ msgid ""
 "%s does not exist"
 msgstr ""
 
-#: git-gui.sh:1630
-#, tcl-format
-msgid "Invalid font specified in gui.%s:"
-msgstr ""
-
-#: git-gui.sh:1655
-msgid "Main Font"
-msgstr ""
-
-#: git-gui.sh:1656
-msgid "Diff/Console Font"
-msgstr ""
-
-#: git-gui.sh:1670
+#: git-gui.sh:1788 lib/choose_repository.tcl:32
 msgid "Repository"
 msgstr "版本树"
 
-#: git-gui.sh:1671
+#: git-gui.sh:1789
 msgid "Edit"
 msgstr "编辑"
 
-#: git-gui.sh:1673
+#: git-gui.sh:1791 lib/choose_rev.tcl:560
 msgid "Branch"
 msgstr "分支"
 
-#: git-gui.sh:1676 git-gui.sh:1854 git-gui.sh:2193
-msgid "Commit"
+#: git-gui.sh:1794 lib/choose_rev.tcl:547
+#, fuzzy
+msgid "Commit@@noun"
 msgstr "提交"
 
-#: git-gui.sh:1679 lib/merge.tcl:96 lib/merge.tcl:157 lib/merge.tcl:173
+#: git-gui.sh:1797 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168
 msgid "Merge"
 msgstr "合并"
 
-#: git-gui.sh:1680
-msgid "Fetch"
-msgstr "导入"
+#: git-gui.sh:1798 lib/choose_rev.tcl:556
+#, fuzzy
+msgid "Remote"
+msgstr "改名..."
 
-#: git-gui.sh:1681 git-gui.sh:2199 lib/transport.tcl:88 lib/transport.tcl:172
-msgid "Push"
-msgstr "上传"
-
-#: git-gui.sh:1690
+#: git-gui.sh:1807
 msgid "Browse Current Branch's Files"
 msgstr "浏览当前分支文件"
 
-#: git-gui.sh:1692
-#, fuzzy, tcl-format
-msgid "Browse %s's Files"
-msgstr "浏览当前分支文件"
-
-#: git-gui.sh:1694
+#: git-gui.sh:1811
 #, fuzzy
 msgid "Browse Branch Files..."
 msgstr "浏览当前分支文件"
 
-#: git-gui.sh:1699
+#: git-gui.sh:1816
 msgid "Visualize Current Branch's History"
 msgstr "调用gitk显示当前分支"
 
-#: git-gui.sh:1701
+#: git-gui.sh:1820
+msgid "Visualize All Branch History"
+msgstr "调用gitk显示所有分支"
+
+#: git-gui.sh:1827
+#, fuzzy, tcl-format
+msgid "Browse %s's Files"
+msgstr "浏览当前分支文件"
+
+#: git-gui.sh:1829
 #, fuzzy, tcl-format
 msgid "Visualize %s's History"
 msgstr "调用gitk显示所有分支"
 
-#: git-gui.sh:1703
-msgid "Visualize All Branch History"
-msgstr "调用gitk显示所有分支"
-
-#: git-gui.sh:1708 lib/database.tcl:27 lib/database.tcl:67
+#: git-gui.sh:1834 lib/database.tcl:27 lib/database.tcl:67
 msgid "Database Statistics"
 msgstr "数据库统计数据"
 
-#: git-gui.sh:1711 lib/database.tcl:34
+#: git-gui.sh:1837 lib/database.tcl:34
 msgid "Compress Database"
 msgstr "压缩数据库"
 
-#: git-gui.sh:1714
+#: git-gui.sh:1840
 msgid "Verify Database"
 msgstr "验证数据库"
 
-#: git-gui.sh:1721 git-gui.sh:1725 git-gui.sh:1729 lib/shortcut.tcl:9
+#: git-gui.sh:1847 git-gui.sh:1851 git-gui.sh:1855 lib/shortcut.tcl:9
 #: lib/shortcut.tcl:45 lib/shortcut.tcl:84
 msgid "Create Desktop Icon"
 msgstr "创建桌面图标"
 
-#: git-gui.sh:1734
+#: git-gui.sh:1860 lib/choose_repository.tcl:36 lib/choose_repository.tcl:95
 msgid "Quit"
 msgstr "退出"
 
-#: git-gui.sh:1741
+#: git-gui.sh:1867
 msgid "Undo"
 msgstr "撤销"
 
-#: git-gui.sh:1744
+#: git-gui.sh:1870
 msgid "Redo"
 msgstr "重做"
 
-#: git-gui.sh:1748 git-gui.sh:2263
+#: git-gui.sh:1874 git-gui.sh:2366
 msgid "Cut"
 msgstr "剪切"
 
-#: git-gui.sh:1751 git-gui.sh:2266 git-gui.sh:2337 git-gui.sh:2409
-#: lib/console.tcl:69
+#: git-gui.sh:1877 git-gui.sh:2369 git-gui.sh:2440 git-gui.sh:2512
+#: lib/console.tcl:67
 msgid "Copy"
 msgstr "复制"
 
-#: git-gui.sh:1754 git-gui.sh:2269
+#: git-gui.sh:1880 git-gui.sh:2372
 msgid "Paste"
 msgstr "粘贴"
 
-#: git-gui.sh:1757 git-gui.sh:2272 lib/branch_delete.tcl:26
+#: git-gui.sh:1883 git-gui.sh:2375 lib/branch_delete.tcl:26
 #: lib/remote_branch_delete.tcl:38
 msgid "Delete"
 msgstr "删除"
 
-#: git-gui.sh:1761 git-gui.sh:2276 git-gui.sh:2413 lib/console.tcl:71
+#: git-gui.sh:1887 git-gui.sh:2379 git-gui.sh:2516 lib/console.tcl:69
 msgid "Select All"
 msgstr "全选"
 
-#: git-gui.sh:1770
+#: git-gui.sh:1896
 msgid "Create..."
 msgstr "新建..."
 
-#: git-gui.sh:1776
+#: git-gui.sh:1902
 msgid "Checkout..."
 msgstr "切换..."
 
-#: git-gui.sh:1782
+#: git-gui.sh:1908
 msgid "Rename..."
 msgstr "改名..."
 
-#: git-gui.sh:1787 git-gui.sh:1885
+#: git-gui.sh:1913 git-gui.sh:2012
 msgid "Delete..."
 msgstr "删除..."
 
-#: git-gui.sh:1792
+#: git-gui.sh:1918
 msgid "Reset..."
 msgstr "重置所有修动..."
 
-#: git-gui.sh:1804 git-gui.sh:2210
+#: git-gui.sh:1930 git-gui.sh:2313
 msgid "New Commit"
 msgstr "新提交"
 
-#: git-gui.sh:1812 git-gui.sh:2217
+#: git-gui.sh:1938 git-gui.sh:2320
 msgid "Amend Last Commit"
 msgstr "修订上次提交"
 
-#: git-gui.sh:1821 git-gui.sh:2177 lib/remote_branch_delete.tcl:99
+#: git-gui.sh:1947 git-gui.sh:2280 lib/remote_branch_delete.tcl:99
 msgid "Rescan"
 msgstr "重新扫描"
 
-#: git-gui.sh:1827
-msgid "Add To Commit"
-msgstr "添加到本次提交"
+#: git-gui.sh:1953
+#, fuzzy
+msgid "Stage To Commit"
+msgstr "从本次提交移除"
 
-#: git-gui.sh:1832
-msgid "Add Existing To Commit"
-msgstr "添加默认修改文件"
+#: git-gui.sh:1958
+#, fuzzy
+msgid "Stage Changed Files To Commit"
+msgstr "将被提交的修改"
 
-#: git-gui.sh:1838
+#: git-gui.sh:1964
 msgid "Unstage From Commit"
 msgstr "从本次提交移除"
 
-#: git-gui.sh:1843 lib/index.tcl:376
+#: git-gui.sh:1969 lib/index.tcl:352
 msgid "Revert Changes"
 msgstr "恢复修改"
 
-#: git-gui.sh:1850 git-gui.sh:2189 git-gui.sh:2287
+#: git-gui.sh:1976 git-gui.sh:2292 git-gui.sh:2390
 msgid "Sign Off"
 msgstr "签名"
 
-#: git-gui.sh:1865
+#: git-gui.sh:1980 git-gui.sh:2296
+#, fuzzy
+msgid "Commit@@verb"
+msgstr "提交"
+
+#: git-gui.sh:1991
 msgid "Local Merge..."
 msgstr "本地合并..."
 
-#: git-gui.sh:1870
+#: git-gui.sh:1996
 msgid "Abort Merge..."
 msgstr "取消合并..."
 
-#: git-gui.sh:1882
+#: git-gui.sh:2008
 msgid "Push..."
 msgstr "上传..."
 
-#: git-gui.sh:1892
+#: git-gui.sh:2019 lib/choose_repository.tcl:41
 msgid "Apple"
 msgstr "苹果"
 
-#: git-gui.sh:1895 git-gui.sh:1942 lib/option.tcl:65
+#: git-gui.sh:2022 git-gui.sh:2044 lib/about.tcl:13
+#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:50
 #, tcl-format
 msgid "About %s"
 msgstr "关于%s"
 
-#: git-gui.sh:1897 git-gui.sh:1903 git-gui.sh:2455
+#: git-gui.sh:2026
+msgid "Preferences..."
+msgstr ""
+
+#: git-gui.sh:2034 git-gui.sh:2558
 msgid "Options..."
 msgstr "选项..."
 
-#: git-gui.sh:1917
-msgid "Running miga..."
-msgstr ""
-
-#: git-gui.sh:1938
+#: git-gui.sh:2040 lib/choose_repository.tcl:47
 msgid "Help"
 msgstr "帮助"
 
-#: git-gui.sh:1979
+#: git-gui.sh:2081
 msgid "Online Documentation"
 msgstr "在线文档"
 
-#: git-gui.sh:2095
+#: git-gui.sh:2165
+#, tcl-format
+msgid "fatal: cannot stat path %s: No such file or directory"
+msgstr ""
+
+#: git-gui.sh:2198
 msgid "Current Branch:"
 msgstr "当前分支:"
 
-#: git-gui.sh:2116
-msgid "Staged Changes (Will Be Committed)"
+#: git-gui.sh:2219
+#, fuzzy
+msgid "Staged Changes (Will Commit)"
 msgstr "将被提交的修改"
 
-#: git-gui.sh:2136
-msgid "Unstaged Changes (Will Not Be Committed)"
-msgstr "不被提交的修改"
+#: git-gui.sh:2239
+msgid "Unstaged Changes"
+msgstr ""
 
-#: git-gui.sh:2183
-msgid "Add Existing"
-msgstr "添加默认修改文件"
+#: git-gui.sh:2286
+msgid "Stage Changed"
+msgstr ""
 
-#: git-gui.sh:2229
+#: git-gui.sh:2302 lib/transport.tcl:93 lib/transport.tcl:182
+msgid "Push"
+msgstr "上传"
+
+#: git-gui.sh:2332
 msgid "Initial Commit Message:"
 msgstr "初始提交描述:"
 
-#: git-gui.sh:2230
+#: git-gui.sh:2333
 msgid "Amended Commit Message:"
 msgstr "修订提交描述:"
 
-#: git-gui.sh:2231
+#: git-gui.sh:2334
 msgid "Amended Initial Commit Message:"
 msgstr "修订初始提交描述:"
 
-#: git-gui.sh:2232
+#: git-gui.sh:2335
 msgid "Amended Merge Commit Message:"
 msgstr "修订合并提交描述:"
 
-#: git-gui.sh:2233
+#: git-gui.sh:2336
 msgid "Merge Commit Message:"
 msgstr "合并提交描述:"
 
-#: git-gui.sh:2234
+#: git-gui.sh:2337
 msgid "Commit Message:"
 msgstr "提交描述:"
 
-#: git-gui.sh:2279 git-gui.sh:2417 lib/console.tcl:73
+#: git-gui.sh:2382 git-gui.sh:2520 lib/console.tcl:71
 msgid "Copy All"
 msgstr "全部复制"
 
-#: git-gui.sh:2303 lib/blame.tcl:104
+#: git-gui.sh:2406 lib/blame.tcl:104
 msgid "File:"
 msgstr ""
 
-#: git-gui.sh:2405
+#: git-gui.sh:2508
 msgid "Refresh"
 msgstr "刷新"
 
-#: git-gui.sh:2426
+#: git-gui.sh:2529
 msgid "Apply/Reverse Hunk"
 msgstr "应用/撤消此修改块"
 
-#: git-gui.sh:2432
+#: git-gui.sh:2535
 msgid "Decrease Font Size"
 msgstr "缩小字体"
 
-#: git-gui.sh:2436
+#: git-gui.sh:2539
 msgid "Increase Font Size"
 msgstr "放大字体"
 
-#: git-gui.sh:2441
+#: git-gui.sh:2544
 msgid "Show Less Context"
 msgstr "显示更多diff上下文"
 
-#: git-gui.sh:2448
+#: git-gui.sh:2551
 msgid "Show More Context"
 msgstr "显示更少diff上下文"
 
-#: git-gui.sh:2461
+#: git-gui.sh:2565
 #, fuzzy
 msgid "Unstage Hunk From Commit"
 msgstr "从本次提交移除"
 
-#: git-gui.sh:2463
+#: git-gui.sh:2567
 #, fuzzy
 msgid "Stage Hunk For Commit"
 msgstr "从本次提交移除"
 
-#: git-gui.sh:2473
+#: git-gui.sh:2586
 msgid "Initializing..."
 msgstr ""
 
+#: git-gui.sh:2677
+#, 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:2707
+msgid ""
+"\n"
+"This is due to a known issue with the\n"
+"Tcl binary distributed by Cygwin."
+msgstr ""
+
+#: git-gui.sh:2712
+#, 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:25
+msgid "git-gui - a graphical user interface for Git."
+msgstr ""
+
 #: lib/blame.tcl:77
 msgid "File Viewer"
 msgstr ""
@@ -432,6 +486,51 @@ msgstr "提交"
 msgid "Reading %s..."
 msgstr ""
 
+#: lib/blame.tcl:473
+msgid "Loading copy/move tracking annotations..."
+msgstr ""
+
+#: lib/blame.tcl:493
+msgid "lines annotated"
+msgstr ""
+
+#: lib/blame.tcl:674
+msgid "Loading original location annotations..."
+msgstr ""
+
+#: lib/blame.tcl:677
+msgid "Annotation complete."
+msgstr ""
+
+#: lib/blame.tcl:731
+msgid "Loading annotation..."
+msgstr ""
+
+#: lib/blame.tcl:787
+msgid "Author:"
+msgstr ""
+
+#: lib/blame.tcl:791
+#, fuzzy
+msgid "Committer:"
+msgstr "提交"
+
+#: lib/blame.tcl:796
+msgid "Original File:"
+msgstr ""
+
+#: lib/blame.tcl:910
+msgid "Originally By:"
+msgstr ""
+
+#: lib/blame.tcl:916
+msgid "In File:"
+msgstr ""
+
+#: lib/blame.tcl:921
+msgid "Copied Or Moved Here By:"
+msgstr ""
+
 #: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19
 #, fuzzy
 msgid "Checkout Branch"
@@ -443,18 +542,17 @@ 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:269
-#: lib/checkout_op.tcl:519 lib/merge.tcl:176 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:281
+#: lib/checkout_op.tcl:522 lib/choose_font.tcl:43 lib/merge.tcl:172
+#: lib/option.tcl:90 lib/remote_branch_delete.tcl:42 lib/transport.tcl:97
 msgid "Cancel"
 msgstr ""
 
-#: lib/branch_checkout.tcl:32 lib/browser.tcl:274
+#: lib/branch_checkout.tcl:32 lib/browser.tcl:286
 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:202
 #, fuzzy
 msgid "Options"
 msgstr "选项..."
@@ -477,7 +575,7 @@ msgstr "当前分支:"
 msgid "Create New Branch"
 msgstr "当前分支:"
 
-#: lib/branch_create.tcl:31
+#: lib/branch_create.tcl:31 lib/choose_repository.tcl:199
 #, fuzzy
 msgid "Create"
 msgstr "新建..."
@@ -511,7 +609,7 @@ msgstr ""
 msgid "Fast Forward Only"
 msgstr ""
 
-#: lib/branch_create.tcl:85 lib/checkout_op.tcl:511
+#: lib/branch_create.tcl:85 lib/checkout_op.tcl:514
 #, fuzzy
 msgid "Reset"
 msgstr "重置所有修动..."
@@ -612,25 +710,31 @@ msgstr ""
 msgid "Failed to rename '%s'."
 msgstr ""
 
-#: lib/browser.tcl:10
+#: lib/browser.tcl:17
 msgid "Starting..."
 msgstr ""
 
-#: lib/browser.tcl:19
+#: lib/browser.tcl:26
 msgid "File Browser"
 msgstr ""
 
-#: lib/browser.tcl:120 lib/browser.tcl:137
+#: lib/browser.tcl:125 lib/browser.tcl:142
 #, tcl-format
 msgid "Loading %s..."
 msgstr ""
 
-#: lib/browser.tcl:254 lib/browser.tcl:260
+#: lib/browser.tcl:186
+msgid "[Up To Parent]"
+msgstr ""
+
+#: lib/browser.tcl:266 lib/browser.tcl:272
 #, fuzzy
 msgid "Browse Branch Files"
 msgstr "浏览当前分支文件"
 
-#: lib/browser.tcl:265
+#: lib/browser.tcl:277 lib/choose_repository.tcl:215
+#: lib/choose_repository.tcl:305 lib/choose_repository.tcl:315
+#: lib/choose_repository.tcl:811
 msgid "Browse"
 msgstr ""
 
@@ -639,7 +743,12 @@ msgstr ""
 msgid "Fetching %s from %s"
 msgstr ""
 
-#: lib/checkout_op.tcl:140 lib/console.tcl:81 lib/database.tcl:31
+#: lib/checkout_op.tcl:127
+#, tcl-format
+msgid "fatal: Cannot resolve %s"
+msgstr ""
+
+#: lib/checkout_op.tcl:140 lib/console.tcl:79 lib/database.tcl:31
 msgid "Close"
 msgstr ""
 
@@ -648,7 +757,7 @@ msgstr ""
 msgid "Branch '%s' does not exist."
 msgstr ""
 
-#: lib/checkout_op.tcl:205
+#: lib/checkout_op.tcl:206
 #, tcl-format
 msgid ""
 "Branch '%s' already exists.\n"
@@ -657,21 +766,21 @@ msgid ""
 "A merge is required."
 msgstr ""
 
-#: lib/checkout_op.tcl:219
+#: lib/checkout_op.tcl:220
 #, tcl-format
 msgid "Merge strategy '%s' not supported."
 msgstr ""
 
-#: lib/checkout_op.tcl:238
+#: lib/checkout_op.tcl:239
 #, tcl-format
 msgid "Failed to update '%s'."
 msgstr ""
 
-#: lib/checkout_op.tcl:250
-msgid "Index is already locked."
+#: lib/checkout_op.tcl:251
+msgid "Staging area (index) is already locked."
 msgstr ""
 
-#: lib/checkout_op.tcl:265
+#: lib/checkout_op.tcl:266
 msgid ""
 "Last scanned state does not match repository state.\n"
 "\n"
@@ -681,21 +790,26 @@ msgid ""
 "The rescan will be automatically started now.\n"
 msgstr ""
 
-#: lib/checkout_op.tcl:352
+#: lib/checkout_op.tcl:322
+#, tcl-format
+msgid "Updating working directory to '%s'..."
+msgstr ""
+
+#: lib/checkout_op.tcl:353
 #, tcl-format
 msgid "Aborted checkout of '%s' (file level merging is required)."
 msgstr ""
 
-#: lib/checkout_op.tcl:353
+#: lib/checkout_op.tcl:354
 msgid "File level merge required."
 msgstr ""
 
-#: lib/checkout_op.tcl:357
+#: lib/checkout_op.tcl:358
 #, tcl-format
 msgid "Staying on branch '%s'."
 msgstr ""
 
-#: lib/checkout_op.tcl:426
+#: lib/checkout_op.tcl:429
 msgid ""
 "You are no longer on a local branch.\n"
 "\n"
@@ -703,25 +817,30 @@ msgid ""
 "Checkout'."
 msgstr ""
 
-#: lib/checkout_op.tcl:475
+#: lib/checkout_op.tcl:446
+#, fuzzy, tcl-format
+msgid "Checked out '%s'."
+msgstr "切换..."
+
+#: lib/checkout_op.tcl:478
 #, tcl-format
 msgid "Resetting '%s' to '%s' will lose the following commits:"
 msgstr ""
 
-#: lib/checkout_op.tcl:497
+#: lib/checkout_op.tcl:500
 msgid "Recovering lost commits may not be easy."
 msgstr ""
 
-#: lib/checkout_op.tcl:502
+#: lib/checkout_op.tcl:505
 #, tcl-format
 msgid "Reset '%s'?"
 msgstr ""
 
-#: lib/checkout_op.tcl:507 lib/merge.tcl:171
+#: lib/checkout_op.tcl:510 lib/merge.tcl:164
 msgid "Visualize"
 msgstr ""
 
-#: lib/checkout_op.tcl:575
+#: lib/checkout_op.tcl:578
 #, tcl-format
 msgid ""
 "Failed to set current branch.\n"
@@ -732,41 +851,286 @@ msgid ""
 "This should not have occurred.  %s will now close and give up."
 msgstr ""
 
-#: lib/choose_rev.tcl:35
+#: lib/choose_font.tcl:39
+#, fuzzy
+msgid "Select"
+msgstr "全选"
+
+#: lib/choose_font.tcl:53
+msgid "Font Family"
+msgstr ""
+
+#: lib/choose_font.tcl:73
+#, fuzzy
+msgid "Font Size"
+msgstr "缩小字体"
+
+#: lib/choose_font.tcl:90
+msgid "Font Example"
+msgstr ""
+
+#: lib/choose_font.tcl:101
+msgid ""
+"This is example text.\n"
+"If you like this text, it can be your font."
+msgstr ""
+
+#: lib/choose_repository.tcl:25
+msgid "Git Gui"
+msgstr ""
+
+#: lib/choose_repository.tcl:69 lib/choose_repository.tcl:204
+#, fuzzy
+msgid "Create New Repository"
+msgstr "版本树"
+
+#: lib/choose_repository.tcl:74 lib/choose_repository.tcl:291
+#, fuzzy
+msgid "Clone Existing Repository"
+msgstr "版本树"
+
+#: lib/choose_repository.tcl:79 lib/choose_repository.tcl:800
+#, fuzzy
+msgid "Open Existing Repository"
+msgstr "版本树"
+
+#: lib/choose_repository.tcl:91
+msgid "Next >"
+msgstr ""
+
+#: lib/choose_repository.tcl:152
+#, tcl-format
+msgid "Location %s already exists."
+msgstr ""
+
+#: lib/choose_repository.tcl:158 lib/choose_repository.tcl:165
+#: lib/choose_repository.tcl:172
+#, tcl-format
+msgid "Failed to create repository %s:"
+msgstr ""
+
+#: lib/choose_repository.tcl:209 lib/choose_repository.tcl:309
+msgid "Directory:"
+msgstr ""
+
+#: lib/choose_repository.tcl:238 lib/choose_repository.tcl:363
+#: lib/choose_repository.tcl:834
+#, fuzzy
+msgid "Git Repository"
+msgstr "版本树"
+
+#: lib/choose_repository.tcl:253 lib/choose_repository.tcl:260
+#, tcl-format
+msgid "Directory %s already exists."
+msgstr ""
+
+#: lib/choose_repository.tcl:265
+#, tcl-format
+msgid "File %s already exists."
+msgstr ""
+
+#: lib/choose_repository.tcl:286
+msgid "Clone"
+msgstr ""
+
+#: lib/choose_repository.tcl:299
+msgid "URL:"
+msgstr ""
+
+#: lib/choose_repository.tcl:319
+msgid "Clone Type:"
+msgstr ""
+
+#: lib/choose_repository.tcl:325
+msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
+msgstr ""
+
+#: lib/choose_repository.tcl:331
+msgid "Full Copy (Slower, Redundant Backup)"
+msgstr ""
+
+#: lib/choose_repository.tcl:337
+msgid "Shared (Fastest, Not Recommended, No Backup)"
+msgstr ""
+
+#: lib/choose_repository.tcl:369 lib/choose_repository.tcl:418
+#: lib/choose_repository.tcl:560 lib/choose_repository.tcl:630
+#: lib/choose_repository.tcl:840 lib/choose_repository.tcl:848
+#, tcl-format
+msgid "Not a Git repository: %s"
+msgstr ""
+
+#: lib/choose_repository.tcl:405
+msgid "Standard only available for local repository."
+msgstr ""
+
+#: lib/choose_repository.tcl:409
+msgid "Shared only available for local repository."
+msgstr ""
+
+#: lib/choose_repository.tcl:439
+msgid "Failed to configure origin"
+msgstr ""
+
+#: lib/choose_repository.tcl:451
+msgid "Counting objects"
+msgstr ""
+
+#: lib/choose_repository.tcl:452
+msgid "buckets"
+msgstr ""
+
+#: lib/choose_repository.tcl:476
+#, tcl-format
+msgid "Unable to copy objects/info/alternates: %s"
+msgstr ""
+
+#: lib/choose_repository.tcl:512
+#, tcl-format
+msgid "Nothing to clone from %s."
+msgstr ""
+
+#: lib/choose_repository.tcl:514 lib/choose_repository.tcl:728
+#: lib/choose_repository.tcl:740
+msgid "The 'master' branch has not been initialized."
+msgstr ""
+
+#: lib/choose_repository.tcl:527
+msgid "Hardlinks are unavailable.  Falling back to copying."
+msgstr ""
+
+#: lib/choose_repository.tcl:539
+#, tcl-format
+msgid "Cloning from %s"
+msgstr ""
+
+#: lib/choose_repository.tcl:570
+#, fuzzy
+msgid "Copying objects"
+msgstr "压缩数据库"
+
+#: lib/choose_repository.tcl:571
+msgid "KiB"
+msgstr ""
+
+#: lib/choose_repository.tcl:595
+#, tcl-format
+msgid "Unable to copy object: %s"
+msgstr ""
+
+#: lib/choose_repository.tcl:605
+msgid "Linking objects"
+msgstr ""
+
+#: lib/choose_repository.tcl:606
+msgid "objects"
+msgstr ""
+
+#: lib/choose_repository.tcl:614
+#, tcl-format
+msgid "Unable to hardlink object: %s"
+msgstr ""
+
+#: lib/choose_repository.tcl:669
+msgid "Cannot fetch branches and objects.  See console output for details."
+msgstr ""
+
+#: lib/choose_repository.tcl:680
+msgid "Cannot fetch tags.  See console output for details."
+msgstr ""
+
+#: lib/choose_repository.tcl:704
+msgid "Cannot determine HEAD.  See console output for details."
+msgstr ""
+
+#: lib/choose_repository.tcl:713
+#, tcl-format
+msgid "Unable to cleanup %s"
+msgstr ""
+
+#: lib/choose_repository.tcl:719
+msgid "Clone failed."
+msgstr ""
+
+#: lib/choose_repository.tcl:726
+msgid "No default branch obtained."
+msgstr ""
+
+#: lib/choose_repository.tcl:737
+#, tcl-format
+msgid "Cannot resolve %s as a commit."
+msgstr ""
+
+#: lib/choose_repository.tcl:749
+msgid "Creating working directory"
+msgstr ""
+
+#: lib/choose_repository.tcl:750 lib/index.tcl:15 lib/index.tcl:80
+#: lib/index.tcl:149
+msgid "files"
+msgstr ""
+
+#: lib/choose_repository.tcl:779
+msgid "Initial file checkout failed."
+msgstr ""
+
+#: lib/choose_repository.tcl:795
+msgid "Open"
+msgstr ""
+
+#: lib/choose_repository.tcl:805
+#, fuzzy
+msgid "Repository:"
+msgstr "版本树"
+
+#: lib/choose_repository.tcl:854
+#, tcl-format
+msgid "Failed to open repository %s:"
+msgstr ""
+
+#: lib/choose_rev.tcl:53
 msgid "This Detached Checkout"
 msgstr ""
 
-#: lib/choose_rev.tcl:42
+#: lib/choose_rev.tcl:60
 msgid "Revision Expression:"
 msgstr ""
 
-#: lib/choose_rev.tcl:56
+#: lib/choose_rev.tcl:74
 #, fuzzy
 msgid "Local Branch"
 msgstr "分支"
 
-#: lib/choose_rev.tcl:61
+#: lib/choose_rev.tcl:79
 #, fuzzy
 msgid "Tracking Branch"
 msgstr "当前分支:"
 
-#: lib/choose_rev.tcl:66
+#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:537
 msgid "Tag"
 msgstr ""
 
-#: lib/choose_rev.tcl:227
+#: lib/choose_rev.tcl:317
 #, tcl-format
 msgid "Invalid revision: %s"
 msgstr ""
 
-#: lib/choose_rev.tcl:248
+#: lib/choose_rev.tcl:338
 msgid "No revision selected."
 msgstr ""
 
-#: lib/choose_rev.tcl:256
+#: lib/choose_rev.tcl:346
 msgid "Revision expression is empty."
 msgstr ""
 
+#: lib/choose_rev.tcl:530
+msgid "Updated"
+msgstr ""
+
+#: lib/choose_rev.tcl:558
+msgid "URL"
+msgstr ""
+
 #: lib/commit.tcl:9
 msgid ""
 "There is nothing to amend.\n"
@@ -811,8 +1175,8 @@ msgstr ""
 msgid ""
 "Unmerged files cannot be committed.\n"
 "\n"
-"File %s has merge conflicts.  You must resolve them and add the file before "
-"committing.\n"
+"File %s has merge conflicts.  You must resolve them and stage the file "
+"before committing.\n"
 msgstr ""
 
 #: lib/commit.tcl:162
@@ -827,7 +1191,7 @@ msgstr ""
 msgid ""
 "No changes to commit.\n"
 "\n"
-"You must add at least 1 file before you can commit.\n"
+"You must stage at least 1 file before you can commit.\n"
 msgstr ""
 
 #: lib/commit.tcl:183
@@ -845,6 +1209,11 @@ msgstr ""
 msgid "write-tree failed:"
 msgstr ""
 
+#: lib/commit.tcl:275
+#, tcl-format
+msgid "Commit %s appears to be corrupt"
+msgstr ""
+
 #: lib/commit.tcl:279
 msgid ""
 "No changes to commit.\n"
@@ -858,6 +1227,11 @@ msgstr ""
 msgid "No changes to commit."
 msgstr ""
 
+#: lib/commit.tcl:303
+#, tcl-format
+msgid "warning: Tcl does not support encoding '%s'."
+msgstr ""
+
 #: lib/commit.tcl:317
 msgid "commit-tree failed:"
 msgstr ""
@@ -871,15 +1245,15 @@ msgstr ""
 msgid "Created commit %s: %s"
 msgstr ""
 
-#: lib/console.tcl:55
+#: lib/console.tcl:57
 msgid "Working... please wait..."
 msgstr ""
 
-#: lib/console.tcl:184
+#: lib/console.tcl:183
 msgid "Success"
 msgstr ""
 
-#: lib/console.tcl:194
+#: lib/console.tcl:196
 msgid "Error: Command Failed"
 msgstr ""
 
@@ -920,6 +1294,22 @@ msgstr "压缩数据库"
 msgid "Verifying the object database with fsck-objects"
 msgstr ""
 
+#: 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:42
 #, tcl-format
 msgid ""
@@ -934,19 +1324,37 @@ msgid ""
 "the same state."
 msgstr ""
 
-#: lib/diff.tcl:97
+#: lib/diff.tcl:81
+#, tcl-format
+msgid "Loading diff of %s..."
+msgstr ""
+
+#: lib/diff.tcl:114 lib/diff.tcl:184
+#, tcl-format
+msgid "Unable to display %s"
+msgstr ""
+
+#: lib/diff.tcl:115
 msgid "Error loading file:"
 msgstr ""
 
-#: lib/diff.tcl:162
+#: lib/diff.tcl:122
+msgid "Git Repository (subproject)"
+msgstr ""
+
+#: lib/diff.tcl:134
+msgid "* Binary file (not showing content)."
+msgstr ""
+
+#: lib/diff.tcl:185
 msgid "Error loading diff:"
 msgstr ""
 
-#: lib/diff.tcl:278
+#: lib/diff.tcl:302
 msgid "Failed to unstage selected hunk."
 msgstr ""
 
-#: lib/diff.tcl:285
+#: lib/diff.tcl:309
 msgid "Failed to stage selected hunk."
 msgstr ""
 
@@ -962,32 +1370,42 @@ msgstr ""
 msgid "You must correct the above errors before committing."
 msgstr ""
 
-#: lib/index.tcl:364
+#: lib/index.tcl:241
+#, fuzzy, tcl-format
+msgid "Unstaging %s from commit"
+msgstr "从本次提交移除"
+
+#: lib/index.tcl:285
+#, tcl-format
+msgid "Adding %s"
+msgstr ""
+
+#: lib/index.tcl:340
 #, fuzzy, tcl-format
 msgid "Revert changes in file %s?"
 msgstr "恢复修改"
 
-#: lib/index.tcl:366
+#: lib/index.tcl:342
 #, tcl-format
 msgid "Revert changes in these %i files?"
 msgstr ""
 
-#: lib/index.tcl:372
-msgid "Any unadded changes will be permanently lost by the revert."
+#: lib/index.tcl:348
+msgid "Any unstaged changes will be permanently lost by the revert."
 msgstr ""
 
-#: lib/index.tcl:375
+#: lib/index.tcl:351
 msgid "Do Nothing"
 msgstr ""
 
-#: lib/merge.tcl:14
+#: 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/merge.tcl:28
+#: lib/merge.tcl:27
 msgid ""
 "Last scanned state does not match repository state.\n"
 "\n"
@@ -997,18 +1415,18 @@ msgid ""
 "The rescan will be automatically started now.\n"
 msgstr ""
 
-#: lib/merge.tcl:45
+#: lib/merge.tcl:44
 #, 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, add the file, and commit to complete the current "
+"You must resolve them, stage the file, and commit to complete the current "
 "merge.  Only then can you begin another merge.\n"
 msgstr ""
 
-#: lib/merge.tcl:55
+#: lib/merge.tcl:54
 #, tcl-format
 msgid ""
 "You are in the middle of a change.\n"
@@ -1019,37 +1437,41 @@ msgid ""
 "will help you abort a failed merge, should the need arise.\n"
 msgstr ""
 
-#: lib/merge.tcl:94
+#: lib/merge.tcl:106
+#, tcl-format
+msgid "%s of %s"
+msgstr ""
+
+#: lib/merge.tcl:119
 #, tcl-format
 msgid "Merging %s and %s"
 msgstr ""
 
-#: lib/merge.tcl:106
+#: lib/merge.tcl:131
 msgid "Merge completed successfully."
 msgstr ""
 
-#: lib/merge.tcl:108
+#: lib/merge.tcl:133
 msgid "Merge failed.  Conflict resolution is required."
 msgstr ""
 
-#: lib/merge.tcl:166
+#: lib/merge.tcl:158
 #, tcl-format
 msgid "Merge Into %s"
 msgstr ""
 
-#: lib/merge.tcl:181 lib/transport.tcl:98
-#, fuzzy
-msgid "Source Branches"
-msgstr "当前分支:"
+#: lib/merge.tcl:177
+msgid "Revision To Merge"
+msgstr ""
 
-#: lib/merge.tcl:240
+#: lib/merge.tcl:212
 msgid ""
 "Cannot abort while amending.\n"
 "\n"
 "You must finish amending this commit.\n"
 msgstr ""
 
-#: lib/merge.tcl:250
+#: lib/merge.tcl:222
 msgid ""
 "Abort merge?\n"
 "\n"
@@ -1058,90 +1480,120 @@ msgid ""
 "Continue with aborting the current merge?"
 msgstr ""
 
-#: lib/merge.tcl:256
+#: lib/merge.tcl:228
 msgid ""
-"Abort commit?\n"
+"Reset changes?\n"
 "\n"
-"Aborting the current commit will cause *ALL* uncommitted changes to be "
-"lost.\n"
+"Resetting the changes will cause *ALL* uncommitted changes to be lost.\n"
 "\n"
-"Continue with aborting the current commit?"
+"Continue with resetting the current changes?"
 msgstr ""
 
-#: lib/merge.tcl:267
-msgid "Aborting... please wait..."
+#: lib/merge.tcl:239
+msgid "Aborting"
 msgstr ""
 
-#: lib/merge.tcl:290
+#: lib/merge.tcl:266
+msgid "Abort failed."
+msgstr ""
+
+#: lib/merge.tcl:268
 msgid "Abort completed.  Ready."
 msgstr ""
 
-#: lib/option.tcl:77
-msgid "git-gui - a graphical user interface for Git."
-msgstr ""
-
-#: lib/option.tcl:164
+#: lib/option.tcl:82
 msgid "Restore Defaults"
 msgstr ""
 
-#: lib/option.tcl:168
+#: lib/option.tcl:86
 msgid "Save"
 msgstr ""
 
-#: lib/option.tcl:178
+#: lib/option.tcl:96
 #, fuzzy, tcl-format
 msgid "%s Repository"
 msgstr "版本树"
 
-#: lib/option.tcl:179
+#: lib/option.tcl:97
 msgid "Global (All Repositories)"
 msgstr ""
 
-#: lib/option.tcl:185
+#: lib/option.tcl:103
 msgid "User Name"
 msgstr ""
 
-#: lib/option.tcl:186
+#: lib/option.tcl:104
 msgid "Email Address"
 msgstr ""
 
-#: lib/option.tcl:188
+#: lib/option.tcl:106
 #, fuzzy
 msgid "Summarize Merge Commits"
 msgstr "修订合并提交描述:"
 
-#: lib/option.tcl:189
+#: lib/option.tcl:107
 msgid "Merge Verbosity"
 msgstr ""
 
-#: lib/option.tcl:190
+#: lib/option.tcl:108
 msgid "Show Diffstat After Merge"
 msgstr ""
 
-#: lib/option.tcl:192
+#: lib/option.tcl:110
 msgid "Trust File Modification Timestamps"
 msgstr ""
 
-#: lib/option.tcl:193
+#: lib/option.tcl:111
 msgid "Prune Tracking Branches During Fetch"
 msgstr ""
 
-#: lib/option.tcl:194
+#: lib/option.tcl:112
 msgid "Match Tracking Branches"
 msgstr ""
 
-#: lib/option.tcl:195
+#: lib/option.tcl:113
 msgid "Number of Diff Context Lines"
 msgstr ""
 
-#: lib/option.tcl:196
+#: lib/option.tcl:114
 msgid "New Branch Name Template"
 msgstr ""
 
-#: lib/option.tcl:305
+#: lib/option.tcl:176
+msgid "Change Font"
+msgstr ""
+
+#: lib/option.tcl:180
+#, tcl-format
+msgid "Choose %s"
+msgstr ""
+
+#: lib/option.tcl:186
+msgid "pt."
+msgstr ""
+
+#: lib/option.tcl:200
+msgid "Preferences"
+msgstr ""
+
+#: lib/option.tcl:235
 msgid "Failed to completely save options:"
 msgstr ""
 
+#: lib/remote.tcl:165
+msgid "Prune from"
+msgstr ""
+
+#: lib/remote.tcl:170
+#, fuzzy
+msgid "Fetch from"
+msgstr "导入"
+
+#: lib/remote.tcl:213
+#, fuzzy
+msgid "Push to"
+msgstr "上传"
+
 #: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34
 msgid "Delete Remote Branch"
 msgstr ""
@@ -1151,11 +1603,11 @@ msgstr ""
 msgid "From Repository"
 msgstr "版本树"
 
-#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:118
+#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:123
 msgid "Remote:"
 msgstr ""
 
-#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:133
+#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:138
 msgid "Arbitrary URL:"
 msgstr ""
 
@@ -1181,6 +1633,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 ""
@@ -1213,21 +1673,6 @@ msgstr ""
 msgid "Scanning %s..."
 msgstr ""
 
-#: lib/remote.tcl:156
-#, tcl-format
-msgid "Fetch from %s..."
-msgstr ""
-
-#: lib/remote.tcl:166
-#, tcl-format
-msgid "Prune from %s..."
-msgstr ""
-
-#: lib/remote.tcl:200
-#, fuzzy, tcl-format
-msgid "Push to %s..."
-msgstr "上传..."
-
 #: lib/shortcut.tcl:26 lib/shortcut.tcl:74
 msgid "Cannot write script:"
 msgstr ""
@@ -1236,49 +1681,89 @@ msgstr ""
 msgid "Cannot write icon:"
 msgstr ""
 
-#: lib/status_bar.tcl:58
+#: lib/status_bar.tcl:83
 #, tcl-format
 msgid "%s ... %*i of %*i %s (%3i%%)"
 msgstr ""
 
+#: lib/transport.tcl:6
+#, fuzzy, tcl-format
+msgid "fetch %s"
+msgstr "导入"
+
 #: lib/transport.tcl:7
 #, tcl-format
 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"
 msgstr ""
 
+#: lib/transport.tcl:25 lib/transport.tcl:71
+#, tcl-format
+msgid "push %s"
+msgstr ""
+
 #: lib/transport.tcl:26
 #, tcl-format
 msgid "Pushing changes to %s"
 msgstr ""
 
-#: lib/transport.tcl:68
+#: lib/transport.tcl:72
 #, tcl-format
 msgid "Pushing %s %s to %s"
 msgstr ""
 
-#: lib/transport.tcl:84
+#: lib/transport.tcl:89
 #, fuzzy
 msgid "Push Branches"
 msgstr "分支"
 
-#: lib/transport.tcl:115
+#: lib/transport.tcl:103
+#, fuzzy
+msgid "Source Branches"
+msgstr "当前分支:"
+
+#: lib/transport.tcl:120
 #, fuzzy
 msgid "Destination Repository"
 msgstr "版本树"
 
-#: lib/transport.tcl:153
+#: lib/transport.tcl:158
 msgid "Transfer Options"
 msgstr ""
 
-#: lib/transport.tcl:155
+#: lib/transport.tcl:160
+msgid "Force overwrite existing branch (may discard changes)"
+msgstr ""
+
+#: lib/transport.tcl:164
 msgid "Use thin pack (for slow network connections)"
 msgstr ""
 
-#: lib/transport.tcl:159
+#: lib/transport.tcl:168
 msgid "Include tags"
 msgstr ""
+
+#~ msgid "Add To Commit"
+#~ msgstr "添加到本次提交"
+
+#~ msgid "Add Existing To Commit"
+#~ msgstr "添加默认修改文件"
+
+#~ msgid "Unstaged Changes (Will Not Be Committed)"
+#~ msgstr "不被提交的修改"
+
+#~ msgid "Add Existing"
+#~ msgstr "添加默认修改文件"
+
+#, fuzzy
+#~ msgid "Push to %s..."
+#~ msgstr "上传..."
diff --git a/git-gui/windows/git-gui.sh b/git-gui/windows/git-gui.sh
new file mode 100644
index 0000000000..98f32c0a07
--- /dev/null
+++ b/git-gui/windows/git-gui.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+# Tcl ignores the next line -*- tcl -*- \
+exec wish "$0" -- "$@"
+
+if { $argc >=2 && [lindex $argv 0] == "--working-dir" } {
+	cd [lindex $argv 1]
+	set argv [lrange $argv 2 end]
+	incr argc -2
+}
+
+set gitguidir [file dirname [info script]]
+regsub -all ";" $gitguidir "\\;" gitguidir
+set env(PATH) "$gitguidir;$env(PATH)"
+unset gitguidir
+
+source [file join [file dirname [info script]] git-gui.tcl]