git-gui: Regenerated po template and merged translations with it

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

diff --git a/po/de.po b/po/de.po
index e84e1c7e087b1c64245124643d798a4f74d39f22..022b816ae1bf5591467218a310ed2a42aa634809 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: git-gui\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: git-gui\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2008-02-16 21:24+0100\n"
+"POT-Creation-Date: 2008-03-14 07:18+0100\n"

 "PO-Revision-Date: 2008-02-16 21:52+0100\n"
 "Last-Translator: Christian Stimming <stimming@tuhh.de>\n"
 "Language-Team: German\n"
 "PO-Revision-Date: 2008-02-16 21:52+0100\n"
 "Last-Translator: Christian Stimming <stimming@tuhh.de>\n"
 "Language-Team: German\n"


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

-#: git-gui.sh:41 git-gui.sh:604 git-gui.sh:618 git-gui.sh:631 git-gui.sh:714
-#: git-gui.sh:733
+#: git-gui.sh:41 git-gui.sh: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"
 
 msgid "git-gui: fatal error"
 msgstr "git-gui: Programmfehler"
 

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

 #, tcl-format
 msgid "Invalid font specified in %s:"
 msgstr "Ungültige Zeichensatz-Angabe in %s:"
 
 #, tcl-format
 msgid "Invalid font specified in %s:"
 msgstr "Ungültige Zeichensatz-Angabe in %s:"
 

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

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

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

 msgid "Diff/Console Font"
 msgstr "Vergleich-Schriftart"
 
 msgid "Diff/Console Font"
 msgstr "Vergleich-Schriftart"
 

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

 msgid "Cannot find git in PATH."
 msgstr "Git kann im PATH nicht gefunden werden."
 
 msgid "Cannot find git in PATH."
 msgstr "Git kann im PATH nicht gefunden werden."
 

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

 msgid "Cannot parse Git version string:"
 msgstr "Git Versionsangabe kann nicht erkannt werden:"
 
 msgid "Cannot parse Git version string:"
 msgstr "Git Versionsangabe kann nicht erkannt werden:"
 

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

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


@@ -60,81 +60,81 @@ msgstr ""
 "\n"
 "Soll angenommen werden, »%s« sei Version 1.5.0?\n"
 
 "\n"
 "Soll angenommen werden, »%s« sei Version 1.5.0?\n"
 

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

 msgid "Git directory not found:"
 msgstr "Git-Verzeichnis nicht gefunden:"
 
 msgid "Git directory not found:"
 msgstr "Git-Verzeichnis nicht gefunden:"
 

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

 msgid "Cannot move to top of working directory:"
 msgstr ""
 "Es konnte nicht in das oberste Verzeichnis der Arbeitskopie gewechselt "
 "werden:"
 
 msgid "Cannot move to top of working directory:"
 msgstr ""
 "Es konnte nicht in das oberste Verzeichnis der Arbeitskopie gewechselt "
 "werden:"
 

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

 msgid "Cannot use funny .git directory:"
 msgstr "Unerwartete Struktur des .git Verzeichnis:"
 
 msgid "Cannot use funny .git directory:"
 msgstr "Unerwartete Struktur des .git Verzeichnis:"
 

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

 msgid "No working directory"
 msgstr "Kein Arbeitsverzeichnis"
 
 msgid "No working directory"
 msgstr "Kein Arbeitsverzeichnis"
 

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

 msgid "Refreshing file status..."
 msgstr "Dateistatus aktualisieren..."
 
 msgid "Refreshing file status..."
 msgstr "Dateistatus aktualisieren..."
 

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

 msgid "Scanning for modified files ..."
 msgstr "Nach geänderten Dateien suchen..."
 
 msgid "Scanning for modified files ..."
 msgstr "Nach geänderten Dateien suchen..."
 

-#: git-gui.sh:1294 lib/browser.tcl:245
+#: git-gui.sh:1324 lib/browser.tcl:246

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

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

 msgid "Unmodified"
 msgstr "Unverändert"
 
 msgid "Unmodified"
 msgstr "Unverändert"
 

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

 msgid "Modified, not staged"
 msgstr "Verändert, nicht bereitgestellt"
 
 msgid "Modified, not staged"
 msgstr "Verändert, nicht bereitgestellt"
 

-#: git-gui.sh:1563 git-gui.sh:1568
+#: git-gui.sh:1593 git-gui.sh:1598

 msgid "Staged for commit"
 msgstr "Bereitgestellt zum Eintragen"
 
 msgid "Staged for commit"
 msgstr "Bereitgestellt zum Eintragen"
 

-#: git-gui.sh:1564 git-gui.sh:1569
+#: git-gui.sh:1594 git-gui.sh:1599

 msgid "Portions staged for commit"
 msgstr "Teilweise bereitgestellt zum Eintragen"
 
 msgid "Portions staged for commit"
 msgstr "Teilweise bereitgestellt zum Eintragen"
 

-#: git-gui.sh:1565 git-gui.sh:1570
+#: git-gui.sh:1595 git-gui.sh:1600

 msgid "Staged for commit, missing"
 msgstr "Bereitgestellt zum Eintragen, fehlend"
 
 msgid "Staged for commit, missing"
 msgstr "Bereitgestellt zum Eintragen, fehlend"
 

-#: git-gui.sh:1567
+#: git-gui.sh:1597

 msgid "Untracked, not staged"
 msgstr "Nicht unter Versionskontrolle, nicht bereitgestellt"
 
 msgid "Untracked, not staged"
 msgstr "Nicht unter Versionskontrolle, nicht bereitgestellt"
 

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

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

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

 msgid "Staged for removal"
 msgstr "Bereitgestellt zum Löschen"
 
 msgid "Staged for removal"
 msgstr "Bereitgestellt zum Löschen"
 

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

 msgid "Staged for removal, still present"
 msgstr "Bereitgestellt zum Löschen, trotzdem vorhanden"
 
 msgid "Staged for removal, still present"
 msgstr "Bereitgestellt zum Löschen, trotzdem vorhanden"
 

-#: git-gui.sh:1576 git-gui.sh:1577 git-gui.sh:1578 git-gui.sh:1579
+#: git-gui.sh:1606 git-gui.sh:1607 git-gui.sh:1608 git-gui.sh:1609

 msgid "Requires merge resolution"
 msgstr "Konfliktauflösung nötig"
 
 msgid "Requires merge resolution"
 msgstr "Konfliktauflösung nötig"
 

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

 msgid "Starting gitk... please wait..."
 msgstr "Gitk wird gestartet... bitte warten."
 
 msgid "Starting gitk... please wait..."
 msgstr "Gitk wird gestartet... bitte warten."
 

-#: git-gui.sh:1623
+#: git-gui.sh:1653

 #, tcl-format
 msgid ""
 "Unable to start gitk:\n"
 #, tcl-format
 msgid ""
 "Unable to start gitk:\n"


@@ -145,297 +145,297 @@ msgstr ""
 "\n"
 "%s existiert nicht"
 
 "\n"
 "%s existiert nicht"
 

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

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

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

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

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

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

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

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

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

 msgid "Merge"
 msgstr "Zusammenführen"
 
 msgid "Merge"
 msgstr "Zusammenführen"
 

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

 msgid "Remote"
 msgstr "Andere Archive"
 
 msgid "Remote"
 msgstr "Andere Archive"
 

-#: git-gui.sh:1842
+#: git-gui.sh:1879

 msgid "Browse Current Branch's Files"
 msgstr "Aktuellen Zweig durchblättern"
 
 msgid "Browse Current Branch's Files"
 msgstr "Aktuellen Zweig durchblättern"
 

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

 msgid "Browse Branch Files..."
 msgstr "Einen Zweig durchblättern..."
 
 msgid "Browse Branch Files..."
 msgstr "Einen Zweig durchblättern..."
 

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

 msgid "Visualize Current Branch's History"
 msgstr "Aktuellen Zweig darstellen"
 
 msgid "Visualize Current Branch's History"
 msgstr "Aktuellen Zweig darstellen"
 

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

 msgid "Visualize All Branch History"
 msgstr "Alle Zweige darstellen"
 
 msgid "Visualize All Branch History"
 msgstr "Alle Zweige darstellen"
 

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

 #, tcl-format
 msgid "Browse %s's Files"
 msgstr "Zweig »%s« durchblättern"
 
 #, tcl-format
 msgid "Browse %s's Files"
 msgstr "Zweig »%s« durchblättern"
 

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

 #, tcl-format
 msgid "Visualize %s's History"
 msgstr "Historie von »%s« darstellen"
 
 #, tcl-format
 msgid "Visualize %s's History"
 msgstr "Historie von »%s« darstellen"
 

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

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

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

 msgid "Compress Database"
 msgstr "Datenbank komprimieren"
 
 msgid "Compress Database"
 msgstr "Datenbank komprimieren"
 

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

 msgid "Verify Database"
 msgstr "Datenbank überprüfen"
 
 msgid "Verify Database"
 msgstr "Datenbank überprüfen"
 

-#: git-gui.sh:1882 git-gui.sh:1886 git-gui.sh:1890 lib/shortcut.tcl:7
+#: git-gui.sh:1919 git-gui.sh:1923 git-gui.sh:1927 lib/shortcut.tcl:7

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

-#: git-gui.sh:1895 lib/choose_repository.tcl:176 lib/choose_repository.tcl:184
+#: git-gui.sh:1932 lib/choose_repository.tcl:177 lib/choose_repository.tcl:185

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

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

 msgid "Undo"
 msgstr "Rückgängig"
 
 msgid "Undo"
 msgstr "Rückgängig"
 

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

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

-#: git-gui.sh:1909 git-gui.sh:2403
+#: git-gui.sh:1946 git-gui.sh:2443

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

-#: git-gui.sh:1912 git-gui.sh:2406 git-gui.sh:2477 git-gui.sh:2549
-#: lib/console.tcl:67
+#: git-gui.sh:1949 git-gui.sh:2446 git-gui.sh:2520 git-gui.sh:2614
+#: lib/console.tcl:69

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

-#: git-gui.sh:1915 git-gui.sh:2409
+#: git-gui.sh:1952 git-gui.sh:2449

 msgid "Paste"
 msgstr "Einfügen"
 
 msgid "Paste"
 msgstr "Einfügen"
 

-#: git-gui.sh:1918 git-gui.sh:2412 lib/branch_delete.tcl:26
+#: git-gui.sh:1955 git-gui.sh:2452 lib/branch_delete.tcl:26

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

-#: git-gui.sh:1922 git-gui.sh:2416 git-gui.sh:2553 lib/console.tcl:69
+#: git-gui.sh:1959 git-gui.sh:2456 git-gui.sh:2618 lib/console.tcl:71

 msgid "Select All"
 msgstr "Alle auswählen"
 
 msgid "Select All"
 msgstr "Alle auswählen"
 

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

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

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

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

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

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

-#: git-gui.sh:1948 git-gui.sh:2048
+#: git-gui.sh:1985 git-gui.sh:2085

 msgid "Delete..."
 msgstr "Löschen..."
 
 msgid "Delete..."
 msgstr "Löschen..."
 

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

 msgid "Reset..."
 msgstr "Zurücksetzen..."
 
 msgid "Reset..."
 msgstr "Zurücksetzen..."
 

-#: git-gui.sh:1965 git-gui.sh:2350
+#: git-gui.sh:2002 git-gui.sh:2389

 msgid "New Commit"
 msgstr "Neue Version"
 
 msgid "New Commit"
 msgstr "Neue Version"
 

-#: git-gui.sh:1973 git-gui.sh:2357
+#: git-gui.sh:2010 git-gui.sh:2396

 msgid "Amend Last Commit"
 msgstr "Letzte nachbessern"
 
 msgid "Amend Last Commit"
 msgstr "Letzte nachbessern"
 

-#: git-gui.sh:1982 git-gui.sh:2317 lib/remote_branch_delete.tcl:99
+#: git-gui.sh:2019 git-gui.sh:2356 lib/remote_branch_delete.tcl:99

 msgid "Rescan"
 msgstr "Neu laden"
 
 msgid "Rescan"
 msgstr "Neu laden"
 

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

 msgid "Stage To Commit"
 msgstr "Zum Eintragen bereitstellen"
 
 msgid "Stage To Commit"
 msgstr "Zum Eintragen bereitstellen"
 

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

 msgid "Stage Changed Files To Commit"
 msgstr "Geänderte Dateien bereitstellen"
 
 msgid "Stage Changed Files To Commit"
 msgstr "Geänderte Dateien bereitstellen"
 

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

 msgid "Unstage From Commit"
 msgstr "Aus der Bereitstellung herausnehmen"
 
 msgid "Unstage From Commit"
 msgstr "Aus der Bereitstellung herausnehmen"
 

-#: git-gui.sh:2005 lib/index.tcl:393
+#: git-gui.sh:2042 lib/index.tcl:395

 msgid "Revert Changes"
 msgstr "Änderungen verwerfen"
 
 msgid "Revert Changes"
 msgstr "Änderungen verwerfen"
 

-#: git-gui.sh:2012 git-gui.sh:2329 git-gui.sh:2427
+#: git-gui.sh:2049 git-gui.sh:2368 git-gui.sh:2467

 msgid "Sign Off"
 msgstr "Abzeichnen"
 
 msgid "Sign Off"
 msgstr "Abzeichnen"
 

-#: git-gui.sh:2016 git-gui.sh:2333
+#: git-gui.sh:2053 git-gui.sh:2372

 msgid "Commit@@verb"
 msgstr "Eintragen"
 
 msgid "Commit@@verb"
 msgstr "Eintragen"
 

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

 msgid "Local Merge..."
 msgstr "Lokales Zusammenführen..."
 
 msgid "Local Merge..."
 msgstr "Lokales Zusammenführen..."
 

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

 msgid "Abort Merge..."
 msgstr "Zusammenführen abbrechen..."
 
 msgid "Abort Merge..."
 msgstr "Zusammenführen abbrechen..."
 

-#: git-gui.sh:2044
+#: git-gui.sh:2081

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

-#: git-gui.sh:2055 lib/choose_repository.tcl:40
+#: git-gui.sh:2092 lib/choose_repository.tcl:41

 msgid "Apple"
 msgstr "Apple"
 
 msgid "Apple"
 msgstr "Apple"
 

-#: git-gui.sh:2058 git-gui.sh:2080 lib/about.tcl:13
-#: lib/choose_repository.tcl:43 lib/choose_repository.tcl:49
+#: git-gui.sh:2095 git-gui.sh:2117 lib/about.tcl:14
+#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:50

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

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

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

-#: git-gui.sh:2070 git-gui.sh:2595
+#: git-gui.sh:2107 git-gui.sh:2639

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

-#: git-gui.sh:2076 lib/choose_repository.tcl:46
+#: git-gui.sh:2113 lib/choose_repository.tcl:47

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

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

 msgid "Online Documentation"
 msgstr "Online-Dokumentation"
 
 msgid "Online Documentation"
 msgstr "Online-Dokumentation"
 

-#: git-gui.sh:2201
+#: git-gui.sh:2238

 #, tcl-format
 msgid "fatal: cannot stat path %s: No such file or directory"
 msgstr ""
 "Fehler: Verzeichnis »%s« kann nicht gelesen werden: Datei oder Verzeichnis "
 "nicht gefunden"
 
 #, tcl-format
 msgid "fatal: cannot stat path %s: No such file or directory"
 msgstr ""
 "Fehler: Verzeichnis »%s« kann nicht gelesen werden: Datei oder Verzeichnis "
 "nicht gefunden"
 

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

 msgid "Current Branch:"
 msgstr "Aktueller Zweig:"
 
 msgid "Current Branch:"
 msgstr "Aktueller Zweig:"
 

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

 msgid "Staged Changes (Will Commit)"
 msgstr "Bereitstellung (zum Eintragen)"
 
 msgid "Staged Changes (Will Commit)"
 msgstr "Bereitstellung (zum Eintragen)"
 

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

 msgid "Unstaged Changes"
 msgstr "Nicht bereitgestellte Änderungen"
 
 msgid "Unstaged Changes"
 msgstr "Nicht bereitgestellte Änderungen"
 

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

 msgid "Stage Changed"
 msgstr "Alles bereitstellen"
 
 msgid "Stage Changed"
 msgstr "Alles bereitstellen"
 

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

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

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

 msgid "Initial Commit Message:"
 msgstr "Erste Versionsbeschreibung:"
 
 msgid "Initial Commit Message:"
 msgstr "Erste Versionsbeschreibung:"
 

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

 msgid "Amended Commit Message:"
 msgstr "Nachgebesserte Beschreibung:"
 
 msgid "Amended Commit Message:"
 msgstr "Nachgebesserte Beschreibung:"
 

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

 msgid "Amended Initial Commit Message:"
 msgstr "Nachgebesserte erste Beschreibung:"
 
 msgid "Amended Initial Commit Message:"
 msgstr "Nachgebesserte erste Beschreibung:"
 

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

 msgid "Amended Merge Commit Message:"
 msgstr "Nachgebesserte Zusammenführungs-Beschreibung:"
 
 msgid "Amended Merge Commit Message:"
 msgstr "Nachgebesserte Zusammenführungs-Beschreibung:"
 

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

 msgid "Merge Commit Message:"
 msgstr "Zusammenführungs-Beschreibung:"
 
 msgid "Merge Commit Message:"
 msgstr "Zusammenführungs-Beschreibung:"
 

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

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

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

 msgid "Copy All"
 msgstr "Alle kopieren"
 
 msgid "Copy All"
 msgstr "Alle kopieren"
 

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

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

-#: git-gui.sh:2573
+#: git-gui.sh:2589

 msgid "Apply/Reverse Hunk"
 msgstr "Kontext anwenden/umkehren"
 
 msgid "Apply/Reverse Hunk"
 msgstr "Kontext anwenden/umkehren"
 

-#: git-gui.sh:2579
+#: git-gui.sh:2595

 msgid "Show Less Context"
 msgstr "Weniger Zeilen anzeigen"
 
 msgid "Show Less Context"
 msgstr "Weniger Zeilen anzeigen"
 

-#: git-gui.sh:2586
+#: git-gui.sh:2602

 msgid "Show More Context"
 msgstr "Mehr Zeilen anzeigen"
 
 msgid "Show More Context"
 msgstr "Mehr Zeilen anzeigen"
 

-#: git-gui.sh:2594
+#: git-gui.sh:2610

 msgid "Refresh"
 msgstr "Aktualisieren"
 
 msgid "Refresh"
 msgstr "Aktualisieren"
 

-#: git-gui.sh:2615
+#: git-gui.sh:2631

 msgid "Decrease Font Size"
 msgstr "Schriftgröße verkleinern"
 
 msgid "Decrease Font Size"
 msgstr "Schriftgröße verkleinern"
 

-#: git-gui.sh:2619
+#: git-gui.sh:2635

 msgid "Increase Font Size"
 msgstr "Schriftgröße vergrößern"
 
 msgid "Increase Font Size"
 msgstr "Schriftgröße vergrößern"
 

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

 msgid "Unstage Hunk From Commit"
 msgstr "Kontext aus Bereitstellung herausnehmen"
 
 msgid "Unstage Hunk From Commit"
 msgstr "Kontext aus Bereitstellung herausnehmen"
 

-#: git-gui.sh:2604
+#: git-gui.sh:2648

 msgid "Stage Hunk For Commit"
 msgstr "Kontext zur Bereitstellung hinzufügen"
 
 msgid "Stage Hunk For Commit"
 msgstr "Kontext zur Bereitstellung hinzufügen"
 

-#: git-gui.sh:2623
+#: git-gui.sh:2667

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

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

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


@@ -451,7 +451,7 @@ msgstr ""
 "von %s an Git weitergegeben werden:\n"
 "\n"
 
 "von %s an Git weitergegeben werden:\n"
 "\n"
 

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

 msgid ""
 "\n"
 "This is due to a known issue with the\n"
 msgid ""
 "\n"
 "This is due to a known issue with the\n"


@@ -461,7 +461,7 @@ msgstr ""
 "Dies ist ein bekanntes Problem der Tcl-Version, die\n"
 "in Cygwin mitgeliefert wird."
 
 "Dies ist ein bekanntes Problem der Tcl-Version, die\n"
 "in Cygwin mitgeliefert wird."
 

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

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


@@ -477,7 +477,7 @@ msgstr ""
 "gewünschten Werte für die Einstellung user.name und \n"
 "user.email in Ihre Datei ~/.gitconfig einfügen.\n"
 
 "gewünschten Werte für die Einstellung user.name und \n"
 "user.email in Ihre Datei ~/.gitconfig einfügen.\n"
 

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

 msgid "git-gui - a graphical user interface for Git."
 msgstr "git-gui - eine grafische Oberfläche für Git."
 
 msgid "git-gui - a graphical user interface for Git."
 msgstr "git-gui - eine grafische Oberfläche für Git."
 


@@ -489,56 +489,56 @@ msgstr "Datei-Browser"
 msgid "Commit:"
 msgstr "Version:"
 
 msgid "Commit:"
 msgstr "Version:"
 

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

 msgid "Copy Commit"
 msgstr "Version kopieren"
 
 msgid "Copy Commit"
 msgstr "Version kopieren"
 

-#: lib/blame.tcl:369
+#: lib/blame.tcl:384

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

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

 msgid "Loading copy/move tracking annotations..."
 msgstr "Annotierungen für Kopieren/Verschieben werden geladen..."
 
 msgid "Loading copy/move tracking annotations..."
 msgstr "Annotierungen für Kopieren/Verschieben werden geladen..."
 

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

 msgid "lines annotated"
 msgstr "Zeilen annotiert"
 
 msgid "lines annotated"
 msgstr "Zeilen annotiert"
 

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

 msgid "Loading original location annotations..."
 msgstr "Annotierungen für ursprünglichen Ort werden geladen..."
 
 msgid "Loading original location annotations..."
 msgstr "Annotierungen für ursprünglichen Ort werden geladen..."
 

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

 msgid "Annotation complete."
 msgstr "Annotierung vollständig."
 
 msgid "Annotation complete."
 msgstr "Annotierung vollständig."
 

-#: lib/blame.tcl:731
+#: lib/blame.tcl:746

 msgid "Loading annotation..."
 msgstr "Annotierung laden..."
 
 msgid "Loading annotation..."
 msgstr "Annotierung laden..."
 

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

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

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

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

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

 msgid "Original File:"
 msgstr "Ursprüngliche Datei:"
 
 msgid "Original File:"
 msgstr "Ursprüngliche Datei:"
 

-#: lib/blame.tcl:910
+#: lib/blame.tcl:925

 msgid "Originally By:"
 msgstr "Ursprünglich von:"
 
 msgid "Originally By:"
 msgstr "Ursprünglich von:"
 

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

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

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

 msgid "Copied Or Moved Here By:"
 msgstr "Kopiert oder verschoben durch:"
 
 msgid "Copied Or Moved Here By:"
 msgstr "Kopiert oder verschoben durch:"
 


@@ -551,17 +551,17 @@ msgid "Checkout"
 msgstr "Umstellen"
 
 #: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35
 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:281
-#: lib/checkout_op.tcl:522 lib/choose_font.tcl:43 lib/merge.tcl:172
-#: lib/option.tcl:90 lib/remote_branch_delete.tcl:42 lib/transport.tcl:97
+#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:282
+#: lib/checkout_op.tcl:522 lib/choose_font.tcl:43 lib/merge.tcl:171
+#: lib/option.tcl:103 lib/remote_branch_delete.tcl:42 lib/transport.tcl:97

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

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

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

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

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


@@ -581,7 +581,7 @@ msgstr "Zweig erstellen"
 msgid "Create New Branch"
 msgstr "Neuen Zweig erstellen"
 
 msgid "Create New Branch"
 msgstr "Neuen Zweig erstellen"
 

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

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


@@ -721,22 +721,22 @@ msgstr "Starten..."
 msgid "File Browser"
 msgstr "Datei-Browser"
 
 msgid "File Browser"
 msgstr "Datei-Browser"
 

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

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

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

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

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

 msgid "Browse Branch Files"
 msgstr "Dateien des Zweigs durchblättern"
 
 msgid "Browse Branch Files"
 msgstr "Dateien des Zweigs durchblättern"
 

-#: lib/browser.tcl:277 lib/choose_repository.tcl:391
-#: lib/choose_repository.tcl:482 lib/choose_repository.tcl:492
-#: lib/choose_repository.tcl:989
+#: lib/browser.tcl:278 lib/choose_repository.tcl:387
+#: lib/choose_repository.tcl:474 lib/choose_repository.tcl:484
+#: lib/choose_repository.tcl:987

 msgid "Browse"
 msgstr "Blättern"
 
 msgid "Browse"
 msgstr "Blättern"
 


@@ -750,7 +750,7 @@ msgstr "Änderungen »%s« von »%s« anfordern"
 msgid "fatal: Cannot resolve %s"
 msgstr "Fehler: »%s« kann nicht als Zweig oder Version erkannt werden"
 
 msgid "fatal: Cannot resolve %s"
 msgstr "Fehler: »%s« kann nicht als Zweig oder Version erkannt werden"
 

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

 msgid "Close"
 msgstr "Schließen"
 
 msgid "Close"
 msgstr "Schließen"
 


@@ -839,7 +839,7 @@ msgstr ""
 "Wenn Sie auf einem Zweig arbeiten möchten, erstellen Sie bitte jetzt einen "
 "Zweig mit der Auswahl »Abgetrennte Arbeitskopie-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
+#: lib/checkout_op.tcl:446 lib/checkout_op.tcl:450

 #, tcl-format
 msgid "Checked out '%s'."
 msgstr "Umgestellt auf »%s«."
 #, tcl-format
 msgid "Checked out '%s'."
 msgstr "Umgestellt auf »%s«."


@@ -860,7 +860,7 @@ msgstr ""
 msgid "Reset '%s'?"
 msgstr "»%s« zurücksetzen?"
 
 msgid "Reset '%s'?"
 msgstr "»%s« zurücksetzen?"
 

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

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


@@ -890,15 +890,15 @@ msgstr "Auswählen"
 msgid "Font Family"
 msgstr "Schriftfamilie"
 
 msgid "Font Family"
 msgstr "Schriftfamilie"
 

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

 msgid "Font Size"
 msgstr "Schriftgröße"
 
 msgid "Font Size"
 msgstr "Schriftgröße"
 

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

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

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

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


@@ -906,231 +906,231 @@ msgstr ""
 "Dies ist ein Beispieltext.\n"
 "Wenn Ihnen dieser Text gefällt, sollten Sie diese Schriftart wählen."
 
 "Dies ist ein Beispieltext.\n"
 "Wenn Ihnen dieser Text gefällt, sollten Sie diese Schriftart wählen."
 

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

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

-#: lib/choose_repository.tcl:80 lib/choose_repository.tcl:380
+#: lib/choose_repository.tcl:81 lib/choose_repository.tcl:376

 msgid "Create New Repository"
 msgstr "Neues Projektarchiv"
 
 msgid "Create New Repository"
 msgstr "Neues Projektarchiv"
 

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

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

-#: lib/choose_repository.tcl:93 lib/choose_repository.tcl:468
+#: lib/choose_repository.tcl:94 lib/choose_repository.tcl:460

 msgid "Clone Existing Repository"
 msgstr "Projektarchiv klonen"
 
 msgid "Clone Existing Repository"
 msgstr "Projektarchiv klonen"
 

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

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

-#: lib/choose_repository.tcl:106 lib/choose_repository.tcl:978
+#: lib/choose_repository.tcl:107 lib/choose_repository.tcl:976

 msgid "Open Existing Repository"
 msgstr "Projektarchiv öffnen"
 
 msgid "Open Existing Repository"
 msgstr "Projektarchiv öffnen"
 

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

 msgid "Open..."
 msgstr "Öffnen..."
 
 msgid "Open..."
 msgstr "Öffnen..."
 

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

 msgid "Recent Repositories"
 msgstr "Zuletzt benutzte Projektarchive"
 
 msgid "Recent Repositories"
 msgstr "Zuletzt benutzte Projektarchive"
 

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

 msgid "Open Recent Repository:"
 msgstr "Zuletzt benutztes Projektarchiv öffnen:"
 
 msgid "Open Recent Repository:"
 msgstr "Zuletzt benutztes Projektarchiv öffnen:"
 

-#: lib/choose_repository.tcl:294
-#, tcl-format
-msgid "Location %s already exists."
-msgstr "Projektarchiv »%s« existiert bereits."
-
-#: lib/choose_repository.tcl:300 lib/choose_repository.tcl:307
-#: lib/choose_repository.tcl:314
+#: lib/choose_repository.tcl:296 lib/choose_repository.tcl:303
+#: lib/choose_repository.tcl:310

 #, tcl-format
 msgid "Failed to create repository %s:"
 msgstr "Projektarchiv »%s« konnte nicht erstellt werden:"
 
 #, tcl-format
 msgid "Failed to create repository %s:"
 msgstr "Projektarchiv »%s« konnte nicht erstellt werden:"
 

-#: lib/choose_repository.tcl:385 lib/choose_repository.tcl:486
+#: lib/choose_repository.tcl:381 lib/choose_repository.tcl:478

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

-#: lib/choose_repository.tcl:415 lib/choose_repository.tcl:544
-#: lib/choose_repository.tcl:1013
+#: lib/choose_repository.tcl:412 lib/choose_repository.tcl:537
+#: lib/choose_repository.tcl:1011

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

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

 #, tcl-format
 msgid "Directory %s already exists."
 msgstr "Verzeichnis »%s« existiert bereits."
 
 #, tcl-format
 msgid "Directory %s already exists."
 msgstr "Verzeichnis »%s« existiert bereits."
 

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

 #, tcl-format
 msgid "File %s already exists."
 msgstr "Datei »%s« existiert bereits."
 
 #, tcl-format
 msgid "File %s already exists."
 msgstr "Datei »%s« existiert bereits."
 

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

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

-#: lib/choose_repository.tcl:476
+#: lib/choose_repository.tcl:468

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

-#: lib/choose_repository.tcl:496
+#: lib/choose_repository.tcl:489

 msgid "Clone Type:"
 msgstr "Art des Klonens:"
 
 msgid "Clone Type:"
 msgstr "Art des Klonens:"
 

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

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

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

 msgid "Full Copy (Slower, Redundant Backup)"
 msgstr "Alles kopieren (langsamer, volle Redundanz)"
 
 msgid "Full Copy (Slower, Redundant Backup)"
 msgstr "Alles kopieren (langsamer, volle Redundanz)"
 

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

 msgid "Shared (Fastest, Not Recommended, No Backup)"
 msgstr "Verknüpft (schnell, nicht empfohlen, kein Backup)"
 
 msgid "Shared (Fastest, Not Recommended, No Backup)"
 msgstr "Verknüpft (schnell, nicht empfohlen, kein Backup)"
 

-#: lib/choose_repository.tcl:550 lib/choose_repository.tcl:597
-#: lib/choose_repository.tcl:738 lib/choose_repository.tcl:808
-#: lib/choose_repository.tcl:1019 lib/choose_repository.tcl:1027
+#: lib/choose_repository.tcl:543 lib/choose_repository.tcl:590
+#: lib/choose_repository.tcl:736 lib/choose_repository.tcl:806
+#: lib/choose_repository.tcl:1017 lib/choose_repository.tcl:1025

 #, tcl-format
 msgid "Not a Git repository: %s"
 msgstr "Kein Git-Projektarchiv in »%s« gefunden."
 
 #, tcl-format
 msgid "Not a Git repository: %s"
 msgstr "Kein Git-Projektarchiv in »%s« gefunden."
 

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

 msgid "Standard only available for local repository."
 msgstr "Standard ist nur für lokale Projektarchive verfügbar."
 
 msgid "Standard only available for local repository."
 msgstr "Standard ist nur für lokale Projektarchive verfügbar."
 

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

 msgid "Shared only available for local repository."
 msgstr "Verknüpft ist nur für lokale Projektarchive verfügbar."
 
 msgid "Shared only available for local repository."
 msgstr "Verknüpft ist nur für lokale Projektarchive verfügbar."
 

-#: lib/choose_repository.tcl:617
+#: lib/choose_repository.tcl:604
+#, tcl-format
+msgid "Location %s already exists."
+msgstr "Projektarchiv »%s« existiert bereits."
+
+#: lib/choose_repository.tcl:615

 msgid "Failed to configure origin"
 msgstr "Der Ursprungsort konnte nicht eingerichtet werden"
 
 msgid "Failed to configure origin"
 msgstr "Der Ursprungsort konnte nicht eingerichtet werden"
 

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

 msgid "Counting objects"
 msgstr "Objekte werden gezählt"
 
 msgid "Counting objects"
 msgstr "Objekte werden gezählt"
 

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

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

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

 #, tcl-format
 msgid "Unable to copy objects/info/alternates: %s"
 msgstr "Kopien von Objekten/Info/Alternates konnten nicht erstellt werden: %s"
 
 #, tcl-format
 msgid "Unable to copy objects/info/alternates: %s"
 msgstr "Kopien von Objekten/Info/Alternates konnten nicht erstellt werden: %s"
 

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

 #, tcl-format
 msgid "Nothing to clone from %s."
 msgstr "Von »%s« konnte nichts geklont werden."
 
 #, tcl-format
 msgid "Nothing to clone from %s."
 msgstr "Von »%s« konnte nichts geklont werden."
 

-#: lib/choose_repository.tcl:692 lib/choose_repository.tcl:906
-#: lib/choose_repository.tcl:918
+#: lib/choose_repository.tcl:690 lib/choose_repository.tcl:904
+#: lib/choose_repository.tcl:916

 msgid "The 'master' branch has not been initialized."
 msgstr "Der »master«-Zweig wurde noch nicht initialisiert."
 
 msgid "The 'master' branch has not been initialized."
 msgstr "Der »master«-Zweig wurde noch nicht initialisiert."
 

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

 msgid "Hardlinks are unavailable.  Falling back to copying."
 msgstr "Hardlinks nicht verfügbar. Stattdessen wird kopiert."
 
 msgid "Hardlinks are unavailable.  Falling back to copying."
 msgstr "Hardlinks nicht verfügbar. Stattdessen wird kopiert."
 

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

 #, tcl-format
 msgid "Cloning from %s"
 msgstr "Kopieren von »%s«"
 
 #, tcl-format
 msgid "Cloning from %s"
 msgstr "Kopieren von »%s«"
 

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

 msgid "Copying objects"
 msgstr "Objektdatenbank kopieren"
 
 msgid "Copying objects"
 msgstr "Objektdatenbank kopieren"
 

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

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

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

 #, tcl-format
 msgid "Unable to copy object: %s"
 msgstr "Objekt kann nicht kopiert werden: %s"
 
 #, tcl-format
 msgid "Unable to copy object: %s"
 msgstr "Objekt kann nicht kopiert werden: %s"
 

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

 msgid "Linking objects"
 msgstr "Objekte verlinken"
 
 msgid "Linking objects"
 msgstr "Objekte verlinken"
 

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

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

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

 #, tcl-format
 msgid "Unable to hardlink object: %s"
 msgstr "Für Objekt konnte kein Hardlink erstellt werden: %s"
 
 #, tcl-format
 msgid "Unable to hardlink object: %s"
 msgstr "Für Objekt konnte kein Hardlink erstellt werden: %s"
 

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

 msgid "Cannot fetch branches and objects.  See console output for details."
 msgstr ""
 "Zweige und Objekte konnten nicht angefordert werden.  Kontrollieren Sie die "
 "Ausgaben auf der Konsole für weitere Angaben."
 
 msgid "Cannot fetch branches and objects.  See console output for details."
 msgstr ""
 "Zweige und Objekte konnten nicht angefordert werden.  Kontrollieren Sie die "
 "Ausgaben auf der Konsole für weitere Angaben."
 

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

 msgid "Cannot fetch tags.  See console output for details."
 msgstr ""
 "Markierungen konnten nicht angefordert werden.  Kontrollieren Sie die "
 "Ausgaben auf der Konsole für weitere Angaben."
 
 msgid "Cannot fetch tags.  See console output for details."
 msgstr ""
 "Markierungen konnten nicht angefordert werden.  Kontrollieren Sie die "
 "Ausgaben auf der Konsole für weitere Angaben."
 

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

 msgid "Cannot determine HEAD.  See console output for details."
 msgstr ""
 "Die Zweigspitze (HEAD) konnte nicht gefunden werden.  Kontrollieren Sie die "
 "Ausgaben auf der Konsole für weitere Angaben."
 
 msgid "Cannot determine HEAD.  See console output for details."
 msgstr ""
 "Die Zweigspitze (HEAD) konnte nicht gefunden werden.  Kontrollieren Sie die "
 "Ausgaben auf der Konsole für weitere Angaben."
 

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

 #, tcl-format
 msgid "Unable to cleanup %s"
 msgstr "Verzeichnis »%s« kann nicht aufgeräumt werden."
 
 #, tcl-format
 msgid "Unable to cleanup %s"
 msgstr "Verzeichnis »%s« kann nicht aufgeräumt werden."
 

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

 msgid "Clone failed."
 msgstr "Klonen fehlgeschlagen."
 
 msgid "Clone failed."
 msgstr "Klonen fehlgeschlagen."
 

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

 msgid "No default branch obtained."
 msgstr "Kein voreingestellter Zweig gefunden."
 
 msgid "No default branch obtained."
 msgstr "Kein voreingestellter Zweig gefunden."
 

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

 #, tcl-format
 msgid "Cannot resolve %s as a commit."
 msgstr "»%s« wurde nicht als Version gefunden."
 
 #, tcl-format
 msgid "Cannot resolve %s as a commit."
 msgstr "»%s« wurde nicht als Version gefunden."
 

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

 msgid "Creating working directory"
 msgstr "Arbeitskopie erstellen"
 
 msgid "Creating working directory"
 msgstr "Arbeitskopie erstellen"
 

-#: lib/choose_repository.tcl:928 lib/index.tcl:65 lib/index.tcl:127
+#: lib/choose_repository.tcl:926 lib/index.tcl:65 lib/index.tcl:127

 #: lib/index.tcl:193
 msgid "files"
 msgstr "Dateien"
 
 #: lib/index.tcl:193
 msgid "files"
 msgstr "Dateien"
 

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

 msgid "Initial file checkout failed."
 msgstr "Erstellen der Arbeitskopie fehlgeschlagen."
 
 msgid "Initial file checkout failed."
 msgstr "Erstellen der Arbeitskopie fehlgeschlagen."
 

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

 msgid "Open"
 msgstr "Öffnen"
 
 msgid "Open"
 msgstr "Öffnen"
 

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

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

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

 #, tcl-format
 msgid "Failed to open repository %s:"
 msgstr "Projektarchiv »%s« konnte nicht geöffnet werden."
 #, tcl-format
 msgid "Failed to open repository %s:"
 msgstr "Projektarchiv »%s« konnte nicht geöffnet werden."


@@ -1151,7 +1151,7 @@ msgstr "Lokaler Zweig"
 msgid "Tracking Branch"
 msgstr "Übernahmezweig"
 
 msgid "Tracking Branch"
 msgstr "Übernahmezweig"
 

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

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


@@ -1168,11 +1168,11 @@ msgstr "Keine Version ausgewählt."
 msgid "Revision expression is empty."
 msgstr "Versions-Ausdruck ist leer."
 
 msgid "Revision expression is empty."
 msgstr "Versions-Ausdruck ist leer."
 

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

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

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

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


@@ -1304,7 +1304,9 @@ msgstr "Aufrufen der Versionsbeschreibungs-Kontrolle..."
 
 #: lib/commit.tcl:274
 msgid "Commit declined by commit-msg hook."
 
 #: lib/commit.tcl:274
 msgid "Commit declined by commit-msg hook."

-msgstr "Eintragen abgelehnt durch Versionsbeschreibungs-Kontrolle (»commit-message hook«)."
+msgstr ""
+"Eintragen abgelehnt durch Versionsbeschreibungs-Kontrolle (»commit-message "
+"hook«)."

 
 #: lib/commit.tcl:287
 msgid "Committing changes..."
 
 #: lib/commit.tcl:287
 msgid "Committing changes..."


@@ -1323,7 +1325,7 @@ msgstr "Eintragen fehlgeschlagen."
 msgid "Commit %s appears to be corrupt"
 msgstr "Version »%s« scheint beschädigt zu sein"
 
 msgid "Commit %s appears to be corrupt"
 msgstr "Version »%s« scheint beschädigt zu sein"
 

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

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


@@ -1338,7 +1340,7 @@ msgstr ""
 "\n"
 "Das Arbeitsverzeichnis wird daher jetzt neu geladen.\n"
 
 "\n"
 "Das Arbeitsverzeichnis wird daher jetzt neu geladen.\n"
 

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

 msgid "No changes to commit."
 msgstr "Keine Änderungen, die eingetragen werden können."
 
 msgid "No changes to commit."
 msgstr "Keine Änderungen, die eingetragen werden können."
 


@@ -1346,24 +1348,24 @@ msgstr "Keine Änderungen, die eingetragen werden können."
 msgid "commit-tree failed:"
 msgstr "commit-tree fehlgeschlagen:"
 
 msgid "commit-tree failed:"
 msgstr "commit-tree fehlgeschlagen:"
 

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

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

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

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

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

 msgid "Working... please wait..."
 msgstr "Verarbeitung. Bitte warten..."
 
 msgid "Working... please wait..."
 msgstr "Verarbeitung. Bitte warten..."
 

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

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

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

 msgid "Error: Command Failed"
 msgstr "Fehler: Kommando fehlgeschlagen"
 
 msgid "Error: Command Failed"
 msgstr "Fehler: Kommando fehlgeschlagen"
 


@@ -1474,24 +1476,24 @@ msgstr "* Binärdatei (Inhalt wird nicht angezeigt)"
 msgid "Error loading diff:"
 msgstr "Fehler beim Laden des Vergleichs:"
 
 msgid "Error loading diff:"
 msgstr "Fehler beim Laden des Vergleichs:"
 

-#: lib/diff.tcl:302
+#: lib/diff.tcl:303

 msgid "Failed to unstage selected hunk."
 msgstr ""
 "Fehler beim Herausnehmen des gewählten Kontexts aus der Bereitstellung."
 
 msgid "Failed to unstage selected hunk."
 msgstr ""
 "Fehler beim Herausnehmen des gewählten Kontexts aus der Bereitstellung."
 

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

 msgid "Failed to stage selected hunk."
 msgstr "Fehler beim Bereitstellen des gewählten Kontexts."
 
 msgid "Failed to stage selected hunk."
 msgstr "Fehler beim Bereitstellen des gewählten Kontexts."
 

-#: lib/error.tcl:12 lib/error.tcl:102
+#: lib/error.tcl:20 lib/error.tcl:114

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

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

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

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

 msgid "You must correct the above errors before committing."
 msgstr ""
 "Sie müssen die obigen Fehler zuerst beheben, bevor Sie eintragen können."
 msgid "You must correct the above errors before committing."
 msgstr ""
 "Sie müssen die obigen Fehler zuerst beheben, bevor Sie eintragen können."


@@ -1545,12 +1547,12 @@ msgstr "Änderungen in Datei »%s« verwerfen?"
 msgid "Revert changes in these %i files?"
 msgstr "Änderungen in den gewählten %i Dateien verwerfen?"
 
 msgid "Revert changes in these %i files?"
 msgstr "Änderungen in den gewählten %i Dateien verwerfen?"
 

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

 msgid "Any unstaged changes will be permanently lost by the revert."
 msgstr ""
 "Alle nicht bereitgestellten Änderungen werden beim Verwerfen verloren gehen."
 
 msgid "Any unstaged changes will be permanently lost by the revert."
 msgstr ""
 "Alle nicht bereitgestellten Änderungen werden beim Verwerfen verloren gehen."
 

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

 msgid "Do Nothing"
 msgstr "Nichts tun"
 
 msgid "Do Nothing"
 msgstr "Nichts tun"
 


@@ -1629,20 +1631,20 @@ msgstr "Zusammenführen von %s und %s..."
 msgid "Merge completed successfully."
 msgstr "Zusammenführen erfolgreich abgeschlossen."
 
 msgid "Merge completed successfully."
 msgstr "Zusammenführen erfolgreich abgeschlossen."
 

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

 msgid "Merge failed.  Conflict resolution is required."
 msgstr "Zusammenführen fehlgeschlagen. Konfliktauflösung ist notwendig."
 
 msgid "Merge failed.  Conflict resolution is required."
 msgstr "Zusammenführen fehlgeschlagen. Konfliktauflösung ist notwendig."
 

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

 #, tcl-format
 msgid "Merge Into %s"
 msgstr "Zusammenführen in »%s«"
 
 #, tcl-format
 msgid "Merge Into %s"
 msgstr "Zusammenführen in »%s«"
 

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

 msgid "Revision To Merge"
 msgstr "Zusammenzuführende Version"
 
 msgid "Revision To Merge"
 msgstr "Zusammenzuführende Version"
 

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

 msgid ""
 "Cannot abort while amending.\n"
 "\n"
 msgid ""
 "Cannot abort while amending.\n"
 "\n"


@@ -1652,7 +1654,7 @@ msgstr ""
 "\n"
 "Sie müssen die Nachbesserung der Version abschließen.\n"
 
 "\n"
 "Sie müssen die Nachbesserung der Version abschließen.\n"
 

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

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


@@ -1667,7 +1669,7 @@ msgstr ""
 "\n"
 "Zusammenführen jetzt abbrechen?"
 
 "\n"
 "Zusammenführen jetzt abbrechen?"
 

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

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


@@ -1682,7 +1684,7 @@ msgstr ""
 "\n"
 "Änderungen jetzt zurücksetzen?"
 
 "\n"
 "Änderungen jetzt zurücksetzen?"
 

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

 msgid "Aborting"
 msgstr "Abbruch"
 
 msgid "Aborting"
 msgstr "Abbruch"
 


@@ -1694,89 +1696,94 @@ msgstr "Dateien zurückgesetzt"
 msgid "Abort failed."
 msgstr "Abbruch fehlgeschlagen."
 
 msgid "Abort failed."
 msgstr "Abbruch fehlgeschlagen."
 

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

 msgid "Abort completed.  Ready."
 msgstr "Abbruch durchgeführt. Bereit."
 
 msgid "Abort completed.  Ready."
 msgstr "Abbruch durchgeführt. Bereit."
 

-#: lib/option.tcl:82
+#: lib/option.tcl:95

 msgid "Restore Defaults"
 msgstr "Voreinstellungen wiederherstellen"
 
 msgid "Restore Defaults"
 msgstr "Voreinstellungen wiederherstellen"
 

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

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

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

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

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

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

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

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

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

 msgid "Email Address"
 msgstr "E-Mail-Adresse"
 
 msgid "Email Address"
 msgstr "E-Mail-Adresse"
 

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

 msgid "Summarize Merge Commits"
 msgstr "Zusammenführungs-Versionen zusammenfassen"
 
 msgid "Summarize Merge Commits"
 msgstr "Zusammenführungs-Versionen zusammenfassen"
 

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

 msgid "Merge Verbosity"
 msgstr "Ausführlichkeit der Zusammenführen-Meldungen"
 
 msgid "Merge Verbosity"
 msgstr "Ausführlichkeit der Zusammenführen-Meldungen"
 

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

 msgid "Show Diffstat After Merge"
 msgstr "Vergleichsstatistik nach Zusammenführen anzeigen"
 
 msgid "Show Diffstat After Merge"
 msgstr "Vergleichsstatistik nach Zusammenführen anzeigen"
 

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

 msgid "Trust File Modification Timestamps"
 msgstr "Auf Dateiänderungsdatum verlassen"
 
 msgid "Trust File Modification Timestamps"
 msgstr "Auf Dateiänderungsdatum verlassen"
 

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

 msgid "Prune Tracking Branches During Fetch"
 msgstr "Übernahmezweige aufräumen während Anforderung"
 
 msgid "Prune Tracking Branches During Fetch"
 msgstr "Übernahmezweige aufräumen während Anforderung"
 

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

 msgid "Match Tracking Branches"
 msgstr "Passend zu Übernahmezweig"
 
 msgid "Match Tracking Branches"
 msgstr "Passend zu Übernahmezweig"
 

-#: lib/option.tcl:113
+#: lib/option.tcl:126

 msgid "Number of Diff Context Lines"
 msgstr "Anzahl der Kontextzeilen beim Vergleich"
 
 msgid "Number of Diff Context Lines"
 msgstr "Anzahl der Kontextzeilen beim Vergleich"
 

-#: lib/option.tcl:114
+#: lib/option.tcl:127
+#, fuzzy
+msgid "Commit Message Text Width"
+msgstr "Versionsbeschreibung:"
+
+#: lib/option.tcl:128

 msgid "New Branch Name Template"
 msgstr "Namensvorschlag für neue Zweige"
 
 msgid "New Branch Name Template"
 msgstr "Namensvorschlag für neue Zweige"
 

-#: lib/option.tcl:191
+#: lib/option.tcl:192

 msgid "Spelling Dictionary:"
 msgstr "Wörterbuch Rechtschreibprüfung:"
 
 msgid "Spelling Dictionary:"
 msgstr "Wörterbuch Rechtschreibprüfung:"
 

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

 msgid "Change Font"
 msgstr "Schriftart ändern"
 
 msgid "Change Font"
 msgstr "Schriftart ändern"
 

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

 #, tcl-format
 msgid "Choose %s"
 msgstr "%s wählen"
 
 #, tcl-format
 msgid "Choose %s"
 msgstr "%s wählen"
 

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

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

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

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

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

 msgid "Failed to completely save options:"
 msgstr "Optionen konnten nicht gespeichert werden:"
 
 msgid "Failed to completely save options:"
 msgstr "Optionen konnten nicht gespeichert werden:"
 


@@ -1886,23 +1893,44 @@ msgstr "Fehler beim Schreiben der Verknüpfung:"
 msgid "Cannot write icon:"
 msgstr "Fehler beim Erstellen des Icons:"
 
 msgid "Cannot write icon:"
 msgstr "Fehler beim Erstellen des Icons:"
 

-#: lib/spellcheck.tcl:37
-msgid "Not connected to aspell"
-msgstr "Keine Verbindung zu »aspell«"
+#: lib/spellcheck.tcl:57
+msgid "Unsupported spell checker"
+msgstr ""
+
+#: lib/spellcheck.tcl:65
+#, fuzzy
+msgid "Spell checking is unavailable"
+msgstr "Rechtschreibprüfung fehlgeschlagen"
+
+#: lib/spellcheck.tcl:68
+msgid "Invalid spell checking configuration"
+msgstr ""
+
+#: lib/spellcheck.tcl:70
+#, tcl-format
+msgid "Reverting dictionary to %s."
+msgstr ""
+
+#: lib/spellcheck.tcl:73
+#, fuzzy
+msgid "Spell checker silently failed on startup"
+msgstr "Rechtschreibprüfung fehlgeschlagen"

 
 

-#: lib/spellcheck.tcl:41
-msgid "Unrecognized aspell version"
+#: lib/spellcheck.tcl:80
+#, fuzzy
+msgid "Unrecognized spell checker"

 msgstr "Unbekannte Version von »aspell«"
 
 msgstr "Unbekannte Version von »aspell«"
 

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

 msgid "No Suggestions"
 msgstr "Keine Vorschläge"
 
 msgid "No Suggestions"
 msgstr "Keine Vorschläge"
 

-#: lib/spellcheck.tcl:336
-msgid "Unexpected EOF from aspell"
+#: lib/spellcheck.tcl:381
+#, fuzzy
+msgid "Unexpected EOF from spell checker"

 msgstr "Unerwartetes EOF von »aspell«"
 
 msgstr "Unerwartetes EOF von »aspell«"
 

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

 msgid "Spell Checker Failed"
 msgstr "Rechtschreibprüfung fehlgeschlagen"
 
 msgid "Spell Checker Failed"
 msgstr "Rechtschreibprüfung fehlgeschlagen"
 


@@ -1974,3 +2002,6 @@ msgstr "Kompaktes Datenformat benutzen (für langsame Netzverbindungen)"
 #: lib/transport.tcl:168
 msgid "Include tags"
 msgstr "Mit Markierungen übertragen"
 #: lib/transport.tcl:168
 msgid "Include tags"
 msgstr "Mit Markierungen übertragen"

+
+#~ msgid "Not connected to aspell"
+#~ msgstr "Keine Verbindung zu »aspell«"

diff --git a/po/fr.po b/po/fr.po
index d389bdaca1b601eb8f6132968c75fce5a90f372e..d281938e33d86bf0e6dc1de479595d3a8b1ffaac 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2007-11-24 10:36+0100\n"
+"POT-Creation-Date: 2008-03-14 07:18+0100\n"

 "PO-Revision-Date: 2008-01-14 21:08+0100\n"
 "Last-Translator: Christian Couder <chriscool@tuxfamily.org>\n"
 "Language-Team: French\n"
 "PO-Revision-Date: 2008-01-14 21:08+0100\n"
 "Last-Translator: Christian Couder <chriscool@tuxfamily.org>\n"
 "Language-Team: French\n"


@@ -18,33 +18,33 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n > 1);\n"
 
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n > 1);\n"
 

-#: git-gui.sh:41 git-gui.sh:604 git-gui.sh:618 git-gui.sh:631 git-gui.sh:714
-#: git-gui.sh:733
+#: git-gui.sh:41 git-gui.sh: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: erreur fatale"
 
 msgid "git-gui: fatal error"
 msgstr "git-gui: erreur fatale"
 

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

 #, tcl-format
 msgid "Invalid font specified in %s:"
 msgstr "Invalide fonte spécifiée dans %s :"
 
 #, tcl-format
 msgid "Invalid font specified in %s:"
 msgstr "Invalide fonte spécifiée dans %s :"
 

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

 msgid "Main Font"
 msgstr "Fonte principale"
 
 msgid "Main Font"
 msgstr "Fonte principale"
 

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

 msgid "Diff/Console Font"
 msgstr "Fonte diff/console"
 
 msgid "Diff/Console Font"
 msgstr "Fonte diff/console"
 

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

 msgid "Cannot find git in PATH."
 msgstr "Impossible de trouver git dans PATH."
 
 msgid "Cannot find git in PATH."
 msgstr "Impossible de trouver git dans PATH."
 

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

 msgid "Cannot parse Git version string:"
 msgstr "Impossible de parser la version de Git :"
 
 msgid "Cannot parse Git version string:"
 msgstr "Impossible de parser la version de Git :"
 

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

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


@@ -63,79 +63,79 @@ msgstr ""
 "\n"
 "Peut'on considérer que '%s' est en version 1.5.0 ?\n"
 
 "\n"
 "Peut'on considérer que '%s' est en version 1.5.0 ?\n"
 

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

 msgid "Git directory not found:"
 msgstr "Impossible de trouver le répertoire de Git :"
 
 msgid "Git directory not found:"
 msgstr "Impossible de trouver le répertoire de Git :"
 

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

 msgid "Cannot move to top of working directory:"
 msgstr "Impossible d'aller à la racine du répertoire de travail :"
 
 msgid "Cannot move to top of working directory:"
 msgstr "Impossible d'aller à la racine du répertoire de travail :"
 

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

 msgid "Cannot use funny .git directory:"
 msgstr "Impossible d'utiliser un drôle de répertoire git :"
 
 msgid "Cannot use funny .git directory:"
 msgstr "Impossible d'utiliser un drôle de répertoire git :"
 

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

 msgid "No working directory"
 msgstr "Pas de répertoire de travail"
 
 msgid "No working directory"
 msgstr "Pas de répertoire de travail"
 

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

 msgid "Refreshing file status..."
 msgstr "Rafraichissement du status des fichiers..."
 
 msgid "Refreshing file status..."
 msgstr "Rafraichissement du status des fichiers..."
 

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

 msgid "Scanning for modified files ..."
 msgstr "Recherche de fichiers modifiés..."
 
 msgid "Scanning for modified files ..."
 msgstr "Recherche de fichiers modifiés..."
 

-#: git-gui.sh:1294 lib/browser.tcl:245
+#: git-gui.sh:1324 lib/browser.tcl:246

 msgid "Ready."
 msgstr "Prêt."
 
 msgid "Ready."
 msgstr "Prêt."
 

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

 msgid "Unmodified"
 msgstr "Non modifié"
 
 msgid "Unmodified"
 msgstr "Non modifié"
 

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

 msgid "Modified, not staged"
 msgstr "Modifié, non pré-commité"
 
 msgid "Modified, not staged"
 msgstr "Modifié, non pré-commité"
 

-#: git-gui.sh:1563 git-gui.sh:1568
+#: git-gui.sh:1593 git-gui.sh:1598

 msgid "Staged for commit"
 msgstr "Pré-commité"
 
 msgid "Staged for commit"
 msgstr "Pré-commité"
 

-#: git-gui.sh:1564 git-gui.sh:1569
+#: git-gui.sh:1594 git-gui.sh:1599

 msgid "Portions staged for commit"
 msgstr "En partie pré-commité"
 
 msgid "Portions staged for commit"
 msgstr "En partie pré-commité"
 

-#: git-gui.sh:1565 git-gui.sh:1570
+#: git-gui.sh:1595 git-gui.sh:1600

 msgid "Staged for commit, missing"
 msgstr "Pré-commité, manquant"
 
 msgid "Staged for commit, missing"
 msgstr "Pré-commité, manquant"
 

-#: git-gui.sh:1567
+#: git-gui.sh:1597

 msgid "Untracked, not staged"
 msgstr "Non suivi, non pré-commité"
 
 msgid "Untracked, not staged"
 msgstr "Non suivi, non pré-commité"
 

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

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

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

 msgid "Staged for removal"
 msgstr "Pré-commité pour suppression"
 
 msgid "Staged for removal"
 msgstr "Pré-commité pour suppression"
 

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

 msgid "Staged for removal, still present"
 msgstr "Pré-commité pour suppression, toujours présent"
 
 msgid "Staged for removal, still present"
 msgstr "Pré-commité pour suppression, toujours présent"
 

-#: git-gui.sh:1576 git-gui.sh:1577 git-gui.sh:1578 git-gui.sh:1579
+#: git-gui.sh:1606 git-gui.sh:1607 git-gui.sh:1608 git-gui.sh:1609

 msgid "Requires merge resolution"
 msgstr "Nécessite la résolution d'une fusion"
 
 msgid "Requires merge resolution"
 msgstr "Nécessite la résolution d'une fusion"
 

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

 msgid "Starting gitk... please wait..."
 msgstr "Lancement de gitk... merci de patienter..."
 
 msgid "Starting gitk... please wait..."
 msgstr "Lancement de gitk... merci de patienter..."
 

-#: git-gui.sh:1623
+#: git-gui.sh:1653

 #, tcl-format
 msgid ""
 "Unable to start gitk:\n"
 #, tcl-format
 msgid ""
 "Unable to start gitk:\n"


@@ -146,295 +146,296 @@ msgstr ""
 "\n"
 "%s inexistant"
 
 "\n"
 "%s inexistant"
 

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

 msgid "Repository"
 msgstr "Référentiel"
 
 msgid "Repository"
 msgstr "Référentiel"
 

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

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

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

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

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

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

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

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

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

 msgid "Remote"
 msgstr "Référentiel distant"
 
 msgid "Remote"
 msgstr "Référentiel distant"
 

-#: git-gui.sh:1842
+#: git-gui.sh:1879

 msgid "Browse Current Branch's Files"
 msgstr "Visionner fichiers dans branche courante"
 
 msgid "Browse Current Branch's Files"
 msgstr "Visionner fichiers dans branche courante"
 

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

 msgid "Browse Branch Files..."
 msgstr "Visionner fichiers de branche"
 
 msgid "Browse Branch Files..."
 msgstr "Visionner fichiers de branche"
 

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

 msgid "Visualize Current Branch's History"
 msgstr "Visualiser historique branche courante"
 
 msgid "Visualize Current Branch's History"
 msgstr "Visualiser historique branche courante"
 

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

 msgid "Visualize All Branch History"
 msgstr "Visualiser historique toutes branches"
 
 msgid "Visualize All Branch History"
 msgstr "Visualiser historique toutes branches"
 

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

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

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

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

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

 msgid "Database Statistics"
 msgstr "Statistiques base de donnée"
 
 msgid "Database Statistics"
 msgstr "Statistiques base de donnée"
 

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

 msgid "Compress Database"
 msgstr "Comprimer base de donnée"
 
 msgid "Compress Database"
 msgstr "Comprimer base de donnée"
 

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

 msgid "Verify Database"
 msgstr "Vérifier base de donnée"
 
 msgid "Verify Database"
 msgstr "Vérifier base de donnée"
 

-#: git-gui.sh:1882 git-gui.sh:1886 git-gui.sh:1890 lib/shortcut.tcl:7
+#: git-gui.sh:1919 git-gui.sh:1923 git-gui.sh:1927 lib/shortcut.tcl:7

 #: lib/shortcut.tcl:39 lib/shortcut.tcl:71
 msgid "Create Desktop Icon"
 msgstr "Créer icône sur bureau"
 
 #: lib/shortcut.tcl:39 lib/shortcut.tcl:71
 msgid "Create Desktop Icon"
 msgstr "Créer icône sur bureau"
 

-#: git-gui.sh:1895 lib/choose_repository.tcl:176 lib/choose_repository.tcl:184
+#: git-gui.sh:1932 lib/choose_repository.tcl:177 lib/choose_repository.tcl:185

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

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

 msgid "Undo"
 msgstr "Défaire"
 
 msgid "Undo"
 msgstr "Défaire"
 

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

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

-#: git-gui.sh:1909 git-gui.sh:2403
+#: git-gui.sh:1946 git-gui.sh:2443

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

-#: git-gui.sh:1912 git-gui.sh:2406 git-gui.sh:2477 git-gui.sh:2549
-#: lib/console.tcl:67
+#: git-gui.sh:1949 git-gui.sh:2446 git-gui.sh:2520 git-gui.sh:2614
+#: lib/console.tcl:69

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

-#: git-gui.sh:1915 git-gui.sh:2409
+#: git-gui.sh:1952 git-gui.sh:2449

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

-#: git-gui.sh:1918 git-gui.sh:2412 lib/branch_delete.tcl:26
+#: git-gui.sh:1955 git-gui.sh:2452 lib/branch_delete.tcl:26

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

-#: git-gui.sh:1922 git-gui.sh:2416 git-gui.sh:2553 lib/console.tcl:69
+#: git-gui.sh:1959 git-gui.sh:2456 git-gui.sh:2618 lib/console.tcl:71

 msgid "Select All"
 msgstr "Tout sélectionner"
 
 msgid "Select All"
 msgstr "Tout sélectionner"
 

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

 msgid "Create..."
 msgstr "Créer..."
 
 msgid "Create..."
 msgstr "Créer..."
 

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

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

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

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

-#: git-gui.sh:1948 git-gui.sh:2048
+#: git-gui.sh:1985 git-gui.sh:2085

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

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

 msgid "Reset..."
 msgstr "Réinitialiser..."
 
 msgid "Reset..."
 msgstr "Réinitialiser..."
 

-#: git-gui.sh:1965 git-gui.sh:2350
+#: git-gui.sh:2002 git-gui.sh:2389

 msgid "New Commit"
 msgstr "Nouveau commit"
 
 msgid "New Commit"
 msgstr "Nouveau commit"
 

-#: git-gui.sh:1973 git-gui.sh:2357
+#: git-gui.sh:2010 git-gui.sh:2396

 msgid "Amend Last Commit"
 msgstr "Corriger dernier commit"
 
 msgid "Amend Last Commit"
 msgstr "Corriger dernier commit"
 

-#: git-gui.sh:1982 git-gui.sh:2317 lib/remote_branch_delete.tcl:99
+#: git-gui.sh:2019 git-gui.sh:2356 lib/remote_branch_delete.tcl:99

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

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

 msgid "Stage To Commit"
 msgstr "Commiter un pré-commit"
 
 msgid "Stage To Commit"
 msgstr "Commiter un pré-commit"
 

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

 msgid "Stage Changed Files To Commit"
 msgstr "Commiter fichiers modifiés dans pré-commit"
 
 msgid "Stage Changed Files To Commit"
 msgstr "Commiter fichiers modifiés dans pré-commit"
 

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

 msgid "Unstage From Commit"
 msgstr "Commit vers pré-commit"
 
 msgid "Unstage From Commit"
 msgstr "Commit vers pré-commit"
 

-#: git-gui.sh:2005 lib/index.tcl:393
+#: git-gui.sh:2042 lib/index.tcl:395

 msgid "Revert Changes"
 msgstr "Inverser modification"
 
 msgid "Revert Changes"
 msgstr "Inverser modification"
 

-#: git-gui.sh:2012 git-gui.sh:2329 git-gui.sh:2427
+#: git-gui.sh:2049 git-gui.sh:2368 git-gui.sh:2467

 msgid "Sign Off"
 msgstr "Se désinscrire"
 
 msgid "Sign Off"
 msgstr "Se désinscrire"
 

-#: git-gui.sh:2016 git-gui.sh:2333
+#: git-gui.sh:2053 git-gui.sh:2372

 msgid "Commit@@verb"
 msgstr "Commiter"
 
 msgid "Commit@@verb"
 msgstr "Commiter"
 

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

 msgid "Local Merge..."
 msgstr "Fusion locale..."
 
 msgid "Local Merge..."
 msgstr "Fusion locale..."
 

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

 msgid "Abort Merge..."
 msgstr "Abandonner fusion..."
 
 msgid "Abort Merge..."
 msgstr "Abandonner fusion..."
 

-#: git-gui.sh:2044
+#: git-gui.sh:2081

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

-#: git-gui.sh:2055 lib/choose_repository.tcl:40
+#: git-gui.sh:2092 lib/choose_repository.tcl:41

 msgid "Apple"
 msgstr "Pomme"
 
 msgid "Apple"
 msgstr "Pomme"
 

-#: git-gui.sh:2058 git-gui.sh:2080 lib/about.tcl:13
-#: lib/choose_repository.tcl:43 lib/choose_repository.tcl:49
+#: git-gui.sh:2095 git-gui.sh:2117 lib/about.tcl:14
+#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:50

 #, tcl-format
 msgid "About %s"
 msgstr "A propos de %s"
 
 #, tcl-format
 msgid "About %s"
 msgstr "A propos de %s"
 

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

 msgid "Preferences..."
 msgstr "Préférences..."
 
 msgid "Preferences..."
 msgstr "Préférences..."
 

-#: git-gui.sh:2070 git-gui.sh:2595
+#: git-gui.sh:2107 git-gui.sh:2639

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

-#: git-gui.sh:2076 lib/choose_repository.tcl:46
+#: git-gui.sh:2113 lib/choose_repository.tcl:47

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

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

 msgid "Online Documentation"
 msgstr "Documentation en ligne"
 
 msgid "Online Documentation"
 msgstr "Documentation en ligne"
 

-#: git-gui.sh:2201
+#: git-gui.sh:2238

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

-msgstr "fatale : pas d'infos sur le chemin %s : Fichier ou répertoire inexistant"
+msgstr ""
+"fatale : pas d'infos sur le chemin %s : Fichier ou répertoire inexistant"

 
 

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

 msgid "Current Branch:"
 msgstr "Branche courante :"
 
 msgid "Current Branch:"
 msgstr "Branche courante :"
 

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

 msgid "Staged Changes (Will Commit)"
 msgstr "Modifications pré-commitées"
 
 msgid "Staged Changes (Will Commit)"
 msgstr "Modifications pré-commitées"
 

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

 msgid "Unstaged Changes"
 msgstr "Modifications non pré-commitées"
 
 msgid "Unstaged Changes"
 msgstr "Modifications non pré-commitées"
 

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

 msgid "Stage Changed"
 msgstr "Pré-commit modifié"
 
 msgid "Stage Changed"
 msgstr "Pré-commit modifié"
 

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

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

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

 msgid "Initial Commit Message:"
 msgstr "Message de commit initial :"
 
 msgid "Initial Commit Message:"
 msgstr "Message de commit initial :"
 

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

 msgid "Amended Commit Message:"
 msgstr "Message de commit corrigé :"
 
 msgid "Amended Commit Message:"
 msgstr "Message de commit corrigé :"
 

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

 msgid "Amended Initial Commit Message:"
 msgstr "Message de commit initial corrigé :"
 
 msgid "Amended Initial Commit Message:"
 msgstr "Message de commit initial corrigé :"
 

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

 msgid "Amended Merge Commit Message:"
 msgstr "Message de commit de fusion corrigé :"
 
 msgid "Amended Merge Commit Message:"
 msgstr "Message de commit de fusion corrigé :"
 

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

 msgid "Merge Commit Message:"
 msgstr "Message de commit de fusion :"
 
 msgid "Merge Commit Message:"
 msgstr "Message de commit de fusion :"
 

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

 msgid "Commit Message:"
 msgstr "Message de commit :"
 
 msgid "Commit Message:"
 msgstr "Message de commit :"
 

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

 msgid "Copy All"
 msgstr "Copier tout"
 
 msgid "Copy All"
 msgstr "Copier tout"
 

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

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

-#: git-gui.sh:2545
-msgid "Refresh"
-msgstr "Rafraichir"
-
-#: git-gui.sh:2566
+#: git-gui.sh:2589

 msgid "Apply/Reverse Hunk"
 msgstr "Appliquer/Inverser section"
 
 msgid "Apply/Reverse Hunk"
 msgstr "Appliquer/Inverser section"
 

-#: git-gui.sh:2572
-msgid "Decrease Font Size"
-msgstr "Réduire fonte"
-
-#: git-gui.sh:2576
-msgid "Increase Font Size"
-msgstr "Agrandir fonte"
-
-#: git-gui.sh:2581
+#: git-gui.sh:2595

 msgid "Show Less Context"
 msgstr "Montrer moins de contexte"
 
 msgid "Show Less Context"
 msgstr "Montrer moins de contexte"
 

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

 msgid "Show More Context"
 msgstr "Montrer plus de contexte"
 
 msgid "Show More Context"
 msgstr "Montrer plus de contexte"
 

-#: git-gui.sh:2602
+#: git-gui.sh:2610
+msgid "Refresh"
+msgstr "Rafraichir"
+
+#: git-gui.sh:2631
+msgid "Decrease Font Size"
+msgstr "Réduire fonte"
+
+#: git-gui.sh:2635
+msgid "Increase Font Size"
+msgstr "Agrandir fonte"
+
+#: git-gui.sh:2646

 msgid "Unstage Hunk From Commit"
 msgstr "Enlever section pré-commitée"
 
 msgid "Unstage Hunk From Commit"
 msgstr "Enlever section pré-commitée"
 

-#: git-gui.sh:2604
+#: git-gui.sh:2648

 msgid "Stage Hunk For Commit"
 msgstr "Pré-commiter section"
 
 msgid "Stage Hunk For Commit"
 msgstr "Pré-commiter section"
 

-#: git-gui.sh:2623
+#: git-gui.sh:2667

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

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

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


@@ -451,7 +452,7 @@ msgstr ""
 "sous-processus de Git lancés par %s\n"
 "\n"
 
 "sous-processus de Git lancés par %s\n"
 "\n"
 

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

 msgid ""
 "\n"
 "This is due to a known issue with the\n"
 msgid ""
 "\n"
 "This is due to a known issue with the\n"


@@ -461,7 +462,7 @@ msgstr ""
 "Ceci est du à un problème connu avec\n"
 "le binaire Tcl distribué par Cygwin."
 
 "Ceci est du à un problème connu avec\n"
 "le binaire Tcl distribué par Cygwin."
 

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

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


@@ -478,7 +479,7 @@ msgstr ""
 "de l'utilisateur) et 'user.email' (addresse email\n"
 "de l'utilisateur) dans votre fichier '~/.gitconfig'.\n"
 
 "de l'utilisateur) et 'user.email' (addresse email\n"
 "de l'utilisateur) dans votre fichier '~/.gitconfig'.\n"
 

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

 msgid "git-gui - a graphical user interface for Git."
 msgstr "git-gui - une interface graphique utilisateur pour Git"
 
 msgid "git-gui - a graphical user interface for Git."
 msgstr "git-gui - une interface graphique utilisateur pour Git"
 


@@ -490,56 +491,56 @@ msgstr "Visionneur de fichier"
 msgid "Commit:"
 msgstr "Commit :"
 
 msgid "Commit:"
 msgstr "Commit :"
 

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

 msgid "Copy Commit"
 msgstr "Copier commit"
 
 msgid "Copy Commit"
 msgstr "Copier commit"
 

-#: lib/blame.tcl:369
+#: lib/blame.tcl:384

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

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

 msgid "Loading copy/move tracking annotations..."
 msgstr "Chargement des annotations de suivi des copies/déplacements..."
 
 msgid "Loading copy/move tracking annotations..."
 msgstr "Chargement des annotations de suivi des copies/déplacements..."
 

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

 msgid "lines annotated"
 msgstr "lignes annotées"
 
 msgid "lines annotated"
 msgstr "lignes annotées"
 

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

 msgid "Loading original location annotations..."
 msgstr "Chargement des annotations d'emplacement original"
 
 msgid "Loading original location annotations..."
 msgstr "Chargement des annotations d'emplacement original"
 

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

 msgid "Annotation complete."
 msgstr "Annotation terminée."
 
 msgid "Annotation complete."
 msgstr "Annotation terminée."
 

-#: lib/blame.tcl:731
+#: lib/blame.tcl:746

 msgid "Loading annotation..."
 msgstr "Chargement des annotations..."
 
 msgid "Loading annotation..."
 msgstr "Chargement des annotations..."
 

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

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

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

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

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

 msgid "Original File:"
 msgstr "Fichier original :"
 
 msgid "Original File:"
 msgstr "Fichier original :"
 

-#: lib/blame.tcl:910
+#: lib/blame.tcl:925

 msgid "Originally By:"
 msgstr "A l'origine par :"
 
 msgid "Originally By:"
 msgstr "A l'origine par :"
 

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

 msgid "In File:"
 msgstr "Dans le fichier :"
 
 msgid "In File:"
 msgstr "Dans le fichier :"
 

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

 msgid "Copied Or Moved Here By:"
 msgstr "Copié ou déplacé ici par :"
 
 msgid "Copied Or Moved Here By:"
 msgstr "Copié ou déplacé ici par :"
 


@@ -552,17 +553,17 @@ msgid "Checkout"
 msgstr "Emprunter"
 
 #: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35
 msgstr "Emprunter"
 
 #: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35

-#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:281
-#: lib/checkout_op.tcl:522 lib/choose_font.tcl:43 lib/merge.tcl:172
-#: lib/option.tcl:90 lib/remote_branch_delete.tcl:42 lib/transport.tcl:97
+#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:282
+#: lib/checkout_op.tcl:522 lib/choose_font.tcl:43 lib/merge.tcl:171
+#: lib/option.tcl:103 lib/remote_branch_delete.tcl:42 lib/transport.tcl:97

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

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

 msgid "Revision"
 msgstr "Révision"
 
 msgid "Revision"
 msgstr "Révision"
 

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

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


@@ -582,7 +583,7 @@ msgstr "Créer branche"
 msgid "Create New Branch"
 msgstr "Créer nouvelle branche"
 
 msgid "Create New Branch"
 msgstr "Créer nouvelle branche"
 

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

 msgid "Create"
 msgstr "Créer"
 
 msgid "Create"
 msgstr "Créer"
 


@@ -629,7 +630,8 @@ msgstr "Merci de choisir une branche de suivi"
 #: lib/branch_create.tcl:140
 #, tcl-format
 msgid "Tracking branch %s is not a branch in the remote repository."
 #: lib/branch_create.tcl:140
 #, tcl-format
 msgid "Tracking branch %s is not a branch in the remote repository."

-msgstr "La branche de suivi %s n'est pas une branche dans le référentiel distant."
+msgstr ""
+"La branche de suivi %s n'est pas une branche dans le référentiel distant."

 
 #: lib/branch_create.tcl:153 lib/branch_rename.tcl:86
 msgid "Please supply a branch name."
 
 #: lib/branch_create.tcl:153 lib/branch_rename.tcl:86
 msgid "Please supply a branch name."


@@ -722,22 +724,22 @@ msgstr "Lancement..."
 msgid "File Browser"
 msgstr "Visionneur de fichier"
 
 msgid "File Browser"
 msgstr "Visionneur de fichier"
 

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

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

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

 msgid "[Up To Parent]"
 msgstr "[Jusqu'au parent]"
 
 msgid "[Up To Parent]"
 msgstr "[Jusqu'au parent]"
 

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

 msgid "Browse Branch Files"
 msgstr "Visionner fichiers de branches"
 
 msgid "Browse Branch Files"
 msgstr "Visionner fichiers de branches"
 

-#: lib/browser.tcl:277 lib/choose_repository.tcl:391
-#: lib/choose_repository.tcl:482 lib/choose_repository.tcl:492
-#: lib/choose_repository.tcl:989
+#: lib/browser.tcl:278 lib/choose_repository.tcl:387
+#: lib/choose_repository.tcl:474 lib/choose_repository.tcl:484
+#: lib/choose_repository.tcl:987

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


@@ -751,7 +753,7 @@ msgstr "Récupération de %s à partir de %s"
 msgid "fatal: Cannot resolve %s"
 msgstr "Erreur fatale : Impossible de résoudre %s"
 
 msgid "fatal: Cannot resolve %s"
 msgstr "Erreur fatale : Impossible de résoudre %s"
 

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

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


@@ -796,9 +798,12 @@ msgid ""
 "\n"
 "The rescan will be automatically started now.\n"
 msgstr ""
 "\n"
 "The rescan will be automatically started now.\n"
 msgstr ""

-"L'état lors de la dernière synchronisation ne correspond plus à l'état du référentiel.\n"
+"L'état lors de la dernière synchronisation ne correspond plus à l'état du "
+"référentiel.\n"

 "\n"
 "\n"

-"Un autre programme Git a modifié ce référentiel depuis la dernière synchronisation. Une resynchronisation doit être effectuée avant de pouvoir modifier la branche courante.\n"
+"Un autre programme Git a modifié ce référentiel depuis la dernière "
+"synchronisation. Une resynchronisation doit être effectuée avant de pouvoir "
+"modifier la branche courante.\n"

 "\n"
 "Cela va être fait tout de suite automatiquement.\n"
 
 "\n"
 "Cela va être fait tout de suite automatiquement.\n"
 


@@ -807,10 +812,15 @@ msgstr ""
 msgid "Updating working directory to '%s'..."
 msgstr "Mise à jour du répertoire courant avec '%s'..."
 
 msgid "Updating working directory to '%s'..."
 msgstr "Mise à jour du répertoire courant avec '%s'..."
 

+#: lib/checkout_op.tcl:323
+msgid "files checked out"
+msgstr ""
+

 #: lib/checkout_op.tcl:353
 #, tcl-format
 msgid "Aborted checkout of '%s' (file level merging is required)."
 #: lib/checkout_op.tcl:353
 #, tcl-format
 msgid "Aborted checkout of '%s' (file level merging is required)."

-msgstr "Emprunt de '%s' abandonné. (Il est nécessaire de fusionner des fichiers.)"
+msgstr ""
+"Emprunt de '%s' abandonné. (Il est nécessaire de fusionner des fichiers.)"

 
 #: lib/checkout_op.tcl:354
 msgid "File level merge required."
 
 #: lib/checkout_op.tcl:354
 msgid "File level merge required."


@@ -830,9 +840,10 @@ msgid ""
 msgstr ""
 "Vous n'êtes plus ur une branche locale.\n"
 "\n"
 msgstr ""
 "Vous n'êtes plus ur une branche locale.\n"
 "\n"

-"Si vous vouliez être sur une branche, créez en une maintenant en partant de 'Cet emprunt détaché'."
+"Si vous vouliez être sur une branche, créez en une maintenant en partant de "
+"'Cet emprunt détaché'."

 
 

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

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


@@ -851,7 +862,7 @@ msgstr "Récupérer les commits perdus ne sera peut être pas facile."
 msgid "Reset '%s'?"
 msgstr "Réinitialiser '%s' ?"
 
 msgid "Reset '%s'?"
 msgstr "Réinitialiser '%s' ?"
 

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

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


@@ -867,7 +878,9 @@ msgid ""
 msgstr ""
 "Le changement de la branche courante a échoué.\n"
 "\n"
 msgstr ""
 "Le changement de la branche courante a échoué.\n"
 "\n"

-"Le répertoire courant n'est que partiellement modifié. Les fichiers ont été mis à jour avec succès, mais la mise à jour d'un fichier interne à Git a échouée.\n"
+"Le répertoire courant n'est que partiellement modifié. Les fichiers ont été "
+"mis à jour avec succès, mais la mise à jour d'un fichier interne à Git a "
+"échouée.\n"

 "\n"
 "Cela n'aurait pas du se produire. %s va abandonner et se terminer."
 
 "\n"
 "Cela n'aurait pas du se produire. %s va abandonner et se terminer."
 


@@ -879,15 +892,15 @@ msgstr "Sélectionner"
 msgid "Font Family"
 msgstr "Famille de fonte"
 
 msgid "Font Family"
 msgstr "Famille de fonte"
 

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

 msgid "Font Size"
 msgstr "Taille de fonte"
 
 msgid "Font Size"
 msgstr "Taille de fonte"
 

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

 msgid "Font Example"
 msgstr "Exemple de fonte"
 
 msgid "Font Example"
 msgstr "Exemple de fonte"
 

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

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


@@ -895,225 +908,230 @@ msgstr ""
 "C'est un texte d'exemple.\n"
 "Si vous aimez ce texte, vous pouvez choisir cette fonte."
 
 "C'est un texte d'exemple.\n"
 "Si vous aimez ce texte, vous pouvez choisir cette fonte."
 

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

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

-#: lib/choose_repository.tcl:80 lib/choose_repository.tcl:380
+#: lib/choose_repository.tcl:81 lib/choose_repository.tcl:376

 msgid "Create New Repository"
 msgstr "Créer nouveau référentiel"
 
 msgid "Create New Repository"
 msgstr "Créer nouveau référentiel"
 

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

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

-#: lib/choose_repository.tcl:93 lib/choose_repository.tcl:468
+#: lib/choose_repository.tcl:94 lib/choose_repository.tcl:460

 msgid "Clone Existing Repository"
 msgstr "Cloner référentiel existant"
 
 msgid "Clone Existing Repository"
 msgstr "Cloner référentiel existant"
 

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

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

-#: lib/choose_repository.tcl:106 lib/choose_repository.tcl:978
+#: lib/choose_repository.tcl:107 lib/choose_repository.tcl:976

 msgid "Open Existing Repository"
 msgstr "Ouvrir référentiel existant"
 
 msgid "Open Existing Repository"
 msgstr "Ouvrir référentiel existant"
 

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

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

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

 msgid "Recent Repositories"
 msgstr "Référentiels récents"
 
 msgid "Recent Repositories"
 msgstr "Référentiels récents"
 

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

 msgid "Open Recent Repository:"
 msgstr "Ouvrir référentiel récent :"
 
 msgid "Open Recent Repository:"
 msgstr "Ouvrir référentiel récent :"
 

-#: lib/choose_repository.tcl:294
-#, tcl-format
-msgid "Location %s already exists."
-msgstr "L'emplacement %s existe déjà."
-
-#: lib/choose_repository.tcl:300 lib/choose_repository.tcl:307
-#: lib/choose_repository.tcl:314
+#: lib/choose_repository.tcl:296 lib/choose_repository.tcl:303
+#: lib/choose_repository.tcl:310

 #, tcl-format
 msgid "Failed to create repository %s:"
 msgstr "La création du référentiel %s a échouée :"
 
 #, tcl-format
 msgid "Failed to create repository %s:"
 msgstr "La création du référentiel %s a échouée :"
 

-#: lib/choose_repository.tcl:385 lib/choose_repository.tcl:486
+#: lib/choose_repository.tcl:381 lib/choose_repository.tcl:478

 msgid "Directory:"
 msgstr "Répertoire :"
 
 msgid "Directory:"
 msgstr "Répertoire :"
 

-#: lib/choose_repository.tcl:415 lib/choose_repository.tcl:544
-#: lib/choose_repository.tcl:1013
+#: lib/choose_repository.tcl:412 lib/choose_repository.tcl:537
+#: lib/choose_repository.tcl:1011

 msgid "Git Repository"
 msgstr "Référentiel Git"
 
 msgid "Git Repository"
 msgstr "Référentiel Git"
 

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

 #, tcl-format
 msgid "Directory %s already exists."
 msgstr "Le répertoire %s existe déjà."
 
 #, tcl-format
 msgid "Directory %s already exists."
 msgstr "Le répertoire %s existe déjà."
 

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

 #, tcl-format
 msgid "File %s already exists."
 msgstr "Le fichier %s existe déjà."
 
 #, tcl-format
 msgid "File %s already exists."
 msgstr "Le fichier %s existe déjà."
 

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

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

-#: lib/choose_repository.tcl:476
+#: lib/choose_repository.tcl:468

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

-#: lib/choose_repository.tcl:496
+#: lib/choose_repository.tcl:489

 msgid "Clone Type:"
 msgstr "Type de clonage :"
 
 msgid "Clone Type:"
 msgstr "Type de clonage :"
 

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

 msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
 msgstr "Standard (rapide, semi-redondant, liens durs)"
 
 msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
 msgstr "Standard (rapide, semi-redondant, liens durs)"
 

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

 msgid "Full Copy (Slower, Redundant Backup)"
 msgstr "Copy complète (plus lent, sauvegarde redondante)"
 
 msgid "Full Copy (Slower, Redundant Backup)"
 msgstr "Copy complète (plus lent, sauvegarde redondante)"
 

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

 msgid "Shared (Fastest, Not Recommended, No Backup)"
 msgstr "Partagé (le plus rapide, non recommandé, pas de sauvegarde)"
 
 msgid "Shared (Fastest, Not Recommended, No Backup)"
 msgstr "Partagé (le plus rapide, non recommandé, pas de sauvegarde)"
 

-#: lib/choose_repository.tcl:550 lib/choose_repository.tcl:597
-#: lib/choose_repository.tcl:738 lib/choose_repository.tcl:808
-#: lib/choose_repository.tcl:1019 lib/choose_repository.tcl:1027
+#: lib/choose_repository.tcl:543 lib/choose_repository.tcl:590
+#: lib/choose_repository.tcl:736 lib/choose_repository.tcl:806
+#: lib/choose_repository.tcl:1017 lib/choose_repository.tcl:1025

 #, tcl-format
 msgid "Not a Git repository: %s"
 msgstr "'%s' n'est pas un référentiel Git."
 
 #, tcl-format
 msgid "Not a Git repository: %s"
 msgstr "'%s' n'est pas un référentiel Git."
 

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

 msgid "Standard only available for local repository."
 msgstr "Standard n'est disponible que pour un référentiel local."
 
 msgid "Standard only available for local repository."
 msgstr "Standard n'est disponible que pour un référentiel local."
 

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

 msgid "Shared only available for local repository."
 msgstr "Partagé n'est disponible que pour un référentiel local."
 
 msgid "Shared only available for local repository."
 msgstr "Partagé n'est disponible que pour un référentiel local."
 

-#: lib/choose_repository.tcl:617
+#: lib/choose_repository.tcl:604
+#, tcl-format
+msgid "Location %s already exists."
+msgstr "L'emplacement %s existe déjà."
+
+#: lib/choose_repository.tcl:615

 msgid "Failed to configure origin"
 msgstr "La configuration de l'origine a échouée."
 
 msgid "Failed to configure origin"
 msgstr "La configuration de l'origine a échouée."
 

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

 msgid "Counting objects"
 msgstr "Comptage des objets"
 
 msgid "Counting objects"
 msgstr "Comptage des objets"
 

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

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

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

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

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

 #, tcl-format
 msgid "Nothing to clone from %s."
 msgstr "Il n'y a rien à cloner depuis %s."
 
 #, tcl-format
 msgid "Nothing to clone from %s."
 msgstr "Il n'y a rien à cloner depuis %s."
 

-#: lib/choose_repository.tcl:692 lib/choose_repository.tcl:906
-#: lib/choose_repository.tcl:918
+#: lib/choose_repository.tcl:690 lib/choose_repository.tcl:904
+#: lib/choose_repository.tcl:916

 msgid "The 'master' branch has not been initialized."
 msgstr "Cette branche 'master' n'a pas été initialisée."
 
 msgid "The 'master' branch has not been initialized."
 msgstr "Cette branche 'master' n'a pas été initialisée."
 

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

 msgid "Hardlinks are unavailable.  Falling back to copying."
 msgstr "Les liens durs ne sont pas disponibles. On se résoud à copier."
 
 msgid "Hardlinks are unavailable.  Falling back to copying."
 msgstr "Les liens durs ne sont pas disponibles. On se résoud à copier."
 

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

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

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

 msgid "Copying objects"
 msgstr "Copie des objets"
 
 msgid "Copying objects"
 msgstr "Copie des objets"
 

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

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

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

 #, tcl-format
 msgid "Unable to copy object: %s"
 msgstr "Impossible de copier l'objet : %s"
 
 #, tcl-format
 msgid "Unable to copy object: %s"
 msgstr "Impossible de copier l'objet : %s"
 

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

 msgid "Linking objects"
 msgstr "Liaison des objets"
 
 msgid "Linking objects"
 msgstr "Liaison des objets"
 

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

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

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

 #, tcl-format
 msgid "Unable to hardlink object: %s"
 msgstr "Impossible créer un lien dur pour l'objet : %s"
 
 #, tcl-format
 msgid "Unable to hardlink object: %s"
 msgstr "Impossible créer un lien dur pour l'objet : %s"
 

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

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

-msgstr "Impossible de récupérer les branches et objets. Voir la sortie console pour plus de détails."
+msgstr ""
+"Impossible de récupérer les branches et objets. Voir la sortie console pour "
+"plus de détails."

 
 

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

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

-msgstr "Impossible de récupérer les marques. Voir la sortie console pour plus de détails."
+msgstr ""
+"Impossible de récupérer les marques. Voir la sortie console pour plus de "
+"détails."

 
 

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

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

-msgstr "Impossible de déterminer HEAD. Voir la sortie console pour plus de détails."
+msgstr ""
+"Impossible de déterminer HEAD. Voir la sortie console pour plus de détails."

 
 

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

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

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

 msgid "Clone failed."
 msgstr "Le clonage a échoué."
 
 msgid "Clone failed."
 msgstr "Le clonage a échoué."
 

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

 msgid "No default branch obtained."
 msgstr "Aucune branche par défaut n'a été obtenue."
 
 msgid "No default branch obtained."
 msgstr "Aucune branche par défaut n'a été obtenue."
 

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

 #, tcl-format
 msgid "Cannot resolve %s as a commit."
 msgstr "Impossible de résoudre %s comme commit."
 
 #, tcl-format
 msgid "Cannot resolve %s as a commit."
 msgstr "Impossible de résoudre %s comme commit."
 

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

 msgid "Creating working directory"
 msgstr "Création du répertoire de travail"
 
 msgid "Creating working directory"
 msgstr "Création du répertoire de travail"
 

-#: lib/choose_repository.tcl:928 lib/index.tcl:65 lib/index.tcl:127
+#: lib/choose_repository.tcl:926 lib/index.tcl:65 lib/index.tcl:127

 #: lib/index.tcl:193
 msgid "files"
 msgstr "fichiers"
 
 #: lib/index.tcl:193
 msgid "files"
 msgstr "fichiers"
 

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

 msgid "Initial file checkout failed."
 msgstr "L'emprunt initial de fichier a échoué."
 
 msgid "Initial file checkout failed."
 msgstr "L'emprunt initial de fichier a échoué."
 

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

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

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

 msgid "Repository:"
 msgstr "Référentiel :"
 
 msgid "Repository:"
 msgstr "Référentiel :"
 

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

 #, tcl-format
 msgid "Failed to open repository %s:"
 msgstr "Impossible d'ouvrir le référentiel %s :"
 #, tcl-format
 msgid "Failed to open repository %s:"
 msgstr "Impossible d'ouvrir le référentiel %s :"


@@ -1134,7 +1152,7 @@ msgstr "Branche locale"
 msgid "Tracking Branch"
 msgstr "Suivi de branche"
 
 msgid "Tracking Branch"
 msgstr "Suivi de branche"
 

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

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


@@ -1151,11 +1169,11 @@ msgstr "Pas de révision selectionnée."
 msgid "Revision expression is empty."
 msgstr "L'expression de révision est vide."
 
 msgid "Revision expression is empty."
 msgstr "L'expression de révision est vide."
 

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

 msgid "Updated"
 msgstr "Misa à jour"
 
 msgid "Updated"
 msgstr "Misa à jour"
 

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

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


@@ -1168,7 +1186,8 @@ msgid ""
 msgstr ""
 "Il n'y a rien à corriger.\n"
 "\n"
 msgstr ""
 "Il n'y a rien à corriger.\n"
 "\n"

-"Vous allez créer le commit initial. Il n'y a pas de commit avant celui-ci à corriger.\n"
+"Vous allez créer le commit initial. Il n'y a pas de commit avant celui-ci à "
+"corriger.\n"

 
 #: lib/commit.tcl:18
 msgid ""
 
 #: lib/commit.tcl:18
 msgid ""


@@ -1180,7 +1199,9 @@ msgid ""
 msgstr ""
 "Impossible de corriger pendant une fusion.\n"
 "\n"
 msgstr ""
 "Impossible de corriger pendant une fusion.\n"
 "\n"

-"Vous êtes actuellement au milieu d'une fusion qui n'a pas été completement terminée. Vous ne pouvez pas corriger le commit précédant sauf si vous abandonnez la fusion courante.\n"
+"Vous êtes actuellement au milieu d'une fusion qui n'a pas été completement "
+"terminée. Vous ne pouvez pas corriger le commit précédant sauf si vous "
+"abandonnez la fusion courante.\n"

 
 #: lib/commit.tcl:49
 msgid "Error loading commit data for amend:"
 
 #: lib/commit.tcl:49
 msgid "Error loading commit data for amend:"


@@ -1203,9 +1224,12 @@ msgid ""
 "\n"
 "The rescan will be automatically started now.\n"
 msgstr ""
 "\n"
 "The rescan will be automatically started now.\n"
 msgstr ""

-"L'état lors de la dernière synchronisation ne correspond plus à l'état du référentiel.\n"
+"L'état lors de la dernière synchronisation ne correspond plus à l'état du "
+"référentiel.\n"

 "\n"
 "\n"

-"Un autre programme Git a modifié ce référentiel depuis la dernière synchronisation. Une resynshronisation doit être effectuée avant de pouvoir créer un nouveau commit.\n"
+"Un autre programme Git a modifié ce référentiel depuis la dernière "
+"synchronisation. Une resynshronisation doit être effectuée avant de pouvoir "
+"créer un nouveau commit.\n"

 "\n"
 "Cela va être fait tout de suite automatiquement.\n"
 
 "\n"
 "Cela va être fait tout de suite automatiquement.\n"
 


@@ -1219,7 +1243,8 @@ msgid ""
 msgstr ""
 "Des fichiers non fusionnés ne peuvent être commités.\n"
 "\n"
 msgstr ""
 "Des fichiers non fusionnés ne peuvent être commités.\n"
 "\n"

-"Le fichier %s a des conflicts de fusion. Vous devez les résoudre et pré-commiter le fichier avant de pouvoir commiter.\n"
+"Le fichier %s a des conflicts de fusion. Vous devez les résoudre et pré-"
+"commiter le fichier avant de pouvoir commiter.\n"

 
 #: lib/commit.tcl:162
 #, tcl-format
 
 #: lib/commit.tcl:162
 #, tcl-format


@@ -1260,16 +1285,46 @@ msgstr ""
 "- Deuxième ligne : rien.\n"
 "- Lignes suivantes : Décrire pourquoi ces modifications sont bonnes.\n"
 
 "- Deuxième ligne : rien.\n"
 "- Lignes suivantes : Décrire pourquoi ces modifications sont bonnes.\n"
 

-#: lib/commit.tcl:257
+#: lib/commit.tcl:207
+#, tcl-format
+msgid "warning: Tcl does not support encoding '%s'."
+msgstr "attention : Tcl ne supporte pas l'encodage '%s'."
+
+#: lib/commit.tcl:221
+msgid "Calling pre-commit hook..."
+msgstr ""
+
+#: lib/commit.tcl:236
+msgid "Commit declined by pre-commit hook."
+msgstr ""
+
+#: lib/commit.tcl:259
+msgid "Calling commit-msg hook..."
+msgstr ""
+
+#: lib/commit.tcl:274
+msgid "Commit declined by commit-msg hook."
+msgstr ""
+
+#: lib/commit.tcl:287
+msgid "Committing changes..."
+msgstr ""
+
+#: lib/commit.tcl:303

 msgid "write-tree failed:"
 msgstr "write-tree a échoué :"
 
 msgid "write-tree failed:"
 msgstr "write-tree a échoué :"
 

-#: lib/commit.tcl:275
+#: lib/commit.tcl:304 lib/commit.tcl:348 lib/commit.tcl:368
+#, fuzzy
+msgid "Commit failed."
+msgstr "Le clonage a échoué."
+
+#: lib/commit.tcl:321

 #, tcl-format
 msgid "Commit %s appears to be corrupt"
 msgstr "Le commit %s semble être corrompu"
 
 #, tcl-format
 msgid "Commit %s appears to be corrupt"
 msgstr "Le commit %s semble être corrompu"
 

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

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


@@ -1279,41 +1334,37 @@ msgid ""
 msgstr ""
 "Pas de modification à commiter.\n"
 "\n"
 msgstr ""
 "Pas de modification à commiter.\n"
 "\n"

-"Aucun fichier n'a été modifié par ce commit et il ne s'agit pas d'un commit de fusion.\n"
+"Aucun fichier n'a été modifié par ce commit et il ne s'agit pas d'un commit "
+"de fusion.\n"

 "\n"
 "Une resynchronisation va être lancée tout de suite automatiquement.\n"
 
 "\n"
 "Une resynchronisation va être lancée tout de suite automatiquement.\n"
 

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

 msgid "No changes to commit."
 msgstr "Pas de modifications à commiter."
 
 msgid "No changes to commit."
 msgstr "Pas de modifications à commiter."
 

-#: lib/commit.tcl:303
-#, tcl-format
-msgid "warning: Tcl does not support encoding '%s'."
-msgstr "attention : Tcl ne supporte pas l'encodage '%s'."
-
-#: lib/commit.tcl:317
+#: lib/commit.tcl:347

 msgid "commit-tree failed:"
 msgstr "commit-tree a échoué :"
 
 msgid "commit-tree failed:"
 msgstr "commit-tree a échoué :"
 

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

 msgid "update-ref failed:"
 msgstr "update-ref a échoué"
 
 msgid "update-ref failed:"
 msgstr "update-ref a échoué"
 

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

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

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

 msgid "Working... please wait..."
 msgstr "Travail en cours... merci de patienter..."
 
 msgid "Working... please wait..."
 msgstr "Travail en cours... merci de patienter..."
 

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

 msgid "Success"
 msgstr "Succès"
 
 msgid "Success"
 msgstr "Succès"
 

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

 msgid "Error: Command Failed"
 msgstr "Erreur : échec de la commande"
 
 msgid "Error: Command Failed"
 msgstr "Erreur : échec de la commande"
 


@@ -1345,7 +1396,7 @@ msgstr "Objets empaquetés attendant d'être supprimés"
 msgid "Garbage files"
 msgstr "Fichiers poubelle"
 
 msgid "Garbage files"
 msgstr "Fichiers poubelle"
 

-#: lib/database.tcl:72ets
+#: lib/database.tcl:72

 msgid "Compressing the object database"
 msgstr "Compression de la base des objets"
 
 msgid "Compressing the object database"
 msgstr "Compression de la base des objets"
 


@@ -1363,9 +1414,12 @@ msgid ""
 "\n"
 "Compress the database now?"
 msgstr ""
 "\n"
 "Compress the database now?"
 msgstr ""

-"Ce référentiel comprend actuellement environ %i objets ayant leur fichier particulier.\n"
+"Ce référentiel comprend actuellement environ %i objets ayant leur fichier "
+"particulier.\n"

 "\n"
 "\n"

-"Pour conserver une performance optimale, il est fortement recommandé de comprimer la base quand plus de %i objets ayant leur fichier particulier existent.\n"
+"Pour conserver une performance optimale, il est fortement recommandé de "
+"comprimer la base quand plus de %i objets ayant leur fichier particulier "
+"existent.\n"

 "\n"
 "Comprimer la base maintenant ?"
 
 "\n"
 "Comprimer la base maintenant ?"
 


@@ -1391,9 +1445,11 @@ msgstr ""
 "\n"
 "%s ne comporte aucune modification.\n"
 "\n"
 "\n"
 "%s ne comporte aucune modification.\n"
 "\n"

-"La date de modification de ce fichier a été mise à jour par une autre application, mais le contenu du fichier n'a pas changé.\n"
+"La date de modification de ce fichier a été mise à jour par une autre "
+"application, mais le contenu du fichier n'a pas changé.\n"

 "\n"
 "\n"

-"Une resynchronisation va être lancée automatiquement pour trouver d'autres fichiers qui pourraient se trouver dans le même état."
+"Une resynchronisation va être lancée automatiquement pour trouver d'autres "
+"fichiers qui pourraient se trouver dans le même état."

 
 #: lib/diff.tcl:81
 #, tcl-format
 
 #: lib/diff.tcl:81
 #, tcl-format


@@ -1421,23 +1477,24 @@ msgstr "* Fichier binaire (pas d'apperçu du contenu)."
 msgid "Error loading diff:"
 msgstr "Erreur lors du chargement des différences :"
 
 msgid "Error loading diff:"
 msgstr "Erreur lors du chargement des différences :"
 

-#: lib/diff.tcl:302
+#: lib/diff.tcl:303

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

-msgstr "La suppression dans le pré-commit de la section sélectionnée a échouée."
+msgstr ""
+"La suppression dans le pré-commit de la section sélectionnée a échouée."

 
 

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

 msgid "Failed to stage selected hunk."
 msgstr "Le pré-commit de la section sélectionnée a échoué."
 
 msgid "Failed to stage selected hunk."
 msgstr "Le pré-commit de la section sélectionnée a échoué."
 

-#: lib/error.tcl:12 lib/error.tcl:102
+#: lib/error.tcl:20 lib/error.tcl:114

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

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

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

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

 msgid "You must correct the above errors before committing."
 msgstr "Vous devez corriger les erreurs suivantes avant de pouvoir commiter."
 
 msgid "You must correct the above errors before committing."
 msgstr "Vous devez corriger les erreurs suivantes avant de pouvoir commiter."
 


@@ -1453,7 +1510,8 @@ msgstr "Erreur de pré-commit"
 msgid ""
 "Updating the Git index failed.  A rescan will be automatically started to "
 "resynchronize git-gui."
 msgid ""
 "Updating the Git index failed.  A rescan will be automatically started to "
 "resynchronize git-gui."

-msgstr "Le pré-commit a échoué. Une resynchronisation va être lancée automatiquement."
+msgstr ""
+"Le pré-commit a échoué. Une resynchronisation va être lancée automatiquement."

 
 #: lib/index.tcl:27
 msgid "Continue"
 
 #: lib/index.tcl:27
 msgid "Continue"


@@ -1468,6 +1526,11 @@ msgstr "Dévérouiller le pré-commit"
 msgid "Unstaging %s from commit"
 msgstr "Supprimer %s du commit"
 
 msgid "Unstaging %s from commit"
 msgstr "Supprimer %s du commit"
 

+#: lib/index.tcl:313
+#, fuzzy
+msgid "Ready to commit."
+msgstr "Pré-commité"
+

 #: lib/index.tcl:326
 #, tcl-format
 msgid "Adding %s"
 #: lib/index.tcl:326
 #, tcl-format
 msgid "Adding %s"


@@ -1483,11 +1546,13 @@ msgstr "Inverser les modifications dans le fichier %s ? "
 msgid "Revert changes in these %i files?"
 msgstr "Inverser les modifications dans ces %i fichiers ?"
 
 msgid "Revert changes in these %i files?"
 msgstr "Inverser les modifications dans ces %i fichiers ?"
 

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

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

-msgstr "Toutes les modifications non pré-commitées seront définitivement perdues lors de l'inversion."
+msgstr ""
+"Toutes les modifications non pré-commitées seront définitivement perdues "
+"lors de l'inversion."

 
 

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

 msgid "Do Nothing"
 msgstr "Ne rien faire"
 
 msgid "Do Nothing"
 msgstr "Ne rien faire"
 


@@ -1499,7 +1564,8 @@ msgid ""
 msgstr ""
 "Impossible de fucionner pendant une correction.\n"
 "\n"
 msgstr ""
 "Impossible de fucionner pendant une correction.\n"
 "\n"

-"Vous devez finir de corriger ce commit avant de lancer une quelconque fusion.\n"
+"Vous devez finir de corriger ce commit avant de lancer une quelconque "
+"fusion.\n"

 
 #: lib/merge.tcl:27
 msgid ""
 
 #: lib/merge.tcl:27
 msgid ""


@@ -1510,9 +1576,12 @@ msgid ""
 "\n"
 "The rescan will be automatically started now.\n"
 msgstr ""
 "\n"
 "The rescan will be automatically started now.\n"
 msgstr ""

-"L'état lors de la dernière synchronisation ne correspond plus à l'état du référentiel.\n"
+"L'état lors de la dernière synchronisation ne correspond plus à l'état du "
+"référentiel.\n"

 "\n"
 "\n"

-"Un autre programme Git a modifié ce référentiel depuis la dernière synchronisation. Une resynchronisation doit être effectuée avant de pouvoir fusionner de nouveau.\n"
+"Un autre programme Git a modifié ce référentiel depuis la dernière "
+"synchronisation. Une resynchronisation doit être effectuée avant de pouvoir "
+"fusionner de nouveau.\n"

 "\n"
 "Cela va être fait tout de suite automatiquement\n"
 
 "\n"
 "Cela va être fait tout de suite automatiquement\n"
 


@@ -1530,7 +1599,9 @@ msgstr ""
 "\n"
 "Le fichier %s a des conflicts de fusion.\n"
 "\n"
 "\n"
 "Le fichier %s a des conflicts de fusion.\n"
 "\n"

-"Vous devez les résoudre, puis pré-commiter le fichier, et enfin commiter pour terminer la fusion courante. Seulementà ce moment là, il sera possible d'effectuer une nouvelle fusion.\n"
+"Vous devez les résoudre, puis pré-commiter le fichier, et enfin commiter "
+"pour terminer la fusion courante. Seulementà ce moment là, il sera possible "
+"d'effectuer une nouvelle fusion.\n"

 
 #: lib/merge.tcl:54
 #, tcl-format
 
 #: lib/merge.tcl:54
 #, tcl-format


@@ -1546,7 +1617,9 @@ msgstr ""
 "\n"
 "Le fichier %s est modifié.\n"
 "\n"
 "\n"
 "Le fichier %s est modifié.\n"
 "\n"

-"Vous devriez terminer le commit courant avant de lancer une fusion. En faisait comme cela, vous éviterez de devoir éventuellement abandonner une fusion ayant échouée.\n"
+"Vous devriez terminer le commit courant avant de lancer une fusion. En "
+"faisait comme cela, vous éviterez de devoir éventuellement abandonner une "
+"fusion ayant échouée.\n"

 
 #: lib/merge.tcl:106
 #, tcl-format
 
 #: lib/merge.tcl:106
 #, tcl-format


@@ -1554,28 +1627,28 @@ msgid "%s of %s"
 msgstr "%s de %s"
 
 #: lib/merge.tcl:119
 msgstr "%s de %s"
 
 #: lib/merge.tcl:119

-#, tcl-format
-msgid "Merging %s and %s"
+#, fuzzy, tcl-format
+msgid "Merging %s and %s..."

 msgstr "Fusion de %s et %s"
 
 msgstr "Fusion de %s et %s"
 

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

 msgid "Merge completed successfully."
 msgstr "La fusion s'est faite avec succès."
 
 msgid "Merge completed successfully."
 msgstr "La fusion s'est faite avec succès."
 

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

 msgid "Merge failed.  Conflict resolution is required."
 msgstr "La fusion a echouée. Il est nécessaire de résoudre les conflicts."
 
 msgid "Merge failed.  Conflict resolution is required."
 msgstr "La fusion a echouée. Il est nécessaire de résoudre les conflicts."
 

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

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

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

 msgid "Revision To Merge"
 msgstr "Révision à fusionner"
 
 msgid "Revision To Merge"
 msgstr "Révision à fusionner"
 

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

 msgid ""
 "Cannot abort while amending.\n"
 "\n"
 msgid ""
 "Cannot abort while amending.\n"
 "\n"


@@ -1585,7 +1658,7 @@ msgstr ""
 "\n"
 "Vous devez finir de corriger ce commit.\n"
 
 "\n"
 "Vous devez finir de corriger ce commit.\n"
 

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

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


@@ -1595,11 +1668,12 @@ msgid ""
 msgstr ""
 "Abandonner la fusion ?\n"
 "\n"
 msgstr ""
 "Abandonner la fusion ?\n"
 "\n"

-"Abandonner la fusion courante entrainera la perte de TOUTES les modifications non commitées.\n"
+"Abandonner la fusion courante entrainera la perte de TOUTES les "
+"modifications non commitées.\n"

 "\n"
 "Abandonner quand même la fusion courante ?"
 
 "\n"
 "Abandonner quand même la fusion courante ?"
 

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

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


@@ -1609,97 +1683,112 @@ msgid ""
 msgstr ""
 "Réinitialiser les modifications ?\n"
 "\n"
 msgstr ""
 "Réinitialiser les modifications ?\n"
 "\n"

-"Réinitialiser les modifications va faire perdre TOUTES les modifications non commitées.\n"
+"Réinitialiser les modifications va faire perdre TOUTES les modifications non "
+"commitées.\n"

 "\n"
 "Réinitialiser quand même les modifications courantes ?"
 
 "\n"
 "Réinitialiser quand même les modifications courantes ?"
 

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

 msgid "Aborting"
 msgstr "Abandon"
 
 msgid "Aborting"
 msgstr "Abandon"
 

-#: lib/merge.tcl:266
+#: lib/merge.tcl:238
+#, fuzzy
+msgid "files reset"
+msgstr "fichiers"
+
+#: lib/merge.tcl:265

 msgid "Abort failed."
 msgstr "L'abandon a échoué."
 
 msgid "Abort failed."
 msgstr "L'abandon a échoué."
 

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

 msgid "Abort completed.  Ready."
 msgstr "Abandon teminé. Prêt."
 
 msgid "Abort completed.  Ready."
 msgstr "Abandon teminé. Prêt."
 

-#: lib/option.tcl:82
+#: lib/option.tcl:95

 msgid "Restore Defaults"
 msgstr "Remettre les valeurs par défaut"
 
 msgid "Restore Defaults"
 msgstr "Remettre les valeurs par défaut"
 

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

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

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

 #, tcl-format
 msgid "%s Repository"
 msgstr "Référentiel de %s"
 
 #, tcl-format
 msgid "%s Repository"
 msgstr "Référentiel de %s"
 

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

 msgid "Global (All Repositories)"
 msgstr "Globales (tous les référentiels)"
 
 msgid "Global (All Repositories)"
 msgstr "Globales (tous les référentiels)"
 

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

 msgid "User Name"
 msgstr "Nom d'utilisateur"
 
 msgid "User Name"
 msgstr "Nom d'utilisateur"
 

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

 msgid "Email Address"
 msgstr "Adresse email"
 
 msgid "Email Address"
 msgstr "Adresse email"
 

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

 msgid "Summarize Merge Commits"
 msgstr "Résumer les commits de fusion"
 
 msgid "Summarize Merge Commits"
 msgstr "Résumer les commits de fusion"
 

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

 msgid "Merge Verbosity"
 msgstr "Fusion bavarde"
 
 msgid "Merge Verbosity"
 msgstr "Fusion bavarde"
 

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

 msgid "Show Diffstat After Merge"
 msgstr "Montrer statistiques de diff après fusion"
 
 msgid "Show Diffstat After Merge"
 msgstr "Montrer statistiques de diff après fusion"
 

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

 msgid "Trust File Modification Timestamps"
 msgstr "Faire confiance aux dates de modification de fichiers "
 
 msgid "Trust File Modification Timestamps"
 msgstr "Faire confiance aux dates de modification de fichiers "
 

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

 msgid "Prune Tracking Branches During Fetch"
 msgstr "Nettoyer les branches de suivi pendant la récupération"
 
 msgid "Prune Tracking Branches During Fetch"
 msgstr "Nettoyer les branches de suivi pendant la récupération"
 

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

 msgid "Match Tracking Branches"
 msgstr "Faire correspondre les branches de suivi"
 
 msgid "Match Tracking Branches"
 msgstr "Faire correspondre les branches de suivi"
 

-#: lib/option.tcl:113
+#: lib/option.tcl:126

 msgid "Number of Diff Context Lines"
 msgstr "Nombre de lignes de contexte dans les diffs"
 
 msgid "Number of Diff Context Lines"
 msgstr "Nombre de lignes de contexte dans les diffs"
 

-#: lib/option.tcl:114
+#: lib/option.tcl:127
+#, fuzzy
+msgid "Commit Message Text Width"
+msgstr "Message de commit :"
+
+#: lib/option.tcl:128

 msgid "New Branch Name Template"
 msgstr "Nouveau modèle de nom de branche"
 
 msgid "New Branch Name Template"
 msgstr "Nouveau modèle de nom de branche"
 

-#: lib/option.tcl:176
+#: lib/option.tcl:192
+msgid "Spelling Dictionary:"
+msgstr ""
+
+#: lib/option.tcl:216

 msgid "Change Font"
 msgstr "Modifier les fontes"
 
 msgid "Change Font"
 msgstr "Modifier les fontes"
 

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

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

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

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

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

 msgid "Preferences"
 msgstr "Préférences"
 
 msgid "Preferences"
 msgstr "Préférences"
 

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

 msgid "Failed to completely save options:"
 msgstr "La sauvegarde complète des options a échouée :"
 
 msgid "Failed to completely save options:"
 msgstr "La sauvegarde complète des options a échouée :"
 


@@ -1755,7 +1844,9 @@ msgstr ""
 msgid ""
 "One or more of the merge tests failed because you have not fetched the "
 "necessary commits.  Try fetching from %s first."
 msgid ""
 "One or more of the merge tests failed because you have not fetched the "
 "necessary commits.  Try fetching from %s first."

-msgstr "Une ou plusieurs des tests de fusion ont échoués parce que vous n'avez pas récupéré les commits nécessaires. Essayez de récupéré à partir de %s d'abord."
+msgstr ""
+"Une ou plusieurs des tests de fusion ont échoués parce que vous n'avez pas "
+"récupéré les commits nécessaires. Essayez de récupéré à partir de %s d'abord."

 
 #: lib/remote_branch_delete.tcl:207
 msgid "Please select one or more branches to delete."
 
 #: lib/remote_branch_delete.tcl:207
 msgid "Please select one or more branches to delete."


@@ -1805,6 +1896,43 @@ msgstr "Impossible d'écrire le raccourcis :"
 msgid "Cannot write icon:"
 msgstr "Impossible d'écrire l'icône :"
 
 msgid "Cannot write icon:"
 msgstr "Impossible d'écrire l'icône :"
 

+#: lib/spellcheck.tcl:57
+msgid "Unsupported spell checker"
+msgstr ""
+
+#: lib/spellcheck.tcl:65
+msgid "Spell checking is unavailable"
+msgstr ""
+
+#: lib/spellcheck.tcl:68
+msgid "Invalid spell checking configuration"
+msgstr ""
+
+#: lib/spellcheck.tcl:70
+#, tcl-format
+msgid "Reverting dictionary to %s."
+msgstr ""
+
+#: lib/spellcheck.tcl:73
+msgid "Spell checker silently failed on startup"
+msgstr ""
+
+#: lib/spellcheck.tcl:80
+msgid "Unrecognized spell checker"
+msgstr ""
+
+#: lib/spellcheck.tcl:180
+msgid "No Suggestions"
+msgstr ""
+
+#: lib/spellcheck.tcl:381
+msgid "Unexpected EOF from spell checker"
+msgstr ""
+
+#: lib/spellcheck.tcl:385
+msgid "Spell Checker Failed"
+msgstr ""
+

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


@@ -1863,7 +1991,9 @@ msgstr "Transférer options"
 
 #: lib/transport.tcl:160
 msgid "Force overwrite existing branch (may discard changes)"
 
 #: lib/transport.tcl:160
 msgid "Force overwrite existing branch (may discard changes)"

-msgstr "Forcer l'écrasement d'une branche existante (peut supprimer des modifications)"
+msgstr ""
+"Forcer l'écrasement d'une branche existante (peut supprimer des "
+"modifications)"

 
 #: lib/transport.tcl:164
 msgid "Use thin pack (for slow network connections)"
 
 #: lib/transport.tcl:164
 msgid "Use thin pack (for slow network connections)"


@@ -1872,4 +2002,3 @@ msgstr "Utiliser des petits paquets (pour les connexions lentes)"
 #: lib/transport.tcl:168
 msgid "Include tags"
 msgstr "Inclure les marques"
 #: lib/transport.tcl:168
 msgid "Include tags"
 msgstr "Inclure les marques"

-

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

-"POT-Creation-Date: 2008-02-16 21:24+0100\n"
+"POT-Creation-Date: 2008-03-14 07:18+0100\n"

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


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

-#: git-gui.sh:41 git-gui.sh:604 git-gui.sh:618 git-gui.sh:631 git-gui.sh:714
-#: git-gui.sh:733
+#: git-gui.sh:41 git-gui.sh:634 git-gui.sh:648 git-gui.sh:661 git-gui.sh:744
+#: git-gui.sh:763

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

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

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

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

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

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

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

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

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

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

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

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

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


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

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

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

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

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

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

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

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

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

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

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

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

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

-#: git-gui.sh:1294 lib/browser.tcl:245
+#: git-gui.sh:1324 lib/browser.tcl:246

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

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

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

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

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

-#: git-gui.sh:1563 git-gui.sh:1568
+#: git-gui.sh:1593 git-gui.sh:1598

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

-#: git-gui.sh:1564 git-gui.sh:1569
+#: git-gui.sh:1594 git-gui.sh:1599

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

-#: git-gui.sh:1565 git-gui.sh:1570
+#: git-gui.sh:1595 git-gui.sh:1600

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

-#: git-gui.sh:1567
+#: git-gui.sh:1597

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

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

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

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

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

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

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

-#: git-gui.sh:1576 git-gui.sh:1577 git-gui.sh:1578 git-gui.sh:1579
+#: git-gui.sh:1606 git-gui.sh:1607 git-gui.sh:1608 git-gui.sh:1609

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

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

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

-#: git-gui.sh:1623
+#: git-gui.sh:1653

 #, tcl-format
 msgid ""
 "Unable to start gitk:\n"
 #, tcl-format
 msgid ""
 "Unable to start gitk:\n"


@@ -134,295 +134,295 @@ msgid ""
 "%s does not exist"
 msgstr ""
 
 "%s does not exist"
 msgstr ""
 

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

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

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

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

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

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

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

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

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

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

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

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

-#: git-gui.sh:1842
+#: git-gui.sh:1879

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: git-gui.sh:1882 git-gui.sh:1886 git-gui.sh:1890 lib/shortcut.tcl:7
+#: git-gui.sh:1919 git-gui.sh:1923 git-gui.sh:1927 lib/shortcut.tcl:7

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

-#: git-gui.sh:1895 lib/choose_repository.tcl:176 lib/choose_repository.tcl:184
+#: git-gui.sh:1932 lib/choose_repository.tcl:177 lib/choose_repository.tcl:185

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

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

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

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

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

-#: git-gui.sh:1909 git-gui.sh:2403
+#: git-gui.sh:1946 git-gui.sh:2443

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

-#: git-gui.sh:1912 git-gui.sh:2406 git-gui.sh:2477 git-gui.sh:2549
-#: lib/console.tcl:67
+#: git-gui.sh:1949 git-gui.sh:2446 git-gui.sh:2520 git-gui.sh:2614
+#: lib/console.tcl:69

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

-#: git-gui.sh:1915 git-gui.sh:2409
+#: git-gui.sh:1952 git-gui.sh:2449

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

-#: git-gui.sh:1918 git-gui.sh:2412 lib/branch_delete.tcl:26
+#: git-gui.sh:1955 git-gui.sh:2452 lib/branch_delete.tcl:26

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

-#: git-gui.sh:1922 git-gui.sh:2416 git-gui.sh:2553 lib/console.tcl:69
+#: git-gui.sh:1959 git-gui.sh:2456 git-gui.sh:2618 lib/console.tcl:71

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

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

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

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

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

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

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

-#: git-gui.sh:1948 git-gui.sh:2048
+#: git-gui.sh:1985 git-gui.sh:2085

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

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

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

-#: git-gui.sh:1965 git-gui.sh:2350
+#: git-gui.sh:2002 git-gui.sh:2389

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

-#: git-gui.sh:1973 git-gui.sh:2357
+#: git-gui.sh:2010 git-gui.sh:2396

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

-#: git-gui.sh:1982 git-gui.sh:2317 lib/remote_branch_delete.tcl:99
+#: git-gui.sh:2019 git-gui.sh:2356 lib/remote_branch_delete.tcl:99

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

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

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

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

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

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

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

-#: git-gui.sh:2005 lib/index.tcl:393
+#: git-gui.sh:2042 lib/index.tcl:395

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

-#: git-gui.sh:2012 git-gui.sh:2329 git-gui.sh:2427
+#: git-gui.sh:2049 git-gui.sh:2368 git-gui.sh:2467

 msgid "Sign Off"
 msgstr ""
 
 msgid "Sign Off"
 msgstr ""
 

-#: git-gui.sh:2016 git-gui.sh:2333
+#: git-gui.sh:2053 git-gui.sh:2372

 msgid "Commit@@verb"
 msgstr ""
 
 msgid "Commit@@verb"
 msgstr ""
 

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

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

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

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

-#: git-gui.sh:2044
+#: git-gui.sh:2081

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

-#: git-gui.sh:2055 lib/choose_repository.tcl:40
+#: git-gui.sh:2092 lib/choose_repository.tcl:41

 msgid "Apple"
 msgstr ""
 
 msgid "Apple"
 msgstr ""
 

-#: git-gui.sh:2058 git-gui.sh:2080 lib/about.tcl:13
-#: lib/choose_repository.tcl:43 lib/choose_repository.tcl:49
+#: git-gui.sh:2095 git-gui.sh:2117 lib/about.tcl:14
+#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:50

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

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

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

-#: git-gui.sh:2070 git-gui.sh:2595
+#: git-gui.sh:2107 git-gui.sh:2639

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

-#: git-gui.sh:2076 lib/choose_repository.tcl:46
+#: git-gui.sh:2113 lib/choose_repository.tcl:47

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

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

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

-#: git-gui.sh:2201
+#: git-gui.sh:2238

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: git-gui.sh:2573
+#: git-gui.sh:2589

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

-#: git-gui.sh:2579
+#: git-gui.sh:2595

 msgid "Show Less Context"
 msgstr ""
 
 msgid "Show Less Context"
 msgstr ""
 

-#: git-gui.sh:2586
+#: git-gui.sh:2602

 msgid "Show More Context"
 msgstr ""
 
 msgid "Show More Context"
 msgstr ""
 

-#: git-gui.sh:2594
+#: git-gui.sh:2610

 msgid "Refresh"
 msgstr ""
 
 msgid "Refresh"
 msgstr ""
 

-#: git-gui.sh:2615
+#: git-gui.sh:2631

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

-#: git-gui.sh:2619
+#: git-gui.sh:2635

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

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

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

-#: git-gui.sh:2604
+#: git-gui.sh:2648

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

-#: git-gui.sh:2623
+#: git-gui.sh:2667

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

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

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


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

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

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

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

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


@@ -451,7 +451,7 @@ msgid ""
 "~/.gitconfig file.\n"
 msgstr ""
 
 "~/.gitconfig file.\n"
 msgstr ""
 

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

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


@@ -463,56 +463,56 @@ msgstr ""
 msgid "Commit:"
 msgstr ""
 
 msgid "Commit:"
 msgstr ""
 

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

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

-#: lib/blame.tcl:369
+#: lib/blame.tcl:384

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

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

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

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

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

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

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

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

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

-#: lib/blame.tcl:731
+#: lib/blame.tcl:746

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

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

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

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

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

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

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

-#: lib/blame.tcl:910
+#: lib/blame.tcl:925

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

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

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

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

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


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

-#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:281
-#: lib/checkout_op.tcl:522 lib/choose_font.tcl:43 lib/merge.tcl:172
-#: lib/option.tcl:90 lib/remote_branch_delete.tcl:42 lib/transport.tcl:97
+#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:282
+#: lib/checkout_op.tcl:522 lib/choose_font.tcl:43 lib/merge.tcl:171
+#: lib/option.tcl:103 lib/remote_branch_delete.tcl:42 lib/transport.tcl:97

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

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

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

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

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


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

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

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


@@ -690,22 +690,22 @@ msgstr ""
 msgid "File Browser"
 msgstr ""
 
 msgid "File Browser"
 msgstr ""
 

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

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

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

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

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

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

-#: lib/browser.tcl:277 lib/choose_repository.tcl:391
-#: lib/choose_repository.tcl:482 lib/choose_repository.tcl:492
-#: lib/choose_repository.tcl:989
+#: lib/browser.tcl:278 lib/choose_repository.tcl:387
+#: lib/choose_repository.tcl:474 lib/choose_repository.tcl:484
+#: lib/choose_repository.tcl:987

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


@@ -719,7 +719,7 @@ msgstr ""
 msgid "fatal: Cannot resolve %s"
 msgstr ""
 
 msgid "fatal: Cannot resolve %s"
 msgstr ""
 

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

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


@@ -792,7 +792,7 @@ msgid ""
 "Checkout'."
 msgstr ""
 
 "Checkout'."
 msgstr ""
 

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

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


@@ -811,7 +811,7 @@ msgstr ""
 msgid "Reset '%s'?"
 msgstr ""
 
 msgid "Reset '%s'?"
 msgstr ""
 

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

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


@@ -834,239 +834,239 @@ msgstr ""
 msgid "Font Family"
 msgstr ""
 
 msgid "Font Family"
 msgstr ""
 

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

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

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

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

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

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

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

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

-#: lib/choose_repository.tcl:80 lib/choose_repository.tcl:380
+#: lib/choose_repository.tcl:81 lib/choose_repository.tcl:376

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

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

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

-#: lib/choose_repository.tcl:93 lib/choose_repository.tcl:468
+#: lib/choose_repository.tcl:94 lib/choose_repository.tcl:460

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

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

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

-#: lib/choose_repository.tcl:106 lib/choose_repository.tcl:978
+#: lib/choose_repository.tcl:107 lib/choose_repository.tcl:976

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

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

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

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

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

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

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

-#: lib/choose_repository.tcl:294
-#, tcl-format
-msgid "Location %s already exists."
-msgstr ""
-
-#: lib/choose_repository.tcl:300 lib/choose_repository.tcl:307
-#: lib/choose_repository.tcl:314
+#: lib/choose_repository.tcl:296 lib/choose_repository.tcl:303
+#: lib/choose_repository.tcl:310

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

-#: lib/choose_repository.tcl:385 lib/choose_repository.tcl:486
+#: lib/choose_repository.tcl:381 lib/choose_repository.tcl:478

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

-#: lib/choose_repository.tcl:415 lib/choose_repository.tcl:544
-#: lib/choose_repository.tcl:1013
+#: lib/choose_repository.tcl:412 lib/choose_repository.tcl:537
+#: lib/choose_repository.tcl:1011

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

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

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

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

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

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

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

-#: lib/choose_repository.tcl:476
+#: lib/choose_repository.tcl:468

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

-#: lib/choose_repository.tcl:496
+#: lib/choose_repository.tcl:489

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

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

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

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

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

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

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

-#: lib/choose_repository.tcl:550 lib/choose_repository.tcl:597
-#: lib/choose_repository.tcl:738 lib/choose_repository.tcl:808
-#: lib/choose_repository.tcl:1019 lib/choose_repository.tcl:1027
+#: lib/choose_repository.tcl:543 lib/choose_repository.tcl:590
+#: lib/choose_repository.tcl:736 lib/choose_repository.tcl:806
+#: lib/choose_repository.tcl:1017 lib/choose_repository.tcl:1025

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: lib/choose_repository.tcl:692 lib/choose_repository.tcl:906
-#: lib/choose_repository.tcl:918
+#: lib/choose_repository.tcl:690 lib/choose_repository.tcl:904
+#: lib/choose_repository.tcl:916

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: lib/choose_repository.tcl:928 lib/index.tcl:65 lib/index.tcl:127
+#: lib/choose_repository.tcl:926 lib/index.tcl:65 lib/index.tcl:127

 #: lib/index.tcl:193
 msgid "files"
 msgstr ""
 
 #: lib/index.tcl:193
 msgid "files"
 msgstr ""
 

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

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

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

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

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

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

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

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


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

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

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


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

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

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

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

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


@@ -1224,7 +1224,7 @@ msgstr ""
 msgid "Commit %s appears to be corrupt"
 msgstr ""
 
 msgid "Commit %s appears to be corrupt"
 msgstr ""
 

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

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


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

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

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


@@ -1241,24 +1241,24 @@ msgstr ""
 msgid "commit-tree failed:"
 msgstr ""
 
 msgid "commit-tree failed:"
 msgstr ""
 

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

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

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

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

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

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

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

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

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

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


@@ -1354,23 +1354,23 @@ msgstr ""
 msgid "Error loading diff:"
 msgstr ""
 
 msgid "Error loading diff:"
 msgstr ""
 

-#: lib/diff.tcl:302
+#: lib/diff.tcl:303

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

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

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

-#: lib/error.tcl:12 lib/error.tcl:102
+#: lib/error.tcl:20 lib/error.tcl:114

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

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

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

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

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


@@ -1420,11 +1420,11 @@ msgstr ""
 msgid "Revert changes in these %i files?"
 msgstr ""
 
 msgid "Revert changes in these %i files?"
 msgstr ""
 

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

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

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

 msgid "Do Nothing"
 msgstr ""
 
 msgid "Do Nothing"
 msgstr ""
 


@@ -1481,27 +1481,27 @@ msgstr ""
 msgid "Merge completed successfully."
 msgstr ""
 
 msgid "Merge completed successfully."
 msgstr ""
 

-#: lib/merge.tcl:133
+#: lib/merge.tcl:132

 msgid "Merge failed.  Conflict resolution is required."
 msgstr ""
 
 msgid "Merge failed.  Conflict resolution is required."
 msgstr ""
 

-#: lib/merge.tcl:158
+#: lib/merge.tcl:157

 #, tcl-format
 msgid "Merge Into %s"
 msgstr ""
 
 #, tcl-format
 msgid "Merge Into %s"
 msgstr ""
 

-#: lib/merge.tcl:177
+#: lib/merge.tcl:176

 msgid "Revision To Merge"
 msgstr ""
 
 msgid "Revision To Merge"
 msgstr ""
 

-#: lib/merge.tcl:212
+#: lib/merge.tcl:211

 msgid ""
 "Cannot abort while amending.\n"
 "\n"
 "You must finish amending this commit.\n"
 msgstr ""
 
 msgid ""
 "Cannot abort while amending.\n"
 "\n"
 "You must finish amending this commit.\n"
 msgstr ""
 

-#: lib/merge.tcl:222
+#: lib/merge.tcl:221

 msgid ""
 "Abort merge?\n"
 "\n"
 msgid ""
 "Abort merge?\n"
 "\n"


@@ -1510,7 +1510,7 @@ msgid ""
 "Continue with aborting the current merge?"
 msgstr ""
 
 "Continue with aborting the current merge?"
 msgstr ""
 

-#: lib/merge.tcl:228
+#: lib/merge.tcl:227

 msgid ""
 "Reset changes?\n"
 "\n"
 msgid ""
 "Reset changes?\n"
 "\n"


@@ -1519,7 +1519,7 @@ msgid ""
 "Continue with resetting the current changes?"
 msgstr ""
 
 "Continue with resetting the current changes?"
 msgstr ""
 

-#: lib/merge.tcl:239
+#: lib/merge.tcl:238

 msgid "Aborting"
 msgstr ""
 
 msgid "Aborting"
 msgstr ""
 


@@ -1531,89 +1531,93 @@ msgstr ""
 msgid "Abort failed."
 msgstr ""
 
 msgid "Abort failed."
 msgstr ""
 

-#: lib/merge.tcl:268
+#: lib/merge.tcl:267

 msgid "Abort completed.  Ready."
 msgstr ""
 
 msgid "Abort completed.  Ready."
 msgstr ""
 

-#: lib/option.tcl:82
+#: lib/option.tcl:95

 msgid "Restore Defaults"
 msgstr ""
 
 msgid "Restore Defaults"
 msgstr ""
 

-#: lib/option.tcl:86
+#: lib/option.tcl:99

 msgid "Save"
 msgstr ""
 
 msgid "Save"
 msgstr ""
 

-#: lib/option.tcl:96
+#: lib/option.tcl:109

 #, tcl-format
 msgid "%s Repository"
 msgstr ""
 
 #, tcl-format
 msgid "%s Repository"
 msgstr ""
 

-#: lib/option.tcl:97
+#: lib/option.tcl:110

 msgid "Global (All Repositories)"
 msgstr ""
 
 msgid "Global (All Repositories)"
 msgstr ""
 

-#: lib/option.tcl:103
+#: lib/option.tcl:116

 msgid "User Name"
 msgstr ""
 
 msgid "User Name"
 msgstr ""
 

-#: lib/option.tcl:104
+#: lib/option.tcl:117

 msgid "Email Address"
 msgstr ""
 
 msgid "Email Address"
 msgstr ""
 

-#: lib/option.tcl:106
+#: lib/option.tcl:119

 msgid "Summarize Merge Commits"
 msgstr ""
 
 msgid "Summarize Merge Commits"
 msgstr ""
 

-#: lib/option.tcl:107
+#: lib/option.tcl:120

 msgid "Merge Verbosity"
 msgstr ""
 
 msgid "Merge Verbosity"
 msgstr ""
 

-#: lib/option.tcl:108
+#: lib/option.tcl:121

 msgid "Show Diffstat After Merge"
 msgstr ""
 
 msgid "Show Diffstat After Merge"
 msgstr ""
 

-#: lib/option.tcl:110
+#: lib/option.tcl:123

 msgid "Trust File Modification Timestamps"
 msgstr ""
 
 msgid "Trust File Modification Timestamps"
 msgstr ""
 

-#: lib/option.tcl:111
+#: lib/option.tcl:124

 msgid "Prune Tracking Branches During Fetch"
 msgstr ""
 
 msgid "Prune Tracking Branches During Fetch"
 msgstr ""
 

-#: lib/option.tcl:112
+#: lib/option.tcl:125

 msgid "Match Tracking Branches"
 msgstr ""
 
 msgid "Match Tracking Branches"
 msgstr ""
 

-#: lib/option.tcl:113
+#: lib/option.tcl:126

 msgid "Number of Diff Context Lines"
 msgstr ""
 
 msgid "Number of Diff Context Lines"
 msgstr ""
 

-#: lib/option.tcl:114
+#: lib/option.tcl:127
+msgid "Commit Message Text Width"
+msgstr ""
+
+#: lib/option.tcl:128

 msgid "New Branch Name Template"
 msgstr ""
 
 msgid "New Branch Name Template"
 msgstr ""
 

-#: lib/option.tcl:191
+#: lib/option.tcl:192

 msgid "Spelling Dictionary:"
 msgstr ""
 
 msgid "Spelling Dictionary:"
 msgstr ""
 

-#: lib/option.tcl:215
+#: lib/option.tcl:216

 msgid "Change Font"
 msgstr ""
 
 msgid "Change Font"
 msgstr ""
 

-#: lib/option.tcl:180
+#: lib/option.tcl:220

 #, tcl-format
 msgid "Choose %s"
 msgstr ""
 
 #, tcl-format
 msgid "Choose %s"
 msgstr ""
 

-#: lib/option.tcl:186
+#: lib/option.tcl:226

 msgid "pt."
 msgstr ""
 
 msgid "pt."
 msgstr ""
 

-#: lib/option.tcl:200
+#: lib/option.tcl:240

 msgid "Preferences"
 msgstr ""
 
 msgid "Preferences"
 msgstr ""
 

-#: lib/option.tcl:235
+#: lib/option.tcl:275

 msgid "Failed to completely save options:"
 msgstr ""
 
 msgid "Failed to completely save options:"
 msgstr ""
 


@@ -1713,23 +1717,40 @@ msgstr ""
 msgid "Cannot write icon:"
 msgstr ""
 
 msgid "Cannot write icon:"
 msgstr ""
 

-#: lib/spellcheck.tcl:37
-msgid "Not connected to aspell"
+#: lib/spellcheck.tcl:57
+msgid "Unsupported spell checker"
+msgstr ""
+
+#: lib/spellcheck.tcl:65
+msgid "Spell checking is unavailable"
+msgstr ""
+
+#: lib/spellcheck.tcl:68
+msgid "Invalid spell checking configuration"
+msgstr ""
+
+#: lib/spellcheck.tcl:70
+#, tcl-format
+msgid "Reverting dictionary to %s."
+msgstr ""
+
+#: lib/spellcheck.tcl:73
+msgid "Spell checker silently failed on startup"

 msgstr ""
 
 msgstr ""
 

-#: lib/spellcheck.tcl:41
-msgid "Unrecognized aspell version"
+#: lib/spellcheck.tcl:80
+msgid "Unrecognized spell checker"

 msgstr ""
 
 msgstr ""
 

-#: lib/spellcheck.tcl:135
+#: lib/spellcheck.tcl:180

 msgid "No Suggestions"
 msgstr ""
 
 msgid "No Suggestions"
 msgstr ""
 

-#: lib/spellcheck.tcl:336
-msgid "Unexpected EOF from aspell"
+#: lib/spellcheck.tcl:381
+msgid "Unexpected EOF from spell checker"

 msgstr ""
 
 msgstr ""
 

-#: lib/spellcheck.tcl:340
+#: lib/spellcheck.tcl:385

 msgid "Spell Checker Failed"
 msgstr ""
 
 msgid "Spell Checker Failed"
 msgstr ""
 

diff --git a/po/hu.po b/po/hu.po
index e3f96a3bc0adf3814955faef31b5948d7742bcdf..89980d2067018540734d77851593f82dfd79cfc7 100644 (file)
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: git-gui-i 18n\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: git-gui-i 18n\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2008-02-16 21:24+0100\n"
+"POT-Creation-Date: 2008-03-14 07:18+0100\n"

 "PO-Revision-Date: 2008-03-13 13:30+0100\n"
 "Last-Translator: Miklos Vajna <vmiklos@frugalware.org>\n"
 "Language-Team: Hungarian\n"
 "PO-Revision-Date: 2008-03-13 13:30+0100\n"
 "Last-Translator: Miklos Vajna <vmiklos@frugalware.org>\n"
 "Language-Team: Hungarian\n"


@@ -16,33 +16,33 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 

-#: git-gui.sh:41 git-gui.sh:604 git-gui.sh:618 git-gui.sh:631 git-gui.sh:714
-#: git-gui.sh:733
+#: git-gui.sh:41 git-gui.sh: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: végzetes hiba"
 
 msgid "git-gui: fatal error"
 msgstr "git-gui: végzetes hiba"
 

-#: git-gui.sh:565
+#: git-gui.sh:593

 #, tcl-format
 msgid "Invalid font specified in %s:"
 msgstr "Érvénytelen font lett megadva itt: %s:"
 
 #, tcl-format
 msgid "Invalid font specified in %s:"
 msgstr "Érvénytelen font lett megadva itt: %s:"
 

-#: git-gui.sh:590
+#: git-gui.sh:620

 msgid "Main Font"
 msgstr "Fő betűtípus"
 
 msgid "Main Font"
 msgstr "Fő betűtípus"
 

-#: git-gui.sh:591
+#: git-gui.sh:621

 msgid "Diff/Console Font"
 msgstr "Diff/konzol betűtípus"
 
 msgid "Diff/Console Font"
 msgstr "Diff/konzol betűtípus"
 

-#: git-gui.sh:605
+#: git-gui.sh:635

 msgid "Cannot find git in PATH."
 msgstr "A git nem található a PATH-ban."
 
 msgid "Cannot find git in PATH."
 msgstr "A git nem található a PATH-ban."
 

-#: git-gui.sh:632
+#: git-gui.sh:662

 msgid "Cannot parse Git version string:"
 msgstr "Nem értelmezhető a Git verzió sztring:"
 
 msgid "Cannot parse Git version string:"
 msgstr "Nem értelmezhető a Git verzió sztring:"
 

-#: git-gui.sh:650
+#: git-gui.sh:680

 #, tcl-format
 msgid ""
 "Git version cannot be determined.\n"
 #, tcl-format
 msgid ""
 "Git version cannot be determined.\n"


@@ -61,79 +61,79 @@ msgstr ""
 "\n"
 "Feltételezhetjük, hogy a(z) '%s' verziója legalább 1.5.0?\n"
 
 "\n"
 "Feltételezhetjük, hogy a(z) '%s' verziója legalább 1.5.0?\n"
 

-#: git-gui.sh:888
+#: git-gui.sh:918

 msgid "Git directory not found:"
 msgstr "A Git könyvtár nem található:"
 
 msgid "Git directory not found:"
 msgstr "A Git könyvtár nem található:"
 

-#: git-gui.sh:895
+#: git-gui.sh:925

 msgid "Cannot move to top of working directory:"
 msgstr "Nem lehet a munkakönyvtár tetejére lépni:"
 
 msgid "Cannot move to top of working directory:"
 msgstr "Nem lehet a munkakönyvtár tetejére lépni:"
 

-#: git-gui.sh:902
+#: git-gui.sh:932

 msgid "Cannot use funny .git directory:"
 msgstr "Nem használható vicces .git könyvtár:"
 
 msgid "Cannot use funny .git directory:"
 msgstr "Nem használható vicces .git könyvtár:"
 

-#: git-gui.sh:907
+#: git-gui.sh:937

 msgid "No working directory"
 msgstr "Nincs munkakönyvtár"
 
 msgid "No working directory"
 msgstr "Nincs munkakönyvtár"
 

-#: git-gui.sh:1054
+#: git-gui.sh:1084 lib/checkout_op.tcl:283

 msgid "Refreshing file status..."
 msgstr "A fájlok státuszának frissítése..."
 
 msgid "Refreshing file status..."
 msgstr "A fájlok státuszának frissítése..."
 

-#: git-gui.sh:1119
+#: git-gui.sh:1149

 msgid "Scanning for modified files ..."
 msgstr "Módosított fájlok keresése ..."
 
 msgid "Scanning for modified files ..."
 msgstr "Módosított fájlok keresése ..."
 

-#: git-gui.sh:1294 lib/browser.tcl:245
+#: git-gui.sh:1324 lib/browser.tcl:246

 msgid "Ready."
 msgstr "Kész."
 
 msgid "Ready."
 msgstr "Kész."
 

-#: git-gui.sh:1560
+#: git-gui.sh:1590

 msgid "Unmodified"
 msgstr "Nem módosított"
 
 msgid "Unmodified"
 msgstr "Nem módosított"
 

-#: git-gui.sh:1562
+#: git-gui.sh:1592

 msgid "Modified, not staged"
 msgstr "Módosított, de nem kiválasztott"
 
 msgid "Modified, not staged"
 msgstr "Módosított, de nem kiválasztott"
 

-#: git-gui.sh:1563 git-gui.sh:1568
+#: git-gui.sh:1593 git-gui.sh:1598

 msgid "Staged for commit"
 msgstr "Kiválasztva commitolásra"
 
 msgid "Staged for commit"
 msgstr "Kiválasztva commitolásra"
 

-#: git-gui.sh:1564 git-gui.sh:1569
+#: git-gui.sh:1594 git-gui.sh:1599

 msgid "Portions staged for commit"
 msgstr "Részek kiválasztva commitolásra"
 
 msgid "Portions staged for commit"
 msgstr "Részek kiválasztva commitolásra"
 

-#: git-gui.sh:1565 git-gui.sh:1570
+#: git-gui.sh:1595 git-gui.sh:1600

 msgid "Staged for commit, missing"
 msgstr "Kiválasztva commitolásra, hiányzó"
 
 msgid "Staged for commit, missing"
 msgstr "Kiválasztva commitolásra, hiányzó"
 

-#: git-gui.sh:1567
+#: git-gui.sh:1597

 msgid "Untracked, not staged"
 msgstr "Nem követett, nem kiválasztott"
 
 msgid "Untracked, not staged"
 msgstr "Nem követett, nem kiválasztott"
 

-#: git-gui.sh:1572
+#: git-gui.sh:1602

 msgid "Missing"
 msgstr "Hiányzó"
 
 msgid "Missing"
 msgstr "Hiányzó"
 

-#: git-gui.sh:1573
+#: git-gui.sh:1603

 msgid "Staged for removal"
 msgstr "Kiválasztva eltávolításra"
 
 msgid "Staged for removal"
 msgstr "Kiválasztva eltávolításra"
 

-#: git-gui.sh:1574
+#: git-gui.sh:1604

 msgid "Staged for removal, still present"
 msgstr "Kiválasztva eltávolításra, jelenleg is elérhető"
 
 msgid "Staged for removal, still present"
 msgstr "Kiválasztva eltávolításra, jelenleg is elérhető"
 

-#: git-gui.sh:1576 git-gui.sh:1577 git-gui.sh:1578 git-gui.sh:1579
+#: git-gui.sh:1606 git-gui.sh:1607 git-gui.sh:1608 git-gui.sh:1609

 msgid "Requires merge resolution"
 msgstr "Merge feloldás szükséges"
 
 msgid "Requires merge resolution"
 msgstr "Merge feloldás szükséges"
 

-#: git-gui.sh:1614
+#: git-gui.sh:1644

 msgid "Starting gitk... please wait..."
 msgstr "A gitk indítása... várjunk..."
 
 msgid "Starting gitk... please wait..."
 msgstr "A gitk indítása... várjunk..."
 

-#: git-gui.sh:1623
+#: git-gui.sh:1653

 #, tcl-format
 msgid ""
 "Unable to start gitk:\n"
 #, tcl-format
 msgid ""
 "Unable to start gitk:\n"


@@ -144,296 +144,296 @@ msgstr ""
 "\n"
 "A(z) %s nem létezik"
 
 "\n"
 "A(z) %s nem létezik"
 

-#: git-gui.sh:1823 lib/choose_repository.tcl:35
+#: git-gui.sh:1860 lib/choose_repository.tcl:36

 msgid "Repository"
 msgstr "Repó"
 
 msgid "Repository"
 msgstr "Repó"
 

-#: git-gui.sh:1824
+#: git-gui.sh:1861

 msgid "Edit"
 msgstr "Szerkesztés"
 
 msgid "Edit"
 msgstr "Szerkesztés"
 

-#: git-gui.sh:1826 lib/choose_rev.tcl:560
+#: git-gui.sh:1863 lib/choose_rev.tcl:561

 msgid "Branch"
 msgstr "Branch"
 
 msgid "Branch"
 msgstr "Branch"
 

-#: git-gui.sh:1829 lib/choose_rev.tcl:547
+#: git-gui.sh:1866 lib/choose_rev.tcl:548

 msgid "Commit@@noun"
 msgstr "Commit@@főnév"
 
 msgid "Commit@@noun"
 msgstr "Commit@@főnév"
 

-#: git-gui.sh:1832 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168
+#: git-gui.sh:1869 lib/merge.tcl:120 lib/merge.tcl:149 lib/merge.tcl:167

 msgid "Merge"
 msgstr "Merge"
 
 msgid "Merge"
 msgstr "Merge"
 

-#: git-gui.sh:1833 lib/choose_rev.tcl:556
+#: git-gui.sh:1870 lib/choose_rev.tcl:557

 msgid "Remote"
 msgstr "Távoli"
 
 msgid "Remote"
 msgstr "Távoli"
 

-#: git-gui.sh:1842
+#: git-gui.sh:1879

 msgid "Browse Current Branch's Files"
 msgstr "A jelenlegi branch fájljainak böngészése"
 
 msgid "Browse Current Branch's Files"
 msgstr "A jelenlegi branch fájljainak böngészése"
 

-#: git-gui.sh:1846
+#: git-gui.sh:1883

 msgid "Browse Branch Files..."
 msgstr "A branch fájljainak böngészése..."
 
 msgid "Browse Branch Files..."
 msgstr "A branch fájljainak böngészése..."
 

-#: git-gui.sh:1851
+#: git-gui.sh:1888

 msgid "Visualize Current Branch's History"
 msgstr "A jelenlegi branch történetének vizualizálása"
 
 msgid "Visualize Current Branch's History"
 msgstr "A jelenlegi branch történetének vizualizálása"
 

-#: git-gui.sh:1855
+#: git-gui.sh:1892

 msgid "Visualize All Branch History"
 msgstr "Az összes branch történetének vizualizálása"
 
 msgid "Visualize All Branch History"
 msgstr "Az összes branch történetének vizualizálása"
 

-#: git-gui.sh:1862
+#: git-gui.sh:1899

 #, tcl-format
 msgid "Browse %s's Files"
 msgstr "A(z) %s branch fájljainak böngészése"
 
 #, tcl-format
 msgid "Browse %s's Files"
 msgstr "A(z) %s branch fájljainak böngészése"
 

-#: git-gui.sh:1864
+#: git-gui.sh:1901

 #, tcl-format
 msgid "Visualize %s's History"
 msgstr "A(z) %s branch történetének vizualizálása"
 
 #, tcl-format
 msgid "Visualize %s's History"
 msgstr "A(z) %s branch történetének vizualizálása"
 

-#: git-gui.sh:1869 lib/database.tcl:27 lib/database.tcl:67
+#: git-gui.sh:1906 lib/database.tcl:27 lib/database.tcl:67

 msgid "Database Statistics"
 msgstr "Adatbázis statisztikák"
 
 msgid "Database Statistics"
 msgstr "Adatbázis statisztikák"
 

-#: git-gui.sh:1872 lib/database.tcl:34
+#: git-gui.sh:1909 lib/database.tcl:34

 msgid "Compress Database"
 msgstr "Adatbázis tömörítése"
 
 msgid "Compress Database"
 msgstr "Adatbázis tömörítése"
 

-#: git-gui.sh:1875
+#: git-gui.sh:1912

 msgid "Verify Database"
 msgstr "Adatbázis ellenőrzése"
 
 msgid "Verify Database"
 msgstr "Adatbázis ellenőrzése"
 

-#: git-gui.sh:1882 git-gui.sh:1886 git-gui.sh:1890 lib/shortcut.tcl:7
+#: git-gui.sh:1919 git-gui.sh:1923 git-gui.sh:1927 lib/shortcut.tcl:7

 #: lib/shortcut.tcl:39 lib/shortcut.tcl:71
 msgid "Create Desktop Icon"
 msgstr "Asztal ikon létrehozása"
 
 #: lib/shortcut.tcl:39 lib/shortcut.tcl:71
 msgid "Create Desktop Icon"
 msgstr "Asztal ikon létrehozása"
 

-#: git-gui.sh:1895 lib/choose_repository.tcl:176 lib/choose_repository.tcl:184
+#: git-gui.sh:1932 lib/choose_repository.tcl:177 lib/choose_repository.tcl:185

 msgid "Quit"
 msgstr "Kilépés"
 
 msgid "Quit"
 msgstr "Kilépés"
 

-#: git-gui.sh:1902
+#: git-gui.sh:1939

 msgid "Undo"
 msgstr "Visszavonás"
 
 msgid "Undo"
 msgstr "Visszavonás"
 

-#: git-gui.sh:1905
+#: git-gui.sh:1942

 msgid "Redo"
 msgstr "Mégis"
 
 msgid "Redo"
 msgstr "Mégis"
 

-#: git-gui.sh:1909 git-gui.sh:2403
+#: git-gui.sh:1946 git-gui.sh:2443

 msgid "Cut"
 msgstr "Kivágás"
 
 msgid "Cut"
 msgstr "Kivágás"
 

-#: git-gui.sh:1912 git-gui.sh:2406 git-gui.sh:2477 git-gui.sh:2549
-#: lib/console.tcl:67
+#: git-gui.sh:1949 git-gui.sh:2446 git-gui.sh:2520 git-gui.sh:2614
+#: lib/console.tcl:69

 msgid "Copy"
 msgstr "Másolás"
 
 msgid "Copy"
 msgstr "Másolás"
 

-#: git-gui.sh:1915 git-gui.sh:2409
+#: git-gui.sh:1952 git-gui.sh:2449

 msgid "Paste"
 msgstr "Beillesztés"
 
 msgid "Paste"
 msgstr "Beillesztés"
 

-#: git-gui.sh:1918 git-gui.sh:2412 lib/branch_delete.tcl:26
+#: git-gui.sh:1955 git-gui.sh:2452 lib/branch_delete.tcl:26

 #: lib/remote_branch_delete.tcl:38
 msgid "Delete"
 msgstr "Törlés"
 
 #: lib/remote_branch_delete.tcl:38
 msgid "Delete"
 msgstr "Törlés"
 

-#: git-gui.sh:1922 git-gui.sh:2416 git-gui.sh:2553 lib/console.tcl:69
+#: git-gui.sh:1959 git-gui.sh:2456 git-gui.sh:2618 lib/console.tcl:71

 msgid "Select All"
 msgstr "Mindent kiválaszt"
 
 msgid "Select All"
 msgstr "Mindent kiválaszt"
 

-#: git-gui.sh:1931
+#: git-gui.sh:1968

 msgid "Create..."
 msgstr "Létrehozás..."
 
 msgid "Create..."
 msgstr "Létrehozás..."
 

-#: git-gui.sh:1937
+#: git-gui.sh:1974

 msgid "Checkout..."
 msgstr "Checkout..."
 
 msgid "Checkout..."
 msgstr "Checkout..."
 

-#: git-gui.sh:1943
+#: git-gui.sh:1980

 msgid "Rename..."
 msgstr "Átnevezés..."
 
 msgid "Rename..."
 msgstr "Átnevezés..."
 

-#: git-gui.sh:1948 git-gui.sh:2048
+#: git-gui.sh:1985 git-gui.sh:2085

 msgid "Delete..."
 msgstr "Törlés..."
 
 msgid "Delete..."
 msgstr "Törlés..."
 

-#: git-gui.sh:1953
+#: git-gui.sh:1990

 msgid "Reset..."
 msgstr "Visszaállítás..."
 
 msgid "Reset..."
 msgstr "Visszaállítás..."
 

-#: git-gui.sh:1965 git-gui.sh:2350
+#: git-gui.sh:2002 git-gui.sh:2389

 msgid "New Commit"
 msgstr "Új commit"
 
 msgid "New Commit"
 msgstr "Új commit"
 

-#: git-gui.sh:1973 git-gui.sh:2357
+#: git-gui.sh:2010 git-gui.sh:2396

 msgid "Amend Last Commit"
 msgstr "Utolsó commit javítása"
 
 msgid "Amend Last Commit"
 msgstr "Utolsó commit javítása"
 

-#: git-gui.sh:1982 git-gui.sh:2317 lib/remote_branch_delete.tcl:99
+#: git-gui.sh:2019 git-gui.sh:2356 lib/remote_branch_delete.tcl:99

 msgid "Rescan"
 msgstr "Keresés újra"
 
 msgid "Rescan"
 msgstr "Keresés újra"
 

-#: git-gui.sh:1988
+#: git-gui.sh:2025

 msgid "Stage To Commit"
 msgstr "Kiválasztás commitolásra"
 
 msgid "Stage To Commit"
 msgstr "Kiválasztás commitolásra"
 

-#: git-gui.sh:1994
+#: git-gui.sh:2031

 msgid "Stage Changed Files To Commit"
 msgstr "Módosított fájlok kiválasztása commitolásra"
 
 msgid "Stage Changed Files To Commit"
 msgstr "Módosított fájlok kiválasztása commitolásra"
 

-#: git-gui.sh:2000
+#: git-gui.sh:2037

 msgid "Unstage From Commit"
 msgstr "Commitba való kiválasztás visszavonása"
 
 msgid "Unstage From Commit"
 msgstr "Commitba való kiválasztás visszavonása"
 

-#: git-gui.sh:2005 lib/index.tcl:393
+#: git-gui.sh:2042 lib/index.tcl:395

 msgid "Revert Changes"
 msgstr "Változtatások visszaállítása"
 
 msgid "Revert Changes"
 msgstr "Változtatások visszaállítása"
 

-#: git-gui.sh:2012 git-gui.sh:2329 git-gui.sh:2427
+#: git-gui.sh:2049 git-gui.sh:2368 git-gui.sh:2467

 msgid "Sign Off"
 msgstr "Aláír"
 
 msgid "Sign Off"
 msgstr "Aláír"
 

-#: git-gui.sh:2016 git-gui.sh:2333
+#: git-gui.sh:2053 git-gui.sh:2372

 msgid "Commit@@verb"
 msgstr "Commit@@ige"
 
 msgid "Commit@@verb"
 msgstr "Commit@@ige"
 

-#: git-gui.sh:2027
+#: git-gui.sh:2064

 msgid "Local Merge..."
 msgstr "Helyi merge..."
 
 msgid "Local Merge..."
 msgstr "Helyi merge..."
 

-#: git-gui.sh:2032
+#: git-gui.sh:2069

 msgid "Abort Merge..."
 msgstr "Merge megszakítása..."
 
 msgid "Abort Merge..."
 msgstr "Merge megszakítása..."
 

-#: git-gui.sh:2044
+#: git-gui.sh:2081

 msgid "Push..."
 msgstr "Push..."
 
 msgid "Push..."
 msgstr "Push..."
 

-#: git-gui.sh:2055 lib/choose_repository.tcl:40
+#: git-gui.sh:2092 lib/choose_repository.tcl:41

 msgid "Apple"
 msgstr "Apple"
 
 msgid "Apple"
 msgstr "Apple"
 

-#: git-gui.sh:2058 git-gui.sh:2080 lib/about.tcl:13
-#: lib/choose_repository.tcl:43 lib/choose_repository.tcl:49
+#: git-gui.sh:2095 git-gui.sh:2117 lib/about.tcl:14
+#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:50

 #, tcl-format
 msgid "About %s"
 msgstr "Névjegy: %s"
 
 #, tcl-format
 msgid "About %s"
 msgstr "Névjegy: %s"
 

-#: git-gui.sh:2062
+#: git-gui.sh:2099

 msgid "Preferences..."
 msgstr "Beállítások..."
 
 msgid "Preferences..."
 msgstr "Beállítások..."
 

-#: git-gui.sh:2070 git-gui.sh:2595
+#: git-gui.sh:2107 git-gui.sh:2639

 msgid "Options..."
 msgstr "Opciók..."
 
 msgid "Options..."
 msgstr "Opciók..."
 

-#: git-gui.sh:2076 lib/choose_repository.tcl:46
+#: git-gui.sh:2113 lib/choose_repository.tcl:47

 msgid "Help"
 msgstr "Segítség"
 
 msgid "Help"
 msgstr "Segítség"
 

-#: git-gui.sh:2117
+#: git-gui.sh:2154

 msgid "Online Documentation"
 msgstr "Online dokumentáció"
 
 msgid "Online Documentation"
 msgstr "Online dokumentáció"
 

-#: git-gui.sh:2201
+#: git-gui.sh:2238

 #, tcl-format
 msgid "fatal: cannot stat path %s: No such file or directory"
 msgstr ""
 "végzetes hiba: nem érhető el a(z) %s útvonal: Nincs ilyen fájl vagy könyvtár"
 
 #, tcl-format
 msgid "fatal: cannot stat path %s: No such file or directory"
 msgstr ""
 "végzetes hiba: nem érhető el a(z) %s útvonal: Nincs ilyen fájl vagy könyvtár"
 

-#: git-gui.sh:2234
+#: git-gui.sh:2271

 msgid "Current Branch:"
 msgstr "Jelenlegi branch:"
 
 msgid "Current Branch:"
 msgstr "Jelenlegi branch:"
 

-#: git-gui.sh:2255
+#: git-gui.sh:2292

 msgid "Staged Changes (Will Commit)"
 msgstr "Kiválasztott változtatások (commitolva lesz)"
 
 msgid "Staged Changes (Will Commit)"
 msgstr "Kiválasztott változtatások (commitolva lesz)"
 

-#: git-gui.sh:2274
+#: git-gui.sh:2312

 msgid "Unstaged Changes"
 msgstr "Kiválasztatlan változtatások"
 
 msgid "Unstaged Changes"
 msgstr "Kiválasztatlan változtatások"
 

-#: git-gui.sh:2323
+#: git-gui.sh:2362

 msgid "Stage Changed"
 msgstr "Változtatások kiválasztása"
 
 msgid "Stage Changed"
 msgstr "Változtatások kiválasztása"
 

-#: git-gui.sh:2339 lib/transport.tcl:93 lib/transport.tcl:182
+#: git-gui.sh:2378 lib/transport.tcl:93 lib/transport.tcl:182

 msgid "Push"
 msgstr "Push"
 
 msgid "Push"
 msgstr "Push"
 

-#: git-gui.sh:2369
+#: git-gui.sh:2408

 msgid "Initial Commit Message:"
 msgstr "Kezdeti commit üzenet:"
 
 msgid "Initial Commit Message:"
 msgstr "Kezdeti commit üzenet:"
 

-#: git-gui.sh:2370
+#: git-gui.sh:2409

 msgid "Amended Commit Message:"
 msgstr "Javító commit üzenet:"
 
 msgid "Amended Commit Message:"
 msgstr "Javító commit üzenet:"
 

-#: git-gui.sh:2371
+#: git-gui.sh:2410

 msgid "Amended Initial Commit Message:"
 msgstr "Kezdeti javító commit üzenet:"
 
 msgid "Amended Initial Commit Message:"
 msgstr "Kezdeti javító commit üzenet:"
 

-#: git-gui.sh:2372
+#: git-gui.sh:2411

 msgid "Amended Merge Commit Message:"
 msgstr "Javító merge commit üzenet:"
 
 msgid "Amended Merge Commit Message:"
 msgstr "Javító merge commit üzenet:"
 

-#: git-gui.sh:2373
+#: git-gui.sh:2412

 msgid "Merge Commit Message:"
 msgstr "Merge commit üzenet:"
 
 msgid "Merge Commit Message:"
 msgstr "Merge commit üzenet:"
 

-#: git-gui.sh:2374
+#: git-gui.sh:2413

 msgid "Commit Message:"
 msgstr "Commit üzenet:"
 
 msgid "Commit Message:"
 msgstr "Commit üzenet:"
 

-#: git-gui.sh:2419 git-gui.sh:2557 lib/console.tcl:71
+#: git-gui.sh:2459 git-gui.sh:2622 lib/console.tcl:73

 msgid "Copy All"
 msgstr "Összes másolása"
 
 msgid "Copy All"
 msgstr "Összes másolása"
 

-#: git-gui.sh:2443 lib/blame.tcl:104
+#: git-gui.sh:2483 lib/blame.tcl:107

 msgid "File:"
 msgstr "Fájl:"
 
 msgid "File:"
 msgstr "Fájl:"
 

-#: git-gui.sh:2573
+#: git-gui.sh:2589

 msgid "Apply/Reverse Hunk"
 msgstr "Hunk alkalmazása/visszaállítása"
 
 msgid "Apply/Reverse Hunk"
 msgstr "Hunk alkalmazása/visszaállítása"
 

-#: git-gui.sh:2579
+#: git-gui.sh:2595

 msgid "Show Less Context"
 msgstr "Kevesebb környezet mutatása"
 
 msgid "Show Less Context"
 msgstr "Kevesebb környezet mutatása"
 

-#: git-gui.sh:2586
+#: git-gui.sh:2602

 msgid "Show More Context"
 msgstr "Több környezet mutatása"
 
 msgid "Show More Context"
 msgstr "Több környezet mutatása"
 

-#: git-gui.sh:2594
+#: git-gui.sh:2610

 msgid "Refresh"
 msgstr "Frissítés"
 
 msgid "Refresh"
 msgstr "Frissítés"
 

-#: git-gui.sh:2615
+#: git-gui.sh:2631

 msgid "Decrease Font Size"
 msgstr "Font méret csökkentése"
 
 msgid "Decrease Font Size"
 msgstr "Font méret csökkentése"
 

-#: git-gui.sh:2619
+#: git-gui.sh:2635

 msgid "Increase Font Size"
 msgstr "Fönt méret növelése"
 
 msgid "Increase Font Size"
 msgstr "Fönt méret növelése"
 

-#: git-gui.sh:2630
+#: git-gui.sh:2646

 msgid "Unstage Hunk From Commit"
 msgstr "Hunk törlése commitból"
 
 msgid "Unstage Hunk From Commit"
 msgstr "Hunk törlése commitból"
 

-#: git-gui.sh:2604
+#: git-gui.sh:2648

 msgid "Stage Hunk For Commit"
 msgstr "Hunk kiválasztása commitba"
 
 msgid "Stage Hunk For Commit"
 msgstr "Hunk kiválasztása commitba"
 

-#: git-gui.sh:2623
+#: git-gui.sh:2667

 msgid "Initializing..."
 msgstr "Inicializálás..."
 
 msgid "Initializing..."
 msgstr "Inicializálás..."
 

-#: git-gui.sh:2718
+#: git-gui.sh:2762

 #, tcl-format
 msgid ""
 "Possible environment issues exist.\n"
 #, tcl-format
 msgid ""
 "Possible environment issues exist.\n"


@@ -450,7 +450,7 @@ msgstr ""
 "indított folyamatok által:\n"
 "\n"
 
 "indított folyamatok által:\n"
 "\n"
 

-#: git-gui.sh:2748
+#: git-gui.sh:2792

 msgid ""
 "\n"
 "This is due to a known issue with the\n"
 msgid ""
 "\n"
 "This is due to a known issue with the\n"


@@ -460,7 +460,7 @@ msgstr ""
 "Ez a Cygwin által terjesztett Tcl binárisban\n"
 "lévő ismert hiba miatt van."
 
 "Ez a Cygwin által terjesztett Tcl binárisban\n"
 "lévő ismert hiba miatt van."
 

-#: git-gui.sh:2753
+#: git-gui.sh:2797

 #, tcl-format
 msgid ""
 "\n"
 #, tcl-format
 msgid ""
 "\n"


@@ -477,7 +477,7 @@ msgstr ""
 "elhelyezése a személyes\n"
 "~/.gitconfig fájlba.\n"
 
 "elhelyezése a személyes\n"
 "~/.gitconfig fájlba.\n"
 

-#: lib/about.tcl:25
+#: lib/about.tcl:26

 msgid "git-gui - a graphical user interface for Git."
 msgstr "git-gui - egy grafikus felület a Githez."
 
 msgid "git-gui - a graphical user interface for Git."
 msgstr "git-gui - egy grafikus felület a Githez."
 


@@ -489,56 +489,56 @@ msgstr "Fájl néző"
 msgid "Commit:"
 msgstr "Commit:"
 
 msgid "Commit:"
 msgstr "Commit:"
 

-#: lib/blame.tcl:249
+#: lib/blame.tcl:264

 msgid "Copy Commit"
 msgstr "Commit másolása"
 
 msgid "Copy Commit"
 msgstr "Commit másolása"
 

-#: lib/blame.tcl:369
+#: lib/blame.tcl:384

 #, tcl-format
 msgid "Reading %s..."
 msgstr "A(z) %s olvasása..."
 
 #, tcl-format
 msgid "Reading %s..."
 msgstr "A(z) %s olvasása..."
 

-#: lib/blame.tcl:473
+#: lib/blame.tcl:488

 msgid "Loading copy/move tracking annotations..."
 msgstr "A másolást/átnevezést követő annotációk betöltése..."
 
 msgid "Loading copy/move tracking annotations..."
 msgstr "A másolást/átnevezést követő annotációk betöltése..."
 

-#: lib/blame.tcl:493
+#: lib/blame.tcl:508

 msgid "lines annotated"
 msgstr "sor annotálva"
 
 msgid "lines annotated"
 msgstr "sor annotálva"
 

-#: lib/blame.tcl:674
+#: lib/blame.tcl:689

 msgid "Loading original location annotations..."
 msgstr "Az eredeti hely annotációk betöltése..."
 
 msgid "Loading original location annotations..."
 msgstr "Az eredeti hely annotációk betöltése..."
 

-#: lib/blame.tcl:677
+#: lib/blame.tcl:692

 msgid "Annotation complete."
 msgstr "Az annotáció kész."
 
 msgid "Annotation complete."
 msgstr "Az annotáció kész."
 

-#: lib/blame.tcl:731
+#: lib/blame.tcl:746

 msgid "Loading annotation..."
 msgstr "Az annotáció betöltése..."
 
 msgid "Loading annotation..."
 msgstr "Az annotáció betöltése..."
 

-#: lib/blame.tcl:787
+#: lib/blame.tcl:802

 msgid "Author:"
 msgstr "Szerző:"
 
 msgid "Author:"
 msgstr "Szerző:"
 

-#: lib/blame.tcl:791
+#: lib/blame.tcl:806

 msgid "Committer:"
 msgstr "Commiter:"
 
 msgid "Committer:"
 msgstr "Commiter:"
 

-#: lib/blame.tcl:796
+#: lib/blame.tcl:811

 msgid "Original File:"
 msgstr "Eredeti fájl:"
 
 msgid "Original File:"
 msgstr "Eredeti fájl:"
 

-#: lib/blame.tcl:910
+#: lib/blame.tcl:925

 msgid "Originally By:"
 msgstr "Eredeti szerző:"
 
 msgid "Originally By:"
 msgstr "Eredeti szerző:"
 

-#: lib/blame.tcl:916
+#: lib/blame.tcl:931

 msgid "In File:"
 msgstr "Ebben a fájlban:"
 
 msgid "In File:"
 msgstr "Ebben a fájlban:"
 

-#: lib/blame.tcl:921
+#: lib/blame.tcl:936

 msgid "Copied Or Moved Here By:"
 msgstr "Ide másolta vagy helyezte:"
 
 msgid "Copied Or Moved Here By:"
 msgstr "Ide másolta vagy helyezte:"
 


@@ -551,17 +551,17 @@ msgid "Checkout"
 msgstr "Checkout"
 
 #: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35
 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:281
-#: lib/checkout_op.tcl:522 lib/choose_font.tcl:43 lib/merge.tcl:172
-#: lib/option.tcl:90 lib/remote_branch_delete.tcl:42 lib/transport.tcl:97
+#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:282
+#: lib/checkout_op.tcl:522 lib/choose_font.tcl:43 lib/merge.tcl:171
+#: lib/option.tcl:103 lib/remote_branch_delete.tcl:42 lib/transport.tcl:97

 msgid "Cancel"
 msgstr "Mégsem"
 
 msgid "Cancel"
 msgstr "Mégsem"
 

-#: lib/branch_checkout.tcl:32 lib/browser.tcl:286
+#: lib/branch_checkout.tcl:32 lib/browser.tcl:287

 msgid "Revision"
 msgstr "Revízió"
 
 msgid "Revision"
 msgstr "Revízió"
 

-#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:202
+#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:242

 msgid "Options"
 msgstr "Opciók"
 
 msgid "Options"
 msgstr "Opciók"
 


@@ -581,7 +581,7 @@ msgstr "Branch létrehozása"
 msgid "Create New Branch"
 msgstr "Új branch létrehozása"
 
 msgid "Create New Branch"
 msgstr "Új branch létrehozása"
 

-#: lib/branch_create.tcl:31 lib/choose_repository.tcl:375
+#: lib/branch_create.tcl:31 lib/choose_repository.tcl:371

 msgid "Create"
 msgstr "Létrehozás"
 
 msgid "Create"
 msgstr "Létrehozás"
 


@@ -721,22 +721,22 @@ msgstr "Indítás..."
 msgid "File Browser"
 msgstr "Fájl böngésző"
 
 msgid "File Browser"
 msgstr "Fájl böngésző"
 

-#: lib/browser.tcl:125 lib/browser.tcl:142
+#: lib/browser.tcl:126 lib/browser.tcl:143

 #, tcl-format
 msgid "Loading %s..."
 msgstr "A(z) %s betöltése..."
 
 #, tcl-format
 msgid "Loading %s..."
 msgstr "A(z) %s betöltése..."
 

-#: lib/browser.tcl:186
+#: lib/browser.tcl:187

 msgid "[Up To Parent]"
 msgstr "[Fel a szülőhöz]"
 
 msgid "[Up To Parent]"
 msgstr "[Fel a szülőhöz]"
 

-#: lib/browser.tcl:266 lib/browser.tcl:272
+#: lib/browser.tcl:267 lib/browser.tcl:273

 msgid "Browse Branch Files"
 msgstr "A branch fájljainak böngészése"
 
 msgid "Browse Branch Files"
 msgstr "A branch fájljainak böngészése"
 

-#: lib/browser.tcl:277 lib/choose_repository.tcl:391
-#: lib/choose_repository.tcl:482 lib/choose_repository.tcl:492
-#: lib/choose_repository.tcl:989
+#: lib/browser.tcl:278 lib/choose_repository.tcl:387
+#: lib/choose_repository.tcl:474 lib/choose_repository.tcl:484
+#: lib/choose_repository.tcl:987

 msgid "Browse"
 msgstr "Böngészés"
 
 msgid "Browse"
 msgstr "Böngészés"
 


@@ -750,7 +750,7 @@ msgstr "A(z) %s letöltése innen: %s"
 msgid "fatal: Cannot resolve %s"
 msgstr "végzetes: Nem lehet feloldani a következőt: %s"
 
 msgid "fatal: Cannot resolve %s"
 msgstr "végzetes: Nem lehet feloldani a következőt: %s"
 

-#: lib/checkout_op.tcl:140 lib/console.tcl:79 lib/database.tcl:31
+#: lib/checkout_op.tcl:140 lib/console.tcl:81 lib/database.tcl:31

 msgid "Close"
 msgstr "Bezárás"
 
 msgid "Close"
 msgstr "Bezárás"
 


@@ -838,7 +838,7 @@ msgstr ""
 "Ha egy branchen szeretnénk lenni, hozzunk létre egyet az 'Ez a leválasztott "
 "checkout'-ból."
 
 "Ha egy branchen szeretnénk lenni, hozzunk létre egyet az 'Ez a leválasztott "
 "checkout'-ból."
 

-#: lib/checkout_op.tcl:446
+#: lib/checkout_op.tcl:446 lib/checkout_op.tcl:450

 #, tcl-format
 msgid "Checked out '%s'."
 msgstr "'%s' kifejtve."
 #, tcl-format
 msgid "Checked out '%s'."
 msgstr "'%s' kifejtve."


@@ -858,7 +858,7 @@ msgstr "Az elveszett commitok helyreállítása nem biztos, hogy egyszerű."
 msgid "Reset '%s'?"
 msgstr "Visszaállítjuk a következőt: '%s'?"
 
 msgid "Reset '%s'?"
 msgstr "Visszaállítjuk a következőt: '%s'?"
 

-#: lib/checkout_op.tcl:510 lib/merge.tcl:164
+#: lib/checkout_op.tcl:510 lib/merge.tcl:163

 msgid "Visualize"
 msgstr "Vizualizálás"
 
 msgid "Visualize"
 msgstr "Vizualizálás"
 


@@ -887,15 +887,15 @@ msgstr "Kiválaszt"
 msgid "Font Family"
 msgstr "Font család"
 
 msgid "Font Family"
 msgstr "Font család"
 

-#: lib/choose_font.tcl:73
+#: lib/choose_font.tcl:74

 msgid "Font Size"
 msgstr "Font méret"
 
 msgid "Font Size"
 msgstr "Font méret"
 

-#: lib/choose_font.tcl:90
+#: lib/choose_font.tcl:91

 msgid "Font Example"
 msgstr "Font példa"
 
 msgid "Font Example"
 msgstr "Font példa"
 

-#: lib/choose_font.tcl:101
+#: lib/choose_font.tcl:103

 msgid ""
 "This is example text.\n"
 "If you like this text, it can be your font."
 msgid ""
 "This is example text.\n"
 "If you like this text, it can be your font."


@@ -903,227 +903,227 @@ msgstr ""
 "Ez egy példa szöveg.\n"
 "Ha ez megfelel, ez lehet a betűtípus."
 
 "Ez egy példa szöveg.\n"
 "Ha ez megfelel, ez lehet a betűtípus."
 

-#: lib/choose_repository.tcl:27
+#: lib/choose_repository.tcl:28

 msgid "Git Gui"
 msgstr "Git Gui"
 
 msgid "Git Gui"
 msgstr "Git Gui"
 

-#: lib/choose_repository.tcl:80 lib/choose_repository.tcl:380
+#: lib/choose_repository.tcl:81 lib/choose_repository.tcl:376

 msgid "Create New Repository"
 msgstr "Új repó létrehozása"
 
 msgid "Create New Repository"
 msgstr "Új repó létrehozása"
 

-#: lib/choose_repository.tcl:86
+#: lib/choose_repository.tcl:87

 msgid "New..."
 msgstr "Új..."
 
 msgid "New..."
 msgstr "Új..."
 

-#: lib/choose_repository.tcl:93 lib/choose_repository.tcl:468
+#: lib/choose_repository.tcl:94 lib/choose_repository.tcl:460

 msgid "Clone Existing Repository"
 msgstr "Létező repó másolása"
 
 msgid "Clone Existing Repository"
 msgstr "Létező repó másolása"
 

-#: lib/choose_repository.tcl:99
+#: lib/choose_repository.tcl:100

 msgid "Clone..."
 msgstr "Másolás..."
 
 msgid "Clone..."
 msgstr "Másolás..."
 

-#: lib/choose_repository.tcl:106 lib/choose_repository.tcl:978
+#: lib/choose_repository.tcl:107 lib/choose_repository.tcl:976

 msgid "Open Existing Repository"
 msgstr "Létező könyvtár megnyitása"
 
 msgid "Open Existing Repository"
 msgstr "Létező könyvtár megnyitása"
 

-#: lib/choose_repository.tcl:112
+#: lib/choose_repository.tcl:113

 msgid "Open..."
 msgstr "Meggyitás..."
 
 msgid "Open..."
 msgstr "Meggyitás..."
 

-#: lib/choose_repository.tcl:125
+#: lib/choose_repository.tcl:126

 msgid "Recent Repositories"
 msgstr "Legutóbbi repók"
 
 msgid "Recent Repositories"
 msgstr "Legutóbbi repók"
 

-#: lib/choose_repository.tcl:131
+#: lib/choose_repository.tcl:132

 msgid "Open Recent Repository:"
 msgstr "Legutóbbi repók megnyitása:"
 
 msgid "Open Recent Repository:"
 msgstr "Legutóbbi repók megnyitása:"
 

-#: lib/choose_repository.tcl:294
-#, tcl-format
-msgid "Location %s already exists."
-msgstr "A(z) '%s' hely már létezik."
-
-#: lib/choose_repository.tcl:300 lib/choose_repository.tcl:307
-#: lib/choose_repository.tcl:314
+#: lib/choose_repository.tcl:296 lib/choose_repository.tcl:303
+#: lib/choose_repository.tcl:310

 #, tcl-format
 msgid "Failed to create repository %s:"
 msgstr "Nem sikerült letrehozni a(z) %s repót:"
 
 #, tcl-format
 msgid "Failed to create repository %s:"
 msgstr "Nem sikerült letrehozni a(z) %s repót:"
 

-#: lib/choose_repository.tcl:385 lib/choose_repository.tcl:486
+#: lib/choose_repository.tcl:381 lib/choose_repository.tcl:478

 msgid "Directory:"
 msgstr "Könyvtár:"
 
 msgid "Directory:"
 msgstr "Könyvtár:"
 

-#: lib/choose_repository.tcl:415 lib/choose_repository.tcl:544
-#: lib/choose_repository.tcl:1013
+#: lib/choose_repository.tcl:412 lib/choose_repository.tcl:537
+#: lib/choose_repository.tcl:1011

 msgid "Git Repository"
 msgstr "Git repó"
 
 msgid "Git Repository"
 msgstr "Git repó"
 

-#: lib/choose_repository.tcl:430 lib/choose_repository.tcl:437
+#: lib/choose_repository.tcl:437

 #, tcl-format
 msgid "Directory %s already exists."
 msgstr "A(z) '%s' könyvtár már létezik."
 
 #, tcl-format
 msgid "Directory %s already exists."
 msgstr "A(z) '%s' könyvtár már létezik."
 

-#: lib/choose_repository.tcl:442
+#: lib/choose_repository.tcl:441

 #, tcl-format
 msgid "File %s already exists."
 msgstr "A(z) '%s' fájl már létezik."
 
 #, tcl-format
 msgid "File %s already exists."
 msgstr "A(z) '%s' fájl már létezik."
 

-#: lib/choose_repository.tcl:463
+#: lib/choose_repository.tcl:455

 msgid "Clone"
 msgstr "Bezárás"
 
 msgid "Clone"
 msgstr "Bezárás"
 

-#: lib/choose_repository.tcl:476
+#: lib/choose_repository.tcl:468

 msgid "URL:"
 msgstr "URL:"
 
 msgid "URL:"
 msgstr "URL:"
 

-#: lib/choose_repository.tcl:496
+#: lib/choose_repository.tcl:489

 msgid "Clone Type:"
 msgstr "Másolás típusa:"
 
 msgid "Clone Type:"
 msgstr "Másolás típusa:"
 

-#: lib/choose_repository.tcl:502
+#: lib/choose_repository.tcl:495

 msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
 msgstr "Általános (Gyors, félig-redundáns, hardlinkek)"
 
 msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
 msgstr "Általános (Gyors, félig-redundáns, hardlinkek)"
 

-#: lib/choose_repository.tcl:508
+#: lib/choose_repository.tcl:501

 msgid "Full Copy (Slower, Redundant Backup)"
 msgstr "Teljes másolás (Lassabb, redundáns biztonsági mentés)"
 
 msgid "Full Copy (Slower, Redundant Backup)"
 msgstr "Teljes másolás (Lassabb, redundáns biztonsági mentés)"
 

-#: lib/choose_repository.tcl:514
+#: lib/choose_repository.tcl:507

 msgid "Shared (Fastest, Not Recommended, No Backup)"
 msgstr "Megosztott (Leggyorsabb, nem ajánlott, nincs mentés)"
 
 msgid "Shared (Fastest, Not Recommended, No Backup)"
 msgstr "Megosztott (Leggyorsabb, nem ajánlott, nincs mentés)"
 

-#: lib/choose_repository.tcl:550 lib/choose_repository.tcl:597
-#: lib/choose_repository.tcl:738 lib/choose_repository.tcl:808
-#: lib/choose_repository.tcl:1019 lib/choose_repository.tcl:1027
+#: lib/choose_repository.tcl:543 lib/choose_repository.tcl:590
+#: lib/choose_repository.tcl:736 lib/choose_repository.tcl:806
+#: lib/choose_repository.tcl:1017 lib/choose_repository.tcl:1025

 #, tcl-format
 msgid "Not a Git repository: %s"
 msgstr "Nem Git repó: %s"
 
 #, tcl-format
 msgid "Not a Git repository: %s"
 msgstr "Nem Git repó: %s"
 

-#: lib/choose_repository.tcl:586
+#: lib/choose_repository.tcl:579

 msgid "Standard only available for local repository."
 msgstr "A standard csak helyi repókra érhető el."
 
 msgid "Standard only available for local repository."
 msgstr "A standard csak helyi repókra érhető el."
 

-#: lib/choose_repository.tcl:590
+#: lib/choose_repository.tcl:583

 msgid "Shared only available for local repository."
 msgstr "A megosztott csak helyi repókra érhető el."
 
 msgid "Shared only available for local repository."
 msgstr "A megosztott csak helyi repókra érhető el."
 

-#: lib/choose_repository.tcl:617
+#: lib/choose_repository.tcl:604
+#, tcl-format
+msgid "Location %s already exists."
+msgstr "A(z) '%s' hely már létezik."
+
+#: lib/choose_repository.tcl:615

 msgid "Failed to configure origin"
 msgstr "Nem sikerült beállítani az origint"
 
 msgid "Failed to configure origin"
 msgstr "Nem sikerült beállítani az origint"
 

-#: lib/choose_repository.tcl:629
+#: lib/choose_repository.tcl:627

 msgid "Counting objects"
 msgstr "Objektumok számolása"
 
 msgid "Counting objects"
 msgstr "Objektumok számolása"
 

-#: lib/choose_repository.tcl:630
+#: lib/choose_repository.tcl:628

 msgid "buckets"
 msgstr "vödrök"
 
 msgid "buckets"
 msgstr "vödrök"
 

-#: lib/choose_repository.tcl:654
+#: lib/choose_repository.tcl:652

 #, tcl-format
 msgid "Unable to copy objects/info/alternates: %s"
 msgstr "Nem sikerült másolni az objects/info/alternates-t: %s"
 
 #, tcl-format
 msgid "Unable to copy objects/info/alternates: %s"
 msgstr "Nem sikerült másolni az objects/info/alternates-t: %s"
 

-#: lib/choose_repository.tcl:690
+#: lib/choose_repository.tcl:688

 #, tcl-format
 msgid "Nothing to clone from %s."
 msgstr "Semmi másolni való nincs innen: %s"
 
 #, tcl-format
 msgid "Nothing to clone from %s."
 msgstr "Semmi másolni való nincs innen: %s"
 

-#: lib/choose_repository.tcl:692 lib/choose_repository.tcl:906
-#: lib/choose_repository.tcl:918
+#: lib/choose_repository.tcl:690 lib/choose_repository.tcl:904
+#: lib/choose_repository.tcl:916

 msgid "The 'master' branch has not been initialized."
 msgstr "A 'master' branch nincs inicializálva."
 
 msgid "The 'master' branch has not been initialized."
 msgstr "A 'master' branch nincs inicializálva."
 

-#: lib/choose_repository.tcl:705
+#: lib/choose_repository.tcl:703

 msgid "Hardlinks are unavailable.  Falling back to copying."
 msgstr "Nem érhetőek el hardlinkek.  Másolás használata."
 
 msgid "Hardlinks are unavailable.  Falling back to copying."
 msgstr "Nem érhetőek el hardlinkek.  Másolás használata."
 

-#: lib/choose_repository.tcl:717
+#: lib/choose_repository.tcl:715

 #, tcl-format
 msgid "Cloning from %s"
 msgstr "Másolás innen: %s"
 
 #, tcl-format
 msgid "Cloning from %s"
 msgstr "Másolás innen: %s"
 

-#: lib/choose_repository.tcl:748
+#: lib/choose_repository.tcl:746

 msgid "Copying objects"
 msgstr "Objektumok másolása"
 
 msgid "Copying objects"
 msgstr "Objektumok másolása"
 

-#: lib/choose_repository.tcl:749
+#: lib/choose_repository.tcl:747

 msgid "KiB"
 msgstr "KiB"
 
 msgid "KiB"
 msgstr "KiB"
 

-#: lib/choose_repository.tcl:773
+#: lib/choose_repository.tcl:771

 #, tcl-format
 msgid "Unable to copy object: %s"
 msgstr "Nem sikerült másolni az objektumot: %s"
 
 #, tcl-format
 msgid "Unable to copy object: %s"
 msgstr "Nem sikerült másolni az objektumot: %s"
 

-#: lib/choose_repository.tcl:783
+#: lib/choose_repository.tcl:781

 msgid "Linking objects"
 msgstr "Objektumok összefűzése"
 
 msgid "Linking objects"
 msgstr "Objektumok összefűzése"
 

-#: lib/choose_repository.tcl:784
+#: lib/choose_repository.tcl:782

 msgid "objects"
 msgstr "objektum"
 
 msgid "objects"
 msgstr "objektum"
 

-#: lib/choose_repository.tcl:792
+#: lib/choose_repository.tcl:790

 #, tcl-format
 msgid "Unable to hardlink object: %s"
 msgstr "Nem sikerült hardlinkelni az objektumot: %s"
 
 #, tcl-format
 msgid "Unable to hardlink object: %s"
 msgstr "Nem sikerült hardlinkelni az objektumot: %s"
 

-#: lib/choose_repository.tcl:847
+#: lib/choose_repository.tcl:845

 msgid "Cannot fetch branches and objects.  See console output for details."
 msgstr ""
 "Nem sikerült letölteni a branch-eket és az objektumokat.  Bővebben a "
 "konzolos kimenetben."
 
 msgid "Cannot fetch branches and objects.  See console output for details."
 msgstr ""
 "Nem sikerült letölteni a branch-eket és az objektumokat.  Bővebben a "
 "konzolos kimenetben."
 

-#: lib/choose_repository.tcl:858
+#: lib/choose_repository.tcl:856

 msgid "Cannot fetch tags.  See console output for details."
 msgstr "Nem sikerült letölteni a tageket.  Bővebben a konzolos kimenetben."
 
 msgid "Cannot fetch tags.  See console output for details."
 msgstr "Nem sikerült letölteni a tageket.  Bővebben a konzolos kimenetben."
 

-#: lib/choose_repository.tcl:882
+#: lib/choose_repository.tcl:880

 msgid "Cannot determine HEAD.  See console output for details."
 msgstr "Nem sikerült megállapítani a HEAD-et.  Bővebben a konzolos kimenetben."
 
 msgid "Cannot determine HEAD.  See console output for details."
 msgstr "Nem sikerült megállapítani a HEAD-et.  Bővebben a konzolos kimenetben."
 

-#: lib/choose_repository.tcl:891
+#: lib/choose_repository.tcl:889

 #, tcl-format
 msgid "Unable to cleanup %s"
 msgstr "Nem sikerült tiszítani: %s."
 
 #, tcl-format
 msgid "Unable to cleanup %s"
 msgstr "Nem sikerült tiszítani: %s."
 

-#: lib/choose_repository.tcl:897
+#: lib/choose_repository.tcl:895

 msgid "Clone failed."
 msgstr "A másolás nem sikerült."
 
 msgid "Clone failed."
 msgstr "A másolás nem sikerült."
 

-#: lib/choose_repository.tcl:904
+#: lib/choose_repository.tcl:902

 msgid "No default branch obtained."
 msgstr "Nincs alapértelmezett branch."
 
 msgid "No default branch obtained."
 msgstr "Nincs alapértelmezett branch."
 

-#: lib/choose_repository.tcl:915
+#: lib/choose_repository.tcl:913

 #, tcl-format
 msgid "Cannot resolve %s as a commit."
 msgstr "Nem sikerült felöldani a(z) %s objektumot commitként."
 
 #, tcl-format
 msgid "Cannot resolve %s as a commit."
 msgstr "Nem sikerült felöldani a(z) %s objektumot commitként."
 

-#: lib/choose_repository.tcl:927
+#: lib/choose_repository.tcl:925

 msgid "Creating working directory"
 msgstr "Munkakönyvtár létrehozása"
 
 msgid "Creating working directory"
 msgstr "Munkakönyvtár létrehozása"
 

-#: lib/choose_repository.tcl:928 lib/index.tcl:65 lib/index.tcl:127
+#: lib/choose_repository.tcl:926 lib/index.tcl:65 lib/index.tcl:127

 #: lib/index.tcl:193
 msgid "files"
 msgstr "fájl"
 
 #: lib/index.tcl:193
 msgid "files"
 msgstr "fájl"
 

-#: lib/choose_repository.tcl:957
+#: lib/choose_repository.tcl:955

 msgid "Initial file checkout failed."
 msgstr "A kezdeti fájl-kibontás sikertelen."
 
 msgid "Initial file checkout failed."
 msgstr "A kezdeti fájl-kibontás sikertelen."
 

-#: lib/choose_repository.tcl:973
+#: lib/choose_repository.tcl:971

 msgid "Open"
 msgstr "Megnyitás"
 
 msgid "Open"
 msgstr "Megnyitás"
 

-#: lib/choose_repository.tcl:983
+#: lib/choose_repository.tcl:981

 msgid "Repository:"
 msgstr "Repó:"
 
 msgid "Repository:"
 msgstr "Repó:"
 

-#: lib/choose_repository.tcl:1033
+#: lib/choose_repository.tcl:1031

 #, tcl-format
 msgid "Failed to open repository %s:"
 msgstr "Nem sikerült megnyitni a(z) %s repót:"
 #, tcl-format
 msgid "Failed to open repository %s:"
 msgstr "Nem sikerült megnyitni a(z) %s repót:"


@@ -1144,7 +1144,7 @@ msgstr "Helyi branch"
 msgid "Tracking Branch"
 msgstr "Követő branch"
 
 msgid "Tracking Branch"
 msgstr "Követő branch"
 

-#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:537
+#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:538

 msgid "Tag"
 msgstr "Tag"
 
 msgid "Tag"
 msgstr "Tag"
 


@@ -1161,11 +1161,11 @@ msgstr "Nincs kiválasztva revízió."
 msgid "Revision expression is empty."
 msgstr "A revízió kifejezés üres."
 
 msgid "Revision expression is empty."
 msgstr "A revízió kifejezés üres."
 

-#: lib/choose_rev.tcl:530
+#: lib/choose_rev.tcl:531

 msgid "Updated"
 msgstr "Frissítve"
 
 msgid "Updated"
 msgstr "Frissítve"
 

-#: lib/choose_rev.tcl:558
+#: lib/choose_rev.tcl:559

 msgid "URL"
 msgstr "URL"
 
 msgid "URL"
 msgstr "URL"
 


@@ -1313,7 +1313,7 @@ msgstr "A commit nem sikerült."
 msgid "Commit %s appears to be corrupt"
 msgstr "A(z) %s commit sérültnek tűnik"
 
 msgid "Commit %s appears to be corrupt"
 msgstr "A(z) %s commit sérültnek tűnik"
 

-#: lib/commit.tcl:279
+#: lib/commit.tcl:326

 msgid ""
 "No changes to commit.\n"
 "\n"
 msgid ""
 "No changes to commit.\n"
 "\n"


@@ -1327,7 +1327,7 @@ msgstr ""
 "\n"
 "Az újrakeresés most automatikusan el fog indulni.\n"
 
 "\n"
 "Az újrakeresés most automatikusan el fog indulni.\n"
 

-#: lib/commit.tcl:286
+#: lib/commit.tcl:333

 msgid "No changes to commit."
 msgstr "Nincs commitolandó változtatás."
 
 msgid "No changes to commit."
 msgstr "Nincs commitolandó változtatás."
 


@@ -1335,24 +1335,24 @@ msgstr "Nincs commitolandó változtatás."
 msgid "commit-tree failed:"
 msgstr "a commit-tree sikertelen:"
 
 msgid "commit-tree failed:"
 msgstr "a commit-tree sikertelen:"
 

-#: lib/commit.tcl:339
+#: lib/commit.tcl:367

 msgid "update-ref failed:"
 msgstr "az update-ref sikertelen:"
 
 msgid "update-ref failed:"
 msgstr "az update-ref sikertelen:"
 

-#: lib/commit.tcl:430
+#: lib/commit.tcl:454

 #, tcl-format
 msgid "Created commit %s: %s"
 msgstr "Létrejött a %s commit: %s"
 
 #, tcl-format
 msgid "Created commit %s: %s"
 msgstr "Létrejött a %s commit: %s"
 

-#: lib/console.tcl:57
+#: lib/console.tcl:59

 msgid "Working... please wait..."
 msgstr "Munka folyamatban.. Várjunk..."
 
 msgid "Working... please wait..."
 msgstr "Munka folyamatban.. Várjunk..."
 

-#: lib/console.tcl:183
+#: lib/console.tcl:186

 msgid "Success"
 msgstr "Siker"
 
 msgid "Success"
 msgstr "Siker"
 

-#: lib/console.tcl:196
+#: lib/console.tcl:200

 msgid "Error: Command Failed"
 msgstr "Hiba: a parancs sikertelen"
 
 msgid "Error: Command Failed"
 msgstr "Hiba: a parancs sikertelen"
 


@@ -1462,23 +1462,23 @@ msgstr "* Bináris fájl (tartalom elrejtése)."
 msgid "Error loading diff:"
 msgstr "Hiba a diff betöltése közben:"
 
 msgid "Error loading diff:"
 msgstr "Hiba a diff betöltése közben:"
 

-#: lib/diff.tcl:302
+#: lib/diff.tcl:303

 msgid "Failed to unstage selected hunk."
 msgstr "Nem visszavonni a hunk kiválasztását."
 
 msgid "Failed to unstage selected hunk."
 msgstr "Nem visszavonni a hunk kiválasztását."
 

-#: lib/diff.tcl:309
+#: lib/diff.tcl:310

 msgid "Failed to stage selected hunk."
 msgstr "Nem sikerült kiválasztani a hunkot."
 
 msgid "Failed to stage selected hunk."
 msgstr "Nem sikerült kiválasztani a hunkot."
 

-#: lib/error.tcl:12 lib/error.tcl:102
+#: lib/error.tcl:20 lib/error.tcl:114

 msgid "error"
 msgstr "hiba"
 
 msgid "error"
 msgstr "hiba"
 

-#: lib/error.tcl:28
+#: lib/error.tcl:36

 msgid "warning"
 msgstr "figyelmeztetés"
 
 msgid "warning"
 msgstr "figyelmeztetés"
 

-#: lib/error.tcl:81
+#: lib/error.tcl:94

 msgid "You must correct the above errors before committing."
 msgstr "Ki kell javítanunk a fenti hibákat commit előtt."
 
 msgid "You must correct the above errors before committing."
 msgstr "Ki kell javítanunk a fenti hibákat commit előtt."
 


@@ -1530,13 +1530,13 @@ msgstr "Visszaállítja a változtatásokat a(z) %s fájlban?"
 msgid "Revert changes in these %i files?"
 msgstr "Visszaállítja a változtatásokat ebben e %i fájlban?"
 
 msgid "Revert changes in these %i files?"
 msgstr "Visszaállítja a változtatásokat ebben e %i fájlban?"
 

-#: lib/index.tcl:389
+#: lib/index.tcl:391

 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."
 
 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:392
+#: lib/index.tcl:394

 msgid "Do Nothing"
 msgstr "Ne csináljunk semmit"
 
 msgid "Do Nothing"
 msgstr "Ne csináljunk semmit"
 


@@ -1616,20 +1616,20 @@ msgstr "A(z) %s és a(z) %s merge-ölése..."
 msgid "Merge completed successfully."
 msgstr "A merge sikeresen befejeződött."
 
 msgid "Merge completed successfully."
 msgstr "A merge sikeresen befejeződött."
 

-#: lib/merge.tcl:133
+#: lib/merge.tcl:132

 msgid "Merge failed.  Conflict resolution is required."
 msgstr "A merge sikertelen. Fel kell oldanunk az ütközéseket."
 
 msgid "Merge failed.  Conflict resolution is required."
 msgstr "A merge sikertelen. Fel kell oldanunk az ütközéseket."
 

-#: lib/merge.tcl:158
+#: lib/merge.tcl:157

 #, tcl-format
 msgid "Merge Into %s"
 msgstr "Merge-ölés a következőbe: %s"
 
 #, tcl-format
 msgid "Merge Into %s"
 msgstr "Merge-ölés a következőbe: %s"
 

-#: lib/merge.tcl:177
+#: lib/merge.tcl:176

 msgid "Revision To Merge"
 msgstr "Merge-ölni szándékozott revízió"
 
 msgid "Revision To Merge"
 msgstr "Merge-ölni szándékozott revízió"
 

-#: lib/merge.tcl:212
+#: lib/merge.tcl:211

 msgid ""
 "Cannot abort while amending.\n"
 "\n"
 msgid ""
 "Cannot abort while amending.\n"
 "\n"


@@ -1639,7 +1639,7 @@ msgstr ""
 "\n"
 "Be kell fejeznünk ennek a commitnak a javítását.\n"
 
 "\n"
 "Be kell fejeznünk ennek a commitnak a javítását.\n"
 

-#: lib/merge.tcl:222
+#: lib/merge.tcl:221

 msgid ""
 "Abort merge?\n"
 "\n"
 msgid ""
 "Abort merge?\n"
 "\n"


@@ -1654,7 +1654,7 @@ msgstr ""
 "\n"
 "Folytatjuk a jelenlegi merge megszakítását?"
 
 "\n"
 "Folytatjuk a jelenlegi merge megszakítását?"
 

-#: lib/merge.tcl:228
+#: lib/merge.tcl:227

 msgid ""
 "Reset changes?\n"
 "\n"
 msgid ""
 "Reset changes?\n"
 "\n"


@@ -1669,7 +1669,7 @@ msgstr ""
 "\n"
 "Folytatjuk a jelenlegi módosítások visszavonását?"
 
 "\n"
 "Folytatjuk a jelenlegi módosítások visszavonását?"
 

-#: lib/merge.tcl:239
+#: lib/merge.tcl:238

 msgid "Aborting"
 msgstr "Félbeszakítás"
 
 msgid "Aborting"
 msgstr "Félbeszakítás"
 


@@ -1681,89 +1681,94 @@ msgstr "fájl visszaállítva"
 msgid "Abort failed."
 msgstr "A félbeszakítás nem sikerült."
 
 msgid "Abort failed."
 msgstr "A félbeszakítás nem sikerült."
 

-#: lib/merge.tcl:268
+#: lib/merge.tcl:267

 msgid "Abort completed.  Ready."
 msgstr "A megkeszakítás befejeződött. Kész."
 
 msgid "Abort completed.  Ready."
 msgstr "A megkeszakítás befejeződött. Kész."
 

-#: lib/option.tcl:82
+#: lib/option.tcl:95

 msgid "Restore Defaults"
 msgstr "Alapértelmezés visszaállítása"
 
 msgid "Restore Defaults"
 msgstr "Alapértelmezés visszaállítása"
 

-#: lib/option.tcl:86
+#: lib/option.tcl:99

 msgid "Save"
 msgstr "Mentés"
 
 msgid "Save"
 msgstr "Mentés"
 

-#: lib/option.tcl:96
+#: lib/option.tcl:109

 #, tcl-format
 msgid "%s Repository"
 msgstr "%s Repó"
 
 #, tcl-format
 msgid "%s Repository"
 msgstr "%s Repó"
 

-#: lib/option.tcl:97
+#: lib/option.tcl:110

 msgid "Global (All Repositories)"
 msgstr "Globális (minden repó)"
 
 msgid "Global (All Repositories)"
 msgstr "Globális (minden repó)"
 

-#: lib/option.tcl:103
+#: lib/option.tcl:116

 msgid "User Name"
 msgstr "Felhasználónév"
 
 msgid "User Name"
 msgstr "Felhasználónév"
 

-#: lib/option.tcl:104
+#: lib/option.tcl:117

 msgid "Email Address"
 msgstr "Email cím"
 
 msgid "Email Address"
 msgstr "Email cím"
 

-#: lib/option.tcl:106
+#: lib/option.tcl:119

 msgid "Summarize Merge Commits"
 msgstr "A merge commitok összegzése"
 
 msgid "Summarize Merge Commits"
 msgstr "A merge commitok összegzése"
 

-#: lib/option.tcl:107
+#: lib/option.tcl:120

 msgid "Merge Verbosity"
 msgstr "Merge beszédesség"
 
 msgid "Merge Verbosity"
 msgstr "Merge beszédesség"
 

-#: lib/option.tcl:108
+#: lib/option.tcl:121

 msgid "Show Diffstat After Merge"
 msgstr "Diffstat mutatása merge után"
 
 msgid "Show Diffstat After Merge"
 msgstr "Diffstat mutatása merge után"
 

-#: lib/option.tcl:110
+#: lib/option.tcl:123

 msgid "Trust File Modification Timestamps"
 msgstr "A fájl módosítási dátumok megbízhatóak"
 
 msgid "Trust File Modification Timestamps"
 msgstr "A fájl módosítási dátumok megbízhatóak"
 

-#: lib/option.tcl:111
+#: lib/option.tcl:124

 msgid "Prune Tracking Branches During Fetch"
 msgstr "A követő branchek eltávolítása letöltés alatt"
 
 msgid "Prune Tracking Branches During Fetch"
 msgstr "A követő branchek eltávolítása letöltés alatt"
 

-#: lib/option.tcl:112
+#: lib/option.tcl:125

 msgid "Match Tracking Branches"
 msgstr "A követő branchek egyeztetése"
 
 msgid "Match Tracking Branches"
 msgstr "A követő branchek egyeztetése"
 

-#: lib/option.tcl:113
+#: lib/option.tcl:126

 msgid "Number of Diff Context Lines"
 msgstr "A diff környezeti sorok száma"
 
 msgid "Number of Diff Context Lines"
 msgstr "A diff környezeti sorok száma"
 

-#: lib/option.tcl:114
+#: lib/option.tcl:127
+#, fuzzy
+msgid "Commit Message Text Width"
+msgstr "Commit üzenet:"
+
+#: lib/option.tcl:128

 msgid "New Branch Name Template"
 msgstr "Új branch név sablon"
 
 msgid "New Branch Name Template"
 msgstr "Új branch név sablon"
 

-#: lib/option.tcl:191
+#: lib/option.tcl:192

 msgid "Spelling Dictionary:"
 msgstr "Helyesírás-ellenőrző szótár:"
 
 msgid "Spelling Dictionary:"
 msgstr "Helyesírás-ellenőrző szótár:"
 

-#: lib/option.tcl:215
+#: lib/option.tcl:216

 msgid "Change Font"
 msgstr "Betűtípus megváltoztatása"
 
 msgid "Change Font"
 msgstr "Betűtípus megváltoztatása"
 

-#: lib/option.tcl:180
+#: lib/option.tcl:220

 #, tcl-format
 msgid "Choose %s"
 msgstr "%s választása"
 
 #, tcl-format
 msgid "Choose %s"
 msgstr "%s választása"
 

-#: lib/option.tcl:186
+#: lib/option.tcl:226

 msgid "pt."
 msgstr "pt."
 
 msgid "pt."
 msgstr "pt."
 

-#: lib/option.tcl:200
+#: lib/option.tcl:240

 msgid "Preferences"
 msgstr "Beállítások"
 
 msgid "Preferences"
 msgstr "Beállítások"
 

-#: lib/option.tcl:235
+#: lib/option.tcl:275

 msgid "Failed to completely save options:"
 msgstr "Nem sikerült teljesen elmenteni a beállításokat:"
 
 msgid "Failed to completely save options:"
 msgstr "Nem sikerült teljesen elmenteni a beállításokat:"
 


@@ -1871,23 +1876,44 @@ msgstr "Nem sikerült írni a gyorsbillentyűt:"
 msgid "Cannot write icon:"
 msgstr "Nem sikerült írni az ikont:"
 
 msgid "Cannot write icon:"
 msgstr "Nem sikerült írni az ikont:"
 

-#: lib/spellcheck.tcl:37
-msgid "Not connected to aspell"
-msgstr "Nincs kapcsolat az aspellhez"
+#: lib/spellcheck.tcl:57
+msgid "Unsupported spell checker"
+msgstr ""
+
+#: lib/spellcheck.tcl:65
+#, fuzzy
+msgid "Spell checking is unavailable"
+msgstr "A helyesírás-ellenőrzés sikertelen"
+
+#: lib/spellcheck.tcl:68
+msgid "Invalid spell checking configuration"
+msgstr ""
+
+#: lib/spellcheck.tcl:70
+#, tcl-format
+msgid "Reverting dictionary to %s."
+msgstr ""
+
+#: lib/spellcheck.tcl:73
+#, fuzzy
+msgid "Spell checker silently failed on startup"
+msgstr "A helyesírás-ellenőrzés sikertelen"

 
 

-#: lib/spellcheck.tcl:41
-msgid "Unrecognized aspell version"
+#: lib/spellcheck.tcl:80
+#, fuzzy
+msgid "Unrecognized spell checker"

 msgstr "Ismeretlen aspell verzió"
 
 msgstr "Ismeretlen aspell verzió"
 

-#: lib/spellcheck.tcl:135
+#: lib/spellcheck.tcl:180

 msgid "No Suggestions"
 msgstr "Nincs javaslat"
 
 msgid "No Suggestions"
 msgstr "Nincs javaslat"
 

-#: lib/spellcheck.tcl:336
-msgid "Unexpected EOF from aspell"
+#: lib/spellcheck.tcl:381
+#, fuzzy
+msgid "Unexpected EOF from spell checker"

 msgstr "Nem várt EOF az aspelltől"
 
 msgstr "Nem várt EOF az aspelltől"
 

-#: lib/spellcheck.tcl:340
+#: lib/spellcheck.tcl:385

 msgid "Spell Checker Failed"
 msgstr "A helyesírás-ellenőrzés sikertelen"
 
 msgid "Spell Checker Failed"
 msgstr "A helyesírás-ellenőrzés sikertelen"
 


@@ -1961,6 +1987,9 @@ msgstr "Vékony csomagok használata (lassú hálózati kapcsolatok számára)"
 msgid "Include tags"
 msgstr "Tageket is"
 
 msgid "Include tags"
 msgstr "Tageket is"
 

+#~ msgid "Not connected to aspell"
+#~ msgstr "Nincs kapcsolat az aspellhez"
+

 #~ msgid "Cannot find the git directory:"
 #~ msgstr "Nem található a git könyvtár:"
 
 #~ msgid "Cannot find the git directory:"
 #~ msgstr "Nem található a git könyvtár:"
 

diff --git a/po/it.po b/po/it.po
index 60c9973acf816e9e12a0a51407618d993aa1173f..877e7e85af4c6023f9a56c5e4ffbb9efca17a23e 100644 (file)
--- a/po/it.po
+++ b/po/it.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: git-gui\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: git-gui\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2008-03-12 22:09+0100\n"
+"POT-Creation-Date: 2008-03-14 07:18+0100\n"

 "PO-Revision-Date: 2008-03-12 22:12+0100\n"
 "Last-Translator: Michele Ballabio <barra_cuda@katamail.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
 "PO-Revision-Date: 2008-03-12 22:12+0100\n"
 "Last-Translator: Michele Ballabio <barra_cuda@katamail.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"


@@ -1784,18 +1784,6 @@ msgstr "Preferenze"
 msgid "Failed to completely save options:"
 msgstr "Impossibile salvare completamente le opzioni:"
 
 msgid "Failed to completely save options:"
 msgstr "Impossibile salvare completamente le opzioni:"
 

-#: lib/remote.tcl:165
-msgid "Prune from"
-msgstr "Effettua potatura da"
-
-#: lib/remote.tcl:170
-msgid "Fetch from"
-msgstr "Recupera da"
-
-#: lib/remote.tcl:213
-msgid "Push to"
-msgstr "Propaga verso"
-

 #: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34
 msgid "Delete Remote Branch"
 msgstr "Cancella ramo remoto"
 #: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34
 msgid "Delete Remote Branch"
 msgstr "Cancella ramo remoto"


@@ -1880,6 +1868,18 @@ msgstr "Nessun archivio selezionato."
 msgid "Scanning %s..."
 msgstr "Analisi in corso %s..."
 
 msgid "Scanning %s..."
 msgstr "Analisi in corso %s..."
 

+#: lib/remote.tcl:165
+msgid "Prune from"
+msgstr "Effettua potatura da"
+
+#: lib/remote.tcl:170
+msgid "Fetch from"
+msgstr "Recupera da"
+
+#: lib/remote.tcl:213
+msgid "Push to"
+msgstr "Propaga verso"
+

 #: lib/shortcut.tcl:20 lib/shortcut.tcl:61
 msgid "Cannot write shortcut:"
 msgstr "Impossibile scrivere shortcut:"
 #: lib/shortcut.tcl:20 lib/shortcut.tcl:61
 msgid "Cannot write shortcut:"
 msgstr "Impossibile scrivere shortcut:"


@@ -1910,6 +1910,7 @@ msgid "Spell checker silently failed on startup"
 msgstr "Il correttore ortografico ha riportato un errore all'avvio"
 
 #: lib/spellcheck.tcl:80
 msgstr "Il correttore ortografico ha riportato un errore all'avvio"
 
 #: lib/spellcheck.tcl:80

+#, fuzzy

 msgid "Unrecognized spell checker"
 msgstr "Correttore ortografico sconosciuto"
 
 msgid "Unrecognized spell checker"
 msgstr "Correttore ortografico sconosciuto"
 


@@ -1918,6 +1919,7 @@ msgid "No Suggestions"
 msgstr "Nessun suggerimento"
 
 #: lib/spellcheck.tcl:381
 msgstr "Nessun suggerimento"
 
 #: lib/spellcheck.tcl:381

+#, fuzzy

 msgid "Unexpected EOF from spell checker"
 msgstr "Il correttore ortografico ha mandato un EOF inaspettato"
 
 msgid "Unexpected EOF from spell checker"
 msgstr "Il correttore ortografico ha mandato un EOF inaspettato"
 

diff --git a/po/ja.po b/po/ja.po
index e2cf5bdc06de45d634b6cac583cbc0e4cafb94d6..dd4e0391242098441eb7c81a522a1603098011db 100644 (file)
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: git-gui\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: git-gui\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2007-11-24 10:36+0100\n"
+"POT-Creation-Date: 2008-03-14 07:18+0100\n"

 "PO-Revision-Date: 2007-12-05 06:12+0900\n"
 "Last-Translator: しらいし ななこ <nanako3@bluebottle.com>\n"
 "Language-Team: Japanese\n"
 "PO-Revision-Date: 2007-12-05 06:12+0900\n"
 "Last-Translator: しらいし ななこ <nanako3@bluebottle.com>\n"
 "Language-Team: Japanese\n"


@@ -16,33 +16,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 

-#: git-gui.sh:41 git-gui.sh:604 git-gui.sh:618 git-gui.sh:631 git-gui.sh:714
-#: git-gui.sh:733
+#: git-gui.sh:41 git-gui.sh: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: 致命的なエラー"
 
 msgid "git-gui: fatal error"
 msgstr "git-gui: 致命的なエラー"
 

-#: git-gui.sh:565
+#: git-gui.sh:593

 #, tcl-format
 msgid "Invalid font specified in %s:"
 msgstr "%s に無効なフォントが指定されています:"
 
 #, tcl-format
 msgid "Invalid font specified in %s:"
 msgstr "%s に無効なフォントが指定されています:"
 

-#: git-gui.sh:590
+#: git-gui.sh:620

 msgid "Main Font"
 msgstr "主フォント"
 
 msgid "Main Font"
 msgstr "主フォント"
 

-#: git-gui.sh:591
+#: git-gui.sh:621

 msgid "Diff/Console Font"
 msgstr "diff/コンソール・フォント"
 
 msgid "Diff/Console Font"
 msgstr "diff/コンソール・フォント"
 

-#: git-gui.sh:605
+#: git-gui.sh:635

 msgid "Cannot find git in PATH."
 msgstr "PATH 中に git が見つかりません"
 
 msgid "Cannot find git in PATH."
 msgstr "PATH 中に git が見つかりません"
 

-#: git-gui.sh:632
+#: git-gui.sh:662

 msgid "Cannot parse Git version string:"
 msgstr "Git バージョン名が理解できません:"
 
 msgid "Cannot parse Git version string:"
 msgstr "Git バージョン名が理解できません:"
 

-#: git-gui.sh:650
+#: git-gui.sh:680

 #, tcl-format
 msgid ""
 "Git version cannot be determined.\n"
 #, tcl-format
 msgid ""
 "Git version cannot be determined.\n"


@@ -61,79 +61,79 @@ msgstr ""
 "\n"
 "'%s' はバージョン 1.5.0 と思って良いですか？\n"
 
 "\n"
 "'%s' はバージョン 1.5.0 と思って良いですか？\n"
 

-#: git-gui.sh:888
+#: git-gui.sh:918

 msgid "Git directory not found:"
 msgstr "Git ディレクトリが見つかりません:"
 
 msgid "Git directory not found:"
 msgstr "Git ディレクトリが見つかりません:"
 

-#: git-gui.sh:895
+#: git-gui.sh:925

 msgid "Cannot move to top of working directory:"
 msgstr "作業ディレクトリの最上位に移動できません"
 
 msgid "Cannot move to top of working directory:"
 msgstr "作業ディレクトリの最上位に移動できません"
 

-#: git-gui.sh:902
+#: git-gui.sh:932

 msgid "Cannot use funny .git directory:"
 msgstr "変な .git ディレクトリは使えません"
 
 msgid "Cannot use funny .git directory:"
 msgstr "変な .git ディレクトリは使えません"
 

-#: git-gui.sh:907
+#: git-gui.sh:937

 msgid "No working directory"
 msgstr "作業ディレクトリがありません"
 
 msgid "No working directory"
 msgstr "作業ディレクトリがありません"
 

-#: git-gui.sh:1054
+#: git-gui.sh:1084 lib/checkout_op.tcl:283

 msgid "Refreshing file status..."
 msgstr "ファイル状態を更新しています…"
 
 msgid "Refreshing file status..."
 msgstr "ファイル状態を更新しています…"
 

-#: git-gui.sh:1119
+#: git-gui.sh:1149

 msgid "Scanning for modified files ..."
 msgstr "変更されたファイルをスキャンしています…"
 
 msgid "Scanning for modified files ..."
 msgstr "変更されたファイルをスキャンしています…"
 

-#: git-gui.sh:1294 lib/browser.tcl:245
+#: git-gui.sh:1324 lib/browser.tcl:246

 msgid "Ready."
 msgstr "準備完了"
 
 msgid "Ready."
 msgstr "準備完了"
 

-#: git-gui.sh:1560
+#: git-gui.sh:1590

 msgid "Unmodified"
 msgstr "変更無し"
 
 msgid "Unmodified"
 msgstr "変更無し"
 

-#: git-gui.sh:1562
+#: git-gui.sh:1592

 msgid "Modified, not staged"
 msgstr "変更あり、コミット未予定"
 
 msgid "Modified, not staged"
 msgstr "変更あり、コミット未予定"
 

-#: git-gui.sh:1563 git-gui.sh:1568
+#: git-gui.sh:1593 git-gui.sh:1598

 msgid "Staged for commit"
 msgstr "コミット予定済"
 
 msgid "Staged for commit"
 msgstr "コミット予定済"
 

-#: git-gui.sh:1564 git-gui.sh:1569
+#: git-gui.sh:1594 git-gui.sh:1599

 msgid "Portions staged for commit"
 msgstr "部分的にコミット予定済"
 
 msgid "Portions staged for commit"
 msgstr "部分的にコミット予定済"
 

-#: git-gui.sh:1565 git-gui.sh:1570
+#: git-gui.sh:1595 git-gui.sh:1600

 msgid "Staged for commit, missing"
 msgstr "コミット予定済、ファイル無し"
 
 msgid "Staged for commit, missing"
 msgstr "コミット予定済、ファイル無し"
 

-#: git-gui.sh:1567
+#: git-gui.sh:1597

 msgid "Untracked, not staged"
 msgstr "管理外、コミット未予定"
 
 msgid "Untracked, not staged"
 msgstr "管理外、コミット未予定"
 

-#: git-gui.sh:1572
+#: git-gui.sh:1602

 msgid "Missing"
 msgstr "ファイル無し"
 
 msgid "Missing"
 msgstr "ファイル無し"
 

-#: git-gui.sh:1573
+#: git-gui.sh:1603

 msgid "Staged for removal"
 msgstr "削除予定済"
 
 msgid "Staged for removal"
 msgstr "削除予定済"
 

-#: git-gui.sh:1574
+#: git-gui.sh:1604

 msgid "Staged for removal, still present"
 msgstr "削除予定済、ファイル未削除"
 
 msgid "Staged for removal, still present"
 msgstr "削除予定済、ファイル未削除"
 

-#: git-gui.sh:1576 git-gui.sh:1577 git-gui.sh:1578 git-gui.sh:1579
+#: git-gui.sh:1606 git-gui.sh:1607 git-gui.sh:1608 git-gui.sh:1609

 msgid "Requires merge resolution"
 msgstr "要マージ解決"
 
 msgid "Requires merge resolution"
 msgstr "要マージ解決"
 

-#: git-gui.sh:1614
+#: git-gui.sh:1644

 msgid "Starting gitk... please wait..."
 msgstr "gitk を起動中…お待ち下さい…"
 
 msgid "Starting gitk... please wait..."
 msgstr "gitk を起動中…お待ち下さい…"
 

-#: git-gui.sh:1623
+#: git-gui.sh:1653

 #, tcl-format
 msgid ""
 "Unable to start gitk:\n"
 #, tcl-format
 msgid ""
 "Unable to start gitk:\n"


@@ -144,297 +144,297 @@ msgstr ""
 "\n"
 "%s がありません"
 
 "\n"
 "%s がありません"
 

-#: git-gui.sh:1823 lib/choose_repository.tcl:35
+#: git-gui.sh:1860 lib/choose_repository.tcl:36

 msgid "Repository"
 msgstr "リポジトリ"
 
 msgid "Repository"
 msgstr "リポジトリ"
 

-#: git-gui.sh:1824
+#: git-gui.sh:1861

 msgid "Edit"
 msgstr "編集"
 
 msgid "Edit"
 msgstr "編集"
 

-#: git-gui.sh:1826 lib/choose_rev.tcl:560
+#: git-gui.sh:1863 lib/choose_rev.tcl:561

 msgid "Branch"
 msgstr "ブランチ"
 
 msgid "Branch"
 msgstr "ブランチ"
 

-#: git-gui.sh:1829 lib/choose_rev.tcl:547
+#: git-gui.sh:1866 lib/choose_rev.tcl:548

 msgid "Commit@@noun"
 msgstr "コミット"
 
 msgid "Commit@@noun"
 msgstr "コミット"
 

-#: git-gui.sh:1832 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168
+#: git-gui.sh:1869 lib/merge.tcl:120 lib/merge.tcl:149 lib/merge.tcl:167

 msgid "Merge"
 msgstr "マージ"
 
 msgid "Merge"
 msgstr "マージ"
 

-#: git-gui.sh:1833 lib/choose_rev.tcl:556
+#: git-gui.sh:1870 lib/choose_rev.tcl:557

 msgid "Remote"
 msgstr "リモート"
 
 msgid "Remote"
 msgstr "リモート"
 

-#: git-gui.sh:1842
+#: git-gui.sh:1879

 msgid "Browse Current Branch's Files"
 msgstr "現在のブランチのファイルを見る"
 
 msgid "Browse Current Branch's Files"
 msgstr "現在のブランチのファイルを見る"
 

-#: git-gui.sh:1846
+#: git-gui.sh:1883

 msgid "Browse Branch Files..."
 msgstr "ブランチのファイルを見る…"
 
 msgid "Browse Branch Files..."
 msgstr "ブランチのファイルを見る…"
 

-#: git-gui.sh:1851
+#: git-gui.sh:1888

 msgid "Visualize Current Branch's History"
 msgstr "現在のブランチの履歴を見る"
 
 msgid "Visualize Current Branch's History"
 msgstr "現在のブランチの履歴を見る"
 

-#: git-gui.sh:1855
+#: git-gui.sh:1892

 msgid "Visualize All Branch History"
 msgstr "全てのブランチの履歴を見る"
 
 msgid "Visualize All Branch History"
 msgstr "全てのブランチの履歴を見る"
 

-#: git-gui.sh:1862
+#: git-gui.sh:1899

 #, tcl-format
 msgid "Browse %s's Files"
 msgstr "ブランチ %s のファイルを見る"
 
 #, tcl-format
 msgid "Browse %s's Files"
 msgstr "ブランチ %s のファイルを見る"
 

-#: git-gui.sh:1864
+#: git-gui.sh:1901

 #, tcl-format
 msgid "Visualize %s's History"
 msgstr "ブランチ %s の履歴を見る"
 
 #, tcl-format
 msgid "Visualize %s's History"
 msgstr "ブランチ %s の履歴を見る"
 

-#: git-gui.sh:1869 lib/database.tcl:27 lib/database.tcl:67
+#: git-gui.sh:1906 lib/database.tcl:27 lib/database.tcl:67

 msgid "Database Statistics"
 msgstr "データベース統計"
 
 msgid "Database Statistics"
 msgstr "データベース統計"
 

-#: git-gui.sh:1872 lib/database.tcl:34
+#: git-gui.sh:1909 lib/database.tcl:34

 msgid "Compress Database"
 msgstr "データベース圧縮"
 
 msgid "Compress Database"
 msgstr "データベース圧縮"
 

-#: git-gui.sh:1875
+#: git-gui.sh:1912

 msgid "Verify Database"
 msgstr "データベース検証"
 
 msgid "Verify Database"
 msgstr "データベース検証"
 

-#: git-gui.sh:1882 git-gui.sh:1886 git-gui.sh:1890 lib/shortcut.tcl:7
+#: git-gui.sh:1919 git-gui.sh:1923 git-gui.sh:1927 lib/shortcut.tcl:7

 #: lib/shortcut.tcl:39 lib/shortcut.tcl:71
 msgid "Create Desktop Icon"
 msgstr "デスクトップ・アイコンを作る"
 
 #: lib/shortcut.tcl:39 lib/shortcut.tcl:71
 msgid "Create Desktop Icon"
 msgstr "デスクトップ・アイコンを作る"
 

-#: git-gui.sh:1895 lib/choose_repository.tcl:176 lib/choose_repository.tcl:184
+#: git-gui.sh:1932 lib/choose_repository.tcl:177 lib/choose_repository.tcl:185

 msgid "Quit"
 msgstr "終了"
 
 msgid "Quit"
 msgstr "終了"
 

-#: git-gui.sh:1902
+#: git-gui.sh:1939

 msgid "Undo"
 msgstr "元に戻す"
 
 msgid "Undo"
 msgstr "元に戻す"
 

-#: git-gui.sh:1905
+#: git-gui.sh:1942

 msgid "Redo"
 msgstr "やり直し"
 
 msgid "Redo"
 msgstr "やり直し"
 

-#: git-gui.sh:1909 git-gui.sh:2403
+#: git-gui.sh:1946 git-gui.sh:2443

 msgid "Cut"
 msgstr "切り取り"
 
 msgid "Cut"
 msgstr "切り取り"
 

-#: git-gui.sh:1912 git-gui.sh:2406 git-gui.sh:2477 git-gui.sh:2549
-#: lib/console.tcl:67
+#: git-gui.sh:1949 git-gui.sh:2446 git-gui.sh:2520 git-gui.sh:2614
+#: lib/console.tcl:69

 msgid "Copy"
 msgstr "コピー"
 
 msgid "Copy"
 msgstr "コピー"
 

-#: git-gui.sh:1915 git-gui.sh:2409
+#: git-gui.sh:1952 git-gui.sh:2449

 msgid "Paste"
 msgstr "貼り付け"
 
 msgid "Paste"
 msgstr "貼り付け"
 

-#: git-gui.sh:1918 git-gui.sh:2412 lib/branch_delete.tcl:26
+#: git-gui.sh:1955 git-gui.sh:2452 lib/branch_delete.tcl:26

 #: lib/remote_branch_delete.tcl:38
 msgid "Delete"
 msgstr "削除"
 
 #: lib/remote_branch_delete.tcl:38
 msgid "Delete"
 msgstr "削除"
 

-#: git-gui.sh:1922 git-gui.sh:2416 git-gui.sh:2553 lib/console.tcl:69
+#: git-gui.sh:1959 git-gui.sh:2456 git-gui.sh:2618 lib/console.tcl:71

 msgid "Select All"
 msgstr "全て選択"
 
 msgid "Select All"
 msgstr "全て選択"
 

-#: git-gui.sh:1931
+#: git-gui.sh:1968

 msgid "Create..."
 msgstr "作成…"
 
 msgid "Create..."
 msgstr "作成…"
 

-#: git-gui.sh:1937
+#: git-gui.sh:1974

 msgid "Checkout..."
 msgstr "チェックアウト"
 
 msgid "Checkout..."
 msgstr "チェックアウト"
 

-#: git-gui.sh:1943
+#: git-gui.sh:1980

 msgid "Rename..."
 msgstr "名前変更…"
 
 msgid "Rename..."
 msgstr "名前変更…"
 

-#: git-gui.sh:1948 git-gui.sh:2048
+#: git-gui.sh:1985 git-gui.sh:2085

 msgid "Delete..."
 msgstr "削除…"
 
 msgid "Delete..."
 msgstr "削除…"
 

-#: git-gui.sh:1953
+#: git-gui.sh:1990

 msgid "Reset..."
 msgstr "リセット…"
 
 msgid "Reset..."
 msgstr "リセット…"
 

-#: git-gui.sh:1965 git-gui.sh:2350
+#: git-gui.sh:2002 git-gui.sh:2389

 msgid "New Commit"
 msgstr "新規コミット"
 
 msgid "New Commit"
 msgstr "新規コミット"
 

-#: git-gui.sh:1973 git-gui.sh:2357
+#: git-gui.sh:2010 git-gui.sh:2396

 msgid "Amend Last Commit"
 msgstr "最新コミットを訂正"
 
 msgid "Amend Last Commit"
 msgstr "最新コミットを訂正"
 

-#: git-gui.sh:1982 git-gui.sh:2317 lib/remote_branch_delete.tcl:99
+#: git-gui.sh:2019 git-gui.sh:2356 lib/remote_branch_delete.tcl:99

 msgid "Rescan"
 msgstr "再スキャン"
 
 msgid "Rescan"
 msgstr "再スキャン"
 

-#: git-gui.sh:1988
+#: git-gui.sh:2025

 msgid "Stage To Commit"
 msgstr "コミット予定する"
 
 msgid "Stage To Commit"
 msgstr "コミット予定する"
 

-#: git-gui.sh:1994
+#: git-gui.sh:2031

 msgid "Stage Changed Files To Commit"
 msgstr "変更されたファイルをコミット予定"
 
 msgid "Stage Changed Files To Commit"
 msgstr "変更されたファイルをコミット予定"
 

-#: git-gui.sh:2000
+#: git-gui.sh:2037

 msgid "Unstage From Commit"
 msgstr "コミットから降ろす"
 
 msgid "Unstage From Commit"
 msgstr "コミットから降ろす"
 

-#: git-gui.sh:2005 lib/index.tcl:393
+#: git-gui.sh:2042 lib/index.tcl:395

 msgid "Revert Changes"
 msgstr "変更を元に戻す"
 
 msgid "Revert Changes"
 msgstr "変更を元に戻す"
 

-#: git-gui.sh:2012 git-gui.sh:2329 git-gui.sh:2427
+#: git-gui.sh:2049 git-gui.sh:2368 git-gui.sh:2467

 msgid "Sign Off"
 msgstr "署名"
 
 msgid "Sign Off"
 msgstr "署名"
 

-#: git-gui.sh:2016 git-gui.sh:2333
+#: git-gui.sh:2053 git-gui.sh:2372

 msgid "Commit@@verb"
 msgstr "コミット"
 
 msgid "Commit@@verb"
 msgstr "コミット"
 

-#: git-gui.sh:2027
+#: git-gui.sh:2064

 msgid "Local Merge..."
 msgstr "ローカル・マージ…"
 
 msgid "Local Merge..."
 msgstr "ローカル・マージ…"
 

-#: git-gui.sh:2032
+#: git-gui.sh:2069

 msgid "Abort Merge..."
 msgstr "マージ中止…"
 
 msgid "Abort Merge..."
 msgstr "マージ中止…"
 

-#: git-gui.sh:2044
+#: git-gui.sh:2081

 msgid "Push..."
 msgstr "プッシュ…"
 
 msgid "Push..."
 msgstr "プッシュ…"
 

-#: git-gui.sh:2055 lib/choose_repository.tcl:40
+#: git-gui.sh:2092 lib/choose_repository.tcl:41

 msgid "Apple"
 msgstr "りんご"
 
 msgid "Apple"
 msgstr "りんご"
 

-#: git-gui.sh:2058 git-gui.sh:2080 lib/about.tcl:13
-#: lib/choose_repository.tcl:43 lib/choose_repository.tcl:49
+#: git-gui.sh:2095 git-gui.sh:2117 lib/about.tcl:14
+#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:50

 #, tcl-format
 msgid "About %s"
 msgstr "%s について"
 
 #, tcl-format
 msgid "About %s"
 msgstr "%s について"
 

-#: git-gui.sh:2062
+#: git-gui.sh:2099

 msgid "Preferences..."
 msgstr "設定…"
 
 msgid "Preferences..."
 msgstr "設定…"
 

-#: git-gui.sh:2070 git-gui.sh:2595
+#: git-gui.sh:2107 git-gui.sh:2639

 msgid "Options..."
 msgstr "オプション…"
 
 msgid "Options..."
 msgstr "オプション…"
 

-#: git-gui.sh:2076 lib/choose_repository.tcl:46
+#: git-gui.sh:2113 lib/choose_repository.tcl:47

 msgid "Help"
 msgstr "ヘルプ"
 
 msgid "Help"
 msgstr "ヘルプ"
 

-#: git-gui.sh:2117
+#: git-gui.sh:2154

 msgid "Online Documentation"
 msgstr "オンライン・ドキュメント"
 
 msgid "Online Documentation"
 msgstr "オンライン・ドキュメント"
 

-#: git-gui.sh:2201
+#: git-gui.sh:2238

 #, tcl-format
 msgid "fatal: cannot stat path %s: No such file or directory"
 msgstr ""
 "致命的: パス %s が stat できません。そのようなファイルやディレクトリはありま"
 "せん"
 
 #, tcl-format
 msgid "fatal: cannot stat path %s: No such file or directory"
 msgstr ""
 "致命的: パス %s が stat できません。そのようなファイルやディレクトリはありま"
 "せん"
 

-#: git-gui.sh:2234
+#: git-gui.sh:2271

 msgid "Current Branch:"
 msgstr "現在のブランチ"
 
 msgid "Current Branch:"
 msgstr "現在のブランチ"
 

-#: git-gui.sh:2255
+#: git-gui.sh:2292

 msgid "Staged Changes (Will Commit)"
 msgstr "ステージングされた（コミット予定済の）変更"
 
 msgid "Staged Changes (Will Commit)"
 msgstr "ステージングされた（コミット予定済の）変更"
 

-#: git-gui.sh:2274
+#: git-gui.sh:2312

 msgid "Unstaged Changes"
 msgstr "コミット予定に入っていない変更"
 
 msgid "Unstaged Changes"
 msgstr "コミット予定に入っていない変更"
 

-#: git-gui.sh:2323
+#: git-gui.sh:2362

 msgid "Stage Changed"
 msgstr "変更をコミット予定に入れる"
 
 msgid "Stage Changed"
 msgstr "変更をコミット予定に入れる"
 

-#: git-gui.sh:2339 lib/transport.tcl:93 lib/transport.tcl:182
+#: git-gui.sh:2378 lib/transport.tcl:93 lib/transport.tcl:182

 msgid "Push"
 msgstr "プッシュ"
 
 msgid "Push"
 msgstr "プッシュ"
 

-#: git-gui.sh:2369
+#: git-gui.sh:2408

 msgid "Initial Commit Message:"
 msgstr "最初のコミットメッセージ:"
 
 msgid "Initial Commit Message:"
 msgstr "最初のコミットメッセージ:"
 

-#: git-gui.sh:2370
+#: git-gui.sh:2409

 msgid "Amended Commit Message:"
 msgstr "訂正したコミットメッセージ:"
 
 msgid "Amended Commit Message:"
 msgstr "訂正したコミットメッセージ:"
 

-#: git-gui.sh:2371
+#: git-gui.sh:2410

 msgid "Amended Initial Commit Message:"
 msgstr "訂正した最初のコミットメッセージ:"
 
 msgid "Amended Initial Commit Message:"
 msgstr "訂正した最初のコミットメッセージ:"
 

-#: git-gui.sh:2372
+#: git-gui.sh:2411

 msgid "Amended Merge Commit Message:"
 msgstr "訂正したマージコミットメッセージ:"
 
 msgid "Amended Merge Commit Message:"
 msgstr "訂正したマージコミットメッセージ:"
 

-#: git-gui.sh:2373
+#: git-gui.sh:2412

 msgid "Merge Commit Message:"
 msgstr "マージコミットメッセージ:"
 
 msgid "Merge Commit Message:"
 msgstr "マージコミットメッセージ:"
 

-#: git-gui.sh:2374
+#: git-gui.sh:2413

 msgid "Commit Message:"
 msgstr "コミットメッセージ:"
 
 msgid "Commit Message:"
 msgstr "コミットメッセージ:"
 

-#: git-gui.sh:2419 git-gui.sh:2557 lib/console.tcl:71
+#: git-gui.sh:2459 git-gui.sh:2622 lib/console.tcl:73

 msgid "Copy All"
 msgstr "全てコピー"
 
 msgid "Copy All"
 msgstr "全てコピー"
 

-#: git-gui.sh:2443 lib/blame.tcl:104
+#: git-gui.sh:2483 lib/blame.tcl:107

 msgid "File:"
 msgstr "ファイル:"
 
 msgid "File:"
 msgstr "ファイル:"
 

-#: git-gui.sh:2545
-msgid "Refresh"
-msgstr "再読み込み"
-
-#: git-gui.sh:2566
+#: git-gui.sh:2589

 msgid "Apply/Reverse Hunk"
 msgstr "パッチを適用/取り消す"
 
 msgid "Apply/Reverse Hunk"
 msgstr "パッチを適用/取り消す"
 

-#: git-gui.sh:2572
-msgid "Decrease Font Size"
-msgstr "フォントを小さく"
-
-#: git-gui.sh:2576
-msgid "Increase Font Size"
-msgstr "フォントを大きく"
-
-#: git-gui.sh:2581
+#: git-gui.sh:2595

 msgid "Show Less Context"
 msgstr "文脈を少なく"
 
 msgid "Show Less Context"
 msgstr "文脈を少なく"
 

-#: git-gui.sh:2588
+#: git-gui.sh:2602

 msgid "Show More Context"
 msgstr "文脈を多く"
 
 msgid "Show More Context"
 msgstr "文脈を多く"
 

-#: git-gui.sh:2602
+#: git-gui.sh:2610
+msgid "Refresh"
+msgstr "再読み込み"
+
+#: git-gui.sh:2631
+msgid "Decrease Font Size"
+msgstr "フォントを小さく"
+
+#: git-gui.sh:2635
+msgid "Increase Font Size"
+msgstr "フォントを大きく"
+
+#: git-gui.sh:2646

 msgid "Unstage Hunk From Commit"
 msgstr "パッチをコミット予定から外す"
 
 msgid "Unstage Hunk From Commit"
 msgstr "パッチをコミット予定から外す"
 

-#: git-gui.sh:2604
+#: git-gui.sh:2648

 msgid "Stage Hunk For Commit"
 msgstr "パッチをコミット予定に加える"
 
 msgid "Stage Hunk For Commit"
 msgstr "パッチをコミット予定に加える"
 

-#: git-gui.sh:2623
+#: git-gui.sh:2667

 msgid "Initializing..."
 msgstr "初期化しています…"
 
 msgid "Initializing..."
 msgstr "初期化しています…"
 

-#: git-gui.sh:2718
+#: git-gui.sh:2762

 #, tcl-format
 msgid ""
 "Possible environment issues exist.\n"
 #, tcl-format
 msgid ""
 "Possible environment issues exist.\n"


@@ -449,7 +449,7 @@ msgstr ""
 "以下の環境変数は %s が起動する Git サブプロセスによって無視されるでしょう:\n"
 "\n"
 
 "以下の環境変数は %s が起動する Git サブプロセスによって無視されるでしょう:\n"
 "\n"
 

-#: git-gui.sh:2748
+#: git-gui.sh:2792

 msgid ""
 "\n"
 "This is due to a known issue with the\n"
 msgid ""
 "\n"
 "This is due to a known issue with the\n"


@@ -459,7 +459,7 @@ msgstr ""
 "これは Cygwin で配布されている Tcl バイナリに\n"
 "関しての既知の問題によります"
 
 "これは Cygwin で配布されている Tcl バイナリに\n"
 "関しての既知の問題によります"
 

-#: git-gui.sh:2753
+#: git-gui.sh:2797

 #, tcl-format
 msgid ""
 "\n"
 #, tcl-format
 msgid ""
 "\n"


@@ -474,7 +474,7 @@ msgstr ""
 "個人的な ~/.gitconfig ファイル内で user.name と user.email の値を設定\n"
 "するのが、%s の良い代用となります\n"
 
 "個人的な ~/.gitconfig ファイル内で user.name と user.email の値を設定\n"
 "するのが、%s の良い代用となります\n"
 

-#: lib/about.tcl:25
+#: lib/about.tcl:26

 msgid "git-gui - a graphical user interface for Git."
 msgstr "Git のグラフィカルUI git-gui"
 
 msgid "git-gui - a graphical user interface for Git."
 msgstr "Git のグラフィカルUI git-gui"
 


@@ -486,56 +486,56 @@ msgstr "ファイルピューワ"
 msgid "Commit:"
 msgstr "コミット:"
 
 msgid "Commit:"
 msgstr "コミット:"
 

-#: lib/blame.tcl:249
+#: lib/blame.tcl:264

 msgid "Copy Commit"
 msgstr "コミットをコピー"
 
 msgid "Copy Commit"
 msgstr "コミットをコピー"
 

-#: lib/blame.tcl:369
+#: lib/blame.tcl:384

 #, tcl-format
 msgid "Reading %s..."
 msgstr "%s を読んでいます…"
 
 #, tcl-format
 msgid "Reading %s..."
 msgstr "%s を読んでいます…"
 

-#: lib/blame.tcl:473
+#: lib/blame.tcl:488

 msgid "Loading copy/move tracking annotations..."
 msgstr "コピー・移動追跡データを読んでいます…"
 
 msgid "Loading copy/move tracking annotations..."
 msgstr "コピー・移動追跡データを読んでいます…"
 

-#: lib/blame.tcl:493
+#: lib/blame.tcl:508

 msgid "lines annotated"
 msgstr "行を注釈しました"
 
 msgid "lines annotated"
 msgstr "行を注釈しました"
 

-#: lib/blame.tcl:674
+#: lib/blame.tcl:689

 msgid "Loading original location annotations..."
 msgstr "元位置行の注釈データを読んでいます…"
 
 msgid "Loading original location annotations..."
 msgstr "元位置行の注釈データを読んでいます…"
 

-#: lib/blame.tcl:677
+#: lib/blame.tcl:692

 msgid "Annotation complete."
 msgstr "注釈完了しました"
 
 msgid "Annotation complete."
 msgstr "注釈完了しました"
 

-#: lib/blame.tcl:731
+#: lib/blame.tcl:746

 msgid "Loading annotation..."
 msgstr "注釈を読み込んでいます…"
 
 msgid "Loading annotation..."
 msgstr "注釈を読み込んでいます…"
 

-#: lib/blame.tcl:787
+#: lib/blame.tcl:802

 msgid "Author:"
 msgstr "作者:"
 
 msgid "Author:"
 msgstr "作者:"
 

-#: lib/blame.tcl:791
+#: lib/blame.tcl:806

 msgid "Committer:"
 msgstr "コミット者:"
 
 msgid "Committer:"
 msgstr "コミット者:"
 

-#: lib/blame.tcl:796
+#: lib/blame.tcl:811

 msgid "Original File:"
 msgstr "元ファイル"
 
 msgid "Original File:"
 msgstr "元ファイル"
 

-#: lib/blame.tcl:910
+#: lib/blame.tcl:925

 msgid "Originally By:"
 msgstr "原作者:"
 
 msgid "Originally By:"
 msgstr "原作者:"
 

-#: lib/blame.tcl:916
+#: lib/blame.tcl:931

 msgid "In File:"
 msgstr "ファイル:"
 
 msgid "In File:"
 msgstr "ファイル:"
 

-#: lib/blame.tcl:921
+#: lib/blame.tcl:936

 msgid "Copied Or Moved Here By:"
 msgstr "複写・移動者:"
 
 msgid "Copied Or Moved Here By:"
 msgstr "複写・移動者:"
 


@@ -548,17 +548,17 @@ msgid "Checkout"
 msgstr "チェックアウト"
 
 #: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35
 msgstr "チェックアウト"
 
 #: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35

-#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:281
-#: lib/checkout_op.tcl:522 lib/choose_font.tcl:43 lib/merge.tcl:172
-#: lib/option.tcl:90 lib/remote_branch_delete.tcl:42 lib/transport.tcl:97
+#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:282
+#: lib/checkout_op.tcl:522 lib/choose_font.tcl:43 lib/merge.tcl:171
+#: lib/option.tcl:103 lib/remote_branch_delete.tcl:42 lib/transport.tcl:97

 msgid "Cancel"
 msgstr "中止"
 
 msgid "Cancel"
 msgstr "中止"
 

-#: lib/branch_checkout.tcl:32 lib/browser.tcl:286
+#: lib/branch_checkout.tcl:32 lib/browser.tcl:287

 msgid "Revision"
 msgstr "リビジョン"
 
 msgid "Revision"
 msgstr "リビジョン"
 

-#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:202
+#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:242

 msgid "Options"
 msgstr "オプション"
 
 msgid "Options"
 msgstr "オプション"
 


@@ -578,7 +578,7 @@ msgstr "ブランチを作成"
 msgid "Create New Branch"
 msgstr "ブランチを新規作成"
 
 msgid "Create New Branch"
 msgstr "ブランチを新規作成"
 

-#: lib/branch_create.tcl:31 lib/choose_repository.tcl:375
+#: lib/branch_create.tcl:31 lib/choose_repository.tcl:371

 msgid "Create"
 msgstr "作成"
 
 msgid "Create"
 msgstr "作成"
 


@@ -718,22 +718,22 @@ msgstr "起動中…"
 msgid "File Browser"
 msgstr "ファイル・ブラウザ"
 
 msgid "File Browser"
 msgstr "ファイル・ブラウザ"
 

-#: lib/browser.tcl:125 lib/browser.tcl:142
+#: lib/browser.tcl:126 lib/browser.tcl:143

 #, tcl-format
 msgid "Loading %s..."
 msgstr "%s をロード中…"
 
 #, tcl-format
 msgid "Loading %s..."
 msgstr "%s をロード中…"
 

-#: lib/browser.tcl:186
+#: lib/browser.tcl:187

 msgid "[Up To Parent]"
 msgstr "[上位フォルダへ]"
 
 msgid "[Up To Parent]"
 msgstr "[上位フォルダへ]"
 

-#: lib/browser.tcl:266 lib/browser.tcl:272
+#: lib/browser.tcl:267 lib/browser.tcl:273

 msgid "Browse Branch Files"
 msgstr "現在のブランチのファイルを見る"
 
 msgid "Browse Branch Files"
 msgstr "現在のブランチのファイルを見る"
 

-#: lib/browser.tcl:277 lib/choose_repository.tcl:391
-#: lib/choose_repository.tcl:482 lib/choose_repository.tcl:492
-#: lib/choose_repository.tcl:989
+#: lib/browser.tcl:278 lib/choose_repository.tcl:387
+#: lib/choose_repository.tcl:474 lib/choose_repository.tcl:484
+#: lib/choose_repository.tcl:987

 msgid "Browse"
 msgstr "ブラウズ"
 
 msgid "Browse"
 msgstr "ブラウズ"
 


@@ -747,7 +747,7 @@ msgstr "%s から %s をフェッチしています"
 msgid "fatal: Cannot resolve %s"
 msgstr "致命的エラー: %s を解決できません"
 
 msgid "fatal: Cannot resolve %s"
 msgstr "致命的エラー: %s を解決できません"
 

-#: lib/checkout_op.tcl:140 lib/console.tcl:79 lib/database.tcl:31
+#: lib/checkout_op.tcl:140 lib/console.tcl:81 lib/database.tcl:31

 msgid "Close"
 msgstr "閉じる"
 
 msgid "Close"
 msgstr "閉じる"
 


@@ -804,6 +804,10 @@ msgstr ""
 msgid "Updating working directory to '%s'..."
 msgstr "作業ディレクトリを '%s' に更新しています…"
 
 msgid "Updating working directory to '%s'..."
 msgstr "作業ディレクトリを '%s' に更新しています…"
 

+#: lib/checkout_op.tcl:323
+msgid "files checked out"
+msgstr ""
+

 #: lib/checkout_op.tcl:353
 #, tcl-format
 msgid "Aborted checkout of '%s' (file level merging is required)."
 #: lib/checkout_op.tcl:353
 #, tcl-format
 msgid "Aborted checkout of '%s' (file level merging is required)."


@@ -830,7 +834,7 @@ msgstr ""
 "ブランチ上に滞まりたいときは、この「分離されたチェックアウト」から新規ブラン"
 "チを開始してください。"
 
 "ブランチ上に滞まりたいときは、この「分離されたチェックアウト」から新規ブラン"
 "チを開始してください。"
 

-#: lib/checkout_op.tcl:446
+#: lib/checkout_op.tcl:446 lib/checkout_op.tcl:450

 #, tcl-format
 msgid "Checked out '%s'."
 msgstr "'%s' をチェックアウトしました"
 #, tcl-format
 msgid "Checked out '%s'."
 msgstr "'%s' をチェックアウトしました"


@@ -849,7 +853,7 @@ msgstr "失なわれたコミットを回復するのは簡単ではありませ
 msgid "Reset '%s'?"
 msgstr "'%s' をリセットしますか？"
 
 msgid "Reset '%s'?"
 msgstr "'%s' をリセットしますか？"
 

-#: lib/checkout_op.tcl:510 lib/merge.tcl:164
+#: lib/checkout_op.tcl:510 lib/merge.tcl:163

 msgid "Visualize"
 msgstr "可視化"
 
 msgid "Visualize"
 msgstr "可視化"
 


@@ -877,15 +881,15 @@ msgstr "選択"
 msgid "Font Family"
 msgstr "フォント・ファミリー"
 
 msgid "Font Family"
 msgstr "フォント・ファミリー"
 

-#: lib/choose_font.tcl:73
+#: lib/choose_font.tcl:74

 msgid "Font Size"
 msgstr "フォントの大きさ"
 
 msgid "Font Size"
 msgstr "フォントの大きさ"
 

-#: lib/choose_font.tcl:90
+#: lib/choose_font.tcl:91

 msgid "Font Example"
 msgstr "フォント・サンプル"
 
 msgid "Font Example"
 msgstr "フォント・サンプル"
 

-#: lib/choose_font.tcl:101
+#: lib/choose_font.tcl:103

 msgid ""
 "This is example text.\n"
 "If you like this text, it can be your font."
 msgid ""
 "This is example text.\n"
 "If you like this text, it can be your font."


@@ -893,225 +897,225 @@ msgstr ""
 "これはサンプル文です。\n"
 "このフォントが気に入ればお使いになれます。"
 
 "これはサンプル文です。\n"
 "このフォントが気に入ればお使いになれます。"
 

-#: lib/choose_repository.tcl:27
+#: lib/choose_repository.tcl:28

 msgid "Git Gui"
 msgstr "Git GUI"
 
 msgid "Git Gui"
 msgstr "Git GUI"
 

-#: lib/choose_repository.tcl:80 lib/choose_repository.tcl:380
+#: lib/choose_repository.tcl:81 lib/choose_repository.tcl:376

 msgid "Create New Repository"
 msgstr "新しいリポジトリを作る"
 
 msgid "Create New Repository"
 msgstr "新しいリポジトリを作る"
 

-#: lib/choose_repository.tcl:86
+#: lib/choose_repository.tcl:87

 msgid "New..."
 msgstr "新規…"
 
 msgid "New..."
 msgstr "新規…"
 

-#: lib/choose_repository.tcl:93 lib/choose_repository.tcl:468
+#: lib/choose_repository.tcl:94 lib/choose_repository.tcl:460

 msgid "Clone Existing Repository"
 msgstr "既存リポジトリを複製する"
 
 msgid "Clone Existing Repository"
 msgstr "既存リポジトリを複製する"
 

-#: lib/choose_repository.tcl:99
+#: lib/choose_repository.tcl:100

 msgid "Clone..."
 msgstr "複製…"
 
 msgid "Clone..."
 msgstr "複製…"
 

-#: lib/choose_repository.tcl:106 lib/choose_repository.tcl:978
+#: lib/choose_repository.tcl:107 lib/choose_repository.tcl:976

 msgid "Open Existing Repository"
 msgstr "既存リポジトリを開く"
 
 msgid "Open Existing Repository"
 msgstr "既存リポジトリを開く"
 

-#: lib/choose_repository.tcl:112
+#: lib/choose_repository.tcl:113

 msgid "Open..."
 msgstr "開く…"
 
 msgid "Open..."
 msgstr "開く…"
 

-#: lib/choose_repository.tcl:125
+#: lib/choose_repository.tcl:126

 msgid "Recent Repositories"
 msgstr "最近使ったリポジトリ"
 
 msgid "Recent Repositories"
 msgstr "最近使ったリポジトリ"
 

-#: lib/choose_repository.tcl:131
+#: lib/choose_repository.tcl:132

 msgid "Open Recent Repository:"
 msgstr "最近使ったリポジトリを開く"
 
 msgid "Open Recent Repository:"
 msgstr "最近使ったリポジトリを開く"
 

-#: lib/choose_repository.tcl:294
-#, tcl-format
-msgid "Location %s already exists."
-msgstr "'%s' は既に存在します。"
-
-#: lib/choose_repository.tcl:300 lib/choose_repository.tcl:307
-#: lib/choose_repository.tcl:314
+#: lib/choose_repository.tcl:296 lib/choose_repository.tcl:303
+#: lib/choose_repository.tcl:310

 #, tcl-format
 msgid "Failed to create repository %s:"
 msgstr "リポジトリ %s を作製できません:"
 
 #, tcl-format
 msgid "Failed to create repository %s:"
 msgstr "リポジトリ %s を作製できません:"
 

-#: lib/choose_repository.tcl:385 lib/choose_repository.tcl:486
+#: lib/choose_repository.tcl:381 lib/choose_repository.tcl:478

 msgid "Directory:"
 msgstr "ディレクトリ:"
 
 msgid "Directory:"
 msgstr "ディレクトリ:"
 

-#: lib/choose_repository.tcl:415 lib/choose_repository.tcl:544
-#: lib/choose_repository.tcl:1013
+#: lib/choose_repository.tcl:412 lib/choose_repository.tcl:537
+#: lib/choose_repository.tcl:1011

 msgid "Git Repository"
 msgstr "GIT リポジトリ"
 
 msgid "Git Repository"
 msgstr "GIT リポジトリ"
 

-#: lib/choose_repository.tcl:430 lib/choose_repository.tcl:437
+#: lib/choose_repository.tcl:437

 #, tcl-format
 msgid "Directory %s already exists."
 msgstr "ディレクトリ '%s' は既に存在します。"
 
 #, tcl-format
 msgid "Directory %s already exists."
 msgstr "ディレクトリ '%s' は既に存在します。"
 

-#: lib/choose_repository.tcl:442
+#: lib/choose_repository.tcl:441

 #, tcl-format
 msgid "File %s already exists."
 msgstr "ファイル '%s' は既に存在します。"
 
 #, tcl-format
 msgid "File %s already exists."
 msgstr "ファイル '%s' は既に存在します。"
 

-#: lib/choose_repository.tcl:463
+#: lib/choose_repository.tcl:455

 msgid "Clone"
 msgstr "複製"
 
 msgid "Clone"
 msgstr "複製"
 

-#: lib/choose_repository.tcl:476
+#: lib/choose_repository.tcl:468

 msgid "URL:"
 msgstr "URL:"
 
 msgid "URL:"
 msgstr "URL:"
 

-#: lib/choose_repository.tcl:496
+#: lib/choose_repository.tcl:489

 msgid "Clone Type:"
 msgstr "複製方式:"
 
 msgid "Clone Type:"
 msgstr "複製方式:"
 

-#: lib/choose_repository.tcl:502
+#: lib/choose_repository.tcl:495

 msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
 msgstr "標準(高速・中冗長度・ハードリンク)"
 
 msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
 msgstr "標準(高速・中冗長度・ハードリンク)"
 

-#: lib/choose_repository.tcl:508
+#: lib/choose_repository.tcl:501

 msgid "Full Copy (Slower, Redundant Backup)"
 msgstr "全複写(低速・冗長バックアップ)"
 
 msgid "Full Copy (Slower, Redundant Backup)"
 msgstr "全複写(低速・冗長バックアップ)"
 

-#: lib/choose_repository.tcl:514
+#: lib/choose_repository.tcl:507

 msgid "Shared (Fastest, Not Recommended, No Backup)"
 msgstr "共有(最高速・非推奨・バックアップ無し)"
 
 msgid "Shared (Fastest, Not Recommended, No Backup)"
 msgstr "共有(最高速・非推奨・バックアップ無し)"
 

-#: lib/choose_repository.tcl:550 lib/choose_repository.tcl:597
-#: lib/choose_repository.tcl:738 lib/choose_repository.tcl:808
-#: lib/choose_repository.tcl:1019 lib/choose_repository.tcl:1027
+#: lib/choose_repository.tcl:543 lib/choose_repository.tcl:590
+#: lib/choose_repository.tcl:736 lib/choose_repository.tcl:806
+#: lib/choose_repository.tcl:1017 lib/choose_repository.tcl:1025

 #, tcl-format
 msgid "Not a Git repository: %s"
 msgstr "Git リポジトリではありません: %s"
 
 #, tcl-format
 msgid "Not a Git repository: %s"
 msgstr "Git リポジトリではありません: %s"
 

-#: lib/choose_repository.tcl:586
+#: lib/choose_repository.tcl:579

 msgid "Standard only available for local repository."
 msgstr "標準方式は同一計算機上のリポジトリにのみ使えます。"
 
 msgid "Standard only available for local repository."
 msgstr "標準方式は同一計算機上のリポジトリにのみ使えます。"
 

-#: lib/choose_repository.tcl:590
+#: lib/choose_repository.tcl:583

 msgid "Shared only available for local repository."
 msgstr "共有方式は同一計算機上のリポジトリにのみ使えます。"
 
 msgid "Shared only available for local repository."
 msgstr "共有方式は同一計算機上のリポジトリにのみ使えます。"
 

-#: lib/choose_repository.tcl:617
+#: lib/choose_repository.tcl:604
+#, tcl-format
+msgid "Location %s already exists."
+msgstr "'%s' は既に存在します。"
+
+#: lib/choose_repository.tcl:615

 msgid "Failed to configure origin"
 msgstr "origin を設定できませんでした"
 
 msgid "Failed to configure origin"
 msgstr "origin を設定できませんでした"
 

-#: lib/choose_repository.tcl:629
+#: lib/choose_repository.tcl:627

 msgid "Counting objects"
 msgstr "オブジェクトを数えています"
 
 msgid "Counting objects"
 msgstr "オブジェクトを数えています"
 

-#: lib/choose_repository.tcl:630
+#: lib/choose_repository.tcl:628

 msgid "buckets"
 msgstr "バケツ"
 
 msgid "buckets"
 msgstr "バケツ"
 

-#: lib/choose_repository.tcl:654
+#: lib/choose_repository.tcl:652

 #, tcl-format
 msgid "Unable to copy objects/info/alternates: %s"
 msgstr "objects/info/alternates を複写できません: %s"
 
 #, tcl-format
 msgid "Unable to copy objects/info/alternates: %s"
 msgstr "objects/info/alternates を複写できません: %s"
 

-#: lib/choose_repository.tcl:690
+#: lib/choose_repository.tcl:688

 #, tcl-format
 msgid "Nothing to clone from %s."
 msgstr "%s から複製する内容はありません"
 
 #, tcl-format
 msgid "Nothing to clone from %s."
 msgstr "%s から複製する内容はありません"
 

-#: lib/choose_repository.tcl:692 lib/choose_repository.tcl:906
-#: lib/choose_repository.tcl:918
+#: lib/choose_repository.tcl:690 lib/choose_repository.tcl:904
+#: lib/choose_repository.tcl:916

 msgid "The 'master' branch has not been initialized."
 msgstr "'master' ブランチが初期化されていません"
 
 msgid "The 'master' branch has not been initialized."
 msgstr "'master' ブランチが初期化されていません"
 

-#: lib/choose_repository.tcl:705
+#: lib/choose_repository.tcl:703

 msgid "Hardlinks are unavailable.  Falling back to copying."
 msgstr "ハードリンクが作れないので、コピーします"
 
 msgid "Hardlinks are unavailable.  Falling back to copying."
 msgstr "ハードリンクが作れないので、コピーします"
 

-#: lib/choose_repository.tcl:717
+#: lib/choose_repository.tcl:715

 #, tcl-format
 msgid "Cloning from %s"
 msgstr "%s から複製しています"
 
 #, tcl-format
 msgid "Cloning from %s"
 msgstr "%s から複製しています"
 

-#: lib/choose_repository.tcl:748
+#: lib/choose_repository.tcl:746

 msgid "Copying objects"
 msgstr "オブジェクトを複写しています"
 
 msgid "Copying objects"
 msgstr "オブジェクトを複写しています"
 

-#: lib/choose_repository.tcl:749
+#: lib/choose_repository.tcl:747

 msgid "KiB"
 msgstr "KiB"
 
 msgid "KiB"
 msgstr "KiB"
 

-#: lib/choose_repository.tcl:773
+#: lib/choose_repository.tcl:771

 #, tcl-format
 msgid "Unable to copy object: %s"
 msgstr "オブジェクトを複写できません: %s"
 
 #, tcl-format
 msgid "Unable to copy object: %s"
 msgstr "オブジェクトを複写できません: %s"
 

-#: lib/choose_repository.tcl:783
+#: lib/choose_repository.tcl:781

 msgid "Linking objects"
 msgstr "オブジェクトを連結しています"
 
 msgid "Linking objects"
 msgstr "オブジェクトを連結しています"
 

-#: lib/choose_repository.tcl:784
+#: lib/choose_repository.tcl:782

 msgid "objects"
 msgstr "オブジェクト"
 
 msgid "objects"
 msgstr "オブジェクト"
 

-#: lib/choose_repository.tcl:792
+#: lib/choose_repository.tcl:790

 #, tcl-format
 msgid "Unable to hardlink object: %s"
 msgstr "オブジェクトをハードリンクできません: %s"
 
 #, tcl-format
 msgid "Unable to hardlink object: %s"
 msgstr "オブジェクトをハードリンクできません: %s"
 

-#: lib/choose_repository.tcl:847
+#: lib/choose_repository.tcl:845

 msgid "Cannot fetch branches and objects.  See console output for details."
 msgstr "ブランチやオブジェクトを取得できません。コンソール出力を見て下さい"
 
 msgid "Cannot fetch branches and objects.  See console output for details."
 msgstr "ブランチやオブジェクトを取得できません。コンソール出力を見て下さい"
 

-#: lib/choose_repository.tcl:858
+#: lib/choose_repository.tcl:856

 msgid "Cannot fetch tags.  See console output for details."
 msgstr "タグを取得できません。コンソール出力を見て下さい"
 
 msgid "Cannot fetch tags.  See console output for details."
 msgstr "タグを取得できません。コンソール出力を見て下さい"
 

-#: lib/choose_repository.tcl:882
+#: lib/choose_repository.tcl:880

 msgid "Cannot determine HEAD.  See console output for details."
 msgstr "HEAD を確定できません。コンソール出力を見て下さい"
 
 msgid "Cannot determine HEAD.  See console output for details."
 msgstr "HEAD を確定できません。コンソール出力を見て下さい"
 

-#: lib/choose_repository.tcl:891
+#: lib/choose_repository.tcl:889

 #, tcl-format
 msgid "Unable to cleanup %s"
 msgstr "%s を掃除できません"
 
 #, tcl-format
 msgid "Unable to cleanup %s"
 msgstr "%s を掃除できません"
 

-#: lib/choose_repository.tcl:897
+#: lib/choose_repository.tcl:895

 msgid "Clone failed."
 msgstr "複写に失敗しました。"
 
 msgid "Clone failed."
 msgstr "複写に失敗しました。"
 

-#: lib/choose_repository.tcl:904
+#: lib/choose_repository.tcl:902

 msgid "No default branch obtained."
 msgstr "デフォールト・ブランチが取得されませんでした"
 
 msgid "No default branch obtained."
 msgstr "デフォールト・ブランチが取得されませんでした"
 

-#: lib/choose_repository.tcl:915
+#: lib/choose_repository.tcl:913

 #, tcl-format
 msgid "Cannot resolve %s as a commit."
 msgstr "%s をコミットとして解釈できません"
 
 #, tcl-format
 msgid "Cannot resolve %s as a commit."
 msgstr "%s をコミットとして解釈できません"
 

-#: lib/choose_repository.tcl:927
+#: lib/choose_repository.tcl:925

 msgid "Creating working directory"
 msgstr "作業ディレクトリを作成しています"
 
 msgid "Creating working directory"
 msgstr "作業ディレクトリを作成しています"
 

-#: lib/choose_repository.tcl:928 lib/index.tcl:65 lib/index.tcl:127
+#: lib/choose_repository.tcl:926 lib/index.tcl:65 lib/index.tcl:127

 #: lib/index.tcl:193
 msgid "files"
 msgstr "ファイル"
 
 #: lib/index.tcl:193
 msgid "files"
 msgstr "ファイル"
 

-#: lib/choose_repository.tcl:957
+#: lib/choose_repository.tcl:955

 msgid "Initial file checkout failed."
 msgstr "初期チェックアウトに失敗しました"
 
 msgid "Initial file checkout failed."
 msgstr "初期チェックアウトに失敗しました"
 

-#: lib/choose_repository.tcl:973
+#: lib/choose_repository.tcl:971

 msgid "Open"
 msgstr "開く"
 
 msgid "Open"
 msgstr "開く"
 

-#: lib/choose_repository.tcl:983
+#: lib/choose_repository.tcl:981

 msgid "Repository:"
 msgstr "リポジトリ:"
 
 msgid "Repository:"
 msgstr "リポジトリ:"
 

-#: lib/choose_repository.tcl:1033
+#: lib/choose_repository.tcl:1031

 #, tcl-format
 msgid "Failed to open repository %s:"
 msgstr "リポジトリ %s を開けません:"
 #, tcl-format
 msgid "Failed to open repository %s:"
 msgstr "リポジトリ %s を開けません:"


@@ -1132,7 +1136,7 @@ msgstr "ローカル・ブランチ"
 msgid "Tracking Branch"
 msgstr "トラッキング・ブランチ"
 
 msgid "Tracking Branch"
 msgstr "トラッキング・ブランチ"
 

-#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:537
+#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:538

 msgid "Tag"
 msgstr "タグ"
 
 msgid "Tag"
 msgstr "タグ"
 


@@ -1149,11 +1153,11 @@ msgstr "リビジョンが未選択です。"
 msgid "Revision expression is empty."
 msgstr "リビジョン式が空です。"
 
 msgid "Revision expression is empty."
 msgstr "リビジョン式が空です。"
 

-#: lib/choose_rev.tcl:530
+#: lib/choose_rev.tcl:531

 msgid "Updated"
 msgstr "更新しました"
 
 msgid "Updated"
 msgstr "更新しました"
 

-#: lib/choose_rev.tcl:558
+#: lib/choose_rev.tcl:559

 msgid "URL"
 msgstr "URL"
 
 msgid "URL"
 msgstr "URL"
 


@@ -1262,16 +1266,46 @@ msgstr ""
 "- 第２行: 空白\n"
 "- 残りの行: なぜ、この変更が良い変更か、の説明。\n"
 
 "- 第２行: 空白\n"
 "- 残りの行: なぜ、この変更が良い変更か、の説明。\n"
 

-#: lib/commit.tcl:257
+#: lib/commit.tcl:207
+#, tcl-format
+msgid "warning: Tcl does not support encoding '%s'."
+msgstr "警告: Tcl はエンコーディング '%s' をサポートしていません"
+
+#: lib/commit.tcl:221
+msgid "Calling pre-commit hook..."
+msgstr ""
+
+#: lib/commit.tcl:236
+msgid "Commit declined by pre-commit hook."
+msgstr ""
+
+#: lib/commit.tcl:259
+msgid "Calling commit-msg hook..."
+msgstr ""
+
+#: lib/commit.tcl:274
+msgid "Commit declined by commit-msg hook."
+msgstr ""
+
+#: lib/commit.tcl:287
+msgid "Committing changes..."
+msgstr ""
+
+#: lib/commit.tcl:303

 msgid "write-tree failed:"
 msgstr "write-tree が失敗しました:"
 
 msgid "write-tree failed:"
 msgstr "write-tree が失敗しました:"
 

-#: lib/commit.tcl:275
+#: lib/commit.tcl:304 lib/commit.tcl:348 lib/commit.tcl:368
+#, fuzzy
+msgid "Commit failed."
+msgstr "複写に失敗しました。"
+
+#: lib/commit.tcl:321

 #, tcl-format
 msgid "Commit %s appears to be corrupt"
 msgstr "コミット %s は壊れています"
 
 #, tcl-format
 msgid "Commit %s appears to be corrupt"
 msgstr "コミット %s は壊れています"
 

-#: lib/commit.tcl:279
+#: lib/commit.tcl:326

 msgid ""
 "No changes to commit.\n"
 "\n"
 msgid ""
 "No changes to commit.\n"
 "\n"


@@ -1285,37 +1319,32 @@ msgstr ""
 "\n"
 "自動的に再スキャンを開始します。\n"
 
 "\n"
 "自動的に再スキャンを開始します。\n"
 

-#: lib/commit.tcl:286
+#: lib/commit.tcl:333

 msgid "No changes to commit."
 msgstr "コミットする変更がありません。"
 
 msgid "No changes to commit."
 msgstr "コミットする変更がありません。"
 

-#: lib/commit.tcl:303
-#, tcl-format
-msgid "warning: Tcl does not support encoding '%s'."
-msgstr "警告: Tcl はエンコーディング '%s' をサポートしていません"
-
-#: lib/commit.tcl:317
+#: lib/commit.tcl:347

 msgid "commit-tree failed:"
 msgstr "commit-tree が失敗しました:"
 
 msgid "commit-tree failed:"
 msgstr "commit-tree が失敗しました:"
 

-#: lib/commit.tcl:339
+#: lib/commit.tcl:367

 msgid "update-ref failed:"
 msgstr "update-ref が失敗しました:"
 
 msgid "update-ref failed:"
 msgstr "update-ref が失敗しました:"
 

-#: lib/commit.tcl:430
+#: lib/commit.tcl:454

 #, tcl-format
 msgid "Created commit %s: %s"
 msgstr "コミット %s を作成しました: %s"
 
 #, tcl-format
 msgid "Created commit %s: %s"
 msgstr "コミット %s を作成しました: %s"
 

-#: lib/console.tcl:57
+#: lib/console.tcl:59

 msgid "Working... please wait..."
 msgstr "実行中…お待ち下さい…"
 
 msgid "Working... please wait..."
 msgstr "実行中…お待ち下さい…"
 

-#: lib/console.tcl:183
+#: lib/console.tcl:186

 msgid "Success"
 msgstr "成功"
 
 msgid "Success"
 msgstr "成功"
 

-#: lib/console.tcl:196
+#: lib/console.tcl:200

 msgid "Error: Command Failed"
 msgstr "エラー: コマンドが失敗しました"
 
 msgid "Error: Command Failed"
 msgstr "エラー: コマンドが失敗しました"
 


@@ -1425,23 +1454,23 @@ msgstr "* バイナリファイル(内容は表示しません)"
 msgid "Error loading diff:"
 msgstr "diff を読む際のエラーです:"
 
 msgid "Error loading diff:"
 msgstr "diff を読む際のエラーです:"
 

-#: lib/diff.tcl:302
+#: lib/diff.tcl:303

 msgid "Failed to unstage selected hunk."
 msgstr "選択されたパッチをコミット予定から外せません。"
 
 msgid "Failed to unstage selected hunk."
 msgstr "選択されたパッチをコミット予定から外せません。"
 

-#: lib/diff.tcl:309
+#: lib/diff.tcl:310

 msgid "Failed to stage selected hunk."
 msgstr "選択されたパッチをコミット予定に加えられません。"
 
 msgid "Failed to stage selected hunk."
 msgstr "選択されたパッチをコミット予定に加えられません。"
 

-#: lib/error.tcl:12 lib/error.tcl:102
+#: lib/error.tcl:20 lib/error.tcl:114

 msgid "error"
 msgstr "エラー"
 
 msgid "error"
 msgstr "エラー"
 

-#: lib/error.tcl:28
+#: lib/error.tcl:36

 msgid "warning"
 msgstr "警告"
 
 msgid "warning"
 msgstr "警告"
 

-#: lib/error.tcl:81
+#: lib/error.tcl:94

 msgid "You must correct the above errors before committing."
 msgstr "コミットする前に、以上のエラーを修正して下さい"
 
 msgid "You must correct the above errors before committing."
 msgstr "コミットする前に、以上のエラーを修正して下さい"
 


@@ -1457,7 +1486,9 @@ msgstr "索引エラー"
 msgid ""
 "Updating the Git index failed.  A rescan will be automatically started to "
 "resynchronize git-gui."
 msgid ""
 "Updating the Git index failed.  A rescan will be automatically started to "
 "resynchronize git-gui."

-msgstr "GIT インデックスの更新が失敗しました。git-gui と同期をとるために再スキャンします。"
+msgstr ""
+"GIT インデックスの更新が失敗しました。git-gui と同期をとるために再スキャンし"
+"ます。"

 
 #: lib/index.tcl:27
 msgid "Continue"
 
 #: lib/index.tcl:27
 msgid "Continue"


@@ -1472,6 +1503,11 @@ msgstr "インデックスのロック解除"
 msgid "Unstaging %s from commit"
 msgstr "コミットから '%s' を降ろす"
 
 msgid "Unstaging %s from commit"
 msgstr "コミットから '%s' を降ろす"
 

+#: lib/index.tcl:313
+#, fuzzy
+msgid "Ready to commit."
+msgstr "コミット予定済"
+

 #: lib/index.tcl:326
 #, tcl-format
 msgid "Adding %s"
 #: lib/index.tcl:326
 #, tcl-format
 msgid "Adding %s"


@@ -1487,11 +1523,11 @@ msgstr "ファイル %s にした変更を元に戻しますか？"
 msgid "Revert changes in these %i files?"
 msgstr "これら %i 個のファイルにした変更を元に戻しますか？"
 
 msgid "Revert changes in these %i files?"
 msgstr "これら %i 個のファイルにした変更を元に戻しますか？"
 

-#: lib/index.tcl:389
+#: lib/index.tcl:391

 msgid "Any unstaged changes will be permanently lost by the revert."
 msgstr "変更を元に戻すとコミット予定していない変更は全て失われます。"
 
 msgid "Any unstaged changes will be permanently lost by the revert."
 msgstr "変更を元に戻すとコミット予定していない変更は全て失われます。"
 

-#: lib/index.tcl:392
+#: lib/index.tcl:394

 msgid "Do Nothing"
 msgstr "何もしない"
 
 msgid "Do Nothing"
 msgstr "何もしない"
 


@@ -1561,28 +1597,28 @@ msgid "%s of %s"
 msgstr "%s の %s ブランチ"
 
 #: lib/merge.tcl:119
 msgstr "%s の %s ブランチ"
 
 #: lib/merge.tcl:119

-#, tcl-format
-msgid "Merging %s and %s"
+#, fuzzy, tcl-format
+msgid "Merging %s and %s..."

 msgstr "%s と %s をマージします"
 
 msgstr "%s と %s をマージします"
 

-#: lib/merge.tcl:131
+#: lib/merge.tcl:130

 msgid "Merge completed successfully."
 msgstr "マージが完了しました"
 
 msgid "Merge completed successfully."
 msgstr "マージが完了しました"
 

-#: lib/merge.tcl:133
+#: lib/merge.tcl:132

 msgid "Merge failed.  Conflict resolution is required."
 msgstr "マージが失敗しました。衝突の解決が必要です。"
 
 msgid "Merge failed.  Conflict resolution is required."
 msgstr "マージが失敗しました。衝突の解決が必要です。"
 

-#: lib/merge.tcl:158
+#: lib/merge.tcl:157

 #, tcl-format
 msgid "Merge Into %s"
 msgstr "%s にマージ"
 
 #, tcl-format
 msgid "Merge Into %s"
 msgstr "%s にマージ"
 

-#: lib/merge.tcl:177
+#: lib/merge.tcl:176

 msgid "Revision To Merge"
 msgstr "マージするリビジョン"
 
 msgid "Revision To Merge"
 msgstr "マージするリビジョン"
 

-#: lib/merge.tcl:212
+#: lib/merge.tcl:211

 msgid ""
 "Cannot abort while amending.\n"
 "\n"
 msgid ""
 "Cannot abort while amending.\n"
 "\n"


@@ -1592,7 +1628,7 @@ msgstr ""
 "\n"
 "まず今のコミット訂正を完了させて下さい。\n"
 
 "\n"
 "まず今のコミット訂正を完了させて下さい。\n"
 

-#: lib/merge.tcl:222
+#: lib/merge.tcl:221

 msgid ""
 "Abort merge?\n"
 "\n"
 msgid ""
 "Abort merge?\n"
 "\n"


@@ -1606,7 +1642,7 @@ msgstr ""
 "\n"
 "マージを中断してよろしいですか？"
 
 "\n"
 "マージを中断してよろしいですか？"
 

-#: lib/merge.tcl:228
+#: lib/merge.tcl:227

 msgid ""
 "Reset changes?\n"
 "\n"
 msgid ""
 "Reset changes?\n"
 "\n"


@@ -1620,93 +1656,107 @@ msgstr ""
 "\n"
 "リセットしてよろしいですか？"
 
 "\n"
 "リセットしてよろしいですか？"
 

-#: lib/merge.tcl:239
+#: lib/merge.tcl:238

 msgid "Aborting"
 msgstr "中断しています"
 
 msgid "Aborting"
 msgstr "中断しています"
 

-#: lib/merge.tcl:266
+#: lib/merge.tcl:238
+#, fuzzy
+msgid "files reset"
+msgstr "ファイル"
+
+#: lib/merge.tcl:265

 msgid "Abort failed."
 msgstr "中断に失敗しました。"
 
 msgid "Abort failed."
 msgstr "中断に失敗しました。"
 

-#: lib/merge.tcl:268
+#: lib/merge.tcl:267

 msgid "Abort completed.  Ready."
 msgstr "中断完了。"
 
 msgid "Abort completed.  Ready."
 msgstr "中断完了。"
 

-#: lib/option.tcl:82
+#: lib/option.tcl:95

 msgid "Restore Defaults"
 msgstr "既定値に戻す"
 
 msgid "Restore Defaults"
 msgstr "既定値に戻す"
 

-#: lib/option.tcl:86
+#: lib/option.tcl:99

 msgid "Save"
 msgstr "保存"
 
 msgid "Save"
 msgstr "保存"
 

-#: lib/option.tcl:96
+#: lib/option.tcl:109

 #, tcl-format
 msgid "%s Repository"
 msgstr "%s リポジトリ"
 
 #, tcl-format
 msgid "%s Repository"
 msgstr "%s リポジトリ"
 

-#: lib/option.tcl:97
+#: lib/option.tcl:110

 msgid "Global (All Repositories)"
 msgstr "大域（全てのリポジトリ）"
 
 msgid "Global (All Repositories)"
 msgstr "大域（全てのリポジトリ）"
 

-#: lib/option.tcl:103
+#: lib/option.tcl:116

 msgid "User Name"
 msgstr "ユーザ名"
 
 msgid "User Name"
 msgstr "ユーザ名"
 

-#: lib/option.tcl:104
+#: lib/option.tcl:117

 msgid "Email Address"
 msgstr "電子メールアドレス"
 
 msgid "Email Address"
 msgstr "電子メールアドレス"
 

-#: lib/option.tcl:106
+#: lib/option.tcl:119

 msgid "Summarize Merge Commits"
 msgstr "マージコミットの要約"
 
 msgid "Summarize Merge Commits"
 msgstr "マージコミットの要約"
 

-#: lib/option.tcl:107
+#: lib/option.tcl:120

 msgid "Merge Verbosity"
 msgstr "マージの冗長度"
 
 msgid "Merge Verbosity"
 msgstr "マージの冗長度"
 

-#: lib/option.tcl:108
+#: lib/option.tcl:121

 msgid "Show Diffstat After Merge"
 msgstr "マージ後に diffstat を表示"
 
 msgid "Show Diffstat After Merge"
 msgstr "マージ後に diffstat を表示"
 

-#: lib/option.tcl:110
+#: lib/option.tcl:123

 msgid "Trust File Modification Timestamps"
 msgstr "ファイル変更時刻を信頼する"
 
 msgid "Trust File Modification Timestamps"
 msgstr "ファイル変更時刻を信頼する"
 

-#: lib/option.tcl:111
+#: lib/option.tcl:124

 msgid "Prune Tracking Branches During Fetch"
 msgstr "フェッチ中にトラッキングブランチを刈る"
 
 msgid "Prune Tracking Branches During Fetch"
 msgstr "フェッチ中にトラッキングブランチを刈る"
 

-#: lib/option.tcl:112
+#: lib/option.tcl:125

 msgid "Match Tracking Branches"
 msgstr "トラッキングブランチを合わせる"
 
 msgid "Match Tracking Branches"
 msgstr "トラッキングブランチを合わせる"
 

-#: lib/option.tcl:113
+#: lib/option.tcl:126

 msgid "Number of Diff Context Lines"
 msgstr "diff の文脈行数"
 
 msgid "Number of Diff Context Lines"
 msgstr "diff の文脈行数"
 

-#: lib/option.tcl:114
+#: lib/option.tcl:127
+#, fuzzy
+msgid "Commit Message Text Width"
+msgstr "コミットメッセージ:"
+
+#: lib/option.tcl:128

 msgid "New Branch Name Template"
 msgstr "新しいブランチ名のテンプレート"
 
 msgid "New Branch Name Template"
 msgstr "新しいブランチ名のテンプレート"
 

-#: lib/option.tcl:176
+#: lib/option.tcl:192
+msgid "Spelling Dictionary:"
+msgstr ""
+
+#: lib/option.tcl:216

 msgid "Change Font"
 msgstr "フォントを変更"
 
 msgid "Change Font"
 msgstr "フォントを変更"
 

-#: lib/option.tcl:180
+#: lib/option.tcl:220

 #, tcl-format
 msgid "Choose %s"
 msgstr "%s を選択"
 
 #, tcl-format
 msgid "Choose %s"
 msgstr "%s を選択"
 

-#: lib/option.tcl:186
+#: lib/option.tcl:226

 msgid "pt."
 msgstr "ポイント"
 
 msgid "pt."
 msgstr "ポイント"
 

-#: lib/option.tcl:200
+#: lib/option.tcl:240

 msgid "Preferences"
 msgstr "設定"
 
 msgid "Preferences"
 msgstr "設定"
 

-#: lib/option.tcl:235
+#: lib/option.tcl:275

 msgid "Failed to completely save options:"
 msgstr "完全にオプションを保存できません:"
 
 msgid "Failed to completely save options:"
 msgstr "完全にオプションを保存できません:"
 


@@ -1814,6 +1864,43 @@ msgstr "ショートカットが書けません:"
 msgid "Cannot write icon:"
 msgstr "アイコンが書けません:"
 
 msgid "Cannot write icon:"
 msgstr "アイコンが書けません:"
 

+#: lib/spellcheck.tcl:57
+msgid "Unsupported spell checker"
+msgstr ""
+
+#: lib/spellcheck.tcl:65
+msgid "Spell checking is unavailable"
+msgstr ""
+
+#: lib/spellcheck.tcl:68
+msgid "Invalid spell checking configuration"
+msgstr ""
+
+#: lib/spellcheck.tcl:70
+#, tcl-format
+msgid "Reverting dictionary to %s."
+msgstr ""
+
+#: lib/spellcheck.tcl:73
+msgid "Spell checker silently failed on startup"
+msgstr ""
+
+#: lib/spellcheck.tcl:80
+msgid "Unrecognized spell checker"
+msgstr ""
+
+#: lib/spellcheck.tcl:180
+msgid "No Suggestions"
+msgstr ""
+
+#: lib/spellcheck.tcl:381
+msgid "Unexpected EOF from spell checker"
+msgstr ""
+
+#: lib/spellcheck.tcl:385
+msgid "Spell Checker Failed"
+msgstr ""
+

 #: lib/status_bar.tcl:83
 #, tcl-format
 msgid "%s ... %*i of %*i %s (%3i%%)"
 #: lib/status_bar.tcl:83
 #, tcl-format
 msgid "%s ... %*i of %*i %s (%3i%%)"

diff --git a/po/ru.po b/po/ru.po
index 6727a832eaae71df6afcf2a1aa5461d9891fd8d0..849dc5c34328012bb57d0f29fdf7c814f477594a 100644 (file)
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: git-gui\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: git-gui\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2007-10-31 21:23+0100\n"
+"POT-Creation-Date: 2008-03-14 07:18+0100\n"

 "PO-Revision-Date: 2007-10-22 22:30-0200\n"
 "Last-Translator: Alex Riesen <raa.lkml@gmail.com>\n"
 "Language-Team: Russian Translation <git@vger.kernel.org>\n"
 "PO-Revision-Date: 2007-10-22 22:30-0200\n"
 "Last-Translator: Alex Riesen <raa.lkml@gmail.com>\n"
 "Language-Team: Russian Translation <git@vger.kernel.org>\n"


@@ -15,33 +15,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 

-#: git-gui.sh:41 git-gui.sh:597 git-gui.sh:611 git-gui.sh:624 git-gui.sh:707
-#: git-gui.sh:726
+#: 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: критическая ошибка"
 
 msgid "git-gui: fatal error"
 msgstr "git-gui: критическая ошибка"
 

-#: git-gui.sh:558
+#: git-gui.sh:593

 #, tcl-format
 msgid "Invalid font specified in %s:"
 msgstr "В %s установлен неверный шрифт:"
 
 #, tcl-format
 msgid "Invalid font specified in %s:"
 msgstr "В %s установлен неверный шрифт:"
 

-#: git-gui.sh:583
+#: git-gui.sh:620

 msgid "Main Font"
 msgstr "Шрифт интерфейса"
 
 msgid "Main Font"
 msgstr "Шрифт интерфейса"
 

-#: git-gui.sh:584
+#: git-gui.sh:621

 msgid "Diff/Console Font"
 msgstr "Шрифт консоли и изменений (diff)"
 
 msgid "Diff/Console Font"
 msgstr "Шрифт консоли и изменений (diff)"
 

-#: git-gui.sh:598
+#: git-gui.sh:635

 msgid "Cannot find git in PATH."
 msgstr "git не найден в PATH."
 
 msgid "Cannot find git in PATH."
 msgstr "git не найден в PATH."
 

-#: git-gui.sh:625
+#: git-gui.sh:662

 msgid "Cannot parse Git version string:"
 msgstr "Невозможно распознать строку версии Git: "
 
 msgid "Cannot parse Git version string:"
 msgstr "Невозможно распознать строку версии Git: "
 

-#: git-gui.sh:643
+#: git-gui.sh:680

 #, tcl-format
 msgid ""
 "Git version cannot be determined.\n"
 #, tcl-format
 msgid ""
 "Git version cannot be determined.\n"


@@ -59,79 +59,79 @@ msgstr ""
 "\n"
 "Принять '%s' как версию 1.5.0?\n"
 
 "\n"
 "Принять '%s' как версию 1.5.0?\n"
 

-#: git-gui.sh:881
+#: git-gui.sh:918

 msgid "Git directory not found:"
 msgstr "Каталог Git не найден:"
 
 msgid "Git directory not found:"
 msgstr "Каталог Git не найден:"
 

-#: git-gui.sh:888
+#: git-gui.sh:925

 msgid "Cannot move to top of working directory:"
 msgstr "Невозможно перейти к корню рабочего каталога репозитория: "
 
 msgid "Cannot move to top of working directory:"
 msgstr "Невозможно перейти к корню рабочего каталога репозитория: "
 

-#: git-gui.sh:895
+#: git-gui.sh:932

 msgid "Cannot use funny .git directory:"
 msgstr "Каталог.git испорчен: "
 
 msgid "Cannot use funny .git directory:"
 msgstr "Каталог.git испорчен: "
 

-#: git-gui.sh:900
+#: git-gui.sh:937

 msgid "No working directory"
 msgstr "Отсутствует рабочий каталог"
 
 msgid "No working directory"
 msgstr "Отсутствует рабочий каталог"
 

-#: git-gui.sh:1047
+#: git-gui.sh:1084 lib/checkout_op.tcl:283

 msgid "Refreshing file status..."
 msgstr "Обновление информации о состоянии файлов..."
 
 msgid "Refreshing file status..."
 msgstr "Обновление информации о состоянии файлов..."
 

-#: git-gui.sh:1112
+#: git-gui.sh:1149

 msgid "Scanning for modified files ..."
 msgstr "Поиск измененных файлов..."
 
 msgid "Scanning for modified files ..."
 msgstr "Поиск измененных файлов..."
 

-#: git-gui.sh:1287 lib/browser.tcl:245
+#: git-gui.sh:1324 lib/browser.tcl:246

 msgid "Ready."
 msgstr "Готово."
 
 msgid "Ready."
 msgstr "Готово."
 

-#: git-gui.sh:1553
+#: git-gui.sh:1590

 msgid "Unmodified"
 msgstr "Не изменено"
 
 msgid "Unmodified"
 msgstr "Не изменено"
 

-#: git-gui.sh:1555
+#: git-gui.sh:1592

 msgid "Modified, not staged"
 msgstr "Изменено, не подготовлено"
 
 msgid "Modified, not staged"
 msgstr "Изменено, не подготовлено"
 

-#: git-gui.sh:1556 git-gui.sh:1561
+#: git-gui.sh:1593 git-gui.sh:1598

 msgid "Staged for commit"
 msgstr "Подготовлено для сохранения"
 
 msgid "Staged for commit"
 msgstr "Подготовлено для сохранения"
 

-#: git-gui.sh:1557 git-gui.sh:1562
+#: git-gui.sh:1594 git-gui.sh:1599

 msgid "Portions staged for commit"
 msgstr "Части, подготовленные для сохранения"
 
 msgid "Portions staged for commit"
 msgstr "Части, подготовленные для сохранения"
 

-#: git-gui.sh:1558 git-gui.sh:1563
+#: git-gui.sh:1595 git-gui.sh:1600

 msgid "Staged for commit, missing"
 msgstr "Подготовлено для сохранения, отсутствует"
 
 msgid "Staged for commit, missing"
 msgstr "Подготовлено для сохранения, отсутствует"
 

-#: git-gui.sh:1560
+#: git-gui.sh:1597

 msgid "Untracked, not staged"
 msgstr "Не отслеживается, не подготовлено"
 
 msgid "Untracked, not staged"
 msgstr "Не отслеживается, не подготовлено"
 

-#: git-gui.sh:1565
+#: git-gui.sh:1602

 msgid "Missing"
 msgstr "Отсутствует"
 
 msgid "Missing"
 msgstr "Отсутствует"
 

-#: git-gui.sh:1566
+#: git-gui.sh:1603

 msgid "Staged for removal"
 msgstr "Подготовлено для удаления"
 
 msgid "Staged for removal"
 msgstr "Подготовлено для удаления"
 

-#: git-gui.sh:1567
+#: git-gui.sh:1604

 msgid "Staged for removal, still present"
 msgstr "Подготовлено для удаления, еще не удалено"
 
 msgid "Staged for removal, still present"
 msgstr "Подготовлено для удаления, еще не удалено"
 

-#: git-gui.sh:1569 git-gui.sh:1570 git-gui.sh:1571 git-gui.sh:1572
+#: git-gui.sh:1606 git-gui.sh:1607 git-gui.sh:1608 git-gui.sh:1609

 msgid "Requires merge resolution"
 msgstr "Требуется разрешение конфликта при объединении"
 
 msgid "Requires merge resolution"
 msgstr "Требуется разрешение конфликта при объединении"
 

-#: git-gui.sh:1607
+#: git-gui.sh:1644

 msgid "Starting gitk... please wait..."
 msgstr "Запускается gitk... пожалуйста, ждите..."
 
 msgid "Starting gitk... please wait..."
 msgstr "Запускается gitk... пожалуйста, ждите..."
 

-#: git-gui.sh:1616
+#: git-gui.sh:1653

 #, tcl-format
 msgid ""
 "Unable to start gitk:\n"
 #, tcl-format
 msgid ""
 "Unable to start gitk:\n"


@@ -142,295 +142,295 @@ msgstr ""
 "\n"
 "%s не существует"
 
 "\n"
 "%s не существует"
 

-#: git-gui.sh:1816 lib/choose_repository.tcl:35
+#: git-gui.sh:1860 lib/choose_repository.tcl:36

 msgid "Repository"
 msgstr "Репозиторий"
 
 msgid "Repository"
 msgstr "Репозиторий"
 

-#: git-gui.sh:1817
+#: git-gui.sh:1861

 msgid "Edit"
 msgstr "Редактировать"
 
 msgid "Edit"
 msgstr "Редактировать"
 

-#: git-gui.sh:1819 lib/choose_rev.tcl:560
+#: git-gui.sh:1863 lib/choose_rev.tcl:561

 msgid "Branch"
 msgstr "Ветвь"
 
 msgid "Branch"
 msgstr "Ветвь"
 

-#: git-gui.sh:1822 lib/choose_rev.tcl:547
+#: git-gui.sh:1866 lib/choose_rev.tcl:548

 msgid "Commit@@noun"
 msgstr "Состояние"
 
 msgid "Commit@@noun"
 msgstr "Состояние"
 

-#: git-gui.sh:1825 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168
+#: git-gui.sh:1869 lib/merge.tcl:120 lib/merge.tcl:149 lib/merge.tcl:167

 msgid "Merge"
 msgstr "Объединить"
 
 msgid "Merge"
 msgstr "Объединить"
 

-#: git-gui.sh:1826 lib/choose_rev.tcl:556
+#: git-gui.sh:1870 lib/choose_rev.tcl:557

 msgid "Remote"
 msgstr "Внешние репозитории"
 
 msgid "Remote"
 msgstr "Внешние репозитории"
 

-#: git-gui.sh:1835
+#: git-gui.sh:1879

 msgid "Browse Current Branch's Files"
 msgstr "Просмотреть файлы текущей ветви"
 
 msgid "Browse Current Branch's Files"
 msgstr "Просмотреть файлы текущей ветви"
 

-#: git-gui.sh:1839
+#: git-gui.sh:1883

 msgid "Browse Branch Files..."
 msgstr "Показать файлы ветви..."
 
 msgid "Browse Branch Files..."
 msgstr "Показать файлы ветви..."
 

-#: git-gui.sh:1844
+#: git-gui.sh:1888

 msgid "Visualize Current Branch's History"
 msgstr "История текущей ветви наглядно"
 
 msgid "Visualize Current Branch's History"
 msgstr "История текущей ветви наглядно"
 

-#: git-gui.sh:1848
+#: git-gui.sh:1892

 msgid "Visualize All Branch History"
 msgstr "История всех ветвей наглядно"
 
 msgid "Visualize All Branch History"
 msgstr "История всех ветвей наглядно"
 

-#: git-gui.sh:1855
+#: git-gui.sh:1899

 #, tcl-format
 msgid "Browse %s's Files"
 msgstr "Показать файлы ветви %s"
 
 #, tcl-format
 msgid "Browse %s's Files"
 msgstr "Показать файлы ветви %s"
 

-#: git-gui.sh:1857
+#: git-gui.sh:1901

 #, tcl-format
 msgid "Visualize %s's History"
 msgstr "История ветви %s наглядно"
 
 #, tcl-format
 msgid "Visualize %s's History"
 msgstr "История ветви %s наглядно"
 

-#: git-gui.sh:1862 lib/database.tcl:27 lib/database.tcl:67
+#: git-gui.sh:1906 lib/database.tcl:27 lib/database.tcl:67

 msgid "Database Statistics"
 msgstr "Статистика базы данных"
 
 msgid "Database Statistics"
 msgstr "Статистика базы данных"
 

-#: git-gui.sh:1865 lib/database.tcl:34
+#: git-gui.sh:1909 lib/database.tcl:34

 msgid "Compress Database"
 msgstr "Сжать базу данных"
 
 msgid "Compress Database"
 msgstr "Сжать базу данных"
 

-#: git-gui.sh:1868
+#: git-gui.sh:1912

 msgid "Verify Database"
 msgstr "Проверить базу данных"
 
 msgid "Verify Database"
 msgstr "Проверить базу данных"
 

-#: git-gui.sh:1875 git-gui.sh:1879 git-gui.sh:1883 lib/shortcut.tcl:7
+#: git-gui.sh:1919 git-gui.sh:1923 git-gui.sh:1927 lib/shortcut.tcl:7

 #: lib/shortcut.tcl:39 lib/shortcut.tcl:71
 msgid "Create Desktop Icon"
 msgstr "Создать ярлык на рабочем столе"
 
 #: lib/shortcut.tcl:39 lib/shortcut.tcl:71
 msgid "Create Desktop Icon"
 msgstr "Создать ярлык на рабочем столе"
 

-#: git-gui.sh:1888 lib/choose_repository.tcl:176 lib/choose_repository.tcl:184
+#: git-gui.sh:1932 lib/choose_repository.tcl:177 lib/choose_repository.tcl:185

 msgid "Quit"
 msgstr "Выход"
 
 msgid "Quit"
 msgstr "Выход"
 

-#: git-gui.sh:1895
+#: git-gui.sh:1939

 msgid "Undo"
 msgstr "Отменить"
 
 msgid "Undo"
 msgstr "Отменить"
 

-#: git-gui.sh:1898
+#: git-gui.sh:1942

 msgid "Redo"
 msgstr "Повторить"
 
 msgid "Redo"
 msgstr "Повторить"
 

-#: git-gui.sh:1902 git-gui.sh:2395
+#: git-gui.sh:1946 git-gui.sh:2443

 msgid "Cut"
 msgstr "Вырезать"
 
 msgid "Cut"
 msgstr "Вырезать"
 

-#: git-gui.sh:1905 git-gui.sh:2398 git-gui.sh:2469 git-gui.sh:2541
-#: lib/console.tcl:67
+#: git-gui.sh:1949 git-gui.sh:2446 git-gui.sh:2520 git-gui.sh:2614
+#: lib/console.tcl:69

 msgid "Copy"
 msgstr "Копировать"
 
 msgid "Copy"
 msgstr "Копировать"
 

-#: git-gui.sh:1908 git-gui.sh:2401
+#: git-gui.sh:1952 git-gui.sh:2449

 msgid "Paste"
 msgstr "Вставить"
 
 msgid "Paste"
 msgstr "Вставить"
 

-#: git-gui.sh:1911 git-gui.sh:2404 lib/branch_delete.tcl:26
+#: git-gui.sh:1955 git-gui.sh:2452 lib/branch_delete.tcl:26

 #: lib/remote_branch_delete.tcl:38
 msgid "Delete"
 msgstr "Удалить"
 
 #: lib/remote_branch_delete.tcl:38
 msgid "Delete"
 msgstr "Удалить"
 

-#: git-gui.sh:1915 git-gui.sh:2408 git-gui.sh:2545 lib/console.tcl:69
+#: git-gui.sh:1959 git-gui.sh:2456 git-gui.sh:2618 lib/console.tcl:71

 msgid "Select All"
 msgstr "Выделить все"
 
 msgid "Select All"
 msgstr "Выделить все"
 

-#: git-gui.sh:1924
+#: git-gui.sh:1968

 msgid "Create..."
 msgstr "Создать..."
 
 msgid "Create..."
 msgstr "Создать..."
 

-#: git-gui.sh:1930
+#: git-gui.sh:1974

 msgid "Checkout..."
 msgstr "Перейти..."
 
 msgid "Checkout..."
 msgstr "Перейти..."
 

-#: git-gui.sh:1936
+#: git-gui.sh:1980

 msgid "Rename..."
 msgstr "Переименовать..."
 
 msgid "Rename..."
 msgstr "Переименовать..."
 

-#: git-gui.sh:1941 git-gui.sh:2040
+#: git-gui.sh:1985 git-gui.sh:2085

 msgid "Delete..."
 msgstr "Удалить..."
 
 msgid "Delete..."
 msgstr "Удалить..."
 

-#: git-gui.sh:1946
+#: git-gui.sh:1990

 msgid "Reset..."
 msgstr "Сбросить..."
 
 msgid "Reset..."
 msgstr "Сбросить..."
 

-#: git-gui.sh:1958 git-gui.sh:2342
+#: git-gui.sh:2002 git-gui.sh:2389

 msgid "New Commit"
 msgstr "Новое состояние"
 
 msgid "New Commit"
 msgstr "Новое состояние"
 

-#: git-gui.sh:1966 git-gui.sh:2349
+#: git-gui.sh:2010 git-gui.sh:2396

 msgid "Amend Last Commit"
 msgstr "Исправить последнее состояние"
 
 msgid "Amend Last Commit"
 msgstr "Исправить последнее состояние"
 

-#: git-gui.sh:1975 git-gui.sh:2309 lib/remote_branch_delete.tcl:99
+#: git-gui.sh:2019 git-gui.sh:2356 lib/remote_branch_delete.tcl:99

 msgid "Rescan"
 msgstr "Перечитать"
 
 msgid "Rescan"
 msgstr "Перечитать"
 

-#: git-gui.sh:1981
+#: git-gui.sh:2025

 msgid "Stage To Commit"
 msgstr "Подготовить для сохранения"
 
 msgid "Stage To Commit"
 msgstr "Подготовить для сохранения"
 

-#: git-gui.sh:1986
+#: git-gui.sh:2031

 msgid "Stage Changed Files To Commit"
 msgstr "Подготовить измененные файлы для сохранения"
 
 msgid "Stage Changed Files To Commit"
 msgstr "Подготовить измененные файлы для сохранения"
 

-#: git-gui.sh:1992
+#: git-gui.sh:2037

 msgid "Unstage From Commit"
 msgstr "Убрать из подготовленного"
 
 msgid "Unstage From Commit"
 msgstr "Убрать из подготовленного"
 

-#: git-gui.sh:1997 lib/index.tcl:393
+#: git-gui.sh:2042 lib/index.tcl:395

 msgid "Revert Changes"
 msgstr "Отменить изменения"
 
 msgid "Revert Changes"
 msgstr "Отменить изменения"
 

-#: git-gui.sh:2004 git-gui.sh:2321 git-gui.sh:2419
+#: git-gui.sh:2049 git-gui.sh:2368 git-gui.sh:2467

 msgid "Sign Off"
 msgstr "Подписать"
 
 msgid "Sign Off"
 msgstr "Подписать"
 

-#: git-gui.sh:2008 git-gui.sh:2325
+#: git-gui.sh:2053 git-gui.sh:2372

 msgid "Commit@@verb"
 msgstr "Сохранить"
 
 msgid "Commit@@verb"
 msgstr "Сохранить"
 

-#: git-gui.sh:2019
+#: git-gui.sh:2064

 msgid "Local Merge..."
 msgstr "Локальное объединение..."
 
 msgid "Local Merge..."
 msgstr "Локальное объединение..."
 

-#: git-gui.sh:2024
+#: git-gui.sh:2069

 msgid "Abort Merge..."
 msgstr "Прервать объединение..."
 
 msgid "Abort Merge..."
 msgstr "Прервать объединение..."
 

-#: git-gui.sh:2036
+#: git-gui.sh:2081

 msgid "Push..."
 msgstr "Отправить..."
 
 msgid "Push..."
 msgstr "Отправить..."
 

-#: git-gui.sh:2047 lib/choose_repository.tcl:40
+#: git-gui.sh:2092 lib/choose_repository.tcl:41

 msgid "Apple"
 msgstr ""
 
 msgid "Apple"
 msgstr ""
 

-#: git-gui.sh:2050 git-gui.sh:2072 lib/about.tcl:13
-#: lib/choose_repository.tcl:43 lib/choose_repository.tcl:49
+#: git-gui.sh:2095 git-gui.sh:2117 lib/about.tcl:14
+#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:50

 #, tcl-format
 msgid "About %s"
 msgstr "О %s"
 
 #, tcl-format
 msgid "About %s"
 msgstr "О %s"
 

-#: git-gui.sh:2054
+#: git-gui.sh:2099

 msgid "Preferences..."
 msgstr "Настройки..."
 
 msgid "Preferences..."
 msgstr "Настройки..."
 

-#: git-gui.sh:2062 git-gui.sh:2587
+#: git-gui.sh:2107 git-gui.sh:2639

 msgid "Options..."
 msgstr "Настройки..."
 
 msgid "Options..."
 msgstr "Настройки..."
 

-#: git-gui.sh:2068 lib/choose_repository.tcl:46
+#: git-gui.sh:2113 lib/choose_repository.tcl:47

 msgid "Help"
 msgstr "Помощь"
 
 msgid "Help"
 msgstr "Помощь"
 

-#: git-gui.sh:2109
+#: git-gui.sh:2154

 msgid "Online Documentation"
 msgstr "Документация в интернете"
 
 msgid "Online Documentation"
 msgstr "Документация в интернете"
 

-#: git-gui.sh:2193
+#: git-gui.sh:2238

 #, tcl-format
 msgid "fatal: cannot stat path %s: No such file or directory"
 msgstr "критическая ошибка: %s: нет такого файла или каталога"
 
 #, tcl-format
 msgid "fatal: cannot stat path %s: No such file or directory"
 msgstr "критическая ошибка: %s: нет такого файла или каталога"
 

-#: git-gui.sh:2226
+#: git-gui.sh:2271

 msgid "Current Branch:"
 msgstr "Текущая ветвь:"
 
 msgid "Current Branch:"
 msgstr "Текущая ветвь:"
 

-#: git-gui.sh:2247
+#: git-gui.sh:2292

 msgid "Staged Changes (Will Commit)"
 msgstr "Подготовлено (будет сохранено)"
 
 msgid "Staged Changes (Will Commit)"
 msgstr "Подготовлено (будет сохранено)"
 

-#: git-gui.sh:2266
+#: git-gui.sh:2312

 msgid "Unstaged Changes"
 msgstr "Изменено (не будет сохранено)"
 
 msgid "Unstaged Changes"
 msgstr "Изменено (не будет сохранено)"
 

-#: git-gui.sh:2315
+#: git-gui.sh:2362

 msgid "Stage Changed"
 msgstr "Подготовить все"
 
 msgid "Stage Changed"
 msgstr "Подготовить все"
 

-#: git-gui.sh:2331 lib/transport.tcl:93 lib/transport.tcl:182
+#: git-gui.sh:2378 lib/transport.tcl:93 lib/transport.tcl:182

 msgid "Push"
 msgstr "Отправить"
 
 msgid "Push"
 msgstr "Отправить"
 

-#: git-gui.sh:2361
+#: git-gui.sh:2408

 msgid "Initial Commit Message:"
 msgstr "Комментарий к первому состоянию:"
 
 msgid "Initial Commit Message:"
 msgstr "Комментарий к первому состоянию:"
 

-#: git-gui.sh:2362
+#: git-gui.sh:2409

 msgid "Amended Commit Message:"
 msgstr "Комментарий к исправленному состоянию:"
 
 msgid "Amended Commit Message:"
 msgstr "Комментарий к исправленному состоянию:"
 

-#: git-gui.sh:2363
+#: git-gui.sh:2410

 msgid "Amended Initial Commit Message:"
 msgstr "Комментарий к исправленному первоначальному состоянию:"
 
 msgid "Amended Initial Commit Message:"
 msgstr "Комментарий к исправленному первоначальному состоянию:"
 

-#: git-gui.sh:2364
+#: git-gui.sh:2411

 msgid "Amended Merge Commit Message:"
 msgstr "Комментарий к исправленному объединению:"
 
 msgid "Amended Merge Commit Message:"
 msgstr "Комментарий к исправленному объединению:"
 

-#: git-gui.sh:2365
+#: git-gui.sh:2412

 msgid "Merge Commit Message:"
 msgstr "Комментарий к объединению:"
 
 msgid "Merge Commit Message:"
 msgstr "Комментарий к объединению:"
 

-#: git-gui.sh:2366
+#: git-gui.sh:2413

 msgid "Commit Message:"
 msgstr "Комментарий к состоянию:"
 
 msgid "Commit Message:"
 msgstr "Комментарий к состоянию:"
 

-#: git-gui.sh:2411 git-gui.sh:2549 lib/console.tcl:71
+#: git-gui.sh:2459 git-gui.sh:2622 lib/console.tcl:73

 msgid "Copy All"
 msgstr "Копировать все"
 
 msgid "Copy All"
 msgstr "Копировать все"
 

-#: git-gui.sh:2435 lib/blame.tcl:104
+#: git-gui.sh:2483 lib/blame.tcl:107

 msgid "File:"
 msgstr "Файл:"
 
 msgid "File:"
 msgstr "Файл:"
 

-#: git-gui.sh:2537
-msgid "Refresh"
-msgstr "Обновить"
-
-#: git-gui.sh:2558
+#: git-gui.sh:2589

 msgid "Apply/Reverse Hunk"
 msgstr "Применить/Убрать изменение"
 
 msgid "Apply/Reverse Hunk"
 msgstr "Применить/Убрать изменение"
 

-#: git-gui.sh:2564
-msgid "Decrease Font Size"
-msgstr "Уменьшить размер шрифта"
-
-#: git-gui.sh:2568
-msgid "Increase Font Size"
-msgstr "Увеличить размер шрифта"
-
-#: git-gui.sh:2573
+#: git-gui.sh:2595

 msgid "Show Less Context"
 msgstr "Меньше контекста"
 
 msgid "Show Less Context"
 msgstr "Меньше контекста"
 

-#: git-gui.sh:2580
+#: git-gui.sh:2602

 msgid "Show More Context"
 msgstr "Больше контекста"
 
 msgid "Show More Context"
 msgstr "Больше контекста"
 

-#: git-gui.sh:2594
+#: git-gui.sh:2610
+msgid "Refresh"
+msgstr "Обновить"
+
+#: git-gui.sh:2631
+msgid "Decrease Font Size"
+msgstr "Уменьшить размер шрифта"
+
+#: git-gui.sh:2635
+msgid "Increase Font Size"
+msgstr "Увеличить размер шрифта"
+
+#: git-gui.sh:2646

 msgid "Unstage Hunk From Commit"
 msgstr "Не сохранять часть"
 
 msgid "Unstage Hunk From Commit"
 msgstr "Не сохранять часть"
 

-#: git-gui.sh:2596
+#: git-gui.sh:2648

 msgid "Stage Hunk For Commit"
 msgstr "Подготовить часть для сохранения"
 
 msgid "Stage Hunk For Commit"
 msgstr "Подготовить часть для сохранения"
 

-#: git-gui.sh:2615
+#: git-gui.sh:2667

 msgid "Initializing..."
 msgstr "Инициализация..."
 
 msgid "Initializing..."
 msgstr "Инициализация..."
 

-#: git-gui.sh:2706
+#: git-gui.sh:2762

 #, tcl-format
 msgid ""
 "Possible environment issues exist.\n"
 #, tcl-format
 msgid ""
 "Possible environment issues exist.\n"


@@ -447,7 +447,7 @@ msgstr ""
 "запущенными из %s\n"
 "\n"
 
 "запущенными из %s\n"
 "\n"
 

-#: git-gui.sh:2736
+#: git-gui.sh:2792

 msgid ""
 "\n"
 "This is due to a known issue with the\n"
 msgid ""
 "\n"
 "This is due to a known issue with the\n"


@@ -457,7 +457,7 @@ msgstr ""
 "Это известная проблема с Tcl,\n"
 "распространяемым Cygwin."
 
 "Это известная проблема с Tcl,\n"
 "распространяемым Cygwin."
 

-#: git-gui.sh:2741
+#: git-gui.sh:2797

 #, tcl-format
 msgid ""
 "\n"
 #, tcl-format
 msgid ""
 "\n"


@@ -474,7 +474,7 @@ msgstr ""
 "user.email в Вашем персональном\n"
 "файле ~/.gitconfig.\n"
 
 "user.email в Вашем персональном\n"
 "файле ~/.gitconfig.\n"
 

-#: lib/about.tcl:25
+#: lib/about.tcl:26

 msgid "git-gui - a graphical user interface for Git."
 msgstr "git-gui - графический пользовательский интерфейс к Git."
 
 msgid "git-gui - a graphical user interface for Git."
 msgstr "git-gui - графический пользовательский интерфейс к Git."
 


@@ -486,56 +486,56 @@ msgstr "Просмотр файла"
 msgid "Commit:"
 msgstr "Сохраненное состояние:"
 
 msgid "Commit:"
 msgstr "Сохраненное состояние:"
 

-#: lib/blame.tcl:249
+#: lib/blame.tcl:264

 msgid "Copy Commit"
 msgstr "Скопировать SHA-1"
 
 msgid "Copy Commit"
 msgstr "Скопировать SHA-1"
 

-#: lib/blame.tcl:369
+#: lib/blame.tcl:384

 #, tcl-format
 msgid "Reading %s..."
 msgstr "Чтение %s..."
 
 #, tcl-format
 msgid "Reading %s..."
 msgstr "Чтение %s..."
 

-#: lib/blame.tcl:473
+#: lib/blame.tcl:488

 msgid "Loading copy/move tracking annotations..."
 msgstr "Загрузка аннотации копирований/переименований..."
 
 msgid "Loading copy/move tracking annotations..."
 msgstr "Загрузка аннотации копирований/переименований..."
 

-#: lib/blame.tcl:493
+#: lib/blame.tcl:508

 msgid "lines annotated"
 msgstr "строк прокомментировано"
 
 msgid "lines annotated"
 msgstr "строк прокомментировано"
 

-#: lib/blame.tcl:674
+#: lib/blame.tcl:689

 msgid "Loading original location annotations..."
 msgstr "Загрузка аннотаций первоначального положения объекта..."
 
 msgid "Loading original location annotations..."
 msgstr "Загрузка аннотаций первоначального положения объекта..."
 

-#: lib/blame.tcl:677
+#: lib/blame.tcl:692

 msgid "Annotation complete."
 msgstr "Аннотация завершена."
 
 msgid "Annotation complete."
 msgstr "Аннотация завершена."
 

-#: lib/blame.tcl:731
+#: lib/blame.tcl:746

 msgid "Loading annotation..."
 msgstr "Загрузка аннотации..."
 
 msgid "Loading annotation..."
 msgstr "Загрузка аннотации..."
 

-#: lib/blame.tcl:787
+#: lib/blame.tcl:802

 msgid "Author:"
 msgstr "Автор:"
 
 msgid "Author:"
 msgstr "Автор:"
 

-#: lib/blame.tcl:791
+#: lib/blame.tcl:806

 msgid "Committer:"
 msgstr "Сохранил:"
 
 msgid "Committer:"
 msgstr "Сохранил:"
 

-#: lib/blame.tcl:796
+#: lib/blame.tcl:811

 msgid "Original File:"
 msgstr "Исходный файл:"
 
 msgid "Original File:"
 msgstr "Исходный файл:"
 

-#: lib/blame.tcl:910
+#: lib/blame.tcl:925

 msgid "Originally By:"
 msgstr "Источник:"
 
 msgid "Originally By:"
 msgstr "Источник:"
 

-#: lib/blame.tcl:916
+#: lib/blame.tcl:931

 msgid "In File:"
 msgstr "Файл:"
 
 msgid "In File:"
 msgstr "Файл:"
 

-#: lib/blame.tcl:921
+#: lib/blame.tcl:936

 msgid "Copied Or Moved Here By:"
 msgstr "Скопировано/перемещено в:"
 
 msgid "Copied Or Moved Here By:"
 msgstr "Скопировано/перемещено в:"
 


@@ -548,17 +548,17 @@ msgid "Checkout"
 msgstr "Перейти"
 
 #: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35
 msgstr "Перейти"
 
 #: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35

-#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:281
-#: lib/checkout_op.tcl:522 lib/choose_font.tcl:43 lib/merge.tcl:172
-#: lib/option.tcl:90 lib/remote_branch_delete.tcl:42 lib/transport.tcl:97
+#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:282
+#: lib/checkout_op.tcl:522 lib/choose_font.tcl:43 lib/merge.tcl:171
+#: lib/option.tcl:103 lib/remote_branch_delete.tcl:42 lib/transport.tcl:97

 msgid "Cancel"
 msgstr "Отменить"
 
 msgid "Cancel"
 msgstr "Отменить"
 

-#: lib/branch_checkout.tcl:32 lib/browser.tcl:286
+#: lib/branch_checkout.tcl:32 lib/browser.tcl:287

 msgid "Revision"
 msgstr "Версия"
 
 msgid "Revision"
 msgstr "Версия"
 

-#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:202
+#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:242

 msgid "Options"
 msgstr "Настройки"
 
 msgid "Options"
 msgstr "Настройки"
 


@@ -578,7 +578,7 @@ msgstr "Создание ветви"
 msgid "Create New Branch"
 msgstr "Создать новую ветвь"
 
 msgid "Create New Branch"
 msgstr "Создать новую ветвь"
 

-#: lib/branch_create.tcl:31 lib/choose_repository.tcl:375
+#: lib/branch_create.tcl:31 lib/choose_repository.tcl:371

 msgid "Create"
 msgstr "Создать"
 
 msgid "Create"
 msgstr "Создать"
 


@@ -718,22 +718,22 @@ msgstr "Запуск..."
 msgid "File Browser"
 msgstr "Просмотр списка файлов"
 
 msgid "File Browser"
 msgstr "Просмотр списка файлов"
 

-#: lib/browser.tcl:125 lib/browser.tcl:142
+#: lib/browser.tcl:126 lib/browser.tcl:143

 #, tcl-format
 msgid "Loading %s..."
 msgstr "Загрузка %s..."
 
 #, tcl-format
 msgid "Loading %s..."
 msgstr "Загрузка %s..."
 

-#: lib/browser.tcl:186
+#: lib/browser.tcl:187

 msgid "[Up To Parent]"
 msgstr "[На уровень выше]"
 
 msgid "[Up To Parent]"
 msgstr "[На уровень выше]"
 

-#: lib/browser.tcl:266 lib/browser.tcl:272
+#: lib/browser.tcl:267 lib/browser.tcl:273

 msgid "Browse Branch Files"
 msgstr "Показать файлы ветви"
 
 msgid "Browse Branch Files"
 msgstr "Показать файлы ветви"
 

-#: lib/browser.tcl:277 lib/choose_repository.tcl:391
-#: lib/choose_repository.tcl:482 lib/choose_repository.tcl:492
-#: lib/choose_repository.tcl:989
+#: lib/browser.tcl:278 lib/choose_repository.tcl:387
+#: lib/choose_repository.tcl:474 lib/choose_repository.tcl:484
+#: lib/choose_repository.tcl:987

 msgid "Browse"
 msgstr "Показать"
 
 msgid "Browse"
 msgstr "Показать"
 


@@ -747,7 +747,7 @@ msgstr "Получение %s из %s "
 msgid "fatal: Cannot resolve %s"
 msgstr "критическая ошибка: невозможно разрешить %s"
 
 msgid "fatal: Cannot resolve %s"
 msgstr "критическая ошибка: невозможно разрешить %s"
 

-#: lib/checkout_op.tcl:140 lib/console.tcl:79 lib/database.tcl:31
+#: lib/checkout_op.tcl:140 lib/console.tcl:81 lib/database.tcl:31

 msgid "Close"
 msgstr "Закрыть"
 
 msgid "Close"
 msgstr "Закрыть"
 


@@ -804,6 +804,10 @@ msgstr ""
 msgid "Updating working directory to '%s'..."
 msgstr "Обновление рабочего каталога из '%s'..."
 
 msgid "Updating working directory to '%s'..."
 msgstr "Обновление рабочего каталога из '%s'..."
 

+#: lib/checkout_op.tcl:323
+msgid "files checked out"
+msgstr ""
+

 #: lib/checkout_op.tcl:353
 #, tcl-format
 msgid "Aborted checkout of '%s' (file level merging is required)."
 #: lib/checkout_op.tcl:353
 #, tcl-format
 msgid "Aborted checkout of '%s' (file level merging is required)."


@@ -830,7 +834,7 @@ msgstr ""
 "Если вы хотите снова вернуться к какой-нибудь ветви, создайте ее сейчас, "
 "начиная с 'Текущего отсоединенного состояния'."
 
 "Если вы хотите снова вернуться к какой-нибудь ветви, создайте ее сейчас, "
 "начиная с 'Текущего отсоединенного состояния'."
 

-#: lib/checkout_op.tcl:446
+#: lib/checkout_op.tcl:446 lib/checkout_op.tcl:450

 #, tcl-format
 msgid "Checked out '%s'."
 msgstr "Ветвь '%s' сделана текущей."
 #, tcl-format
 msgid "Checked out '%s'."
 msgstr "Ветвь '%s' сделана текущей."


@@ -849,7 +853,7 @@ msgstr "Восстановить потерянные сохраненные с
 msgid "Reset '%s'?"
 msgstr "Сбросить '%s'?"
 
 msgid "Reset '%s'?"
 msgstr "Сбросить '%s'?"
 

-#: lib/checkout_op.tcl:510 lib/merge.tcl:164
+#: lib/checkout_op.tcl:510 lib/merge.tcl:163

 msgid "Visualize"
 msgstr "Наглядно"
 
 msgid "Visualize"
 msgstr "Наглядно"
 


@@ -878,15 +882,15 @@ msgstr "Выбрать"
 msgid "Font Family"
 msgstr "Шрифт"
 
 msgid "Font Family"
 msgstr "Шрифт"
 

-#: lib/choose_font.tcl:73
+#: lib/choose_font.tcl:74

 msgid "Font Size"
 msgstr "Размер шрифта"
 
 msgid "Font Size"
 msgstr "Размер шрифта"
 

-#: lib/choose_font.tcl:90
+#: lib/choose_font.tcl:91

 msgid "Font Example"
 msgstr "Пример текста"
 
 msgid "Font Example"
 msgstr "Пример текста"
 

-#: lib/choose_font.tcl:101
+#: lib/choose_font.tcl:103

 msgid ""
 "This is example text.\n"
 "If you like this text, it can be your font."
 msgid ""
 "This is example text.\n"
 "If you like this text, it can be your font."


@@ -894,226 +898,226 @@ msgstr ""
 "Это пример текста.\n"
 "Если Вам нравится этот текст, это может быть Ваш шрифт."
 
 "Это пример текста.\n"
 "Если Вам нравится этот текст, это может быть Ваш шрифт."
 

-#: lib/choose_repository.tcl:27
+#: lib/choose_repository.tcl:28

 msgid "Git Gui"
 msgstr ""
 
 msgid "Git Gui"
 msgstr ""
 

-#: lib/choose_repository.tcl:80 lib/choose_repository.tcl:380
+#: lib/choose_repository.tcl:81 lib/choose_repository.tcl:376

 msgid "Create New Repository"
 msgstr "Создать новый репозиторий"
 
 msgid "Create New Repository"
 msgstr "Создать новый репозиторий"
 

-#: lib/choose_repository.tcl:86
+#: lib/choose_repository.tcl:87

 msgid "New..."
 msgstr "Новый..."
 
 msgid "New..."
 msgstr "Новый..."
 

-#: lib/choose_repository.tcl:93 lib/choose_repository.tcl:468
+#: lib/choose_repository.tcl:94 lib/choose_repository.tcl:460

 msgid "Clone Existing Repository"
 msgstr "Склонировать существующий репозиторий"
 
 msgid "Clone Existing Repository"
 msgstr "Склонировать существующий репозиторий"
 

-#: lib/choose_repository.tcl:99
+#: lib/choose_repository.tcl:100

 msgid "Clone..."
 msgstr "Склонировать..."
 
 msgid "Clone..."
 msgstr "Склонировать..."
 

-#: lib/choose_repository.tcl:106 lib/choose_repository.tcl:978
+#: lib/choose_repository.tcl:107 lib/choose_repository.tcl:976

 msgid "Open Existing Repository"
 msgstr "Выбрать существующий репозиторий"
 
 msgid "Open Existing Repository"
 msgstr "Выбрать существующий репозиторий"
 

-#: lib/choose_repository.tcl:112
+#: lib/choose_repository.tcl:113

 msgid "Open..."
 msgstr "Открыть..."
 
 msgid "Open..."
 msgstr "Открыть..."
 

-#: lib/choose_repository.tcl:125
+#: lib/choose_repository.tcl:126

 msgid "Recent Repositories"
 msgstr "Недавние репозитории"
 
 msgid "Recent Repositories"
 msgstr "Недавние репозитории"
 

-#: lib/choose_repository.tcl:131
+#: lib/choose_repository.tcl:132

 msgid "Open Recent Repository:"
 msgstr "Открыть последний репозиторий"
 
 msgid "Open Recent Repository:"
 msgstr "Открыть последний репозиторий"
 

-#: lib/choose_repository.tcl:294
-#, tcl-format
-msgid "Location %s already exists."
-msgstr "Путь '%s' уже существует."
-
-#: lib/choose_repository.tcl:300 lib/choose_repository.tcl:307
-#: lib/choose_repository.tcl:314
+#: lib/choose_repository.tcl:296 lib/choose_repository.tcl:303
+#: lib/choose_repository.tcl:310

 #, tcl-format
 msgid "Failed to create repository %s:"
 msgstr "Не удалось создать репозиторий %s:"
 
 #, tcl-format
 msgid "Failed to create repository %s:"
 msgstr "Не удалось создать репозиторий %s:"
 

-#: lib/choose_repository.tcl:385 lib/choose_repository.tcl:486
+#: lib/choose_repository.tcl:381 lib/choose_repository.tcl:478

 msgid "Directory:"
 msgstr "Каталог:"
 
 msgid "Directory:"
 msgstr "Каталог:"
 

-#: lib/choose_repository.tcl:415 lib/choose_repository.tcl:544
-#: lib/choose_repository.tcl:1013
+#: lib/choose_repository.tcl:412 lib/choose_repository.tcl:537
+#: lib/choose_repository.tcl:1011

 msgid "Git Repository"
 msgstr "Репозиторий"
 
 msgid "Git Repository"
 msgstr "Репозиторий"
 

-#: lib/choose_repository.tcl:430 lib/choose_repository.tcl:437
+#: lib/choose_repository.tcl:437

 #, tcl-format
 msgid "Directory %s already exists."
 msgstr "Каталог '%s' уже существует."
 
 #, tcl-format
 msgid "Directory %s already exists."
 msgstr "Каталог '%s' уже существует."
 

-#: lib/choose_repository.tcl:442
+#: lib/choose_repository.tcl:441

 #, tcl-format
 msgid "File %s already exists."
 msgstr "Файл '%s' уже существует."
 
 #, tcl-format
 msgid "File %s already exists."
 msgstr "Файл '%s' уже существует."
 

-#: lib/choose_repository.tcl:463
+#: lib/choose_repository.tcl:455

 msgid "Clone"
 msgstr "Склонировать"
 
 msgid "Clone"
 msgstr "Склонировать"
 

-#: lib/choose_repository.tcl:476
+#: lib/choose_repository.tcl:468

 msgid "URL:"
 msgstr "Ссылка:"
 
 msgid "URL:"
 msgstr "Ссылка:"
 

-#: lib/choose_repository.tcl:496
+#: lib/choose_repository.tcl:489

 msgid "Clone Type:"
 msgstr "Тип клона:"
 
 msgid "Clone Type:"
 msgstr "Тип клона:"
 

-#: lib/choose_repository.tcl:502
+#: lib/choose_repository.tcl:495

 msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
 msgstr "Стандартный (Быстрый, полуизбыточный, \"жесткие\" ссылки)"
 
 msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
 msgstr "Стандартный (Быстрый, полуизбыточный, \"жесткие\" ссылки)"
 

-#: lib/choose_repository.tcl:508
+#: lib/choose_repository.tcl:501

 msgid "Full Copy (Slower, Redundant Backup)"
 msgstr "Полная копия (Медленный, создает резервную копию)"
 
 msgid "Full Copy (Slower, Redundant Backup)"
 msgstr "Полная копия (Медленный, создает резервную копию)"
 

-#: lib/choose_repository.tcl:514
+#: lib/choose_repository.tcl:507

 msgid "Shared (Fastest, Not Recommended, No Backup)"
 msgstr "Общий (Самый быстрый, не рекомендуется, без резервной копии)"
 
 msgid "Shared (Fastest, Not Recommended, No Backup)"
 msgstr "Общий (Самый быстрый, не рекомендуется, без резервной копии)"
 

-#: lib/choose_repository.tcl:550 lib/choose_repository.tcl:597
-#: lib/choose_repository.tcl:738 lib/choose_repository.tcl:808
-#: lib/choose_repository.tcl:1019 lib/choose_repository.tcl:1027
+#: lib/choose_repository.tcl:543 lib/choose_repository.tcl:590
+#: lib/choose_repository.tcl:736 lib/choose_repository.tcl:806
+#: lib/choose_repository.tcl:1017 lib/choose_repository.tcl:1025

 #, tcl-format
 msgid "Not a Git repository: %s"
 msgstr "Каталог не является репозиторием: %s"
 
 #, tcl-format
 msgid "Not a Git repository: %s"
 msgstr "Каталог не является репозиторием: %s"
 

-#: lib/choose_repository.tcl:586
+#: lib/choose_repository.tcl:579

 msgid "Standard only available for local repository."
 msgstr "Стандартный клон возможен только для локального репозитория."
 
 msgid "Standard only available for local repository."
 msgstr "Стандартный клон возможен только для локального репозитория."
 

-#: lib/choose_repository.tcl:590
+#: lib/choose_repository.tcl:583

 msgid "Shared only available for local repository."
 msgstr "Общий клон возможен только для локального репозитория."
 
 msgid "Shared only available for local repository."
 msgstr "Общий клон возможен только для локального репозитория."
 

-#: lib/choose_repository.tcl:617
+#: lib/choose_repository.tcl:604
+#, tcl-format
+msgid "Location %s already exists."
+msgstr "Путь '%s' уже существует."
+
+#: lib/choose_repository.tcl:615

 msgid "Failed to configure origin"
 msgstr "Не могу сконфигурировать исходный репозиторий."
 
 msgid "Failed to configure origin"
 msgstr "Не могу сконфигурировать исходный репозиторий."
 

-#: lib/choose_repository.tcl:629
+#: lib/choose_repository.tcl:627

 msgid "Counting objects"
 msgstr "Считаю объекты"
 
 msgid "Counting objects"
 msgstr "Считаю объекты"
 

-#: lib/choose_repository.tcl:630
+#: lib/choose_repository.tcl:628

 msgid "buckets"
 msgstr ""
 
 msgid "buckets"
 msgstr ""
 

-#: lib/choose_repository.tcl:654
+#: lib/choose_repository.tcl:652

 #, tcl-format
 msgid "Unable to copy objects/info/alternates: %s"
 msgstr "Не могу скопировать objects/info/alternates: %s"
 
 #, tcl-format
 msgid "Unable to copy objects/info/alternates: %s"
 msgstr "Не могу скопировать objects/info/alternates: %s"
 

-#: lib/choose_repository.tcl:690
+#: lib/choose_repository.tcl:688

 #, tcl-format
 msgid "Nothing to clone from %s."
 msgstr "Нечего клонировать с %s."
 
 #, tcl-format
 msgid "Nothing to clone from %s."
 msgstr "Нечего клонировать с %s."
 

-#: lib/choose_repository.tcl:692 lib/choose_repository.tcl:906
-#: lib/choose_repository.tcl:918
+#: lib/choose_repository.tcl:690 lib/choose_repository.tcl:904
+#: lib/choose_repository.tcl:916

 msgid "The 'master' branch has not been initialized."
 msgstr "Не инициализирована ветвь 'master'."
 
 msgid "The 'master' branch has not been initialized."
 msgstr "Не инициализирована ветвь 'master'."
 

-#: lib/choose_repository.tcl:705
+#: lib/choose_repository.tcl:703

 msgid "Hardlinks are unavailable.  Falling back to copying."
 msgstr "\"Жесткие ссылки\" не доступны. Буду использовать копирование."
 
 msgid "Hardlinks are unavailable.  Falling back to copying."
 msgstr "\"Жесткие ссылки\" не доступны. Буду использовать копирование."
 

-#: lib/choose_repository.tcl:717
+#: lib/choose_repository.tcl:715

 #, tcl-format
 msgid "Cloning from %s"
 msgstr "Клонирование %s"
 
 #, tcl-format
 msgid "Cloning from %s"
 msgstr "Клонирование %s"
 

-#: lib/choose_repository.tcl:748
+#: lib/choose_repository.tcl:746

 msgid "Copying objects"
 msgstr "Копирование objects"
 
 msgid "Copying objects"
 msgstr "Копирование objects"
 

-#: lib/choose_repository.tcl:749
+#: lib/choose_repository.tcl:747

 msgid "KiB"
 msgstr "КБ"
 
 msgid "KiB"
 msgstr "КБ"
 

-#: lib/choose_repository.tcl:773
+#: lib/choose_repository.tcl:771

 #, tcl-format
 msgid "Unable to copy object: %s"
 msgstr "Не могу скопировать объект: %s"
 
 #, tcl-format
 msgid "Unable to copy object: %s"
 msgstr "Не могу скопировать объект: %s"
 

-#: lib/choose_repository.tcl:783
+#: lib/choose_repository.tcl:781

 msgid "Linking objects"
 msgstr "Создание ссылок на objects"
 
 msgid "Linking objects"
 msgstr "Создание ссылок на objects"
 

-#: lib/choose_repository.tcl:784
+#: lib/choose_repository.tcl:782

 msgid "objects"
 msgstr "объекты"
 
 msgid "objects"
 msgstr "объекты"
 

-#: lib/choose_repository.tcl:792
+#: lib/choose_repository.tcl:790

 #, tcl-format
 msgid "Unable to hardlink object: %s"
 msgstr "Не могу \"жестко связать\" объект: %s"
 
 #, tcl-format
 msgid "Unable to hardlink object: %s"
 msgstr "Не могу \"жестко связать\" объект: %s"
 

-#: lib/choose_repository.tcl:847
+#: lib/choose_repository.tcl:845

 msgid "Cannot fetch branches and objects.  See console output for details."
 msgstr ""
 "Не могу получить ветви и объекты. Дополнительная информация на консоли."
 
 msgid "Cannot fetch branches and objects.  See console output for details."
 msgstr ""
 "Не могу получить ветви и объекты. Дополнительная информация на консоли."
 

-#: lib/choose_repository.tcl:858
+#: lib/choose_repository.tcl:856

 msgid "Cannot fetch tags.  See console output for details."
 msgstr "Не могу получить метки. Дополнительная информация на консоли."
 
 msgid "Cannot fetch tags.  See console output for details."
 msgstr "Не могу получить метки. Дополнительная информация на консоли."
 

-#: lib/choose_repository.tcl:882
+#: lib/choose_repository.tcl:880

 msgid "Cannot determine HEAD.  See console output for details."
 msgstr "Не могу определить HEAD. Дополнительная информация на консоли."
 
 msgid "Cannot determine HEAD.  See console output for details."
 msgstr "Не могу определить HEAD. Дополнительная информация на консоли."
 

-#: lib/choose_repository.tcl:891
+#: lib/choose_repository.tcl:889

 #, tcl-format
 msgid "Unable to cleanup %s"
 msgstr "Не могу очистить %s"
 
 #, tcl-format
 msgid "Unable to cleanup %s"
 msgstr "Не могу очистить %s"
 

-#: lib/choose_repository.tcl:897
+#: lib/choose_repository.tcl:895

 msgid "Clone failed."
 msgstr "Клонирование не удалось."
 
 msgid "Clone failed."
 msgstr "Клонирование не удалось."
 

-#: lib/choose_repository.tcl:904
+#: lib/choose_repository.tcl:902

 msgid "No default branch obtained."
 msgstr "Не было получено ветви по умолчанию."
 
 msgid "No default branch obtained."
 msgstr "Не было получено ветви по умолчанию."
 

-#: lib/choose_repository.tcl:915
+#: lib/choose_repository.tcl:913

 #, tcl-format
 msgid "Cannot resolve %s as a commit."
 msgstr "Не могу распознать %s как состояние."
 
 #, tcl-format
 msgid "Cannot resolve %s as a commit."
 msgstr "Не могу распознать %s как состояние."
 

-#: lib/choose_repository.tcl:927
+#: lib/choose_repository.tcl:925

 msgid "Creating working directory"
 msgstr "Создаю рабочий каталог"
 
 msgid "Creating working directory"
 msgstr "Создаю рабочий каталог"
 

-#: lib/choose_repository.tcl:928 lib/index.tcl:65 lib/index.tcl:127
+#: lib/choose_repository.tcl:926 lib/index.tcl:65 lib/index.tcl:127

 #: lib/index.tcl:193
 msgid "files"
 msgstr "файлов"
 
 #: lib/index.tcl:193
 msgid "files"
 msgstr "файлов"
 

-#: lib/choose_repository.tcl:957
+#: lib/choose_repository.tcl:955

 msgid "Initial file checkout failed."
 msgstr "Не удалось получить начальное состояние файлов репозитория."
 
 msgid "Initial file checkout failed."
 msgstr "Не удалось получить начальное состояние файлов репозитория."
 

-#: lib/choose_repository.tcl:973
+#: lib/choose_repository.tcl:971

 msgid "Open"
 msgstr "Открыть"
 
 msgid "Open"
 msgstr "Открыть"
 

-#: lib/choose_repository.tcl:983
+#: lib/choose_repository.tcl:981

 msgid "Repository:"
 msgstr "Репозиторий:"
 
 msgid "Repository:"
 msgstr "Репозиторий:"
 

-#: lib/choose_repository.tcl:1033
+#: lib/choose_repository.tcl:1031

 #, tcl-format
 msgid "Failed to open repository %s:"
 msgstr "Не удалось открыть репозиторий %s:"
 #, tcl-format
 msgid "Failed to open repository %s:"
 msgstr "Не удалось открыть репозиторий %s:"


@@ -1134,7 +1138,7 @@ msgstr "Локальная ветвь:"
 msgid "Tracking Branch"
 msgstr "Ветвь слежения"
 
 msgid "Tracking Branch"
 msgstr "Ветвь слежения"
 

-#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:537
+#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:538

 msgid "Tag"
 msgstr "Таг"
 
 msgid "Tag"
 msgstr "Таг"
 


@@ -1151,11 +1155,11 @@ msgstr "Версия не указана."
 msgid "Revision expression is empty."
 msgstr "Пустое выражение для определения версии."
 
 msgid "Revision expression is empty."
 msgstr "Пустое выражение для определения версии."
 

-#: lib/choose_rev.tcl:530
+#: lib/choose_rev.tcl:531

 msgid "Updated"
 msgstr "Обновлено"
 
 msgid "Updated"
 msgstr "Обновлено"
 

-#: lib/choose_rev.tcl:558
+#: lib/choose_rev.tcl:559

 msgid "URL"
 msgstr "Ссылка"
 
 msgid "URL"
 msgstr "Ссылка"
 


@@ -1246,12 +1250,13 @@ msgstr ""
 "Подготовьте хотя бы один файл до создания сохраненного состояния.\n"
 
 #: lib/commit.tcl:183
 "Подготовьте хотя бы один файл до создания сохраненного состояния.\n"
 
 #: lib/commit.tcl:183

+#, fuzzy

 msgid ""
 "Please supply a commit message.\n"
 "\n"
 "A good commit message has the following format:\n"
 "\n"
 msgid ""
 "Please supply a commit message.\n"
 "\n"
 "A good commit message has the following format:\n"
 "\n"

-"- First line: Describe in one sentance what you did.\n"
+"- First line: Describe in one sentence what you did.\n"

 "- Second line: Blank\n"
 "- Remaining lines: Describe why this change is good.\n"
 msgstr ""
 "- Second line: Blank\n"
 "- Remaining lines: Describe why this change is good.\n"
 msgstr ""


@@ -1263,16 +1268,46 @@ msgstr ""
 "- вторая строка пустая\n"
 "- оставшиеся строки: опишите, что дают ваши изменения.\n"
 
 "- вторая строка пустая\n"
 "- оставшиеся строки: опишите, что дают ваши изменения.\n"
 

-#: lib/commit.tcl:257
+#: lib/commit.tcl:207
+#, tcl-format
+msgid "warning: Tcl does not support encoding '%s'."
+msgstr "предупреждение: Tcl не поддерживает кодировку '%s'."
+
+#: lib/commit.tcl:221
+msgid "Calling pre-commit hook..."
+msgstr ""
+
+#: lib/commit.tcl:236
+msgid "Commit declined by pre-commit hook."
+msgstr ""
+
+#: lib/commit.tcl:259
+msgid "Calling commit-msg hook..."
+msgstr ""
+
+#: lib/commit.tcl:274
+msgid "Commit declined by commit-msg hook."
+msgstr ""
+
+#: lib/commit.tcl:287
+msgid "Committing changes..."
+msgstr ""
+
+#: lib/commit.tcl:303

 msgid "write-tree failed:"
 msgstr "Программа write-tree завершилась с ошибкой:"
 
 msgid "write-tree failed:"
 msgstr "Программа write-tree завершилась с ошибкой:"
 

-#: lib/commit.tcl:275
+#: lib/commit.tcl:304 lib/commit.tcl:348 lib/commit.tcl:368
+#, fuzzy
+msgid "Commit failed."
+msgstr "Клонирование не удалось."
+
+#: lib/commit.tcl:321

 #, tcl-format
 msgid "Commit %s appears to be corrupt"
 msgstr "Состояние %s выглядит поврежденным"
 
 #, tcl-format
 msgid "Commit %s appears to be corrupt"
 msgstr "Состояние %s выглядит поврежденным"
 

-#: lib/commit.tcl:279
+#: lib/commit.tcl:326

 msgid ""
 "No changes to commit.\n"
 "\n"
 msgid ""
 "No changes to commit.\n"
 "\n"


@@ -1286,37 +1321,32 @@ msgstr ""
 "\n"
 "Сейчас автоматически запустится перечитывание репозитория.\n"
 
 "\n"
 "Сейчас автоматически запустится перечитывание репозитория.\n"
 

-#: lib/commit.tcl:286
+#: lib/commit.tcl:333

 msgid "No changes to commit."
 msgstr "Отуствуют измения для сохранения."
 
 msgid "No changes to commit."
 msgstr "Отуствуют измения для сохранения."
 

-#: lib/commit.tcl:303
-#, tcl-format
-msgid "warning: Tcl does not support encoding '%s'."
-msgstr "предупреждение: Tcl не поддерживает кодировку '%s'."
-
-#: lib/commit.tcl:317
+#: lib/commit.tcl:347

 msgid "commit-tree failed:"
 msgstr "Программа commit-tree завершилась с ошибкой:"
 
 msgid "commit-tree failed:"
 msgstr "Программа commit-tree завершилась с ошибкой:"
 

-#: lib/commit.tcl:339
+#: lib/commit.tcl:367

 msgid "update-ref failed:"
 msgstr "Программа update-ref завершилась с ошибкой:"
 
 msgid "update-ref failed:"
 msgstr "Программа update-ref завершилась с ошибкой:"
 

-#: lib/commit.tcl:430
+#: lib/commit.tcl:454

 #, tcl-format
 msgid "Created commit %s: %s"
 msgstr "Создано состояние %s: %s "
 
 #, tcl-format
 msgid "Created commit %s: %s"
 msgstr "Создано состояние %s: %s "
 

-#: lib/console.tcl:57
+#: lib/console.tcl:59

 msgid "Working... please wait..."
 msgstr "В процессе... пожалуйста, ждите..."
 
 msgid "Working... please wait..."
 msgstr "В процессе... пожалуйста, ждите..."
 

-#: lib/console.tcl:183
+#: lib/console.tcl:186

 msgid "Success"
 msgstr "Процесс успешно завершен"
 
 msgid "Success"
 msgstr "Процесс успешно завершен"
 

-#: lib/console.tcl:196
+#: lib/console.tcl:200

 msgid "Error: Command Failed"
 msgstr "Ошибка: не удалось выполнить команду"
 
 msgid "Error: Command Failed"
 msgstr "Ошибка: не удалось выполнить команду"
 


@@ -1426,23 +1456,23 @@ msgstr "* Двоичный файл (содержимое не показано)
 msgid "Error loading diff:"
 msgstr "Ошибка загрузки diff:"
 
 msgid "Error loading diff:"
 msgstr "Ошибка загрузки diff:"
 

-#: lib/diff.tcl:302
+#: lib/diff.tcl:303

 msgid "Failed to unstage selected hunk."
 msgstr "Не удалось исключить выбранную часть."
 
 msgid "Failed to unstage selected hunk."
 msgstr "Не удалось исключить выбранную часть."
 

-#: lib/diff.tcl:309
+#: lib/diff.tcl:310

 msgid "Failed to stage selected hunk."
 msgstr "Не удалось подготовить к сохранению выбранную часть."
 
 msgid "Failed to stage selected hunk."
 msgstr "Не удалось подготовить к сохранению выбранную часть."
 

-#: lib/error.tcl:12 lib/error.tcl:102
+#: lib/error.tcl:20 lib/error.tcl:114

 msgid "error"
 msgstr "ошибка"
 
 msgid "error"
 msgstr "ошибка"
 

-#: lib/error.tcl:28
+#: lib/error.tcl:36

 msgid "warning"
 msgstr "предупреждение"
 
 msgid "warning"
 msgstr "предупреждение"
 

-#: lib/error.tcl:81
+#: lib/error.tcl:94

 msgid "You must correct the above errors before committing."
 msgstr "Прежде чем сохранить, исправьте вышеуказанные ошибки."
 
 msgid "You must correct the above errors before committing."
 msgstr "Прежде чем сохранить, исправьте вышеуказанные ошибки."
 


@@ -1459,8 +1489,8 @@ msgid ""
 "Updating the Git index failed.  A rescan will be automatically started to "
 "resynchronize git-gui."
 msgstr ""
 "Updating the Git index failed.  A rescan will be automatically started to "
 "resynchronize git-gui."
 msgstr ""

-"Не удалось обновить индекс Git. Состояние репозитория будет"
-"пеÑ\80еÑ\87иÑ\82ано авÑ\82омаÑ\82иÑ\87еÑ\81ки."
+"Не удалось обновить индекс Git. Состояние репозитория будетперечитано "
+"автоматически."

 
 #: lib/index.tcl:27
 msgid "Continue"
 
 #: lib/index.tcl:27
 msgid "Continue"


@@ -1475,6 +1505,11 @@ msgstr "Разблокировать индекс"
 msgid "Unstaging %s from commit"
 msgstr "Удаление %s из подготовленного"
 
 msgid "Unstaging %s from commit"
 msgstr "Удаление %s из подготовленного"
 

+#: lib/index.tcl:313
+#, fuzzy
+msgid "Ready to commit."
+msgstr "Подготовлено для сохранения"
+

 #: lib/index.tcl:326
 #, tcl-format
 msgid "Adding %s"
 #: lib/index.tcl:326
 #, tcl-format
 msgid "Adding %s"


@@ -1490,13 +1525,13 @@ msgstr "Отменить изменения в файле %s?"
 msgid "Revert changes in these %i files?"
 msgstr "Отменить изменения в %i файле(-ах)?"
 
 msgid "Revert changes in these %i files?"
 msgstr "Отменить изменения в %i файле(-ах)?"
 

-#: lib/index.tcl:389
+#: lib/index.tcl:391

 msgid "Any unstaged changes will be permanently lost by the revert."
 msgstr ""
 "Любые изменения, не подготовленные к сохранению, будут потеряны при данной "
 "операции."
 
 msgid "Any unstaged changes will be permanently lost by the revert."
 msgstr ""
 "Любые изменения, не подготовленные к сохранению, будут потеряны при данной "
 "операции."
 

-#: lib/index.tcl:392
+#: lib/index.tcl:394

 msgid "Do Nothing"
 msgstr "Ничего не делать"
 
 msgid "Do Nothing"
 msgstr "Ничего не делать"
 


@@ -1567,28 +1602,28 @@ msgid "%s of %s"
 msgstr "%s из %s"
 
 #: lib/merge.tcl:119
 msgstr "%s из %s"
 
 #: lib/merge.tcl:119

-#, tcl-format
-msgid "Merging %s and %s"
+#, fuzzy, tcl-format
+msgid "Merging %s and %s..."

 msgstr "Объединение %s и %s"
 
 msgstr "Объединение %s и %s"
 

-#: lib/merge.tcl:131
+#: lib/merge.tcl:130

 msgid "Merge completed successfully."
 msgstr "Объединение успешно завершено."
 
 msgid "Merge completed successfully."
 msgstr "Объединение успешно завершено."
 

-#: lib/merge.tcl:133
+#: lib/merge.tcl:132

 msgid "Merge failed.  Conflict resolution is required."
 msgstr "Не удалось завершить объединение. Требуется разрешение конфликта."
 
 msgid "Merge failed.  Conflict resolution is required."
 msgstr "Не удалось завершить объединение. Требуется разрешение конфликта."
 

-#: lib/merge.tcl:158
+#: lib/merge.tcl:157

 #, tcl-format
 msgid "Merge Into %s"
 msgstr "Объединить с %s"
 
 #, tcl-format
 msgid "Merge Into %s"
 msgstr "Объединить с %s"
 

-#: lib/merge.tcl:177
+#: lib/merge.tcl:176

 msgid "Revision To Merge"
 msgstr "Версия для объединения"
 
 msgid "Revision To Merge"
 msgstr "Версия для объединения"
 

-#: lib/merge.tcl:212
+#: lib/merge.tcl:211

 msgid ""
 "Cannot abort while amending.\n"
 "\n"
 msgid ""
 "Cannot abort while amending.\n"
 "\n"


@@ -1598,7 +1633,7 @@ msgstr ""
 "\n"
 "Завершите текущее исправление сохраненного состояния.\n"
 
 "\n"
 "Завершите текущее исправление сохраненного состояния.\n"
 

-#: lib/merge.tcl:222
+#: lib/merge.tcl:221

 msgid ""
 "Abort merge?\n"
 "\n"
 msgid ""
 "Abort merge?\n"
 "\n"


@@ -1612,7 +1647,7 @@ msgstr ""
 "\n"
 "Продолжить?"
 
 "\n"
 "Продолжить?"
 

-#: lib/merge.tcl:228
+#: lib/merge.tcl:227

 msgid ""
 "Reset changes?\n"
 "\n"
 msgid ""
 "Reset changes?\n"
 "\n"


@@ -1626,94 +1661,108 @@ msgstr ""
 "\n"
 "Продолжить?"
 
 "\n"
 "Продолжить?"
 

-#: lib/merge.tcl:239
+#: lib/merge.tcl:238

 msgid "Aborting"
 msgstr "Прерываю"
 
 msgid "Aborting"
 msgstr "Прерываю"
 

-#: lib/merge.tcl:266
+#: lib/merge.tcl:238
+#, fuzzy
+msgid "files reset"
+msgstr "файлов"
+
+#: lib/merge.tcl:265

 msgid "Abort failed."
 msgstr "Прервать не удалось."
 
 msgid "Abort failed."
 msgstr "Прервать не удалось."
 

-#: lib/merge.tcl:268
+#: lib/merge.tcl:267

 msgid "Abort completed.  Ready."
 msgstr "Прервано."
 
 msgid "Abort completed.  Ready."
 msgstr "Прервано."
 

-#: lib/option.tcl:82
+#: lib/option.tcl:95

 msgid "Restore Defaults"
 msgstr "Восстановить настройки по умолчанию"
 
 msgid "Restore Defaults"
 msgstr "Восстановить настройки по умолчанию"
 

-#: lib/option.tcl:86
+#: lib/option.tcl:99

 msgid "Save"
 msgstr "Сохранить"
 
 msgid "Save"
 msgstr "Сохранить"
 

-#: lib/option.tcl:96
+#: lib/option.tcl:109

 #, tcl-format
 msgid "%s Repository"
 msgstr "для репозитория %s"
 
 #, tcl-format
 msgid "%s Repository"
 msgstr "для репозитория %s"
 

-#: lib/option.tcl:97
+#: lib/option.tcl:110

 msgid "Global (All Repositories)"
 msgstr "Общие (для всех репозиториев)"
 
 msgid "Global (All Repositories)"
 msgstr "Общие (для всех репозиториев)"
 

-#: lib/option.tcl:103
+#: lib/option.tcl:116

 msgid "User Name"
 msgstr "Имя пользователя"
 
 msgid "User Name"
 msgstr "Имя пользователя"
 

-#: lib/option.tcl:104
+#: lib/option.tcl:117

 msgid "Email Address"
 msgstr "Адес электронной почты"
 
 msgid "Email Address"
 msgstr "Адес электронной почты"
 

-#: lib/option.tcl:106
+#: lib/option.tcl:119

 msgid "Summarize Merge Commits"
 msgstr "Суммарный комментарий при объединении"
 
 msgid "Summarize Merge Commits"
 msgstr "Суммарный комментарий при объединении"
 

-#: lib/option.tcl:107
+#: lib/option.tcl:120

 msgid "Merge Verbosity"
 msgstr "Уровень детальности сообщений при объединении"
 
 msgid "Merge Verbosity"
 msgstr "Уровень детальности сообщений при объединении"
 

-#: lib/option.tcl:108
+#: lib/option.tcl:121

 msgid "Show Diffstat After Merge"
 msgstr "Показать отчет об изменениях после объединения"
 
 msgid "Show Diffstat After Merge"
 msgstr "Показать отчет об изменениях после объединения"
 

-#: lib/option.tcl:110
+#: lib/option.tcl:123

 msgid "Trust File Modification Timestamps"
 msgstr "Доверять времени модификации файла"
 
 msgid "Trust File Modification Timestamps"
 msgstr "Доверять времени модификации файла"
 

-#: lib/option.tcl:111
+#: lib/option.tcl:124

 msgid "Prune Tracking Branches During Fetch"
 msgstr "Чистка ветвей слежения при получении изменений"
 
 msgid "Prune Tracking Branches During Fetch"
 msgstr "Чистка ветвей слежения при получении изменений"
 

-#: lib/option.tcl:112
+#: lib/option.tcl:125

 msgid "Match Tracking Branches"
 msgstr "Имя новой ветви взять из имен ветвей слежения"
 
 msgid "Match Tracking Branches"
 msgstr "Имя новой ветви взять из имен ветвей слежения"
 

-#: lib/option.tcl:113
+#: lib/option.tcl:126

 msgid "Number of Diff Context Lines"
 msgstr "Число строк в контексте diff"
 
 msgid "Number of Diff Context Lines"
 msgstr "Число строк в контексте diff"
 

-#: lib/option.tcl:114
+#: lib/option.tcl:127
+#, fuzzy
+msgid "Commit Message Text Width"
+msgstr "Комментарий к состоянию:"
+
+#: lib/option.tcl:128

 msgid "New Branch Name Template"
 msgstr "Шаблон для имени новой ветви"
 
 msgid "New Branch Name Template"
 msgstr "Шаблон для имени новой ветви"
 

-#: lib/option.tcl:176
+#: lib/option.tcl:192
+msgid "Spelling Dictionary:"
+msgstr ""
+
+#: lib/option.tcl:216

 msgid "Change Font"
 msgstr "Изменить шрифт"
 
 msgid "Change Font"
 msgstr "Изменить шрифт"
 

-#: lib/option.tcl:180
+#: lib/option.tcl:220

 #, tcl-format
 msgid "Choose %s"
 msgstr "Выберите %s"
 
 # carbon copy
 #, tcl-format
 msgid "Choose %s"
 msgstr "Выберите %s"
 
 # carbon copy

-#: lib/option.tcl:186
+#: lib/option.tcl:226

 msgid "pt."
 msgstr ""
 
 msgid "pt."
 msgstr ""
 

-#: lib/option.tcl:200
+#: lib/option.tcl:240

 msgid "Preferences"
 msgstr "Настройки"
 
 msgid "Preferences"
 msgstr "Настройки"
 

-#: lib/option.tcl:235
+#: lib/option.tcl:275

 msgid "Failed to completely save options:"
 msgstr "Не удалось полностью сохранить настройки:"
 
 msgid "Failed to completely save options:"
 msgstr "Не удалось полностью сохранить настройки:"
 


@@ -1820,6 +1869,43 @@ msgstr "Невозможно записать ссылку:"
 msgid "Cannot write icon:"
 msgstr "Невозможно записать значок:"
 
 msgid "Cannot write icon:"
 msgstr "Невозможно записать значок:"
 

+#: lib/spellcheck.tcl:57
+msgid "Unsupported spell checker"
+msgstr ""
+
+#: lib/spellcheck.tcl:65
+msgid "Spell checking is unavailable"
+msgstr ""
+
+#: lib/spellcheck.tcl:68
+msgid "Invalid spell checking configuration"
+msgstr ""
+
+#: lib/spellcheck.tcl:70
+#, tcl-format
+msgid "Reverting dictionary to %s."
+msgstr ""
+
+#: lib/spellcheck.tcl:73
+msgid "Spell checker silently failed on startup"
+msgstr ""
+
+#: lib/spellcheck.tcl:80
+msgid "Unrecognized spell checker"
+msgstr ""
+
+#: lib/spellcheck.tcl:180
+msgid "No Suggestions"
+msgstr ""
+
+#: lib/spellcheck.tcl:381
+msgid "Unexpected EOF from spell checker"
+msgstr ""
+
+#: lib/spellcheck.tcl:385
+msgid "Spell Checker Failed"
+msgstr ""
+

 #: lib/status_bar.tcl:83
 #, tcl-format
 msgid "%s ... %*i of %*i %s (%3i%%)"
 #: lib/status_bar.tcl:83
 #, tcl-format
 msgid "%s ... %*i of %*i %s (%3i%%)"

diff --git a/po/zh_cn.po b/po/zh_cn.po
index f8697216f71a56fcda47056fe5b5c287839ef7f0..d2c686667163ec4cd83045efd429e3413564290e 100644 (file)
--- a/po/zh_cn.po
+++ b/po/zh_cn.po
@@ -15,7 +15,7 @@
 #      fast forward    快速合并(??)
 #      stage           缓存 (译自 index/cache)
 #      amend           修正
 #      fast forward    快速合并(??)
 #      stage           缓存 (译自 index/cache)
 #      amend           修正

-#      reset           复位
+#      reset           复位

 #
 # 2008-01-06 Eric Miao <eric.y.miao@gmail.com>
 # FIXME: checkout 的标准翻译
 #
 # 2008-01-06 Eric Miao <eric.y.miao@gmail.com>
 # FIXME: checkout 的标准翻译


@@ -25,7 +25,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: git-gui\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: git-gui\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2007-11-24 10:36+0100\n"
+"POT-Creation-Date: 2008-03-14 07:18+0100\n"

 "PO-Revision-Date: 2007-07-21 01:23-0700\n"
 "Last-Translator: Eric Miao <eric.y.miao@gmail.com>\n"
 "Language-Team: Chinese\n"
 "PO-Revision-Date: 2007-07-21 01:23-0700\n"
 "Last-Translator: Eric Miao <eric.y.miao@gmail.com>\n"
 "Language-Team: Chinese\n"


@@ -33,33 +33,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 

-#: git-gui.sh:41 git-gui.sh:604 git-gui.sh:618 git-gui.sh:631 git-gui.sh:714
-#: git-gui.sh:733
+#: git-gui.sh:41 git-gui.sh: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: 致命错误"
 
 msgid "git-gui: fatal error"
 msgstr "git-gui: 致命错误"
 

-#: git-gui.sh:565
+#: git-gui.sh:593

 #, tcl-format
 msgid "Invalid font specified in %s:"
 msgstr "%s 中指定的字体无效:"
 
 #, tcl-format
 msgid "Invalid font specified in %s:"
 msgstr "%s 中指定的字体无效:"
 

-#: git-gui.sh:590
+#: git-gui.sh:620

 msgid "Main Font"
 msgstr "主要字体"
 
 msgid "Main Font"
 msgstr "主要字体"
 

-#: git-gui.sh:591
+#: git-gui.sh:621

 msgid "Diff/Console Font"
 msgstr "Diff/控制终端字体"
 
 msgid "Diff/Console Font"
 msgstr "Diff/控制终端字体"
 

-#: git-gui.sh:605
+#: git-gui.sh:635

 msgid "Cannot find git in PATH."
 msgstr "PATH 中没有找到 git"
 
 msgid "Cannot find git in PATH."
 msgstr "PATH 中没有找到 git"
 

-#: git-gui.sh:632
+#: git-gui.sh:662

 msgid "Cannot parse Git version string:"
 msgstr "无法解析 Git 的版本信息:"
 
 msgid "Cannot parse Git version string:"
 msgstr "无法解析 Git 的版本信息:"
 

-#: git-gui.sh:650
+#: git-gui.sh:680

 #, tcl-format
 msgid ""
 "Git version cannot be determined.\n"
 #, tcl-format
 msgid ""
 "Git version cannot be determined.\n"


@@ -78,79 +78,79 @@ msgstr ""
 "\n"
 "是否假定 '%s' 为版本 1.5.0?\n"
 
 "\n"
 "是否假定 '%s' 为版本 1.5.0?\n"
 

-#: git-gui.sh:888
+#: git-gui.sh:918

 msgid "Git directory not found:"
 msgstr "Git 目录无法找到:"
 
 msgid "Git directory not found:"
 msgstr "Git 目录无法找到:"
 

-#: git-gui.sh:895
+#: git-gui.sh:925

 msgid "Cannot move to top of working directory:"
 msgstr "无法移动到工作根目录:"
 
 msgid "Cannot move to top of working directory:"
 msgstr "无法移动到工作根目录:"
 

-#: git-gui.sh:902
+#: git-gui.sh:932

 msgid "Cannot use funny .git directory:"
 msgstr "无法使用 .git 目录:"
 
 msgid "Cannot use funny .git directory:"
 msgstr "无法使用 .git 目录:"
 

-#: git-gui.sh:907
+#: git-gui.sh:937

 msgid "No working directory"
 msgstr "没有工作目录"
 
 msgid "No working directory"
 msgstr "没有工作目录"
 

-#: git-gui.sh:1054
+#: git-gui.sh:1084 lib/checkout_op.tcl:283

 msgid "Refreshing file status..."
 msgstr "更新文件状态..."
 
 msgid "Refreshing file status..."
 msgstr "更新文件状态..."
 

-#: git-gui.sh:1119
+#: git-gui.sh:1149

 msgid "Scanning for modified files ..."
 msgstr "扫描修改过的文件 ..."
 
 msgid "Scanning for modified files ..."
 msgstr "扫描修改过的文件 ..."
 

-#: git-gui.sh:1294 lib/browser.tcl:245
+#: git-gui.sh:1324 lib/browser.tcl:246

 msgid "Ready."
 msgstr "就绪"
 
 msgid "Ready."
 msgstr "就绪"
 

-#: git-gui.sh:1560
+#: git-gui.sh:1590

 msgid "Unmodified"
 msgstr "未修改"
 
 msgid "Unmodified"
 msgstr "未修改"
 

-#: git-gui.sh:1562
+#: git-gui.sh:1592

 msgid "Modified, not staged"
 msgstr "修改但未缓存"
 
 msgid "Modified, not staged"
 msgstr "修改但未缓存"
 

-#: git-gui.sh:1563 git-gui.sh:1568
+#: git-gui.sh:1593 git-gui.sh:1598

 msgid "Staged for commit"
 msgstr "缓存为提交"
 
 msgid "Staged for commit"
 msgstr "缓存为提交"
 

-#: git-gui.sh:1564 git-gui.sh:1569
+#: git-gui.sh:1594 git-gui.sh:1599

 msgid "Portions staged for commit"
 msgstr "部分缓存为提交"
 
 msgid "Portions staged for commit"
 msgstr "部分缓存为提交"
 

-#: git-gui.sh:1565 git-gui.sh:1570
+#: git-gui.sh:1595 git-gui.sh:1600

 msgid "Staged for commit, missing"
 msgstr "缓存为提交, 不存在"
 
 msgid "Staged for commit, missing"
 msgstr "缓存为提交, 不存在"
 

-#: git-gui.sh:1567
+#: git-gui.sh:1597

 msgid "Untracked, not staged"
 msgstr "未跟踪, 未缓存"
 
 msgid "Untracked, not staged"
 msgstr "未跟踪, 未缓存"
 

-#: git-gui.sh:1572
+#: git-gui.sh:1602

 msgid "Missing"
 msgstr "不存在"
 
 msgid "Missing"
 msgstr "不存在"
 

-#: git-gui.sh:1573
+#: git-gui.sh:1603

 msgid "Staged for removal"
 msgstr "缓存为删除"
 
 msgid "Staged for removal"
 msgstr "缓存为删除"
 

-#: git-gui.sh:1574
+#: git-gui.sh:1604

 msgid "Staged for removal, still present"
 msgstr "缓存为删除, 但仍存在"
 
 msgid "Staged for removal, still present"
 msgstr "缓存为删除, 但仍存在"
 

-#: git-gui.sh:1576 git-gui.sh:1577 git-gui.sh:1578 git-gui.sh:1579
+#: git-gui.sh:1606 git-gui.sh:1607 git-gui.sh:1608 git-gui.sh:1609

 msgid "Requires merge resolution"
 msgstr "需要解决合并冲突"
 
 msgid "Requires merge resolution"
 msgstr "需要解决合并冲突"
 

-#: git-gui.sh:1614
+#: git-gui.sh:1644

 msgid "Starting gitk... please wait..."
 msgstr "启动 gitk... 请等待..."
 
 msgid "Starting gitk... please wait..."
 msgstr "启动 gitk... 请等待..."
 

-#: git-gui.sh:1623
+#: git-gui.sh:1653

 #, tcl-format
 msgid ""
 "Unable to start gitk:\n"
 #, tcl-format
 msgid ""
 "Unable to start gitk:\n"


@@ -161,295 +161,295 @@ msgstr ""
 "\n"
 "%s 不存在"
 
 "\n"
 "%s 不存在"
 

-#: git-gui.sh:1823 lib/choose_repository.tcl:35
+#: git-gui.sh:1860 lib/choose_repository.tcl:36

 msgid "Repository"
 msgstr "版本库(repository)"
 
 msgid "Repository"
 msgstr "版本库(repository)"
 

-#: git-gui.sh:1824
+#: git-gui.sh:1861

 msgid "Edit"
 msgstr "编辑"
 
 msgid "Edit"
 msgstr "编辑"
 

-#: git-gui.sh:1826 lib/choose_rev.tcl:560
+#: git-gui.sh:1863 lib/choose_rev.tcl:561

 msgid "Branch"
 msgstr "分支(branch)"
 
 msgid "Branch"
 msgstr "分支(branch)"
 

-#: git-gui.sh:1829 lib/choose_rev.tcl:547
+#: git-gui.sh:1866 lib/choose_rev.tcl:548

 msgid "Commit@@noun"
 msgstr "提交(commit)"
 
 msgid "Commit@@noun"
 msgstr "提交(commit)"
 

-#: git-gui.sh:1832 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168
+#: git-gui.sh:1869 lib/merge.tcl:120 lib/merge.tcl:149 lib/merge.tcl:167

 msgid "Merge"
 msgstr "合并(merge)"
 
 msgid "Merge"
 msgstr "合并(merge)"
 

-#: git-gui.sh:1833 lib/choose_rev.tcl:556
+#: git-gui.sh:1870 lib/choose_rev.tcl:557

 msgid "Remote"
 msgstr "远端(remote)"
 
 msgid "Remote"
 msgstr "远端(remote)"
 

-#: git-gui.sh:1842
+#: git-gui.sh:1879

 msgid "Browse Current Branch's Files"
 msgstr "浏览当前分支上的文件"
 
 msgid "Browse Current Branch's Files"
 msgstr "浏览当前分支上的文件"
 

-#: git-gui.sh:1846
+#: git-gui.sh:1883

 msgid "Browse Branch Files..."
 msgstr "浏览分支上的文件..."
 
 msgid "Browse Branch Files..."
 msgstr "浏览分支上的文件..."
 

-#: git-gui.sh:1851
+#: git-gui.sh:1888

 msgid "Visualize Current Branch's History"
 msgstr "图示当前分支的历史"
 
 msgid "Visualize Current Branch's History"
 msgstr "图示当前分支的历史"
 

-#: git-gui.sh:1855
+#: git-gui.sh:1892

 msgid "Visualize All Branch History"
 msgstr "图示所有分支的历史"
 
 msgid "Visualize All Branch History"
 msgstr "图示所有分支的历史"
 

-#: git-gui.sh:1862
+#: git-gui.sh:1899

 #, tcl-format
 msgid "Browse %s's Files"
 msgstr "浏览 %s 上的文件"
 
 #, tcl-format
 msgid "Browse %s's Files"
 msgstr "浏览 %s 上的文件"
 

-#: git-gui.sh:1864
+#: git-gui.sh:1901

 #, tcl-format
 msgid "Visualize %s's History"
 msgstr "图示 %s 分支的历史"
 
 #, tcl-format
 msgid "Visualize %s's History"
 msgstr "图示 %s 分支的历史"
 

-#: git-gui.sh:1869 lib/database.tcl:27 lib/database.tcl:67
+#: git-gui.sh:1906 lib/database.tcl:27 lib/database.tcl:67

 msgid "Database Statistics"
 msgstr "数据库统计信息"
 
 msgid "Database Statistics"
 msgstr "数据库统计信息"
 

-#: git-gui.sh:1872 lib/database.tcl:34
+#: git-gui.sh:1909 lib/database.tcl:34

 msgid "Compress Database"
 msgstr "压缩数据库"
 
 msgid "Compress Database"
 msgstr "压缩数据库"
 

-#: git-gui.sh:1875
+#: git-gui.sh:1912

 msgid "Verify Database"
 msgstr "验证数据库"
 
 msgid "Verify Database"
 msgstr "验证数据库"
 

-#: git-gui.sh:1882 git-gui.sh:1886 git-gui.sh:1890 lib/shortcut.tcl:7
+#: git-gui.sh:1919 git-gui.sh:1923 git-gui.sh:1927 lib/shortcut.tcl:7

 #: lib/shortcut.tcl:39 lib/shortcut.tcl:71
 msgid "Create Desktop Icon"
 msgstr "创建桌面图标"
 
 #: lib/shortcut.tcl:39 lib/shortcut.tcl:71
 msgid "Create Desktop Icon"
 msgstr "创建桌面图标"
 

-#: git-gui.sh:1895 lib/choose_repository.tcl:176 lib/choose_repository.tcl:184
+#: git-gui.sh:1932 lib/choose_repository.tcl:177 lib/choose_repository.tcl:185

 msgid "Quit"
 msgstr "退出"
 
 msgid "Quit"
 msgstr "退出"
 

-#: git-gui.sh:1902
+#: git-gui.sh:1939

 msgid "Undo"
 msgstr "撤销"
 
 msgid "Undo"
 msgstr "撤销"
 

-#: git-gui.sh:1905
+#: git-gui.sh:1942

 msgid "Redo"
 msgstr "重做"
 
 msgid "Redo"
 msgstr "重做"
 

-#: git-gui.sh:1909 git-gui.sh:2403
+#: git-gui.sh:1946 git-gui.sh:2443

 msgid "Cut"
 msgstr "剪切"
 
 msgid "Cut"
 msgstr "剪切"
 

-#: git-gui.sh:1912 git-gui.sh:2406 git-gui.sh:2477 git-gui.sh:2549
-#: lib/console.tcl:67
+#: git-gui.sh:1949 git-gui.sh:2446 git-gui.sh:2520 git-gui.sh:2614
+#: lib/console.tcl:69

 msgid "Copy"
 msgstr "复制"
 
 msgid "Copy"
 msgstr "复制"
 

-#: git-gui.sh:1915 git-gui.sh:2409
+#: git-gui.sh:1952 git-gui.sh:2449

 msgid "Paste"
 msgstr "粘贴"
 
 msgid "Paste"
 msgstr "粘贴"
 

-#: git-gui.sh:1918 git-gui.sh:2412 lib/branch_delete.tcl:26
+#: git-gui.sh:1955 git-gui.sh:2452 lib/branch_delete.tcl:26

 #: lib/remote_branch_delete.tcl:38
 msgid "Delete"
 msgstr "删除"
 
 #: lib/remote_branch_delete.tcl:38
 msgid "Delete"
 msgstr "删除"
 

-#: git-gui.sh:1922 git-gui.sh:2416 git-gui.sh:2553 lib/console.tcl:69
+#: git-gui.sh:1959 git-gui.sh:2456 git-gui.sh:2618 lib/console.tcl:71

 msgid "Select All"
 msgstr "全选"
 
 msgid "Select All"
 msgstr "全选"
 

-#: git-gui.sh:1931
+#: git-gui.sh:1968

 msgid "Create..."
 msgstr "新建..."
 
 msgid "Create..."
 msgstr "新建..."
 

-#: git-gui.sh:1937
+#: git-gui.sh:1974

 msgid "Checkout..."
 msgstr "Checkout..."
 
 msgid "Checkout..."
 msgstr "Checkout..."
 

-#: git-gui.sh:1943
+#: git-gui.sh:1980

 msgid "Rename..."
 msgstr "更名..."
 
 msgid "Rename..."
 msgstr "更名..."
 

-#: git-gui.sh:1948 git-gui.sh:2048
+#: git-gui.sh:1985 git-gui.sh:2085

 msgid "Delete..."
 msgstr "删除..."
 
 msgid "Delete..."
 msgstr "删除..."
 

-#: git-gui.sh:1953
+#: git-gui.sh:1990

 msgid "Reset..."
 msgstr "复位(Reset)..."
 
 msgid "Reset..."
 msgstr "复位(Reset)..."
 

-#: git-gui.sh:1965 git-gui.sh:2350
+#: git-gui.sh:2002 git-gui.sh:2389

 msgid "New Commit"
 msgstr "新建提交"
 
 msgid "New Commit"
 msgstr "新建提交"
 

-#: git-gui.sh:1973 git-gui.sh:2357
+#: git-gui.sh:2010 git-gui.sh:2396

 msgid "Amend Last Commit"
 msgstr "修正上次提交"
 
 msgid "Amend Last Commit"
 msgstr "修正上次提交"
 

-#: git-gui.sh:1982 git-gui.sh:2317 lib/remote_branch_delete.tcl:99
+#: git-gui.sh:2019 git-gui.sh:2356 lib/remote_branch_delete.tcl:99

 msgid "Rescan"
 msgstr "重新扫描"
 
 msgid "Rescan"
 msgstr "重新扫描"
 

-#: git-gui.sh:1988
+#: git-gui.sh:2025

 msgid "Stage To Commit"
 msgstr "缓存为提交"
 
 msgid "Stage To Commit"
 msgstr "缓存为提交"
 

-#: git-gui.sh:1994
+#: git-gui.sh:2031

 msgid "Stage Changed Files To Commit"
 msgstr "缓存修改的文件为提交"
 
 msgid "Stage Changed Files To Commit"
 msgstr "缓存修改的文件为提交"
 

-#: git-gui.sh:2000
+#: git-gui.sh:2037

 msgid "Unstage From Commit"
 msgstr "从本次提交撤除"
 
 msgid "Unstage From Commit"
 msgstr "从本次提交撤除"
 

-#: git-gui.sh:2005 lib/index.tcl:393
+#: git-gui.sh:2042 lib/index.tcl:395

 msgid "Revert Changes"
 msgstr "撤销修改"
 
 msgid "Revert Changes"
 msgstr "撤销修改"
 

-#: git-gui.sh:2012 git-gui.sh:2329 git-gui.sh:2427
+#: git-gui.sh:2049 git-gui.sh:2368 git-gui.sh:2467

 msgid "Sign Off"
 msgstr "签名(Sign Off)"
 
 msgid "Sign Off"
 msgstr "签名(Sign Off)"
 

-#: git-gui.sh:2016 git-gui.sh:2333
+#: git-gui.sh:2053 git-gui.sh:2372

 msgid "Commit@@verb"
 msgstr "提交"
 
 msgid "Commit@@verb"
 msgstr "提交"
 

-#: git-gui.sh:2027
+#: git-gui.sh:2064

 msgid "Local Merge..."
 msgstr "本地合并..."
 
 msgid "Local Merge..."
 msgstr "本地合并..."
 

-#: git-gui.sh:2032
+#: git-gui.sh:2069

 msgid "Abort Merge..."
 msgstr "中止合并..."
 
 msgid "Abort Merge..."
 msgstr "中止合并..."
 

-#: git-gui.sh:2044
+#: git-gui.sh:2081

 msgid "Push..."
 msgstr "上传..."
 
 msgid "Push..."
 msgstr "上传..."
 

-#: git-gui.sh:2055 lib/choose_repository.tcl:40
+#: git-gui.sh:2092 lib/choose_repository.tcl:41

 msgid "Apple"
 msgstr "苹果"
 
 msgid "Apple"
 msgstr "苹果"
 

-#: git-gui.sh:2058 git-gui.sh:2080 lib/about.tcl:13
-#: lib/choose_repository.tcl:43 lib/choose_repository.tcl:49
+#: git-gui.sh:2095 git-gui.sh:2117 lib/about.tcl:14
+#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:50

 #, tcl-format
 msgid "About %s"
 msgstr "关于 %s"
 
 #, tcl-format
 msgid "About %s"
 msgstr "关于 %s"
 

-#: git-gui.sh:2062
+#: git-gui.sh:2099

 msgid "Preferences..."
 msgstr "首选项..."
 
 msgid "Preferences..."
 msgstr "首选项..."
 

-#: git-gui.sh:2070 git-gui.sh:2595
+#: git-gui.sh:2107 git-gui.sh:2639

 msgid "Options..."
 msgstr "选项..."
 
 msgid "Options..."
 msgstr "选项..."
 

-#: git-gui.sh:2076 lib/choose_repository.tcl:46
+#: git-gui.sh:2113 lib/choose_repository.tcl:47

 msgid "Help"
 msgstr "帮助"
 
 msgid "Help"
 msgstr "帮助"
 

-#: git-gui.sh:2117
+#: git-gui.sh:2154

 msgid "Online Documentation"
 msgstr "在线文档"
 
 msgid "Online Documentation"
 msgstr "在线文档"
 

-#: git-gui.sh:2201
+#: git-gui.sh:2238

 #, tcl-format
 msgid "fatal: cannot stat path %s: No such file or directory"
 msgstr "致命错误: 无法获取路径 %s 的信息: 该文件或目录不存在"
 
 #, tcl-format
 msgid "fatal: cannot stat path %s: No such file or directory"
 msgstr "致命错误: 无法获取路径 %s 的信息: 该文件或目录不存在"
 

-#: git-gui.sh:2234
+#: git-gui.sh:2271

 msgid "Current Branch:"
 msgstr "当前分支:"
 
 msgid "Current Branch:"
 msgstr "当前分支:"
 

-#: git-gui.sh:2255
+#: git-gui.sh:2292

 msgid "Staged Changes (Will Commit)"
 msgstr "已缓存的改动 (将被提交)"
 
 msgid "Staged Changes (Will Commit)"
 msgstr "已缓存的改动 (将被提交)"
 

-#: git-gui.sh:2274
+#: git-gui.sh:2312

 msgid "Unstaged Changes"
 msgstr "未缓存的改动"
 
 msgid "Unstaged Changes"
 msgstr "未缓存的改动"
 

-#: git-gui.sh:2323
+#: git-gui.sh:2362

 msgid "Stage Changed"
 msgstr "缓存改动"
 
 msgid "Stage Changed"
 msgstr "缓存改动"
 

-#: git-gui.sh:2339 lib/transport.tcl:93 lib/transport.tcl:182
+#: git-gui.sh:2378 lib/transport.tcl:93 lib/transport.tcl:182

 msgid "Push"
 msgstr "上传"
 
 msgid "Push"
 msgstr "上传"
 

-#: git-gui.sh:2369
+#: git-gui.sh:2408

 msgid "Initial Commit Message:"
 msgstr "初始的提交描述:"
 
 msgid "Initial Commit Message:"
 msgstr "初始的提交描述:"
 

-#: git-gui.sh:2370
+#: git-gui.sh:2409

 msgid "Amended Commit Message:"
 msgstr "修正的提交描述:"
 
 msgid "Amended Commit Message:"
 msgstr "修正的提交描述:"
 

-#: git-gui.sh:2371
+#: git-gui.sh:2410

 msgid "Amended Initial Commit Message:"
 msgstr "修正的初始提交描述:"
 
 msgid "Amended Initial Commit Message:"
 msgstr "修正的初始提交描述:"
 

-#: git-gui.sh:2372
+#: git-gui.sh:2411

 msgid "Amended Merge Commit Message:"
 msgstr "修正的合并提交描述:"
 
 msgid "Amended Merge Commit Message:"
 msgstr "修正的合并提交描述:"
 

-#: git-gui.sh:2373
+#: git-gui.sh:2412

 msgid "Merge Commit Message:"
 msgstr "合并提交描述:"
 
 msgid "Merge Commit Message:"
 msgstr "合并提交描述:"
 

-#: git-gui.sh:2374
+#: git-gui.sh:2413

 msgid "Commit Message:"
 msgstr "提交描述:"
 
 msgid "Commit Message:"
 msgstr "提交描述:"
 

-#: git-gui.sh:2419 git-gui.sh:2557 lib/console.tcl:71
+#: git-gui.sh:2459 git-gui.sh:2622 lib/console.tcl:73

 msgid "Copy All"
 msgstr "全部复制"
 
 msgid "Copy All"
 msgstr "全部复制"
 

-#: git-gui.sh:2443 lib/blame.tcl:104
+#: git-gui.sh:2483 lib/blame.tcl:107

 msgid "File:"
 msgstr "文件:"
 
 msgid "File:"
 msgstr "文件:"
 

-#: git-gui.sh:2545
-msgid "Refresh"
-msgstr "刷新"
-
-#: git-gui.sh:2566
+#: git-gui.sh:2589

 msgid "Apply/Reverse Hunk"
 msgstr "应用/撤消此修改块"
 
 msgid "Apply/Reverse Hunk"
 msgstr "应用/撤消此修改块"
 

-#: git-gui.sh:2572
-msgid "Decrease Font Size"
-msgstr "缩小字体"
-
-#: git-gui.sh:2576
-msgid "Increase Font Size"
-msgstr "放大字体"
-
-#: git-gui.sh:2581
+#: git-gui.sh:2595

 msgid "Show Less Context"
 msgstr "显示更少上下文"
 
 msgid "Show Less Context"
 msgstr "显示更少上下文"
 

-#: git-gui.sh:2588
+#: git-gui.sh:2602

 msgid "Show More Context"
 msgstr "显示更多上下文"
 
 msgid "Show More Context"
 msgstr "显示更多上下文"
 

-#: git-gui.sh:2602
+#: git-gui.sh:2610
+msgid "Refresh"
+msgstr "刷新"
+
+#: git-gui.sh:2631
+msgid "Decrease Font Size"
+msgstr "缩小字体"
+
+#: git-gui.sh:2635
+msgid "Increase Font Size"
+msgstr "放大字体"
+
+#: git-gui.sh:2646

 msgid "Unstage Hunk From Commit"
 msgstr "从提交中撤除修改块"
 
 msgid "Unstage Hunk From Commit"
 msgstr "从提交中撤除修改块"
 

-#: git-gui.sh:2604
+#: git-gui.sh:2648

 msgid "Stage Hunk For Commit"
 msgstr "缓存修改块为提交"
 
 msgid "Stage Hunk For Commit"
 msgstr "缓存修改块为提交"
 

-#: git-gui.sh:2623
+#: git-gui.sh:2667

 msgid "Initializing..."
 msgstr "初始化..."
 
 msgid "Initializing..."
 msgstr "初始化..."
 

-#: git-gui.sh:2718
+#: git-gui.sh:2762

 #, tcl-format
 msgid ""
 "Possible environment issues exist.\n"
 #, tcl-format
 msgid ""
 "Possible environment issues exist.\n"


@@ -464,7 +464,7 @@ msgstr ""
 "由 %s 执行的 Git 子进程可能忽略下列环境变量:\n"
 "\n"
 
 "由 %s 执行的 Git 子进程可能忽略下列环境变量:\n"
 "\n"
 

-#: git-gui.sh:2748
+#: git-gui.sh:2792

 msgid ""
 "\n"
 "This is due to a known issue with the\n"
 msgid ""
 "\n"
 "This is due to a known issue with the\n"


@@ -474,7 +474,7 @@ msgstr ""
 "这是由 Cygwin 发布的 Tcl 代码中一个\n"
 "已知问题所引起."
 
 "这是由 Cygwin 发布的 Tcl 代码中一个\n"
 "已知问题所引起."
 

-#: git-gui.sh:2753
+#: git-gui.sh:2797

 #, tcl-format
 msgid ""
 "\n"
 #, tcl-format
 msgid ""
 "\n"


@@ -489,7 +489,7 @@ msgstr ""
 "%s 的一个很好的替代方案是将 user.name 以及\n"
 "user.email 设置放在你的个人 ~/.gitconfig 文件中.\n"
 
 "%s 的一个很好的替代方案是将 user.name 以及\n"
 "user.email 设置放在你的个人 ~/.gitconfig 文件中.\n"
 

-#: lib/about.tcl:25
+#: lib/about.tcl:26

 msgid "git-gui - a graphical user interface for Git."
 msgstr "git-gui - Git 的图形化用户界面"
 
 msgid "git-gui - a graphical user interface for Git."
 msgstr "git-gui - Git 的图形化用户界面"
 


@@ -501,56 +501,56 @@ msgstr "文件查看器"
 msgid "Commit:"
 msgstr "提交:"
 
 msgid "Commit:"
 msgstr "提交:"
 

-#: lib/blame.tcl:249
+#: lib/blame.tcl:264

 msgid "Copy Commit"
 msgstr "复制提交"
 
 msgid "Copy Commit"
 msgstr "复制提交"
 

-#: lib/blame.tcl:369
+#: lib/blame.tcl:384

 #, tcl-format
 msgid "Reading %s..."
 msgstr "读取 %s..."
 
 #, tcl-format
 msgid "Reading %s..."
 msgstr "读取 %s..."
 

-#: lib/blame.tcl:473
+#: lib/blame.tcl:488

 msgid "Loading copy/move tracking annotations..."
 msgstr "装载复制/移动跟踪标注..."
 
 msgid "Loading copy/move tracking annotations..."
 msgstr "装载复制/移动跟踪标注..."
 

-#: lib/blame.tcl:493
+#: lib/blame.tcl:508

 msgid "lines annotated"
 msgstr "标注行"
 
 msgid "lines annotated"
 msgstr "标注行"
 

-#: lib/blame.tcl:674
+#: lib/blame.tcl:689

 msgid "Loading original location annotations..."
 msgstr "装载原始位置标注..."
 
 msgid "Loading original location annotations..."
 msgstr "装载原始位置标注..."
 

-#: lib/blame.tcl:677
+#: lib/blame.tcl:692

 msgid "Annotation complete."
 msgstr "标注完成."
 
 msgid "Annotation complete."
 msgstr "标注完成."
 

-#: lib/blame.tcl:731
+#: lib/blame.tcl:746

 msgid "Loading annotation..."
 msgstr "裝載标注..."
 
 msgid "Loading annotation..."
 msgstr "裝載标注..."
 

-#: lib/blame.tcl:787
+#: lib/blame.tcl:802

 msgid "Author:"
 msgstr "作者:"
 
 msgid "Author:"
 msgstr "作者:"
 

-#: lib/blame.tcl:791
+#: lib/blame.tcl:806

 msgid "Committer:"
 msgstr "提交者:"
 
 msgid "Committer:"
 msgstr "提交者:"
 

-#: lib/blame.tcl:796
+#: lib/blame.tcl:811

 msgid "Original File:"
 msgstr "原始文件:"
 
 msgid "Original File:"
 msgstr "原始文件:"
 

-#: lib/blame.tcl:910
+#: lib/blame.tcl:925

 msgid "Originally By:"
 msgstr "最初由:"
 
 msgid "Originally By:"
 msgstr "最初由:"
 

-#: lib/blame.tcl:916
+#: lib/blame.tcl:931

 msgid "In File:"
 msgstr "在文件:"
 
 msgid "In File:"
 msgstr "在文件:"
 

-#: lib/blame.tcl:921
+#: lib/blame.tcl:936

 msgid "Copied Or Moved Here By:"
 msgstr "由复制或移动至此:"
 
 msgid "Copied Or Moved Here By:"
 msgstr "由复制或移动至此:"
 


@@ -563,17 +563,17 @@ msgid "Checkout"
 msgstr "Checkout"
 
 #: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35
 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:281
-#: lib/checkout_op.tcl:522 lib/choose_font.tcl:43 lib/merge.tcl:172
-#: lib/option.tcl:90 lib/remote_branch_delete.tcl:42 lib/transport.tcl:97
+#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:282
+#: lib/checkout_op.tcl:522 lib/choose_font.tcl:43 lib/merge.tcl:171
+#: lib/option.tcl:103 lib/remote_branch_delete.tcl:42 lib/transport.tcl:97

 msgid "Cancel"
 msgstr "取消"
 
 msgid "Cancel"
 msgstr "取消"
 

-#: lib/branch_checkout.tcl:32 lib/browser.tcl:286
+#: lib/branch_checkout.tcl:32 lib/browser.tcl:287

 msgid "Revision"
 msgstr "版本"
 
 msgid "Revision"
 msgstr "版本"
 

-#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:202
+#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:242

 msgid "Options"
 msgstr "选项..."
 
 msgid "Options"
 msgstr "选项..."
 


@@ -593,7 +593,7 @@ msgstr "创建分支"
 msgid "Create New Branch"
 msgstr "新建分支"
 
 msgid "Create New Branch"
 msgstr "新建分支"
 

-#: lib/branch_create.tcl:31 lib/choose_repository.tcl:375
+#: lib/branch_create.tcl:31 lib/choose_repository.tcl:371

 msgid "Create"
 msgstr "新建"
 
 msgid "Create"
 msgstr "新建"
 


@@ -733,22 +733,22 @@ msgstr "开始..."
 msgid "File Browser"
 msgstr "文件浏览器"
 
 msgid "File Browser"
 msgstr "文件浏览器"
 

-#: lib/browser.tcl:125 lib/browser.tcl:142
+#: lib/browser.tcl:126 lib/browser.tcl:143

 #, tcl-format
 msgid "Loading %s..."
 msgstr "装载 %s..."
 
 #, tcl-format
 msgid "Loading %s..."
 msgstr "装载 %s..."
 

-#: lib/browser.tcl:186
+#: lib/browser.tcl:187

 msgid "[Up To Parent]"
 msgstr "[上层目录]"
 
 msgid "[Up To Parent]"
 msgstr "[上层目录]"
 

-#: lib/browser.tcl:266 lib/browser.tcl:272
+#: lib/browser.tcl:267 lib/browser.tcl:273

 msgid "Browse Branch Files"
 msgstr "浏览分支文件"
 
 msgid "Browse Branch Files"
 msgstr "浏览分支文件"
 

-#: lib/browser.tcl:277 lib/choose_repository.tcl:391
-#: lib/choose_repository.tcl:482 lib/choose_repository.tcl:492
-#: lib/choose_repository.tcl:989
+#: lib/browser.tcl:278 lib/choose_repository.tcl:387
+#: lib/choose_repository.tcl:474 lib/choose_repository.tcl:484
+#: lib/choose_repository.tcl:987

 msgid "Browse"
 msgstr "浏览"
 
 msgid "Browse"
 msgstr "浏览"
 


@@ -762,7 +762,7 @@ msgstr "获取 %s 自 %s"
 msgid "fatal: Cannot resolve %s"
 msgstr "致命错误: 无法解决 %s"
 
 msgid "fatal: Cannot resolve %s"
 msgstr "致命错误: 无法解决 %s"
 

-#: lib/checkout_op.tcl:140 lib/console.tcl:79 lib/database.tcl:31
+#: lib/checkout_op.tcl:140 lib/console.tcl:81 lib/database.tcl:31

 msgid "Close"
 msgstr "关闭"
 
 msgid "Close"
 msgstr "关闭"
 


@@ -819,6 +819,10 @@ msgstr ""
 msgid "Updating working directory to '%s'..."
 msgstr "更新工作目录到 '%s'..."
 
 msgid "Updating working directory to '%s'..."
 msgstr "更新工作目录到 '%s'..."
 

+#: lib/checkout_op.tcl:323
+msgid "files checked out"
+msgstr ""
+

 #: lib/checkout_op.tcl:353
 #, tcl-format
 msgid "Aborted checkout of '%s' (file level merging is required)."
 #: lib/checkout_op.tcl:353
 #, tcl-format
 msgid "Aborted checkout of '%s' (file level merging is required)."


@@ -844,7 +848,7 @@ msgstr ""
 "\n"
 "如果你想位于某分支上, 从当前脱节的Checkout中创建一个新分支."
 
 "\n"
 "如果你想位于某分支上, 从当前脱节的Checkout中创建一个新分支."
 

-#: lib/checkout_op.tcl:446
+#: lib/checkout_op.tcl:446 lib/checkout_op.tcl:450

 #, tcl-format
 msgid "Checked out '%s'."
 msgstr "'%s' 已被 checkout"
 #, tcl-format
 msgid "Checked out '%s'."
 msgstr "'%s' 已被 checkout"


@@ -863,7 +867,7 @@ msgstr "恢复丢失的提交是比较困难的."
 msgid "Reset '%s'?"
 msgstr "复位 '%s'?"
 
 msgid "Reset '%s'?"
 msgstr "复位 '%s'?"
 

-#: lib/checkout_op.tcl:510 lib/merge.tcl:164
+#: lib/checkout_op.tcl:510 lib/merge.tcl:163

 msgid "Visualize"
 msgstr "图示"
 
 msgid "Visualize"
 msgstr "图示"
 


@@ -892,15 +896,15 @@ msgstr "选择"
 msgid "Font Family"
 msgstr "字体族"
 
 msgid "Font Family"
 msgstr "字体族"
 

-#: lib/choose_font.tcl:73
+#: lib/choose_font.tcl:74

 msgid "Font Size"
 msgstr "字体大小"
 
 msgid "Font Size"
 msgstr "字体大小"
 

-#: lib/choose_font.tcl:90
+#: lib/choose_font.tcl:91

 msgid "Font Example"
 msgstr "字体样例"
 
 msgid "Font Example"
 msgstr "字体样例"
 

-#: lib/choose_font.tcl:101
+#: lib/choose_font.tcl:103

 msgid ""
 "This is example text.\n"
 "If you like this text, it can be your font."
 msgid ""
 "This is example text.\n"
 "If you like this text, it can be your font."


@@ -908,226 +912,226 @@ msgstr ""
 "这是样例文本.\n"
 "如果你喜欢, 你可以设置该字体."
 
 "这是样例文本.\n"
 "如果你喜欢, 你可以设置该字体."
 

-#: lib/choose_repository.tcl:27
+#: lib/choose_repository.tcl:28

 msgid "Git Gui"
 msgstr "Git Gui"
 
 msgid "Git Gui"
 msgstr "Git Gui"
 

-#: lib/choose_repository.tcl:80 lib/choose_repository.tcl:380
+#: lib/choose_repository.tcl:81 lib/choose_repository.tcl:376

 msgid "Create New Repository"
 msgstr "创建新的版本库"
 
 msgid "Create New Repository"
 msgstr "创建新的版本库"
 

-#: lib/choose_repository.tcl:86
+#: lib/choose_repository.tcl:87

 msgid "New..."
 msgstr "新建..."
 
 msgid "New..."
 msgstr "新建..."
 

-#: lib/choose_repository.tcl:93 lib/choose_repository.tcl:468
+#: lib/choose_repository.tcl:94 lib/choose_repository.tcl:460

 msgid "Clone Existing Repository"
 msgstr "克隆已有版本库"
 
 msgid "Clone Existing Repository"
 msgstr "克隆已有版本库"
 

-#: lib/choose_repository.tcl:99
+#: lib/choose_repository.tcl:100

 msgid "Clone..."
 msgstr "克隆..."
 
 msgid "Clone..."
 msgstr "克隆..."
 

-#: lib/choose_repository.tcl:106 lib/choose_repository.tcl:978
+#: lib/choose_repository.tcl:107 lib/choose_repository.tcl:976

 msgid "Open Existing Repository"
 msgstr "打开已有版本库"
 
 msgid "Open Existing Repository"
 msgstr "打开已有版本库"
 

-#: lib/choose_repository.tcl:112
+#: lib/choose_repository.tcl:113

 msgid "Open..."
 msgstr "打开..."
 
 msgid "Open..."
 msgstr "打开..."
 

-#: lib/choose_repository.tcl:125
+#: lib/choose_repository.tcl:126

 msgid "Recent Repositories"
 msgstr "最近版本库"
 
 msgid "Recent Repositories"
 msgstr "最近版本库"
 

-#: lib/choose_repository.tcl:131
+#: lib/choose_repository.tcl:132

 msgid "Open Recent Repository:"
 msgstr "打开最近版本库"
 
 msgid "Open Recent Repository:"
 msgstr "打开最近版本库"
 

-#: lib/choose_repository.tcl:294
-#, tcl-format
-msgid "Location %s already exists."
-msgstr "位置 %s 已经存在."
-
-#: lib/choose_repository.tcl:300 lib/choose_repository.tcl:307
-#: lib/choose_repository.tcl:314
+#: lib/choose_repository.tcl:296 lib/choose_repository.tcl:303
+#: lib/choose_repository.tcl:310

 #, tcl-format
 msgid "Failed to create repository %s:"
 msgstr "无法创建版本库 %s:"
 
 #, tcl-format
 msgid "Failed to create repository %s:"
 msgstr "无法创建版本库 %s:"
 

-#: lib/choose_repository.tcl:385 lib/choose_repository.tcl:486
+#: lib/choose_repository.tcl:381 lib/choose_repository.tcl:478

 msgid "Directory:"
 msgstr "目录:"
 
 msgid "Directory:"
 msgstr "目录:"
 

-#: lib/choose_repository.tcl:415 lib/choose_repository.tcl:544
-#: lib/choose_repository.tcl:1013
+#: lib/choose_repository.tcl:412 lib/choose_repository.tcl:537
+#: lib/choose_repository.tcl:1011

 msgid "Git Repository"
 msgstr "Git 版本库"
 
 msgid "Git Repository"
 msgstr "Git 版本库"
 

-#: lib/choose_repository.tcl:430 lib/choose_repository.tcl:437
+#: lib/choose_repository.tcl:437

 #, tcl-format
 msgid "Directory %s already exists."
 msgstr "目录 %s 已经存在."
 
 #, tcl-format
 msgid "Directory %s already exists."
 msgstr "目录 %s 已经存在."
 

-#: lib/choose_repository.tcl:442
+#: lib/choose_repository.tcl:441

 #, tcl-format
 msgid "File %s already exists."
 msgstr "文件 %s 已经存在."
 
 #, tcl-format
 msgid "File %s already exists."
 msgstr "文件 %s 已经存在."
 

-#: lib/choose_repository.tcl:463
+#: lib/choose_repository.tcl:455

 msgid "Clone"
 msgstr "克隆"
 
 msgid "Clone"
 msgstr "克隆"
 

-#: lib/choose_repository.tcl:476
+#: lib/choose_repository.tcl:468

 msgid "URL:"
 msgstr "URL:"
 
 msgid "URL:"
 msgstr "URL:"
 

-#: lib/choose_repository.tcl:496
+#: lib/choose_repository.tcl:489

 msgid "Clone Type:"
 msgstr "克隆类型:"
 
 msgid "Clone Type:"
 msgstr "克隆类型:"
 

-#: lib/choose_repository.tcl:502
+#: lib/choose_repository.tcl:495

 msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
 msgstr "标准方式 (快速, 部分备份, 作硬连接)"
 
 msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
 msgstr "标准方式 (快速, 部分备份, 作硬连接)"
 

-#: lib/choose_repository.tcl:508
+#: lib/choose_repository.tcl:501

 msgid "Full Copy (Slower, Redundant Backup)"
 msgstr "全部复制 (较慢, 做备份)"
 
 msgid "Full Copy (Slower, Redundant Backup)"
 msgstr "全部复制 (较慢, 做备份)"
 

-#: lib/choose_repository.tcl:514
+#: lib/choose_repository.tcl:507

 msgid "Shared (Fastest, Not Recommended, No Backup)"
 msgstr "共享方式 (最快, 不推荐, 不做备份)"
 
 msgid "Shared (Fastest, Not Recommended, No Backup)"
 msgstr "共享方式 (最快, 不推荐, 不做备份)"
 

-#: lib/choose_repository.tcl:550 lib/choose_repository.tcl:597
-#: lib/choose_repository.tcl:738 lib/choose_repository.tcl:808
-#: lib/choose_repository.tcl:1019 lib/choose_repository.tcl:1027
+#: lib/choose_repository.tcl:543 lib/choose_repository.tcl:590
+#: lib/choose_repository.tcl:736 lib/choose_repository.tcl:806
+#: lib/choose_repository.tcl:1017 lib/choose_repository.tcl:1025

 #, tcl-format
 msgid "Not a Git repository: %s"
 msgstr "不是一个 Git 版本库: %s"
 
 #, tcl-format
 msgid "Not a Git repository: %s"
 msgstr "不是一个 Git 版本库: %s"
 

-#: lib/choose_repository.tcl:586
+#: lib/choose_repository.tcl:579

 msgid "Standard only available for local repository."
 msgstr "标准方式仅当是本地版本库时有效."
 
 msgid "Standard only available for local repository."
 msgstr "标准方式仅当是本地版本库时有效."
 

-#: lib/choose_repository.tcl:590
+#: lib/choose_repository.tcl:583

 msgid "Shared only available for local repository."
 msgstr "共享方式仅当是本地版本库时有效."
 
 msgid "Shared only available for local repository."
 msgstr "共享方式仅当是本地版本库时有效."
 

-#: lib/choose_repository.tcl:617
+#: lib/choose_repository.tcl:604
+#, tcl-format
+msgid "Location %s already exists."
+msgstr "位置 %s 已经存在."
+
+#: lib/choose_repository.tcl:615

 msgid "Failed to configure origin"
 msgstr "无法配置 origin"
 
 msgid "Failed to configure origin"
 msgstr "无法配置 origin"
 

-#: lib/choose_repository.tcl:629
+#: lib/choose_repository.tcl:627

 msgid "Counting objects"
 msgstr "清点对象"
 
 msgid "Counting objects"
 msgstr "清点对象"
 

-#: lib/choose_repository.tcl:630
+#: lib/choose_repository.tcl:628

 #, fuzzy
 msgid "buckets"
 msgstr "水桶??"
 
 #, fuzzy
 msgid "buckets"
 msgstr "水桶??"
 

-#: lib/choose_repository.tcl:654
+#: lib/choose_repository.tcl:652

 #, tcl-format
 msgid "Unable to copy objects/info/alternates: %s"
 msgstr "无法复制 objects/info/alternates: %s"
 
 #, tcl-format
 msgid "Unable to copy objects/info/alternates: %s"
 msgstr "无法复制 objects/info/alternates: %s"
 

-#: lib/choose_repository.tcl:690
+#: lib/choose_repository.tcl:688

 #, tcl-format
 msgid "Nothing to clone from %s."
 msgstr "没有东西可从 %s 克隆."
 
 #, tcl-format
 msgid "Nothing to clone from %s."
 msgstr "没有东西可从 %s 克隆."
 

-#: lib/choose_repository.tcl:692 lib/choose_repository.tcl:906
-#: lib/choose_repository.tcl:918
+#: lib/choose_repository.tcl:690 lib/choose_repository.tcl:904
+#: lib/choose_repository.tcl:916

 msgid "The 'master' branch has not been initialized."
 msgstr "'master'分支尚未初始化."
 
 msgid "The 'master' branch has not been initialized."
 msgstr "'master'分支尚未初始化."
 

-#: lib/choose_repository.tcl:705
+#: lib/choose_repository.tcl:703

 msgid "Hardlinks are unavailable.  Falling back to copying."
 msgstr "硬连接不可用. 使用复制."
 
 msgid "Hardlinks are unavailable.  Falling back to copying."
 msgstr "硬连接不可用. 使用复制."
 

-#: lib/choose_repository.tcl:717
+#: lib/choose_repository.tcl:715

 #, tcl-format
 msgid "Cloning from %s"
 msgstr "从 %s 克隆"
 
 #, tcl-format
 msgid "Cloning from %s"
 msgstr "从 %s 克隆"
 

-#: lib/choose_repository.tcl:748
+#: lib/choose_repository.tcl:746

 msgid "Copying objects"
 msgstr "复制 objects"
 
 msgid "Copying objects"
 msgstr "复制 objects"
 

-#: lib/choose_repository.tcl:749
+#: lib/choose_repository.tcl:747

 msgid "KiB"
 msgstr "KiB"
 
 msgid "KiB"
 msgstr "KiB"
 

-#: lib/choose_repository.tcl:773
+#: lib/choose_repository.tcl:771

 #, tcl-format
 msgid "Unable to copy object: %s"
 msgstr "无法复制 object: %s"
 
 #, tcl-format
 msgid "Unable to copy object: %s"
 msgstr "无法复制 object: %s"
 

-#: lib/choose_repository.tcl:783
+#: lib/choose_repository.tcl:781

 msgid "Linking objects"
 msgstr "链接 objects"
 
 msgid "Linking objects"
 msgstr "链接 objects"
 

-#: lib/choose_repository.tcl:784
+#: lib/choose_repository.tcl:782

 msgid "objects"
 msgstr "objects"
 
 msgid "objects"
 msgstr "objects"
 

-#: lib/choose_repository.tcl:792
+#: lib/choose_repository.tcl:790

 #, tcl-format
 msgid "Unable to hardlink object: %s"
 msgstr "无法硬链接 object: %s"
 
 #, tcl-format
 msgid "Unable to hardlink object: %s"
 msgstr "无法硬链接 object: %s"
 

-#: lib/choose_repository.tcl:847
+#: lib/choose_repository.tcl:845

 msgid "Cannot fetch branches and objects.  See console output for details."
 msgstr "无法获取分支和对象. 请查看控制终端的输出."
 
 msgid "Cannot fetch branches and objects.  See console output for details."
 msgstr "无法获取分支和对象. 请查看控制终端的输出."
 

-#: lib/choose_repository.tcl:858
+#: lib/choose_repository.tcl:856

 msgid "Cannot fetch tags.  See console output for details."
 msgstr "无法获取标签. 请查看控制终端的输出."
 
 msgid "Cannot fetch tags.  See console output for details."
 msgstr "无法获取标签. 请查看控制终端的输出."
 

-#: lib/choose_repository.tcl:882
+#: lib/choose_repository.tcl:880

 msgid "Cannot determine HEAD.  See console output for details."
 msgstr "无法确定 HEAD. 请查看控制终端的输出."
 
 msgid "Cannot determine HEAD.  See console output for details."
 msgstr "无法确定 HEAD. 请查看控制终端的输出."
 

-#: lib/choose_repository.tcl:891
+#: lib/choose_repository.tcl:889

 #, tcl-format
 msgid "Unable to cleanup %s"
 msgstr "无法清理 %s"
 
 #, tcl-format
 msgid "Unable to cleanup %s"
 msgstr "无法清理 %s"
 

-#: lib/choose_repository.tcl:897
+#: lib/choose_repository.tcl:895

 msgid "Clone failed."
 msgstr "克隆失败."
 
 msgid "Clone failed."
 msgstr "克隆失败."
 

-#: lib/choose_repository.tcl:904
+#: lib/choose_repository.tcl:902

 msgid "No default branch obtained."
 msgstr "没有获取缺省分支"
 
 msgid "No default branch obtained."
 msgstr "没有获取缺省分支"
 

-#: lib/choose_repository.tcl:915
+#: lib/choose_repository.tcl:913

 #, tcl-format
 msgid "Cannot resolve %s as a commit."
 msgstr "无法解析 %s 为提交."
 
 #, tcl-format
 msgid "Cannot resolve %s as a commit."
 msgstr "无法解析 %s 为提交."
 

-#: lib/choose_repository.tcl:927
+#: lib/choose_repository.tcl:925

 msgid "Creating working directory"
 msgstr "创建工作目录"
 
 msgid "Creating working directory"
 msgstr "创建工作目录"
 

-#: lib/choose_repository.tcl:928 lib/index.tcl:65 lib/index.tcl:127
+#: lib/choose_repository.tcl:926 lib/index.tcl:65 lib/index.tcl:127

 #: lib/index.tcl:193
 msgid "files"
 msgstr "文件"
 
 #: lib/index.tcl:193
 msgid "files"
 msgstr "文件"
 

-#: lib/choose_repository.tcl:957
+#: lib/choose_repository.tcl:955

 msgid "Initial file checkout failed."
 msgstr "初始的文件checkout失败"
 
 msgid "Initial file checkout failed."
 msgstr "初始的文件checkout失败"
 

-#: lib/choose_repository.tcl:973
+#: lib/choose_repository.tcl:971

 msgid "Open"
 msgstr "打开"
 
 msgid "Open"
 msgstr "打开"
 

-#: lib/choose_repository.tcl:983
+#: lib/choose_repository.tcl:981

 msgid "Repository:"
 msgstr "版本库"
 
 msgid "Repository:"
 msgstr "版本库"
 

-#: lib/choose_repository.tcl:1033
+#: lib/choose_repository.tcl:1031

 #, tcl-format
 msgid "Failed to open repository %s:"
 msgstr "无法打开版本库 %s:"
 #, tcl-format
 msgid "Failed to open repository %s:"
 msgstr "无法打开版本库 %s:"


@@ -1148,7 +1152,7 @@ msgstr "本地分支"
 msgid "Tracking Branch"
 msgstr "跟踪分支:"
 
 msgid "Tracking Branch"
 msgstr "跟踪分支:"
 

-#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:537
+#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:538

 msgid "Tag"
 msgstr "标签"
 
 msgid "Tag"
 msgstr "标签"
 


@@ -1165,11 +1169,11 @@ msgstr "没有选择版本."
 msgid "Revision expression is empty."
 msgstr "版本表达式为空."
 
 msgid "Revision expression is empty."
 msgstr "版本表达式为空."
 

-#: lib/choose_rev.tcl:530
+#: lib/choose_rev.tcl:531

 msgid "Updated"
 msgstr "已更新"
 
 msgid "Updated"
 msgstr "已更新"
 

-#: lib/choose_rev.tcl:558
+#: lib/choose_rev.tcl:559

 msgid "URL"
 msgstr "URL"
 
 msgid "URL"
 msgstr "URL"
 


@@ -1276,16 +1280,46 @@ msgstr ""
 "- 第二行: 空行\n"
 "- 剩余行: 请描述为什么你做的这些改动是好的.\n"
 
 "- 第二行: 空行\n"
 "- 剩余行: 请描述为什么你做的这些改动是好的.\n"
 

-#: lib/commit.tcl:257
+#: lib/commit.tcl:207
+#, tcl-format
+msgid "warning: Tcl does not support encoding '%s'."
+msgstr "警告: Tcl 不支持编码方式 '%s'."
+
+#: lib/commit.tcl:221
+msgid "Calling pre-commit hook..."
+msgstr ""
+
+#: lib/commit.tcl:236
+msgid "Commit declined by pre-commit hook."
+msgstr ""
+
+#: lib/commit.tcl:259
+msgid "Calling commit-msg hook..."
+msgstr ""
+
+#: lib/commit.tcl:274
+msgid "Commit declined by commit-msg hook."
+msgstr ""
+
+#: lib/commit.tcl:287
+msgid "Committing changes..."
+msgstr ""
+
+#: lib/commit.tcl:303

 msgid "write-tree failed:"
 msgstr "write-tree 失败:"
 
 msgid "write-tree failed:"
 msgstr "write-tree 失败:"
 

-#: lib/commit.tcl:275
+#: lib/commit.tcl:304 lib/commit.tcl:348 lib/commit.tcl:368
+#, fuzzy
+msgid "Commit failed."
+msgstr "克隆失败."
+
+#: lib/commit.tcl:321

 #, tcl-format
 msgid "Commit %s appears to be corrupt"
 msgstr "提交 %s 似乎已损坏"
 
 #, tcl-format
 msgid "Commit %s appears to be corrupt"
 msgstr "提交 %s 似乎已损坏"
 

-#: lib/commit.tcl:279
+#: lib/commit.tcl:326

 msgid ""
 "No changes to commit.\n"
 "\n"
 msgid ""
 "No changes to commit.\n"
 "\n"


@@ -1299,37 +1333,32 @@ msgstr ""
 "\n"
 "重新扫描将自动开始.\n"
 
 "\n"
 "重新扫描将自动开始.\n"
 

-#: lib/commit.tcl:286
+#: lib/commit.tcl:333

 msgid "No changes to commit."
 msgstr "没有改动要提交."
 
 msgid "No changes to commit."
 msgstr "没有改动要提交."
 

-#: lib/commit.tcl:303
-#, tcl-format
-msgid "warning: Tcl does not support encoding '%s'."
-msgstr "警告: Tcl 不支持编码方式 '%s'."
-
-#: lib/commit.tcl:317
+#: lib/commit.tcl:347

 msgid "commit-tree failed:"
 msgstr "commit-tree 失败:"
 
 msgid "commit-tree failed:"
 msgstr "commit-tree 失败:"
 

-#: lib/commit.tcl:339
+#: lib/commit.tcl:367

 msgid "update-ref failed:"
 msgstr "update-ref 失败:"
 
 msgid "update-ref failed:"
 msgstr "update-ref 失败:"
 

-#: lib/commit.tcl:430
+#: lib/commit.tcl:454

 #, tcl-format
 msgid "Created commit %s: %s"
 msgstr "创建了 commit %s: %s"
 
 #, tcl-format
 msgid "Created commit %s: %s"
 msgstr "创建了 commit %s: %s"
 

-#: lib/console.tcl:57
+#: lib/console.tcl:59

 msgid "Working... please wait..."
 msgstr "工作中... 请等待..."
 
 msgid "Working... please wait..."
 msgstr "工作中... 请等待..."
 

-#: lib/console.tcl:183
+#: lib/console.tcl:186

 msgid "Success"
 msgstr "成功"
 
 msgid "Success"
 msgstr "成功"
 

-#: lib/console.tcl:196
+#: lib/console.tcl:200

 msgid "Error: Command Failed"
 msgstr "错误: 命令失败"
 
 msgid "Error: Command Failed"
 msgstr "错误: 命令失败"
 


@@ -1435,23 +1464,23 @@ msgstr "* 二进制文件 (不显示内容)."
 msgid "Error loading diff:"
 msgstr "装载 diff 错误:"
 
 msgid "Error loading diff:"
 msgstr "装载 diff 错误:"
 

-#: lib/diff.tcl:302
+#: lib/diff.tcl:303

 msgid "Failed to unstage selected hunk."
 msgstr "无法将选择的代码段从缓存中删除."
 
 msgid "Failed to unstage selected hunk."
 msgstr "无法将选择的代码段从缓存中删除."
 

-#: lib/diff.tcl:309
+#: lib/diff.tcl:310

 msgid "Failed to stage selected hunk."
 msgstr "无法缓存所选代码段."
 
 msgid "Failed to stage selected hunk."
 msgstr "无法缓存所选代码段."
 

-#: lib/error.tcl:12 lib/error.tcl:102
+#: lib/error.tcl:20 lib/error.tcl:114

 msgid "error"
 msgstr "错误"
 
 msgid "error"
 msgstr "错误"
 

-#: lib/error.tcl:28
+#: lib/error.tcl:36

 msgid "warning"
 msgstr "警告"
 
 msgid "warning"
 msgstr "警告"
 

-#: lib/error.tcl:81
+#: lib/error.tcl:94

 msgid "You must correct the above errors before committing."
 msgstr "你必须在提交前修正上述错误."
 
 msgid "You must correct the above errors before committing."
 msgstr "你必须在提交前修正上述错误."
 


@@ -1482,6 +1511,11 @@ msgstr "解锁 Index"
 msgid "Unstaging %s from commit"
 msgstr "从提交缓存中删除 %s"
 
 msgid "Unstaging %s from commit"
 msgstr "从提交缓存中删除 %s"
 

+#: lib/index.tcl:313
+#, fuzzy
+msgid "Ready to commit."
+msgstr "缓存为提交"
+

 #: lib/index.tcl:326
 #, tcl-format
 msgid "Adding %s"
 #: lib/index.tcl:326
 #, tcl-format
 msgid "Adding %s"


@@ -1497,11 +1531,11 @@ msgstr "撤销文件 %s 中的改动?"
 msgid "Revert changes in these %i files?"
 msgstr "撤销这些 (%i个) 文件的改动?"
 
 msgid "Revert changes in these %i files?"
 msgstr "撤销这些 (%i个) 文件的改动?"
 

-#: lib/index.tcl:389
+#: lib/index.tcl:391

 msgid "Any unstaged changes will be permanently lost by the revert."
 msgstr "任何未缓存的改动将在这次撤销中永久丢失."
 
 msgid "Any unstaged changes will be permanently lost by the revert."
 msgstr "任何未缓存的改动将在这次撤销中永久丢失."
 

-#: lib/index.tcl:392
+#: lib/index.tcl:394

 msgid "Do Nothing"
 msgstr "不做操作"
 
 msgid "Do Nothing"
 msgstr "不做操作"
 


@@ -1562,8 +1596,8 @@ msgstr ""
 "\n"
 "文件 %s 已被修改.\n"
 "\n"
 "\n"
 "文件 %s 已被修改.\n"
 "\n"

-"你必须完成当前的提交后才能开始合并. 如果需要, 这么做将有助于"
-"中止一次失败的合并.\n"
+"你必须完成当前的提交后才能开始合并. 如果需要, 这么做将有助于中止一次失败的合"
+"并.\n"

 
 #: lib/merge.tcl:106
 #, tcl-format
 
 #: lib/merge.tcl:106
 #, tcl-format


@@ -1571,28 +1605,28 @@ msgid "%s of %s"
 msgstr ""
 
 #: lib/merge.tcl:119
 msgstr ""
 
 #: lib/merge.tcl:119

-#, tcl-format
-msgid "Merging %s and %s"
+#, fuzzy, tcl-format
+msgid "Merging %s and %s..."

 msgstr "合并 %s 和 %s"
 
 msgstr "合并 %s 和 %s"
 

-#: lib/merge.tcl:131
+#: lib/merge.tcl:130

 msgid "Merge completed successfully."
 msgstr "合并成功完成."
 
 msgid "Merge completed successfully."
 msgstr "合并成功完成."
 

-#: lib/merge.tcl:133
+#: lib/merge.tcl:132

 msgid "Merge failed.  Conflict resolution is required."
 msgstr "合并失败. 需要解决冲突."
 
 msgid "Merge failed.  Conflict resolution is required."
 msgstr "合并失败. 需要解决冲突."
 

-#: lib/merge.tcl:158
+#: lib/merge.tcl:157

 #, tcl-format
 msgid "Merge Into %s"
 msgstr "合并到 %s"
 
 #, tcl-format
 msgid "Merge Into %s"
 msgstr "合并到 %s"
 

-#: lib/merge.tcl:177
+#: lib/merge.tcl:176

 msgid "Revision To Merge"
 msgstr "要合并的版本"
 
 msgid "Revision To Merge"
 msgstr "要合并的版本"
 

-#: lib/merge.tcl:212
+#: lib/merge.tcl:211

 msgid ""
 "Cannot abort while amending.\n"
 "\n"
 msgid ""
 "Cannot abort while amending.\n"
 "\n"


@@ -1602,7 +1636,7 @@ msgstr ""
 "\n"
 "你必须先完成本次修正操作.\n"
 
 "\n"
 "你必须先完成本次修正操作.\n"
 

-#: lib/merge.tcl:222
+#: lib/merge.tcl:221

 msgid ""
 "Abort merge?\n"
 "\n"
 msgid ""
 "Abort merge?\n"
 "\n"


@@ -1616,7 +1650,7 @@ msgstr ""
 "\n"
 "是否要继续中止当前的合并操作?"
 
 "\n"
 "是否要继续中止当前的合并操作?"
 

-#: lib/merge.tcl:228
+#: lib/merge.tcl:227

 msgid ""
 "Reset changes?\n"
 "\n"
 msgid ""
 "Reset changes?\n"
 "\n"


@@ -1630,93 +1664,107 @@ msgstr ""
 "\n"
 "是否要继续复位当前的改动?"
 
 "\n"
 "是否要继续复位当前的改动?"
 

-#: lib/merge.tcl:239
+#: lib/merge.tcl:238

 msgid "Aborting"
 msgstr "中止"
 
 msgid "Aborting"
 msgstr "中止"
 

-#: lib/merge.tcl:266
+#: lib/merge.tcl:238
+#, fuzzy
+msgid "files reset"
+msgstr "文件"
+
+#: lib/merge.tcl:265

 msgid "Abort failed."
 msgstr "中止失败"
 
 msgid "Abort failed."
 msgstr "中止失败"
 

-#: lib/merge.tcl:268
+#: lib/merge.tcl:267

 msgid "Abort completed.  Ready."
 msgstr "中止完成. 就绪."
 
 msgid "Abort completed.  Ready."
 msgstr "中止完成. 就绪."
 

-#: lib/option.tcl:82
+#: lib/option.tcl:95

 msgid "Restore Defaults"
 msgstr "恢复默认值"
 
 msgid "Restore Defaults"
 msgstr "恢复默认值"
 

-#: lib/option.tcl:86
+#: lib/option.tcl:99

 msgid "Save"
 msgstr "保存"
 
 msgid "Save"
 msgstr "保存"
 

-#: lib/option.tcl:96
+#: lib/option.tcl:109

 #, tcl-format
 msgid "%s Repository"
 msgstr "%s 版本库"
 
 #, tcl-format
 msgid "%s Repository"
 msgstr "%s 版本库"
 

-#: lib/option.tcl:97
+#: lib/option.tcl:110

 msgid "Global (All Repositories)"
 msgstr "全局 (所有版本库)"
 
 msgid "Global (All Repositories)"
 msgstr "全局 (所有版本库)"
 

-#: lib/option.tcl:103
+#: lib/option.tcl:116

 msgid "User Name"
 msgstr "用户名"
 
 msgid "User Name"
 msgstr "用户名"
 

-#: lib/option.tcl:104
+#: lib/option.tcl:117

 msgid "Email Address"
 msgstr "Email 地址"
 
 msgid "Email Address"
 msgstr "Email 地址"
 

-#: lib/option.tcl:106
+#: lib/option.tcl:119

 msgid "Summarize Merge Commits"
 msgstr "概述合并提交:"
 
 msgid "Summarize Merge Commits"
 msgstr "概述合并提交:"
 

-#: lib/option.tcl:107
+#: lib/option.tcl:120

 msgid "Merge Verbosity"
 msgstr "合并冗余度"
 
 msgid "Merge Verbosity"
 msgstr "合并冗余度"
 

-#: lib/option.tcl:108
+#: lib/option.tcl:121

 msgid "Show Diffstat After Merge"
 msgstr "在合并后显示 Diffstat"
 
 msgid "Show Diffstat After Merge"
 msgstr "在合并后显示 Diffstat"
 

-#: lib/option.tcl:110
+#: lib/option.tcl:123

 msgid "Trust File Modification Timestamps"
 msgstr "相信文件的改动时间"
 
 msgid "Trust File Modification Timestamps"
 msgstr "相信文件的改动时间"
 

-#: lib/option.tcl:111
+#: lib/option.tcl:124

 msgid "Prune Tracking Branches During Fetch"
 msgstr "获取时清除跟踪分支"
 
 msgid "Prune Tracking Branches During Fetch"
 msgstr "获取时清除跟踪分支"
 

-#: lib/option.tcl:112
+#: lib/option.tcl:125

 msgid "Match Tracking Branches"
 msgstr "匹配跟踪分支"
 
 msgid "Match Tracking Branches"
 msgstr "匹配跟踪分支"
 

-#: lib/option.tcl:113
+#: lib/option.tcl:126

 msgid "Number of Diff Context Lines"
 msgstr "Diff 上下文行数"
 
 msgid "Number of Diff Context Lines"
 msgstr "Diff 上下文行数"
 

-#: lib/option.tcl:114
+#: lib/option.tcl:127
+#, fuzzy
+msgid "Commit Message Text Width"
+msgstr "提交描述:"
+
+#: lib/option.tcl:128

 msgid "New Branch Name Template"
 msgstr "新建分支命名模板"
 
 msgid "New Branch Name Template"
 msgstr "新建分支命名模板"
 

-#: lib/option.tcl:176
+#: lib/option.tcl:192
+msgid "Spelling Dictionary:"
+msgstr ""
+
+#: lib/option.tcl:216

 msgid "Change Font"
 msgstr "更改字体"
 
 msgid "Change Font"
 msgstr "更改字体"
 

-#: lib/option.tcl:180
+#: lib/option.tcl:220

 #, tcl-format
 msgid "Choose %s"
 msgstr "选择 %s"
 
 #, tcl-format
 msgid "Choose %s"
 msgstr "选择 %s"
 

-#: lib/option.tcl:186
+#: lib/option.tcl:226

 msgid "pt."
 msgstr "磅"
 
 msgid "pt."
 msgstr "磅"
 

-#: lib/option.tcl:200
+#: lib/option.tcl:240

 msgid "Preferences"
 msgstr "首选项"
 
 msgid "Preferences"
 msgstr "首选项"
 

-#: lib/option.tcl:235
+#: lib/option.tcl:275

 msgid "Failed to completely save options:"
 msgstr "无法完全保存选项:"
 
 msgid "Failed to completely save options:"
 msgstr "无法完全保存选项:"
 


@@ -1823,6 +1871,43 @@ msgstr "无法修改快捷方式:"
 msgid "Cannot write icon:"
 msgstr "无法修改图标:"
 
 msgid "Cannot write icon:"
 msgstr "无法修改图标:"
 

+#: lib/spellcheck.tcl:57
+msgid "Unsupported spell checker"
+msgstr ""
+
+#: lib/spellcheck.tcl:65
+msgid "Spell checking is unavailable"
+msgstr ""
+
+#: lib/spellcheck.tcl:68
+msgid "Invalid spell checking configuration"
+msgstr ""
+
+#: lib/spellcheck.tcl:70
+#, tcl-format
+msgid "Reverting dictionary to %s."
+msgstr ""
+
+#: lib/spellcheck.tcl:73
+msgid "Spell checker silently failed on startup"
+msgstr ""
+
+#: lib/spellcheck.tcl:80
+msgid "Unrecognized spell checker"
+msgstr ""
+
+#: lib/spellcheck.tcl:180
+msgid "No Suggestions"
+msgstr ""
+
+#: lib/spellcheck.tcl:381
+msgid "Unexpected EOF from spell checker"
+msgstr ""
+
+#: lib/spellcheck.tcl:385
+msgid "Spell Checker Failed"
+msgstr ""
+

 #: lib/status_bar.tcl:83
 #, tcl-format
 msgid "%s ... %*i of %*i %s (%3i%%)"
 #: lib/status_bar.tcl:83
 #, tcl-format
 msgid "%s ... %*i of %*i %s (%3i%%)"