aboutsummaryrefslogtreecommitdiff
path: root/git-gui
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-03-15 23:07:54 -0700
committerJunio C Hamano <gitster@pobox.com>2008-03-15 23:07:54 -0700
commitf4198c9b7d319a7a595f0d759e7d8094387ab77b (patch)
tree80f3d8d9cadd41d5245292cc4314206a70ce5f66 /git-gui
parent1f9ff0de82f0f2990f3d6f06dad1d381158c2a75 (diff)
parent739a6d4970836463f5ffc9f56381e4efc9e61914 (diff)
downloadgit-f4198c9b7d319a7a595f0d759e7d8094387ab77b.tar.gz
git-f4198c9b7d319a7a595f0d759e7d8094387ab77b.tar.xz
Merge branch 'master' of git://repo.or.cz/git-gui
* 'master' of git://repo.or.cz/git-gui: git-gui: Improve directions regarding POT update in po/README git-gui: Update Japanese translation git-gui: Adjusted Japanese translation to updated POT git-gui: Update Japanese translation git-gui: Don't translate the special Apple menu git-gui: Updated Hungarian translation (e5fba18) git-gui: update russian translation git-gui: remove spurious "fuzzy" attributes in po/it.po git-gui: updated Swedish translation git-gui: Regenerated po template and merged translations with it Update Hungarian translation. 100% completed. git-gui: update Italian translation
Diffstat (limited to 'git-gui')
-rwxr-xr-xgit-gui/git-gui.sh2
-rw-r--r--git-gui/lib/choose_repository.tcl2
-rw-r--r--git-gui/po/README62
-rw-r--r--git-gui/po/de.po531
-rw-r--r--git-gui/po/fr.po717
-rw-r--r--git-gui/po/git-gui.pot517
-rw-r--r--git-gui/po/hu.po624
-rw-r--r--git-gui/po/it.po635
-rw-r--r--git-gui/po/ja.po610
-rw-r--r--git-gui/po/ru.po610
-rw-r--r--git-gui/po/sv.po665
-rw-r--r--git-gui/po/zh_cn.po611
12 files changed, 3155 insertions, 2431 deletions
diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh
index 3a58cd2c6..5e97fbf03 100755
--- a/git-gui/git-gui.sh
+++ b/git-gui/git-gui.sh
@@ -2089,7 +2089,7 @@ if {[is_enabled transport]} {
if {[is_MacOSX]} {
# -- Apple Menu (Mac OS X only)
#
- .mbar add cascade -label [mc Apple] -menu .mbar.apple
+ .mbar add cascade -label Apple -menu .mbar.apple
menu .mbar.apple
.mbar.apple add command -label [mc "About %s" [appname]] \
diff --git a/git-gui/lib/choose_repository.tcl b/git-gui/lib/choose_repository.tcl
index 0adcf9d95..ae4a4cd0a 100644
--- a/git-gui/lib/choose_repository.tcl
+++ b/git-gui/lib/choose_repository.tcl
@@ -38,7 +38,7 @@ constructor pick {} {
menu $m_repo
if {[is_MacOSX]} {
- $w.mbar add cascade -label [mc Apple] -menu .mbar.apple
+ $w.mbar add cascade -label Apple -menu .mbar.apple
menu $w.mbar.apple
$w.mbar.apple add command \
-label [mc "About %s" [appname]] \
diff --git a/git-gui/po/README b/git-gui/po/README
index 9d8b7364f..5e77a7d7d 100644
--- a/git-gui/po/README
+++ b/git-gui/po/README
@@ -178,18 +178,6 @@ step.
$ msgmerge -U po/af.po po/git-gui.pot
-[NEEDSWORK: who is responsible for updating po/git-gui.pot file by
-running xgettext? IIRC, Christian recommended against running it
-nilly-willy because it can become a source of unnecessary merge
-conflicts. Perhaps we should mention something like "
-
-The po/git-gui.pot file is updated by the internationalization
-coordinator from time to time. You _could_ update it yourself, but
-translators are discouraged from doing so because we would want all
-language teams to be working off of the same version of git-gui.pot.
-
-" here?]
-
This updates po/af.po (again, replace "af" with your language
code) so that it contains msgid lines (i.e. the original) that
your translation did not have before. There are a few things to
@@ -207,3 +195,53 @@ watch out for:
- New messages added to the software will have msgstr lines with empty
strings. You would need to translate them.
+
+The po/git-gui.pot file is updated by the internationalization
+coordinator from time to time. You _could_ update it yourself, but
+translators are discouraged from doing so because we would want all
+language teams to be working off of the same version of git-gui.pot.
+
+****************************************************************
+
+This section is a note to the internationalization coordinator, and
+translators do not have to worry about it too much.
+
+The message template file po/git-gui.pot needs to be kept up to date
+relative to the software the translations apply to, and it is the
+responsibility of the internationalization coordinator.
+
+When updating po/git-gui.pot file, however, _never_ run "msgmerge -U
+po/xx.po" for individual language translations, unless you are absolutely
+sure that there is no outstanding work on translation for language xx.
+Doing so will create unnecessary merge conflicts and force needless
+re-translation on translators. The translator however may not have access
+to the msgmerge tool, in which case the coordinator may run it for the
+translator as a service.
+
+But mistakes do happen. Suppose a translation was based on an older
+version X, the POT file was updated at version Y and then msgmerge was run
+at version Z for the language, and the translator sent in a patch based on
+version X:
+
+ ? translated
+ /
+ ---X---Y---Z (master)
+
+The coordinator could recover from such a mistake by first applying the
+patch to X, replace the translated file in Z, and then running msgmerge
+again based on the updated POT file and commit the result. The sequence
+would look like this:
+
+ $ git checkout X
+ $ git am -s xx.patch
+ $ git checkout master
+ $ git checkout HEAD@{1} po/xx.po
+ $ msgmerge -U po/xx.po po/git-gui.pot
+ $ git commit -c HEAD@{1} po/xx.po
+
+State in the message that the translated messages are based on a slightly
+older version, and msgmerge was run to incorporate changes to message
+templates from the updated POT file. The result needs to be further
+translated, but at least the messages that were updated by the patch that
+were not changed by the POT update will survive the process and do not
+need to be re-translated.
diff --git a/git-gui/po/de.po b/git-gui/po/de.po
index e84e1c7e0..022b816ae 100644
--- a/git-gui/po/de.po
+++ b/git-gui/po/de.po
@@ -7,7 +7,7 @@ msgid ""
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"
@@ -15,33 +15,33 @@ msgstr ""
"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"
-#: git-gui.sh:565
+#: git-gui.sh:593
#, 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"
-#: git-gui.sh:591
+#: git-gui.sh:621
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."
-#: git-gui.sh:632
+#: git-gui.sh:662
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"
@@ -60,81 +60,81 @@ msgstr ""
"\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:"
-#: 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:"
-#: git-gui.sh:902
+#: git-gui.sh:932
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"
-#: git-gui.sh:1054
+#: git-gui.sh:1084 lib/checkout_op.tcl:283
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..."
-#: git-gui.sh:1294 lib/browser.tcl:245
+#: git-gui.sh:1324 lib/browser.tcl:246
msgid "Ready."
msgstr "Bereit."
-#: git-gui.sh:1560
+#: git-gui.sh:1590
msgid "Unmodified"
msgstr "Unverändert"
-#: git-gui.sh:1562
+#: git-gui.sh:1592
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"
-#: 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"
-#: 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"
-#: git-gui.sh:1567
+#: git-gui.sh:1597
msgid "Untracked, not staged"
msgstr "Nicht unter Versionskontrolle, nicht bereitgestellt"
-#: git-gui.sh:1572
+#: git-gui.sh:1602
msgid "Missing"
msgstr "Fehlend"
-#: git-gui.sh:1573
+#: git-gui.sh:1603
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"
-#: 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"
-#: git-gui.sh:1614
+#: git-gui.sh:1644
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"
@@ -145,297 +145,297 @@ msgstr ""
"\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"
-#: git-gui.sh:1824
+#: git-gui.sh:1861
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"
-#: git-gui.sh:1829 lib/choose_rev.tcl:547
+#: git-gui.sh:1866 lib/choose_rev.tcl:548
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"
-#: git-gui.sh:1833 lib/choose_rev.tcl:556
+#: git-gui.sh:1870 lib/choose_rev.tcl:557
msgid "Remote"
msgstr "Andere Archive"
-#: git-gui.sh:1842
+#: git-gui.sh:1879
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..."
-#: git-gui.sh:1851
+#: git-gui.sh:1888
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"
-#: git-gui.sh:1862
+#: git-gui.sh:1899
#, 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"
-#: 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"
-#: git-gui.sh:1872 lib/database.tcl:34
+#: git-gui.sh:1909 lib/database.tcl:34
msgid "Compress Database"
msgstr "Datenbank komprimieren"
-#: git-gui.sh:1875
+#: git-gui.sh:1912
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"
-#: 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"
-#: git-gui.sh:1902
+#: git-gui.sh:1939
msgid "Undo"
msgstr "Rückgängig"
-#: git-gui.sh:1905
+#: git-gui.sh:1942
msgid "Redo"
msgstr "Wiederholen"
-#: git-gui.sh:1909 git-gui.sh:2403
+#: git-gui.sh:1946 git-gui.sh:2443
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"
-#: git-gui.sh:1915 git-gui.sh:2409
+#: git-gui.sh:1952 git-gui.sh:2449
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"
-#: 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"
-#: git-gui.sh:1931
+#: git-gui.sh:1968
msgid "Create..."
msgstr "Erstellen..."
-#: git-gui.sh:1937
+#: git-gui.sh:1974
msgid "Checkout..."
msgstr "Umstellen..."
-#: git-gui.sh:1943
+#: git-gui.sh:1980
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..."
-#: git-gui.sh:1953
+#: git-gui.sh:1990
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"
-#: git-gui.sh:1973 git-gui.sh:2357
+#: git-gui.sh:2010 git-gui.sh:2396
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"
-#: git-gui.sh:1988
+#: git-gui.sh:2025
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"
-#: git-gui.sh:2000
+#: git-gui.sh:2037
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"
-#: 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"
-#: git-gui.sh:2016 git-gui.sh:2333
+#: git-gui.sh:2053 git-gui.sh:2372
msgid "Commit@@verb"
msgstr "Eintragen"
-#: git-gui.sh:2027
+#: git-gui.sh:2064
msgid "Local Merge..."
msgstr "Lokales Zusammenführen..."
-#: git-gui.sh:2032
+#: git-gui.sh:2069
msgid "Abort Merge..."
msgstr "Zusammenführen abbrechen..."
-#: git-gui.sh:2044
+#: git-gui.sh:2081
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"
-#: 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"
-#: git-gui.sh:2062
+#: git-gui.sh:2099
msgid "Preferences..."
msgstr "Einstellungen..."
-#: git-gui.sh:2070 git-gui.sh:2595
+#: git-gui.sh:2107 git-gui.sh:2639
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"
-#: git-gui.sh:2117
+#: git-gui.sh:2154
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"
-#: git-gui.sh:2234
+#: git-gui.sh:2271
msgid "Current Branch:"
msgstr "Aktueller Zweig:"
-#: git-gui.sh:2255
+#: git-gui.sh:2292
msgid "Staged Changes (Will Commit)"
msgstr "Bereitstellung (zum Eintragen)"
-#: git-gui.sh:2274
+#: git-gui.sh:2312
msgid "Unstaged Changes"
msgstr "Nicht bereitgestellte Änderungen"
-#: git-gui.sh:2323
+#: git-gui.sh:2362
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"
-#: git-gui.sh:2369
+#: git-gui.sh:2408
msgid "Initial Commit Message:"
msgstr "Erste Versionsbeschreibung:"
-#: git-gui.sh:2370
+#: git-gui.sh:2409
msgid "Amended Commit Message:"
msgstr "Nachgebesserte Beschreibung:"
-#: git-gui.sh:2371
+#: git-gui.sh:2410
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:"
-#: git-gui.sh:2373
+#: git-gui.sh:2412
msgid "Merge Commit Message:"
msgstr "Zusammenführungs-Beschreibung:"
-#: git-gui.sh:2374
+#: git-gui.sh:2413
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"
-#: git-gui.sh:2443 lib/blame.tcl:104
+#: git-gui.sh:2483 lib/blame.tcl:107
msgid "File:"
msgstr "Datei:"
-#: git-gui.sh:2573
+#: git-gui.sh:2589
msgid "Apply/Reverse Hunk"
msgstr "Kontext anwenden/umkehren"
-#: git-gui.sh:2579
+#: git-gui.sh:2595
msgid "Show Less Context"
msgstr "Weniger Zeilen anzeigen"
-#: git-gui.sh:2586
+#: git-gui.sh:2602
msgid "Show More Context"
msgstr "Mehr Zeilen anzeigen"
-#: git-gui.sh:2594
+#: git-gui.sh:2610
msgid "Refresh"
msgstr "Aktualisieren"
-#: git-gui.sh:2615
+#: git-gui.sh:2631
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"
-#: git-gui.sh:2630
+#: git-gui.sh:2646
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"
-#: git-gui.sh:2623
+#: git-gui.sh:2667
msgid "Initializing..."
msgstr "Initialisieren..."
-#: git-gui.sh:2718
+#: git-gui.sh:2762
#, tcl-format
msgid ""
"Possible environment issues exist.\n"
@@ -451,7 +451,7 @@ msgstr ""
"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"
@@ -461,7 +461,7 @@ msgstr ""
"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"
@@ -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"
-#: 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."
@@ -489,56 +489,56 @@ msgstr "Datei-Browser"
msgid "Commit:"
msgstr "Version:"
-#: lib/blame.tcl:249
+#: lib/blame.tcl:264
msgid "Copy Commit"
msgstr "Version kopieren"
-#: lib/blame.tcl:369
+#: lib/blame.tcl:384
#, 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..."
-#: lib/blame.tcl:493
+#: lib/blame.tcl:508
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..."
-#: lib/blame.tcl:677
+#: lib/blame.tcl:692
msgid "Annotation complete."
msgstr "Annotierung vollständig."
-#: lib/blame.tcl:731
+#: lib/blame.tcl:746
msgid "Loading annotation..."
msgstr "Annotierung laden..."
-#: lib/blame.tcl:787
+#: lib/blame.tcl:802
msgid "Author:"
msgstr "Autor:"
-#: lib/blame.tcl:791
+#: lib/blame.tcl:806
msgid "Committer:"
msgstr "Eintragender:"
-#: lib/blame.tcl:796
+#: lib/blame.tcl:811
msgid "Original File:"
msgstr "Ursprüngliche Datei:"
-#: lib/blame.tcl:910
+#: lib/blame.tcl:925
msgid "Originally By:"
msgstr "Ursprünglich von:"
-#: lib/blame.tcl:916
+#: lib/blame.tcl:931
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:"
@@ -551,17 +551,17 @@ msgid "Checkout"
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"
-#: lib/branch_checkout.tcl:32 lib/browser.tcl:286
+#: lib/branch_checkout.tcl:32 lib/browser.tcl:287
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"
@@ -581,7 +581,7 @@ msgstr "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"
@@ -721,22 +721,22 @@ msgstr "Starten..."
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..."
-#: lib/browser.tcl:186
+#: lib/browser.tcl:187
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"
-#: 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"
@@ -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"
-#: 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"
@@ -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«."
-#: 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«."
@@ -860,7 +860,7 @@ msgstr ""
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"
@@ -890,15 +890,15 @@ msgstr "Auswählen"
msgid "Font Family"
msgstr "Schriftfamilie"
-#: lib/choose_font.tcl:73
+#: lib/choose_font.tcl:74
msgid "Font Size"
msgstr "Schriftgröße"
-#: lib/choose_font.tcl:90
+#: lib/choose_font.tcl:91
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."
@@ -906,231 +906,231 @@ msgstr ""
"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"
-#: 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"
-#: lib/choose_repository.tcl:86
+#: lib/choose_repository.tcl:87
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"
-#: lib/choose_repository.tcl:99
+#: lib/choose_repository.tcl:100
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"
-#: lib/choose_repository.tcl:112
+#: lib/choose_repository.tcl:113
msgid "Open..."
msgstr "Öffnen..."
-#: lib/choose_repository.tcl:125
+#: lib/choose_repository.tcl:126
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:"
-#: 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:"
-#: lib/choose_repository.tcl:385 lib/choose_repository.tcl:486
+#: lib/choose_repository.tcl:381 lib/choose_repository.tcl:478
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"
-#: 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."
-#: lib/choose_repository.tcl:442
+#: lib/choose_repository.tcl:441
#, 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"
-#: lib/choose_repository.tcl:476
+#: lib/choose_repository.tcl:468
msgid "URL:"
msgstr "URL:"
-#: lib/choose_repository.tcl:496
+#: lib/choose_repository.tcl:489
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)"
-#: lib/choose_repository.tcl:508
+#: lib/choose_repository.tcl:501
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)"
-#: 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."
-#: 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."
-#: 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."
-#: 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"
-#: lib/choose_repository.tcl:629
+#: lib/choose_repository.tcl:627
msgid "Counting objects"
msgstr "Objekte werden gezählt"
-#: lib/choose_repository.tcl:630
+#: lib/choose_repository.tcl:628
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"
-#: 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."
-#: 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."
-#: 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."
-#: lib/choose_repository.tcl:717
+#: lib/choose_repository.tcl:715
#, 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"
-#: lib/choose_repository.tcl:749
+#: lib/choose_repository.tcl:747
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"
-#: lib/choose_repository.tcl:783
+#: lib/choose_repository.tcl:781
msgid "Linking objects"
msgstr "Objekte verlinken"
-#: lib/choose_repository.tcl:784
+#: lib/choose_repository.tcl:782
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"
-#: 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."
-#: 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."
-#: 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."
-#: 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."
-#: lib/choose_repository.tcl:897
+#: lib/choose_repository.tcl:895
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."
-#: 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."
-#: lib/choose_repository.tcl:927
+#: lib/choose_repository.tcl:925
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/choose_repository.tcl:957
+#: lib/choose_repository.tcl:955
msgid "Initial file checkout failed."
msgstr "Erstellen der Arbeitskopie fehlgeschlagen."
-#: lib/choose_repository.tcl:973
+#: lib/choose_repository.tcl:971
msgid "Open"
msgstr "Öffnen"
-#: lib/choose_repository.tcl:983
+#: lib/choose_repository.tcl:981
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."
@@ -1151,7 +1151,7 @@ msgstr "Lokaler Zweig"
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"
@@ -1168,11 +1168,11 @@ msgstr "Keine Version ausgewählt."
msgid "Revision expression is empty."
msgstr "Versions-Ausdruck ist leer."
-#: lib/choose_rev.tcl:530
+#: lib/choose_rev.tcl:531
msgid "Updated"
msgstr "Aktualisiert"
-#: lib/choose_rev.tcl:558
+#: lib/choose_rev.tcl:559
msgid "URL"
msgstr "URL"
@@ -1304,7 +1304,9 @@ msgstr "Aufrufen der Versionsbeschreibungs-Kontrolle..."
#: 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..."
@@ -1323,7 +1325,7 @@ msgstr "Eintragen fehlgeschlagen."
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"
@@ -1338,7 +1340,7 @@ msgstr ""
"\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."
@@ -1346,24 +1348,24 @@ msgstr "Keine Änderungen, die eingetragen werden können."
msgid "commit-tree failed:"
msgstr "commit-tree fehlgeschlagen:"
-#: lib/commit.tcl:339
+#: lib/commit.tcl:367
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"
-#: lib/console.tcl:57
+#: lib/console.tcl:59
msgid "Working... please wait..."
msgstr "Verarbeitung. Bitte warten..."
-#: lib/console.tcl:183
+#: lib/console.tcl:186
msgid "Success"
msgstr "Erfolgreich"
-#: lib/console.tcl:196
+#: lib/console.tcl:200
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:"
-#: 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."
-#: lib/diff.tcl:309
+#: lib/diff.tcl:310
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"
-#: lib/error.tcl:28
+#: lib/error.tcl:36
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."
@@ -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?"
-#: 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."
-#: lib/index.tcl:392
+#: lib/index.tcl:394
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."
-#: lib/merge.tcl:133
+#: lib/merge.tcl:132
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«"
-#: lib/merge.tcl:177
+#: lib/merge.tcl:176
msgid "Revision To Merge"
msgstr "Zusammenzuführende Version"
-#: lib/merge.tcl:212
+#: lib/merge.tcl:211
msgid ""
"Cannot abort while amending.\n"
"\n"
@@ -1652,7 +1654,7 @@ msgstr ""
"\n"
"Sie müssen die Nachbesserung der Version abschließen.\n"
-#: lib/merge.tcl:222
+#: lib/merge.tcl:221
msgid ""
"Abort merge?\n"
"\n"
@@ -1667,7 +1669,7 @@ msgstr ""
"\n"
"Zusammenführen jetzt abbrechen?"
-#: lib/merge.tcl:228
+#: lib/merge.tcl:227
msgid ""
"Reset changes?\n"
"\n"
@@ -1682,7 +1684,7 @@ msgstr ""
"\n"
"Änderungen jetzt zurücksetzen?"
-#: lib/merge.tcl:239
+#: lib/merge.tcl:238
msgid "Aborting"
msgstr "Abbruch"
@@ -1694,89 +1696,94 @@ msgstr "Dateien zurückgesetzt"
msgid "Abort failed."
msgstr "Abbruch fehlgeschlagen."
-#: lib/merge.tcl:268
+#: lib/merge.tcl:267
msgid "Abort completed. Ready."
msgstr "Abbruch durchgeführt. Bereit."
-#: lib/option.tcl:82
+#: lib/option.tcl:95
msgid "Restore Defaults"
msgstr "Voreinstellungen wiederherstellen"
-#: lib/option.tcl:86
+#: lib/option.tcl:99
msgid "Save"
msgstr "Speichern"
-#: lib/option.tcl:96
+#: lib/option.tcl:109
#, tcl-format
msgid "%s Repository"
msgstr "Projektarchiv %s"
-#: lib/option.tcl:97
+#: lib/option.tcl:110
msgid "Global (All Repositories)"
msgstr "Global (Alle Projektarchive)"
-#: lib/option.tcl:103
+#: lib/option.tcl:116
msgid "User Name"
msgstr "Benutzername"
-#: lib/option.tcl:104
+#: lib/option.tcl:117
msgid "Email Address"
msgstr "E-Mail-Adresse"
-#: lib/option.tcl:106
+#: lib/option.tcl:119
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"
-#: lib/option.tcl:108
+#: lib/option.tcl:121
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"
-#: lib/option.tcl:111
+#: lib/option.tcl:124
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"
-#: lib/option.tcl:113
+#: lib/option.tcl:126
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"
-#: lib/option.tcl:191
+#: lib/option.tcl:192
msgid "Spelling Dictionary:"
msgstr "Wörterbuch Rechtschreibprüfung:"
-#: lib/option.tcl:215
+#: lib/option.tcl:216
msgid "Change Font"
msgstr "Schriftart ändern"
-#: lib/option.tcl:180
+#: lib/option.tcl:220
#, tcl-format
msgid "Choose %s"
msgstr "%s wählen"
-#: lib/option.tcl:186
+#: lib/option.tcl:226
msgid "pt."
msgstr "pt."
-#: lib/option.tcl:200
+#: lib/option.tcl:240
msgid "Preferences"
msgstr "Einstellungen"
-#: lib/option.tcl:235
+#: lib/option.tcl:275
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:"
-#: 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«"
-#: lib/spellcheck.tcl:135
+#: lib/spellcheck.tcl:180
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«"
-#: lib/spellcheck.tcl:340
+#: lib/spellcheck.tcl:385
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"
+
+#~ msgid "Not connected to aspell"
+#~ msgstr "Keine Verbindung zu »aspell«"
diff --git a/git-gui/po/fr.po b/git-gui/po/fr.po
index d389bdaca..d281938e3 100644
--- a/git-gui/po/fr.po
+++ b/git-gui/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
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"
@@ -18,33 +18,33 @@ msgstr ""
"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"
-#: git-gui.sh:565
+#: git-gui.sh:593
#, 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"
-#: git-gui.sh:591
+#: git-gui.sh:621
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."
-#: git-gui.sh:632
+#: git-gui.sh:662
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"
@@ -63,79 +63,79 @@ msgstr ""
"\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 :"
-#: 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 :"
-#: 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 :"
-#: git-gui.sh:907
+#: git-gui.sh:937
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..."
-#: git-gui.sh:1119
+#: git-gui.sh:1149
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."
-#: git-gui.sh:1560
+#: git-gui.sh:1590
msgid "Unmodified"
msgstr "Non modifié"
-#: git-gui.sh:1562
+#: git-gui.sh:1592
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é"
-#: 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é"
-#: 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"
-#: git-gui.sh:1567
+#: git-gui.sh:1597
msgid "Untracked, not staged"
msgstr "Non suivi, non pré-commité"
-#: git-gui.sh:1572
+#: git-gui.sh:1602
msgid "Missing"
msgstr "Manquant"
-#: git-gui.sh:1573
+#: git-gui.sh:1603
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"
-#: 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"
-#: git-gui.sh:1614
+#: git-gui.sh:1644
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"
@@ -146,295 +146,296 @@ msgstr ""
"\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"
-#: git-gui.sh:1824
+#: git-gui.sh:1861
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"
-#: git-gui.sh:1829 lib/choose_rev.tcl:547
+#: git-gui.sh:1866 lib/choose_rev.tcl:548
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"
-#: 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"
-#: git-gui.sh:1842
+#: git-gui.sh:1879
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"
-#: git-gui.sh:1851
+#: git-gui.sh:1888
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"
-#: git-gui.sh:1862
+#: git-gui.sh:1899
#, 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"
-#: 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"
-#: 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"
-#: git-gui.sh:1875
+#: git-gui.sh:1912
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"
-#: 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"
-#: git-gui.sh:1902
+#: git-gui.sh:1939
msgid "Undo"
msgstr "Défaire"
-#: git-gui.sh:1905
+#: git-gui.sh:1942
msgid "Redo"
msgstr "Refaire"
-#: git-gui.sh:1909 git-gui.sh:2403
+#: git-gui.sh:1946 git-gui.sh:2443
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"
-#: git-gui.sh:1915 git-gui.sh:2409
+#: git-gui.sh:1952 git-gui.sh:2449
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"
-#: 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"
-#: git-gui.sh:1931
+#: git-gui.sh:1968
msgid "Create..."
msgstr "Créer..."
-#: git-gui.sh:1937
+#: git-gui.sh:1974
msgid "Checkout..."
msgstr "Emprunter... "
-#: git-gui.sh:1943
+#: git-gui.sh:1980
msgid "Rename..."
msgstr "Renommer..."
-#: git-gui.sh:1948 git-gui.sh:2048
+#: git-gui.sh:1985 git-gui.sh:2085
msgid "Delete..."
msgstr "Supprimer..."
-#: git-gui.sh:1953
+#: git-gui.sh:1990
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"
-#: git-gui.sh:1973 git-gui.sh:2357
+#: git-gui.sh:2010 git-gui.sh:2396
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"
-#: git-gui.sh:1988
+#: git-gui.sh:2025
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"
-#: git-gui.sh:2000
+#: git-gui.sh:2037
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"
-#: 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"
-#: git-gui.sh:2016 git-gui.sh:2333
+#: git-gui.sh:2053 git-gui.sh:2372
msgid "Commit@@verb"
msgstr "Commiter"
-#: git-gui.sh:2027
+#: git-gui.sh:2064
msgid "Local Merge..."
msgstr "Fusion locale..."
-#: git-gui.sh:2032
+#: git-gui.sh:2069
msgid "Abort Merge..."
msgstr "Abandonner fusion..."
-#: git-gui.sh:2044
+#: git-gui.sh:2081
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"
-#: 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"
-#: git-gui.sh:2062
+#: git-gui.sh:2099
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..."
-#: git-gui.sh:2076 lib/choose_repository.tcl:46
+#: git-gui.sh:2113 lib/choose_repository.tcl:47
msgid "Help"
msgstr "Aide"
-#: git-gui.sh:2117
+#: git-gui.sh:2154
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"
-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 :"
-#: git-gui.sh:2255
+#: git-gui.sh:2292
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"
-#: git-gui.sh:2323
+#: git-gui.sh:2362
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"
-#: git-gui.sh:2369
+#: git-gui.sh:2408
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é :"
-#: git-gui.sh:2371
+#: git-gui.sh:2410
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é :"
-#: git-gui.sh:2373
+#: git-gui.sh:2412
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 :"
-#: 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"
-#: git-gui.sh:2443 lib/blame.tcl:104
+#: git-gui.sh:2483 lib/blame.tcl:107
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"
-#: 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"
-#: git-gui.sh:2588
+#: git-gui.sh:2602
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"
-#: git-gui.sh:2604
+#: git-gui.sh:2648
msgid "Stage Hunk For Commit"
msgstr "Pré-commiter section"
-#: git-gui.sh:2623
+#: git-gui.sh:2667
msgid "Initializing..."
msgstr "Initialisation..."
-#: git-gui.sh:2718
+#: git-gui.sh:2762
#, tcl-format
msgid ""
"Possible environment issues exist.\n"
@@ -451,7 +452,7 @@ msgstr ""
"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"
@@ -461,7 +462,7 @@ msgstr ""
"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"
@@ -478,7 +479,7 @@ msgstr ""
"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"
@@ -490,56 +491,56 @@ msgstr "Visionneur de fichier"
msgid "Commit:"
msgstr "Commit :"
-#: lib/blame.tcl:249
+#: lib/blame.tcl:264
msgid "Copy Commit"
msgstr "Copier commit"
-#: lib/blame.tcl:369
+#: lib/blame.tcl:384
#, 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..."
-#: lib/blame.tcl:493
+#: lib/blame.tcl:508
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"
-#: lib/blame.tcl:677
+#: lib/blame.tcl:692
msgid "Annotation complete."
msgstr "Annotation terminée."
-#: lib/blame.tcl:731
+#: lib/blame.tcl:746
msgid "Loading annotation..."
msgstr "Chargement des annotations..."
-#: lib/blame.tcl:787
+#: lib/blame.tcl:802
msgid "Author:"
msgstr "Auteur :"
-#: lib/blame.tcl:791
+#: lib/blame.tcl:806
msgid "Committer:"
msgstr "Commiteur :"
-#: lib/blame.tcl:796
+#: lib/blame.tcl:811
msgid "Original File:"
msgstr "Fichier original :"
-#: lib/blame.tcl:910
+#: lib/blame.tcl:925
msgid "Originally By:"
msgstr "A l'origine par :"
-#: lib/blame.tcl:916
+#: lib/blame.tcl:931
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 :"
@@ -552,17 +553,17 @@ msgid "Checkout"
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"
-#: lib/branch_checkout.tcl:32 lib/browser.tcl:286
+#: lib/branch_checkout.tcl:32 lib/browser.tcl:287
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"
@@ -582,7 +583,7 @@ msgstr "Créer 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"
@@ -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."
-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."
@@ -722,22 +724,22 @@ msgstr "Lancement..."
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..."
-#: lib/browser.tcl:186
+#: lib/browser.tcl:187
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"
-#: 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"
@@ -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"
-#: 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"
@@ -796,9 +798,12 @@ msgid ""
"\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"
-"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"
@@ -807,10 +812,15 @@ msgstr ""
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)."
-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."
@@ -830,9 +840,10 @@ msgid ""
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é."
@@ -851,7 +862,7 @@ msgstr "Récupérer les commits perdus ne sera peut être pas facile."
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"
@@ -867,7 +878,9 @@ msgid ""
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."
@@ -879,15 +892,15 @@ msgstr "Sélectionner"
msgid "Font Family"
msgstr "Famille de fonte"
-#: lib/choose_font.tcl:73
+#: lib/choose_font.tcl:74
msgid "Font Size"
msgstr "Taille de fonte"
-#: lib/choose_font.tcl:90
+#: lib/choose_font.tcl:91
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."
@@ -895,225 +908,230 @@ msgstr ""
"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"
-#: 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"
-#: lib/choose_repository.tcl:86
+#: lib/choose_repository.tcl:87
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"
-#: lib/choose_repository.tcl:99
+#: lib/choose_repository.tcl:100
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"
-#: lib/choose_repository.tcl:112
+#: lib/choose_repository.tcl:113
msgid "Open..."
msgstr "Ouvrir..."
-#: lib/choose_repository.tcl:125
+#: lib/choose_repository.tcl:126
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 :"
-#: 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 :"
-#: 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 :"
-#: 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"
-#: 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à."
-#: lib/choose_repository.tcl:442
+#: lib/choose_repository.tcl:441
#, 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"
-#: lib/choose_repository.tcl:476
+#: lib/choose_repository.tcl:468
msgid "URL:"
msgstr "URL :"
-#: lib/choose_repository.tcl:496
+#: lib/choose_repository.tcl:489
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)"
-#: lib/choose_repository.tcl:508
+#: lib/choose_repository.tcl:501
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)"
-#: 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."
-#: 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."
-#: 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."
-#: 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."
-#: lib/choose_repository.tcl:629
+#: lib/choose_repository.tcl:627
msgid "Counting objects"
msgstr "Comptage des objets"
-#: lib/choose_repository.tcl:630
+#: lib/choose_repository.tcl:628
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"
-#: 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."
-#: 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."
-#: 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."
-#: lib/choose_repository.tcl:717
+#: lib/choose_repository.tcl:715
#, 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"
-#: lib/choose_repository.tcl:749
+#: lib/choose_repository.tcl:747
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"
-#: lib/choose_repository.tcl:783
+#: lib/choose_repository.tcl:781
msgid "Linking objects"
msgstr "Liaison des objets"
-#: lib/choose_repository.tcl:784
+#: lib/choose_repository.tcl:782
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"
-#: lib/choose_repository.tcl:847
+#: lib/choose_repository.tcl:845
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."
-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."
-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"
-#: lib/choose_repository.tcl:897
+#: lib/choose_repository.tcl:895
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."
-#: 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."
-#: lib/choose_repository.tcl:927
+#: lib/choose_repository.tcl:925
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/choose_repository.tcl:957
+#: lib/choose_repository.tcl:955
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"
-#: lib/choose_repository.tcl:983
+#: lib/choose_repository.tcl:981
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 :"
@@ -1134,7 +1152,7 @@ msgstr "Branche locale"
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"
@@ -1151,11 +1169,11 @@ msgstr "Pas de révision selectionnée."
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"
-#: lib/choose_rev.tcl:558
+#: lib/choose_rev.tcl:559
msgid "URL"
msgstr "URL"
@@ -1168,7 +1186,8 @@ msgid ""
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 ""
@@ -1180,7 +1199,9 @@ msgid ""
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:"
@@ -1203,9 +1224,12 @@ msgid ""
"\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"
-"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"
@@ -1219,7 +1243,8 @@ msgid ""
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
@@ -1260,16 +1285,46 @@ msgstr ""
"- 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é :"
-#: 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"
-#: lib/commit.tcl:279
+#: lib/commit.tcl:326
msgid ""
"No changes to commit.\n"
"\n"
@@ -1279,41 +1334,37 @@ msgid ""
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"
-#: lib/commit.tcl:286
+#: lib/commit.tcl:333
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é :"
-#: lib/commit.tcl:339
+#: lib/commit.tcl:367
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"
-#: lib/console.tcl:57
+#: lib/console.tcl:59
msgid "Working... please wait..."
msgstr "Travail en cours... merci de patienter..."
-#: lib/console.tcl:183
+#: lib/console.tcl:186
msgid "Success"
msgstr "Succès"
-#: lib/console.tcl:196
+#: lib/console.tcl:200
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"
-#: lib/database.tcl:72ets
+#: lib/database.tcl:72
msgid "Compressing the object database"
msgstr "Compression de la base des objets"
@@ -1363,9 +1414,12 @@ msgid ""
"\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"
-"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 ?"
@@ -1391,9 +1445,11 @@ msgstr ""
"\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"
-"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
@@ -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 :"
-#: lib/diff.tcl:302
+#: lib/diff.tcl:303
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é."
-#: lib/error.tcl:12 lib/error.tcl:102
+#: lib/error.tcl:20 lib/error.tcl:114
msgid "error"
msgstr "erreur"
-#: lib/error.tcl:28
+#: lib/error.tcl:36
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."
@@ -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."
-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"
@@ -1468,6 +1526,11 @@ msgstr "Dévérouiller le pré-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"
@@ -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 ?"
-#: lib/index.tcl:389
+#: lib/index.tcl:391
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"
@@ -1499,7 +1564,8 @@ msgid ""
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 ""
@@ -1510,9 +1576,12 @@ msgid ""
"\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"
-"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"
@@ -1530,7 +1599,9 @@ msgstr ""
"\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
@@ -1546,7 +1617,9 @@ msgstr ""
"\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
@@ -1554,28 +1627,28 @@ msgid "%s of %s"
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"
-#: lib/merge.tcl:131
+#: lib/merge.tcl:130
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."
-#: lib/merge.tcl:158
+#: lib/merge.tcl:157
#, 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"
-#: lib/merge.tcl:212
+#: lib/merge.tcl:211
msgid ""
"Cannot abort while amending.\n"
"\n"
@@ -1585,7 +1658,7 @@ msgstr ""
"\n"
"Vous devez finir de corriger ce commit.\n"
-#: lib/merge.tcl:222
+#: lib/merge.tcl:221
msgid ""
"Abort merge?\n"
"\n"
@@ -1595,11 +1668,12 @@ msgid ""
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 ?"
-#: lib/merge.tcl:228
+#: lib/merge.tcl:227
msgid ""
"Reset changes?\n"
"\n"
@@ -1609,97 +1683,112 @@ msgid ""
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 ?"
-#: lib/merge.tcl:239
+#: lib/merge.tcl:238
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é."
-#: lib/merge.tcl:268
+#: lib/merge.tcl:267
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"
-#: lib/option.tcl:86
+#: lib/option.tcl:99
msgid "Save"
msgstr "Sauvegarder"
-#: lib/option.tcl:96
+#: lib/option.tcl:109
#, 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)"
-#: lib/option.tcl:103
+#: lib/option.tcl:116
msgid "User Name"
msgstr "Nom d'utilisateur"
-#: lib/option.tcl:104
+#: lib/option.tcl:117
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"
-#: lib/option.tcl:107
+#: lib/option.tcl:120
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"
-#: lib/option.tcl:110
+#: lib/option.tcl:123
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"
-#: lib/option.tcl:112
+#: lib/option.tcl:125
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"
-#: 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"
-#: lib/option.tcl:176
+#: lib/option.tcl:192
+msgid "Spelling Dictionary:"
+msgstr ""
+
+#: lib/option.tcl:216
msgid "Change Font"
msgstr "Modifier les fontes"
-#: lib/option.tcl:180
+#: lib/option.tcl:220
#, tcl-format
msgid "Choose %s"
msgstr "Choisir %s"
-#: lib/option.tcl:186
+#: lib/option.tcl:226
msgid "pt."
msgstr "pt."
-#: lib/option.tcl:200
+#: lib/option.tcl:240
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 :"
@@ -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."
-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."
@@ -1805,6 +1896,43 @@ msgstr "Impossible d'écrire le raccourcis :"
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%%)"
@@ -1863,7 +1991,9 @@ msgstr "Transférer options"
#: 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)"
@@ -1872,4 +2002,3 @@ msgstr "Utiliser des petits paquets (pour les connexions lentes)"
#: lib/transport.tcl:168
msgid "Include tags"
msgstr "Inclure les marques"
-
diff --git a/git-gui/po/git-gui.pot b/git-gui/po/git-gui.pot
index 2e332849f..813199f78 100644
--- a/git-gui/po/git-gui.pot
+++ b/git-gui/po/git-gui.pot
@@ -8,7 +8,7 @@ msgid ""
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"
@@ -16,33 +16,33 @@ msgstr ""
"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 ""
-#: git-gui.sh:565
+#: git-gui.sh:593
#, tcl-format
msgid "Invalid font specified in %s:"
msgstr ""
-#: git-gui.sh:590
+#: git-gui.sh:620
msgid "Main Font"
msgstr ""
-#: git-gui.sh:591
+#: git-gui.sh:621
msgid "Diff/Console Font"
msgstr ""
-#: git-gui.sh:605
+#: git-gui.sh:635
msgid "Cannot find git in PATH."
msgstr ""
-#: git-gui.sh:632
+#: git-gui.sh:662
msgid "Cannot parse Git version string:"
msgstr ""
-#: git-gui.sh:650
+#: git-gui.sh:680
#, tcl-format
msgid ""
"Git version cannot be determined.\n"
@@ -54,79 +54,79 @@ msgid ""
"Assume '%s' is version 1.5.0?\n"
msgstr ""
-#: git-gui.sh:888
+#: git-gui.sh:918
msgid "Git directory not found:"
msgstr ""
-#: git-gui.sh:895
+#: git-gui.sh:925
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-gui.sh:907
+#: git-gui.sh:937
msgid "No working directory"
msgstr ""
-#: git-gui.sh:1054
+#: git-gui.sh:1084 lib/checkout_op.tcl:283
msgid "Refreshing file status..."
msgstr ""
-#: git-gui.sh:1119
+#: git-gui.sh:1149
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 ""
-#: git-gui.sh:1560
+#: git-gui.sh:1590
msgid "Unmodified"
msgstr ""
-#: git-gui.sh:1562
+#: git-gui.sh:1592
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 ""
-#: git-gui.sh:1564 git-gui.sh:1569
+#: git-gui.sh:1594 git-gui.sh:1599
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 ""
-#: git-gui.sh:1567
+#: git-gui.sh:1597
msgid "Untracked, not staged"
msgstr ""
-#: git-gui.sh:1572
+#: git-gui.sh:1602
msgid "Missing"
msgstr ""
-#: git-gui.sh:1573
+#: git-gui.sh:1603
msgid "Staged for removal"
msgstr ""
-#: git-gui.sh:1574
+#: git-gui.sh:1604
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 ""
-#: git-gui.sh:1614
+#: git-gui.sh:1644
msgid "Starting gitk... please wait..."
msgstr ""
-#: git-gui.sh:1623
+#: git-gui.sh:1653
#, tcl-format
msgid ""
"Unable to start gitk:\n"
@@ -134,295 +134,295 @@ msgid ""
"%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 ""
-#: git-gui.sh:1824
+#: git-gui.sh:1861
msgid "Edit"
msgstr ""
-#: git-gui.sh:1826 lib/choose_rev.tcl:560
+#: git-gui.sh:1863 lib/choose_rev.tcl:561
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 ""
-#: 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 ""
-#: git-gui.sh:1833 lib/choose_rev.tcl:556
+#: git-gui.sh:1870 lib/choose_rev.tcl:557
msgid "Remote"
msgstr ""
-#: git-gui.sh:1842
+#: git-gui.sh:1879
msgid "Browse Current Branch's Files"
msgstr ""
-#: git-gui.sh:1846
+#: git-gui.sh:1883
msgid "Browse Branch Files..."
msgstr ""
-#: git-gui.sh:1851
+#: git-gui.sh:1888
msgid "Visualize Current Branch's History"
msgstr ""
-#: git-gui.sh:1855
+#: git-gui.sh:1892
msgid "Visualize All Branch History"
msgstr ""
-#: git-gui.sh:1862
+#: git-gui.sh:1899
#, tcl-format
msgid "Browse %s's Files"
msgstr ""
-#: git-gui.sh:1864
+#: git-gui.sh:1901
#, 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 ""
-#: git-gui.sh:1872 lib/database.tcl:34
+#: git-gui.sh:1909 lib/database.tcl:34
msgid "Compress Database"
msgstr ""
-#: git-gui.sh:1875
+#: git-gui.sh:1912
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 ""
-#: 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 ""
-#: git-gui.sh:1902
+#: git-gui.sh:1939
msgid "Undo"
msgstr ""
-#: git-gui.sh:1905
+#: git-gui.sh:1942
msgid "Redo"
msgstr ""
-#: git-gui.sh:1909 git-gui.sh:2403
+#: git-gui.sh:1946 git-gui.sh:2443
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 ""
-#: git-gui.sh:1915 git-gui.sh:2409
+#: git-gui.sh:1952 git-gui.sh:2449
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 ""
-#: 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 ""
-#: git-gui.sh:1931
+#: git-gui.sh:1968
msgid "Create..."
msgstr ""
-#: git-gui.sh:1937
+#: git-gui.sh:1974
msgid "Checkout..."
msgstr ""
-#: git-gui.sh:1943
+#: git-gui.sh:1980
msgid "Rename..."
msgstr ""
-#: git-gui.sh:1948 git-gui.sh:2048
+#: git-gui.sh:1985 git-gui.sh:2085
msgid "Delete..."
msgstr ""
-#: git-gui.sh:1953
+#: git-gui.sh:1990
msgid "Reset..."
msgstr ""
-#: git-gui.sh:1965 git-gui.sh:2350
+#: git-gui.sh:2002 git-gui.sh:2389
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 ""
-#: 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 ""
-#: git-gui.sh:1988
+#: git-gui.sh:2025
msgid "Stage To Commit"
msgstr ""
-#: git-gui.sh:1994
+#: git-gui.sh:2031
msgid "Stage Changed Files To Commit"
msgstr ""
-#: git-gui.sh:2000
+#: git-gui.sh:2037
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 ""
-#: 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 ""
-#: git-gui.sh:2016 git-gui.sh:2333
+#: git-gui.sh:2053 git-gui.sh:2372
msgid "Commit@@verb"
msgstr ""
-#: git-gui.sh:2027
+#: git-gui.sh:2064
msgid "Local Merge..."
msgstr ""
-#: git-gui.sh:2032
+#: git-gui.sh:2069
msgid "Abort Merge..."
msgstr ""
-#: git-gui.sh:2044
+#: git-gui.sh:2081
msgid "Push..."
msgstr ""
-#: git-gui.sh:2055 lib/choose_repository.tcl:40
+#: git-gui.sh:2092 lib/choose_repository.tcl:41
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 ""
-#: git-gui.sh:2062
+#: git-gui.sh:2099
msgid "Preferences..."
msgstr ""
-#: git-gui.sh:2070 git-gui.sh:2595
+#: git-gui.sh:2107 git-gui.sh:2639
msgid "Options..."
msgstr ""
-#: git-gui.sh:2076 lib/choose_repository.tcl:46
+#: git-gui.sh:2113 lib/choose_repository.tcl:47
msgid "Help"
msgstr ""
-#: git-gui.sh:2117
+#: git-gui.sh:2154
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 ""
-#: git-gui.sh:2234
+#: git-gui.sh:2271
msgid "Current Branch:"
msgstr ""
-#: git-gui.sh:2255
+#: git-gui.sh:2292
msgid "Staged Changes (Will Commit)"
msgstr ""
-#: git-gui.sh:2274
+#: git-gui.sh:2312
msgid "Unstaged Changes"
msgstr ""
-#: git-gui.sh:2323
+#: git-gui.sh:2362
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 ""
-#: git-gui.sh:2369
+#: git-gui.sh:2408
msgid "Initial Commit Message:"
msgstr ""
-#: git-gui.sh:2370
+#: git-gui.sh:2409
msgid "Amended Commit Message:"
msgstr ""
-#: git-gui.sh:2371
+#: git-gui.sh:2410
msgid "Amended Initial Commit Message:"
msgstr ""
-#: git-gui.sh:2372
+#: git-gui.sh:2411
msgid "Amended Merge Commit Message:"
msgstr ""
-#: git-gui.sh:2373
+#: git-gui.sh:2412
msgid "Merge Commit Message:"
msgstr ""
-#: git-gui.sh:2374
+#: git-gui.sh:2413
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 ""
-#: git-gui.sh:2443 lib/blame.tcl:104
+#: git-gui.sh:2483 lib/blame.tcl:107
msgid "File:"
msgstr ""
-#: git-gui.sh:2573
+#: git-gui.sh:2589
msgid "Apply/Reverse Hunk"
msgstr ""
-#: git-gui.sh:2579
+#: git-gui.sh:2595
msgid "Show Less Context"
msgstr ""
-#: git-gui.sh:2586
+#: git-gui.sh:2602
msgid "Show More Context"
msgstr ""
-#: git-gui.sh:2594
+#: git-gui.sh:2610
msgid "Refresh"
msgstr ""
-#: git-gui.sh:2615
+#: git-gui.sh:2631
msgid "Decrease Font Size"
msgstr ""
-#: git-gui.sh:2619
+#: git-gui.sh:2635
msgid "Increase Font Size"
msgstr ""
-#: git-gui.sh:2630
+#: git-gui.sh:2646
msgid "Unstage Hunk From Commit"
msgstr ""
-#: git-gui.sh:2604
+#: git-gui.sh:2648
msgid "Stage Hunk For Commit"
msgstr ""
-#: git-gui.sh:2623
+#: git-gui.sh:2667
msgid "Initializing..."
msgstr ""
-#: git-gui.sh:2718
+#: git-gui.sh:2762
#, tcl-format
msgid ""
"Possible environment issues exist.\n"
@@ -433,14 +433,14 @@ msgid ""
"\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 ""
-#: git-gui.sh:2753
+#: git-gui.sh:2797
#, tcl-format
msgid ""
"\n"
@@ -451,7 +451,7 @@ msgid ""
"~/.gitconfig file.\n"
msgstr ""
-#: lib/about.tcl:25
+#: lib/about.tcl:26
msgid "git-gui - a graphical user interface for Git."
msgstr ""
@@ -463,56 +463,56 @@ msgstr ""
msgid "Commit:"
msgstr ""
-#: lib/blame.tcl:249
+#: lib/blame.tcl:264
msgid "Copy Commit"
msgstr ""
-#: lib/blame.tcl:369
+#: lib/blame.tcl:384
#, tcl-format
msgid "Reading %s..."
msgstr ""
-#: lib/blame.tcl:473
+#: lib/blame.tcl:488
msgid "Loading copy/move tracking annotations..."
msgstr ""
-#: lib/blame.tcl:493
+#: lib/blame.tcl:508
msgid "lines annotated"
msgstr ""
-#: lib/blame.tcl:674
+#: lib/blame.tcl:689
msgid "Loading original location annotations..."
msgstr ""
-#: lib/blame.tcl:677
+#: lib/blame.tcl:692
msgid "Annotation complete."
msgstr ""
-#: lib/blame.tcl:731
+#: lib/blame.tcl:746
msgid "Loading annotation..."
msgstr ""
-#: lib/blame.tcl:787
+#: lib/blame.tcl:802
msgid "Author:"
msgstr ""
-#: lib/blame.tcl:791
+#: lib/blame.tcl:806
msgid "Committer:"
msgstr ""
-#: lib/blame.tcl:796
+#: lib/blame.tcl:811
msgid "Original File:"
msgstr ""
-#: lib/blame.tcl:910
+#: lib/blame.tcl:925
msgid "Originally By:"
msgstr ""
-#: lib/blame.tcl:916
+#: lib/blame.tcl:931
msgid "In File:"
msgstr ""
-#: lib/blame.tcl:921
+#: lib/blame.tcl:936
msgid "Copied Or Moved Here By:"
msgstr ""
@@ -525,17 +525,17 @@ msgid "Checkout"
msgstr ""
#: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35
-#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl: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 ""
-#: lib/branch_checkout.tcl:32 lib/browser.tcl:286
+#: lib/branch_checkout.tcl:32 lib/browser.tcl:287
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 ""
@@ -555,7 +555,7 @@ 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 ""
@@ -690,22 +690,22 @@ 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 ""
-#: lib/browser.tcl:186
+#: lib/browser.tcl:187
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 ""
-#: 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 ""
@@ -719,7 +719,7 @@ 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 ""
@@ -792,7 +792,7 @@ msgid ""
"Checkout'."
msgstr ""
-#: lib/checkout_op.tcl:446
+#: lib/checkout_op.tcl:446 lib/checkout_op.tcl:450
#, tcl-format
msgid "Checked out '%s'."
msgstr ""
@@ -811,7 +811,7 @@ 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 ""
@@ -834,239 +834,239 @@ msgstr ""
msgid "Font Family"
msgstr ""
-#: lib/choose_font.tcl:73
+#: lib/choose_font.tcl:74
msgid "Font Size"
msgstr ""
-#: lib/choose_font.tcl:90
+#: lib/choose_font.tcl:91
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 ""
-#: lib/choose_repository.tcl:27
+#: lib/choose_repository.tcl:28
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 ""
-#: lib/choose_repository.tcl:86
+#: lib/choose_repository.tcl:87
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 ""
-#: lib/choose_repository.tcl:99
+#: lib/choose_repository.tcl:100
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 ""
-#: lib/choose_repository.tcl:112
+#: lib/choose_repository.tcl:113
msgid "Open..."
msgstr ""
-#: lib/choose_repository.tcl:125
+#: lib/choose_repository.tcl:126
msgid "Recent Repositories"
msgstr ""
-#: lib/choose_repository.tcl:131
+#: lib/choose_repository.tcl:132
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 ""
-#: lib/choose_repository.tcl:385 lib/choose_repository.tcl:486
+#: lib/choose_repository.tcl:381 lib/choose_repository.tcl:478
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 ""
-#: lib/choose_repository.tcl:430 lib/choose_repository.tcl:437
+#: lib/choose_repository.tcl:437
#, 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 ""
-#: lib/choose_repository.tcl:463
+#: lib/choose_repository.tcl:455
msgid "Clone"
msgstr ""
-#: lib/choose_repository.tcl:476
+#: lib/choose_repository.tcl:468
msgid "URL:"
msgstr ""
-#: lib/choose_repository.tcl:496
+#: lib/choose_repository.tcl:489
msgid "Clone Type:"
msgstr ""
-#: lib/choose_repository.tcl:502
+#: lib/choose_repository.tcl:495
msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
msgstr ""
-#: lib/choose_repository.tcl:508
+#: lib/choose_repository.tcl:501
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 ""
-#: 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 ""
-#: lib/choose_repository.tcl:586
+#: lib/choose_repository.tcl:579
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 ""
-#: 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 ""
-#: lib/choose_repository.tcl:629
+#: lib/choose_repository.tcl:627
msgid "Counting objects"
msgstr ""
-#: lib/choose_repository.tcl:630
+#: lib/choose_repository.tcl:628
msgid "buckets"
msgstr ""
-#: lib/choose_repository.tcl:654
+#: lib/choose_repository.tcl:652
#, 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 ""
-#: 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 ""
-#: lib/choose_repository.tcl:705
+#: lib/choose_repository.tcl:703
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 ""
-#: lib/choose_repository.tcl:748
+#: lib/choose_repository.tcl:746
msgid "Copying objects"
msgstr ""
-#: lib/choose_repository.tcl:749
+#: lib/choose_repository.tcl:747
msgid "KiB"
msgstr ""
-#: lib/choose_repository.tcl:773
+#: lib/choose_repository.tcl:771
#, tcl-format
msgid "Unable to copy object: %s"
msgstr ""
-#: lib/choose_repository.tcl:783
+#: lib/choose_repository.tcl:781
msgid "Linking objects"
msgstr ""
-#: lib/choose_repository.tcl:784
+#: lib/choose_repository.tcl:782
msgid "objects"
msgstr ""
-#: lib/choose_repository.tcl:792
+#: lib/choose_repository.tcl:790
#, 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 ""
-#: lib/choose_repository.tcl:858
+#: lib/choose_repository.tcl:856
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 ""
-#: lib/choose_repository.tcl:891
+#: lib/choose_repository.tcl:889
#, tcl-format
msgid "Unable to cleanup %s"
msgstr ""
-#: lib/choose_repository.tcl:897
+#: lib/choose_repository.tcl:895
msgid "Clone failed."
msgstr ""
-#: lib/choose_repository.tcl:904
+#: lib/choose_repository.tcl:902
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 ""
-#: lib/choose_repository.tcl:927
+#: lib/choose_repository.tcl:925
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/choose_repository.tcl:957
+#: lib/choose_repository.tcl:955
msgid "Initial file checkout failed."
msgstr ""
-#: lib/choose_repository.tcl:973
+#: lib/choose_repository.tcl:971
msgid "Open"
msgstr ""
-#: lib/choose_repository.tcl:983
+#: lib/choose_repository.tcl:981
msgid "Repository:"
msgstr ""
-#: lib/choose_repository.tcl:1033
+#: lib/choose_repository.tcl:1031
#, tcl-format
msgid "Failed to open repository %s:"
msgstr ""
@@ -1087,7 +1087,7 @@ 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 ""
@@ -1104,11 +1104,11 @@ msgstr ""
msgid "Revision expression is empty."
msgstr ""
-#: lib/choose_rev.tcl:530
+#: lib/choose_rev.tcl:531
msgid "Updated"
msgstr ""
-#: lib/choose_rev.tcl:558
+#: lib/choose_rev.tcl:559
msgid "URL"
msgstr ""
@@ -1224,7 +1224,7 @@ msgstr ""
msgid "Commit %s appears to be corrupt"
msgstr ""
-#: lib/commit.tcl:279
+#: lib/commit.tcl:326
msgid ""
"No changes to commit.\n"
"\n"
@@ -1233,7 +1233,7 @@ msgid ""
"A rescan will be automatically started now.\n"
msgstr ""
-#: lib/commit.tcl:286
+#: lib/commit.tcl:333
msgid "No changes to commit."
msgstr ""
@@ -1241,24 +1241,24 @@ msgstr ""
msgid "commit-tree failed:"
msgstr ""
-#: lib/commit.tcl:339
+#: lib/commit.tcl:367
msgid "update-ref failed:"
msgstr ""
-#: lib/commit.tcl:430
+#: lib/commit.tcl:454
#, tcl-format
msgid "Created commit %s: %s"
msgstr ""
-#: lib/console.tcl:57
+#: lib/console.tcl:59
msgid "Working... please wait..."
msgstr ""
-#: lib/console.tcl:183
+#: lib/console.tcl:186
msgid "Success"
msgstr ""
-#: lib/console.tcl:196
+#: lib/console.tcl:200
msgid "Error: Command Failed"
msgstr ""
@@ -1354,23 +1354,23 @@ msgstr ""
msgid "Error loading diff:"
msgstr ""
-#: lib/diff.tcl:302
+#: lib/diff.tcl:303
msgid "Failed to unstage selected hunk."
msgstr ""
-#: lib/diff.tcl:309
+#: lib/diff.tcl:310
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 ""
-#: lib/error.tcl:28
+#: lib/error.tcl:36
msgid "warning"
msgstr ""
-#: lib/error.tcl:81
+#: lib/error.tcl:94
msgid "You must correct the above errors before committing."
msgstr ""
@@ -1420,11 +1420,11 @@ 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 ""
-#: lib/index.tcl:392
+#: lib/index.tcl:394
msgid "Do Nothing"
msgstr ""
@@ -1481,27 +1481,27 @@ msgstr ""
msgid "Merge completed successfully."
msgstr ""
-#: lib/merge.tcl:133
+#: lib/merge.tcl:132
msgid "Merge failed. Conflict resolution is required."
msgstr ""
-#: lib/merge.tcl:158
+#: lib/merge.tcl:157
#, tcl-format
msgid "Merge Into %s"
msgstr ""
-#: lib/merge.tcl:177
+#: lib/merge.tcl:176
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 ""
-#: lib/merge.tcl:222
+#: lib/merge.tcl:221
msgid ""
"Abort merge?\n"
"\n"
@@ -1510,7 +1510,7 @@ msgid ""
"Continue with aborting the current merge?"
msgstr ""
-#: lib/merge.tcl:228
+#: lib/merge.tcl:227
msgid ""
"Reset changes?\n"
"\n"
@@ -1519,7 +1519,7 @@ msgid ""
"Continue with resetting the current changes?"
msgstr ""
-#: lib/merge.tcl:239
+#: lib/merge.tcl:238
msgid "Aborting"
msgstr ""
@@ -1531,89 +1531,93 @@ msgstr ""
msgid "Abort failed."
msgstr ""
-#: lib/merge.tcl:268
+#: lib/merge.tcl:267
msgid "Abort completed. Ready."
msgstr ""
-#: lib/option.tcl:82
+#: lib/option.tcl:95
msgid "Restore Defaults"
msgstr ""
-#: lib/option.tcl:86
+#: lib/option.tcl:99
msgid "Save"
msgstr ""
-#: lib/option.tcl:96
+#: lib/option.tcl:109
#, tcl-format
msgid "%s Repository"
msgstr ""
-#: lib/option.tcl:97
+#: lib/option.tcl:110
msgid "Global (All Repositories)"
msgstr ""
-#: lib/option.tcl:103
+#: lib/option.tcl:116
msgid "User Name"
msgstr ""
-#: lib/option.tcl:104
+#: lib/option.tcl:117
msgid "Email Address"
msgstr ""
-#: lib/option.tcl:106
+#: lib/option.tcl:119
msgid "Summarize Merge Commits"
msgstr ""
-#: lib/option.tcl:107
+#: lib/option.tcl:120
msgid "Merge Verbosity"
msgstr ""
-#: lib/option.tcl:108
+#: lib/option.tcl:121
msgid "Show Diffstat After Merge"
msgstr ""
-#: lib/option.tcl:110
+#: lib/option.tcl:123
msgid "Trust File Modification Timestamps"
msgstr ""
-#: lib/option.tcl:111
+#: lib/option.tcl:124
msgid "Prune Tracking Branches During Fetch"
msgstr ""
-#: lib/option.tcl:112
+#: lib/option.tcl:125
msgid "Match Tracking Branches"
msgstr ""
-#: lib/option.tcl:113
+#: lib/option.tcl:126
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 ""
-#: lib/option.tcl:191
+#: lib/option.tcl:192
msgid "Spelling Dictionary:"
msgstr ""
-#: lib/option.tcl:215
+#: lib/option.tcl:216
msgid "Change Font"
msgstr ""
-#: lib/option.tcl:180
+#: lib/option.tcl:220
#, tcl-format
msgid "Choose %s"
msgstr ""
-#: lib/option.tcl:186
+#: lib/option.tcl:226
msgid "pt."
msgstr ""
-#: lib/option.tcl:200
+#: lib/option.tcl:240
msgid "Preferences"
msgstr ""
-#: lib/option.tcl:235
+#: lib/option.tcl:275
msgid "Failed to completely save options:"
msgstr ""
@@ -1713,23 +1717,40 @@ 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 ""
-#: lib/spellcheck.tcl:41
-msgid "Unrecognized aspell version"
+#: lib/spellcheck.tcl:80
+msgid "Unrecognized spell checker"
msgstr ""
-#: lib/spellcheck.tcl:135
+#: lib/spellcheck.tcl:180
msgid "No Suggestions"
msgstr ""
-#: lib/spellcheck.tcl:336
-msgid "Unexpected EOF from aspell"
+#: lib/spellcheck.tcl:381
+msgid "Unexpected EOF from spell checker"
msgstr ""
-#: lib/spellcheck.tcl:340
+#: lib/spellcheck.tcl:385
msgid "Spell Checker Failed"
msgstr ""
diff --git a/git-gui/po/hu.po b/git-gui/po/hu.po
index 627c05eb9..28760ed97 100644
--- a/git-gui/po/hu.po
+++ b/git-gui/po/hu.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: git-gui-i 18n\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-11-24 10:36+0100\n"
-"PO-Revision-Date: 2007-12-04 01:15+0100\n"
+"POT-Creation-Date: 2008-03-14 07:18+0100\n"
+"PO-Revision-Date: 2008-03-14 17:24+0100\n"
"Last-Translator: Miklos Vajna <vmiklos@frugalware.org>\n"
"Language-Team: Hungarian\n"
"MIME-Version: 1.0\n"
@@ -16,33 +16,33 @@ msgstr ""
"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"
-#: git-gui.sh:565
+#: git-gui.sh:593
#, 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"
-#: git-gui.sh:591
+#: git-gui.sh:621
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."
-#: git-gui.sh:632
+#: git-gui.sh:662
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"
@@ -61,79 +61,79 @@ msgstr ""
"\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ó:"
-#: 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:"
-#: git-gui.sh:902
+#: git-gui.sh:932
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"
-#: 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..."
-#: git-gui.sh:1119
+#: git-gui.sh:1149
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."
-#: git-gui.sh:1560
+#: git-gui.sh:1590
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"
-#: 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"
-#: 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"
-#: 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ó"
-#: git-gui.sh:1567
+#: git-gui.sh:1597
msgid "Untracked, not staged"
msgstr "Nem követett, nem kiválasztott"
-#: git-gui.sh:1572
+#: git-gui.sh:1602
msgid "Missing"
msgstr "Hiányzó"
-#: git-gui.sh:1573
+#: git-gui.sh:1603
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ő"
-#: 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"
-#: git-gui.sh:1614
+#: git-gui.sh:1644
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"
@@ -144,295 +144,296 @@ msgstr ""
"\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ó"
-#: git-gui.sh:1824
+#: git-gui.sh:1861
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"
-#: 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"
-#: 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"
-#: git-gui.sh:1833 lib/choose_rev.tcl:556
+#: git-gui.sh:1870 lib/choose_rev.tcl:557
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"
-#: git-gui.sh:1846
+#: git-gui.sh:1883
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"
-#: git-gui.sh:1855
+#: git-gui.sh:1892
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"
-#: 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"
-#: 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"
-#: 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"
-#: git-gui.sh:1875
+#: git-gui.sh:1912
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"
-#: 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"
-#: git-gui.sh:1902
+#: git-gui.sh:1939
msgid "Undo"
msgstr "Visszavonás"
-#: git-gui.sh:1905
+#: git-gui.sh:1942
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"
-#: 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"
-#: git-gui.sh:1915 git-gui.sh:2409
+#: git-gui.sh:1952 git-gui.sh:2449
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"
-#: 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"
-#: git-gui.sh:1931
+#: git-gui.sh:1968
msgid "Create..."
msgstr "Létrehozás..."
-#: git-gui.sh:1937
+#: git-gui.sh:1974
msgid "Checkout..."
msgstr "Checkout..."
-#: git-gui.sh:1943
+#: git-gui.sh:1980
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..."
-#: git-gui.sh:1953
+#: git-gui.sh:1990
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"
-#: 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"
-#: 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"
-#: git-gui.sh:1988
+#: git-gui.sh:2025
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"
-#: git-gui.sh:2000
+#: git-gui.sh:2037
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"
-#: 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"
-#: git-gui.sh:2016 git-gui.sh:2333
+#: git-gui.sh:2053 git-gui.sh:2372
msgid "Commit@@verb"
msgstr "Commit@@ige"
-#: git-gui.sh:2027
+#: git-gui.sh:2064
msgid "Local Merge..."
msgstr "Helyi merge..."
-#: git-gui.sh:2032
+#: git-gui.sh:2069
msgid "Abort Merge..."
msgstr "Merge megszakítása..."
-#: git-gui.sh:2044
+#: git-gui.sh:2081
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"
-#: 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"
-#: git-gui.sh:2062
+#: git-gui.sh:2099
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..."
-#: git-gui.sh:2076 lib/choose_repository.tcl:46
+#: git-gui.sh:2113 lib/choose_repository.tcl:47
msgid "Help"
msgstr "Segítség"
-#: git-gui.sh:2117
+#: git-gui.sh:2154
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"
+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:"
-#: git-gui.sh:2255
+#: git-gui.sh:2292
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"
-#: git-gui.sh:2323
+#: git-gui.sh:2362
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"
-#: git-gui.sh:2369
+#: git-gui.sh:2408
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:"
-#: git-gui.sh:2371
+#: git-gui.sh:2410
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:"
-#: git-gui.sh:2373
+#: git-gui.sh:2412
msgid "Merge Commit Message:"
msgstr "Merge commit üzenet:"
-#: git-gui.sh:2374
+#: git-gui.sh:2413
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"
-#: git-gui.sh:2443 lib/blame.tcl:104
+#: git-gui.sh:2483 lib/blame.tcl:107
msgid "File:"
msgstr "Fájl:"
-#: git-gui.sh:2545
-msgid "Refresh"
-msgstr "Frissítés"
-
-#: git-gui.sh:2566
+#: git-gui.sh:2589
msgid "Apply/Reverse Hunk"
msgstr "Hunk alkalmazása/visszaállítása"
-#: git-gui.sh:2572
-msgid "Decrease Font Size"
-msgstr "Font méret csökkentése"
-
-#: git-gui.sh:2576
-msgid "Increase Font Size"
-msgstr "Fönt méret növelése"
-
-#: git-gui.sh:2581
+#: git-gui.sh:2595
msgid "Show Less Context"
msgstr "Kevesebb környezet mutatása"
-#: git-gui.sh:2588
+#: git-gui.sh:2602
msgid "Show More Context"
msgstr "Több környezet mutatása"
-#: git-gui.sh:2602
+#: git-gui.sh:2610
+msgid "Refresh"
+msgstr "Frissítés"
+
+#: git-gui.sh:2631
+msgid "Decrease Font Size"
+msgstr "Font méret csökkentése"
+
+#: git-gui.sh:2635
+msgid "Increase Font Size"
+msgstr "Fönt méret növelése"
+
+#: git-gui.sh:2646
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"
-#: git-gui.sh:2623
+#: git-gui.sh:2667
msgid "Initializing..."
msgstr "Inicializálás..."
-#: git-gui.sh:2718
+#: git-gui.sh:2762
#, tcl-format
msgid ""
"Possible environment issues exist.\n"
@@ -449,7 +450,7 @@ msgstr ""
"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"
@@ -459,7 +460,7 @@ msgstr ""
"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"
@@ -476,7 +477,7 @@ msgstr ""
"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."
@@ -488,56 +489,56 @@ msgstr "Fájl néző"
msgid "Commit:"
msgstr "Commit:"
-#: lib/blame.tcl:249
+#: lib/blame.tcl:264
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..."
-#: 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..."
-#: lib/blame.tcl:493
+#: lib/blame.tcl:508
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..."
-#: lib/blame.tcl:677
+#: lib/blame.tcl:692
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..."
-#: lib/blame.tcl:787
+#: lib/blame.tcl:802
msgid "Author:"
msgstr "Szerző:"
-#: lib/blame.tcl:791
+#: lib/blame.tcl:806
msgid "Committer:"
msgstr "Commiter:"
-#: lib/blame.tcl:796
+#: lib/blame.tcl:811
msgid "Original File:"
msgstr "Eredeti fájl:"
-#: lib/blame.tcl:910
+#: lib/blame.tcl:925
msgid "Originally By:"
msgstr "Eredeti szerző:"
-#: lib/blame.tcl:916
+#: lib/blame.tcl:931
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:"
@@ -550,17 +551,17 @@ msgid "Checkout"
msgstr "Checkout"
#: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35
-#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl: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"
-#: lib/branch_checkout.tcl:32 lib/browser.tcl:286
+#: lib/branch_checkout.tcl:32 lib/browser.tcl:287
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"
@@ -580,7 +581,7 @@ msgstr "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"
@@ -720,22 +721,22 @@ msgstr "Indítás..."
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..."
-#: lib/browser.tcl:186
+#: lib/browser.tcl:187
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"
-#: 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"
@@ -749,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"
-#: 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"
@@ -807,6 +808,10 @@ msgstr ""
msgid "Updating working directory to '%s'..."
msgstr "A munkkönyvtár frissiítése a következőre: '%s'..."
+#: lib/checkout_op.tcl:323
+msgid "files checked out"
+msgstr "fájl frissítve"
+
#: lib/checkout_op.tcl:353
#, tcl-format
msgid "Aborted checkout of '%s' (file level merging is required)."
@@ -833,7 +838,7 @@ msgstr ""
"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."
@@ -853,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'?"
-#: lib/checkout_op.tcl:510 lib/merge.tcl:164
+#: lib/checkout_op.tcl:510 lib/merge.tcl:163
msgid "Visualize"
msgstr "Vizualizálás"
@@ -882,15 +887,15 @@ msgstr "Kiválaszt"
msgid "Font Family"
msgstr "Font család"
-#: lib/choose_font.tcl:73
+#: lib/choose_font.tcl:74
msgid "Font Size"
msgstr "Font méret"
-#: lib/choose_font.tcl:90
+#: lib/choose_font.tcl:91
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."
@@ -898,225 +903,227 @@ msgstr ""
"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"
-#: 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"
-#: lib/choose_repository.tcl:86
+#: lib/choose_repository.tcl:87
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"
-#: lib/choose_repository.tcl:99
+#: lib/choose_repository.tcl:100
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"
-#: lib/choose_repository.tcl:112
+#: lib/choose_repository.tcl:113
msgid "Open..."
msgstr "Meggyitás..."
-#: lib/choose_repository.tcl:125
+#: lib/choose_repository.tcl:126
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:"
-#: 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:"
-#: 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:"
-#: 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ó"
-#: 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."
-#: 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."
-#: lib/choose_repository.tcl:463
+#: lib/choose_repository.tcl:455
msgid "Clone"
msgstr "Bezárás"
-#: lib/choose_repository.tcl:476
+#: lib/choose_repository.tcl:468
msgid "URL:"
msgstr "URL:"
-#: lib/choose_repository.tcl:496
+#: lib/choose_repository.tcl:489
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)"
-#: 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)"
-#: 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)"
-#: 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"
-#: 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."
-#: 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."
-#: 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"
-#: lib/choose_repository.tcl:629
+#: lib/choose_repository.tcl:627
msgid "Counting objects"
msgstr "Objektumok számolása"
-#: lib/choose_repository.tcl:630
+#: lib/choose_repository.tcl:628
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"
-#: 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"
-#: 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."
-#: 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."
-#: lib/choose_repository.tcl:717
+#: lib/choose_repository.tcl:715
#, 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"
-#: lib/choose_repository.tcl:749
+#: lib/choose_repository.tcl:747
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"
-#: lib/choose_repository.tcl:783
+#: lib/choose_repository.tcl:781
msgid "Linking objects"
msgstr "Objektumok összefűzése"
-#: lib/choose_repository.tcl:784
+#: lib/choose_repository.tcl:782
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"
-#: 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."
+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."
-#: 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."
-#: lib/choose_repository.tcl:891
+#: lib/choose_repository.tcl:889
#, 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."
-#: lib/choose_repository.tcl:904
+#: lib/choose_repository.tcl:902
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."
-#: lib/choose_repository.tcl:927
+#: lib/choose_repository.tcl:925
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/choose_repository.tcl:957
+#: lib/choose_repository.tcl:955
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"
-#: lib/choose_repository.tcl:983
+#: lib/choose_repository.tcl:981
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:"
@@ -1137,7 +1144,7 @@ msgstr "Helyi 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"
@@ -1154,11 +1161,11 @@ msgstr "Nincs kiválasztva revízió."
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"
-#: lib/choose_rev.tcl:558
+#: lib/choose_rev.tcl:559
msgid "URL"
msgstr "URL"
@@ -1268,16 +1275,45 @@ msgstr ""
"- Második sor: Üres\n"
"- A többi sor: Leírja, hogy miért jó ez a változtatás.\n"
-#: lib/commit.tcl:257
+#: lib/commit.tcl:207
+#, tcl-format
+msgid "warning: Tcl does not support encoding '%s'."
+msgstr "figyelmeztetés: a Tcl nem támogatja a(z) '%s' kódolást."
+
+#: lib/commit.tcl:221
+msgid "Calling pre-commit hook..."
+msgstr "A pre-commit hurok meghívása..."
+
+#: lib/commit.tcl:236
+msgid "Commit declined by pre-commit hook."
+msgstr "A commitot megakadályozta a pre-commit hurok. "
+
+#: lib/commit.tcl:259
+msgid "Calling commit-msg hook..."
+msgstr "A commit-msg hurok meghívása..."
+
+#: lib/commit.tcl:274
+msgid "Commit declined by commit-msg hook."
+msgstr "A commiot megakadályozta a commit-msg hurok."
+
+#: lib/commit.tcl:287
+msgid "Committing changes..."
+msgstr "A változtatások commitolása..."
+
+#: lib/commit.tcl:303
msgid "write-tree failed:"
msgstr "a write-tree sikertelen:"
-#: lib/commit.tcl:275
+#: lib/commit.tcl:304 lib/commit.tcl:348 lib/commit.tcl:368
+msgid "Commit failed."
+msgstr "A commit nem sikerült."
+
+#: lib/commit.tcl:321
#, tcl-format
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"
@@ -1291,37 +1327,32 @@ msgstr ""
"\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."
-#: lib/commit.tcl:303
-#, tcl-format
-msgid "warning: Tcl does not support encoding '%s'."
-msgstr "figyelmeztetés: a Tcl nem támogatja a(z) '%s' kódolást."
-
-#: lib/commit.tcl:317
+#: lib/commit.tcl:347
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:"
-#: lib/commit.tcl:430
+#: lib/commit.tcl:454
#, 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..."
-#: lib/console.tcl:183
+#: lib/console.tcl:186
msgid "Success"
msgstr "Siker"
-#: lib/console.tcl:196
+#: lib/console.tcl:200
msgid "Error: Command Failed"
msgstr "Hiba: a parancs sikertelen"
@@ -1431,23 +1462,23 @@ msgstr "* Bináris fájl (tartalom elrejtése)."
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."
-#: lib/diff.tcl:309
+#: lib/diff.tcl:310
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"
-#: lib/error.tcl:28
+#: lib/error.tcl:36
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."
@@ -1464,8 +1495,8 @@ msgid ""
"Updating the Git index failed. A rescan will be automatically started to "
"resynchronize git-gui."
msgstr ""
-"A Git index frissítése sikertelen volt. Egy újraolvasás automatikusan elindult, hogy "
-"a git-gui újra szinkonban legyen."
+"A Git index frissítése sikertelen volt. Egy újraolvasás automatikusan "
+"elindult, hogy a git-gui újra szinkonban legyen."
#: lib/index.tcl:27
msgid "Continue"
@@ -1480,6 +1511,10 @@ msgstr "Index zárolásának feloldása"
msgid "Unstaging %s from commit"
msgstr "A(z) %s commitba való kiválasztásának visszavonása"
+#: lib/index.tcl:313
+msgid "Ready to commit."
+msgstr "Commitolásra kész."
+
#: lib/index.tcl:326
#, tcl-format
msgid "Adding %s"
@@ -1495,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?"
-#: 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."
-#: lib/index.tcl:392
+#: lib/index.tcl:394
msgid "Do Nothing"
msgstr "Ne csináljunk semmit"
@@ -1574,27 +1609,27 @@ msgstr "%s / %s"
#: lib/merge.tcl:119
#, tcl-format
-msgid "Merging %s and %s"
-msgstr "A(z) %s és a(z) %s merge-ölése"
+msgid "Merging %s and %s..."
+msgstr "A(z) %s és a(z) %s merge-ölése..."
-#: lib/merge.tcl:131
+#: lib/merge.tcl:130
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."
-#: lib/merge.tcl:158
+#: lib/merge.tcl:157
#, 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ó"
-#: lib/merge.tcl:212
+#: lib/merge.tcl:211
msgid ""
"Cannot abort while amending.\n"
"\n"
@@ -1604,7 +1639,7 @@ msgstr ""
"\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"
@@ -1619,7 +1654,7 @@ msgstr ""
"\n"
"Folytatjuk a jelenlegi merge megszakítását?"
-#: lib/merge.tcl:228
+#: lib/merge.tcl:227
msgid ""
"Reset changes?\n"
"\n"
@@ -1634,93 +1669,105 @@ msgstr ""
"\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"
-#: lib/merge.tcl:266
+#: lib/merge.tcl:238
+msgid "files reset"
+msgstr "fájl visszaállítva"
+
+#: lib/merge.tcl:265
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."
-#: lib/option.tcl:82
+#: lib/option.tcl:95
msgid "Restore Defaults"
msgstr "Alapértelmezés visszaállítása"
-#: lib/option.tcl:86
+#: lib/option.tcl:99
msgid "Save"
msgstr "Mentés"
-#: lib/option.tcl:96
+#: lib/option.tcl:109
#, 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ó)"
-#: lib/option.tcl:103
+#: lib/option.tcl:116
msgid "User Name"
msgstr "Felhasználónév"
-#: lib/option.tcl:104
+#: lib/option.tcl:117
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"
-#: lib/option.tcl:107
+#: lib/option.tcl:120
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"
-#: 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"
-#: 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"
-#: lib/option.tcl:112
+#: lib/option.tcl:125
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"
-#: lib/option.tcl:114
+#: lib/option.tcl:127
+msgid "Commit Message Text Width"
+msgstr "Commit üzenet szövegének szélessége"
+
+#: lib/option.tcl:128
msgid "New Branch Name Template"
msgstr "Új branch név sablon"
-#: lib/option.tcl:176
+#: lib/option.tcl:192
+msgid "Spelling Dictionary:"
+msgstr "Helyesírás-ellenőrző szótár:"
+
+#: lib/option.tcl:216
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"
-#: lib/option.tcl:186
+#: lib/option.tcl:226
msgid "pt."
msgstr "pt."
-#: lib/option.tcl:200
+#: lib/option.tcl:240
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:"
@@ -1767,8 +1814,7 @@ msgid ""
"\n"
" - %s"
msgstr ""
-"A következő branchek nem teljesen lettek merge-ölve ebbe: %s:"
-"\n"
+"A következő branchek nem teljesen lettek merge-ölve ebbe: %s:\n"
" - %s"
#: lib/remote_branch_delete.tcl:189
@@ -1829,6 +1875,43 @@ msgstr "Nem sikerült írni a gyorsbillentyűt:"
msgid "Cannot write icon:"
msgstr "Nem sikerült írni az ikont:"
+#: lib/spellcheck.tcl:57
+msgid "Unsupported spell checker"
+msgstr "Nem támogatott helyesírás-ellenőrző"
+
+#: lib/spellcheck.tcl:65
+msgid "Spell checking is unavailable"
+msgstr "A helyesírás-ellenőrzés nem elérhető"
+
+#: lib/spellcheck.tcl:68
+msgid "Invalid spell checking configuration"
+msgstr "Érvénytelen a helyesírás-ellenőrző beállítása"
+
+#: lib/spellcheck.tcl:70
+#, tcl-format
+msgid "Reverting dictionary to %s."
+msgstr "Szótár visszaállítása a következőre: %s."
+
+#: lib/spellcheck.tcl:73
+msgid "Spell checker silently failed on startup"
+msgstr "A helyesírás-ellenőrő indítása sikertelen"
+
+#: lib/spellcheck.tcl:80
+msgid "Unrecognized spell checker"
+msgstr "Ismeretlen helyesírás-ellenőrző"
+
+#: lib/spellcheck.tcl:180
+msgid "No Suggestions"
+msgstr "Nincs javaslat"
+
+#: lib/spellcheck.tcl:381
+msgid "Unexpected EOF from spell checker"
+msgstr "Nem várt EOF a helyesírás-ellenőrzőtől"
+
+#: lib/spellcheck.tcl:385
+msgid "Spell Checker Failed"
+msgstr "A helyesírás-ellenőrzés sikertelen"
+
#: lib/status_bar.tcl:83
#, tcl-format
msgid "%s ... %*i of %*i %s (%3i%%)"
@@ -1887,7 +1970,9 @@ msgstr "Átviteli opciók"
#: lib/transport.tcl:160
msgid "Force overwrite existing branch (may discard changes)"
-msgstr "Létező branch felülírásának erőltetése (lehet, hogy el fog dobni változtatásokat)"
+msgstr ""
+"Létező branch felülírásának erőltetése (lehet, hogy el fog dobni "
+"változtatásokat)"
#: lib/transport.tcl:164
msgid "Use thin pack (for slow network connections)"
@@ -1897,6 +1982,9 @@ msgstr "Vékony csomagok használata (lassú hálózati kapcsolatok számára)"
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:"
diff --git a/git-gui/po/it.po b/git-gui/po/it.po
index 33a839917..11cc79bb5 100644
--- a/git-gui/po/it.po
+++ b/git-gui/po/it.po
@@ -9,41 +9,41 @@ msgid ""
msgstr ""
"Project-Id-Version: git-gui\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-11-09 11:18+0100\n"
-"PO-Revision-Date: 2007-11-01 21:05+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"
"MIME-Version: 1.0\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: errore grave"
-#: git-gui.sh:565
+#: git-gui.sh:593
#, tcl-format
msgid "Invalid font specified in %s:"
msgstr "Caratteri non validi specificati in %s:"
-#: git-gui.sh:590
+#: git-gui.sh:620
msgid "Main Font"
msgstr "Caratteri principali"
-#: git-gui.sh:591
+#: git-gui.sh:621
msgid "Diff/Console Font"
msgstr "Caratteri per confronti e terminale"
-#: git-gui.sh:605
+#: git-gui.sh:635
msgid "Cannot find git in PATH."
msgstr "Impossibile trovare git nel PATH"
-#: git-gui.sh:632
+#: git-gui.sh:662
msgid "Cannot parse Git version string:"
msgstr "Impossibile determinare la versione di Git:"
-#: git-gui.sh:650
+#: git-gui.sh:680
#, tcl-format
msgid ""
"Git version cannot be determined.\n"
@@ -62,79 +62,79 @@ msgstr ""
"\n"
"Assumere che '%s' sia alla versione 1.5.0?\n"
-#: git-gui.sh:888
+#: git-gui.sh:918
msgid "Git directory not found:"
msgstr "Non trovo la directory di git: "
-#: git-gui.sh:895
+#: git-gui.sh:925
msgid "Cannot move to top of working directory:"
msgstr "Impossibile spostarsi sulla directory principale del progetto:"
-#: git-gui.sh:902
+#: git-gui.sh:932
msgid "Cannot use funny .git directory:"
msgstr "Impossibile usare una .git directory strana:"
-#: git-gui.sh:907
+#: git-gui.sh:937
msgid "No working directory"
msgstr "Nessuna directory di lavoro"
-#: git-gui.sh:1054
+#: git-gui.sh:1084 lib/checkout_op.tcl:283
msgid "Refreshing file status..."
msgstr "Controllo dello stato dei file in corso..."
-#: git-gui.sh:1119
+#: git-gui.sh:1149
msgid "Scanning for modified files ..."
msgstr "Ricerca di file modificati in corso..."
-#: git-gui.sh:1294 lib/browser.tcl:245
+#: git-gui.sh:1324 lib/browser.tcl:246
msgid "Ready."
msgstr "Pronto."
-#: git-gui.sh:1560
+#: git-gui.sh:1590
msgid "Unmodified"
msgstr "Non modificato"
-#: git-gui.sh:1562
+#: git-gui.sh:1592
msgid "Modified, not staged"
msgstr "Modificato, non preparato per una nuova revisione"
-#: git-gui.sh:1563 git-gui.sh:1568
+#: git-gui.sh:1593 git-gui.sh:1598
msgid "Staged for commit"
msgstr "Preparato per una nuova revisione"
-#: git-gui.sh:1564 git-gui.sh:1569
+#: git-gui.sh:1594 git-gui.sh:1599
msgid "Portions staged for commit"
msgstr "Parti preparate per una nuova revisione"
-#: git-gui.sh:1565 git-gui.sh:1570
+#: git-gui.sh:1595 git-gui.sh:1600
msgid "Staged for commit, missing"
msgstr "Preparato per una nuova revisione, mancante"
-#: git-gui.sh:1567
+#: git-gui.sh:1597
msgid "Untracked, not staged"
msgstr "Non tracciato, non preparato per una nuova revisione"
-#: git-gui.sh:1572
+#: git-gui.sh:1602
msgid "Missing"
msgstr "Mancante"
-#: git-gui.sh:1573
+#: git-gui.sh:1603
msgid "Staged for removal"
msgstr "Preparato per la rimozione"
-#: git-gui.sh:1574
+#: git-gui.sh:1604
msgid "Staged for removal, still present"
msgstr "Preparato alla rimozione, ancora presente"
-#: 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 "Richiede risoluzione dei conflitti"
-#: git-gui.sh:1614
+#: git-gui.sh:1644
msgid "Starting gitk... please wait..."
msgstr "Avvio di gitk... attendere..."
-#: git-gui.sh:1623
+#: git-gui.sh:1653
#, tcl-format
msgid ""
"Unable to start gitk:\n"
@@ -145,297 +145,297 @@ msgstr ""
"\n"
"%s non esiste"
-#: git-gui.sh:1823 lib/choose_repository.tcl:35
+#: git-gui.sh:1860 lib/choose_repository.tcl:36
msgid "Repository"
msgstr "Archivio"
-#: git-gui.sh:1824
+#: git-gui.sh:1861
msgid "Edit"
msgstr "Modifica"
-#: git-gui.sh:1826 lib/choose_rev.tcl:560
+#: git-gui.sh:1863 lib/choose_rev.tcl:561
msgid "Branch"
msgstr "Ramo"
-#: git-gui.sh:1829 lib/choose_rev.tcl:547
+#: git-gui.sh:1866 lib/choose_rev.tcl:548
msgid "Commit@@noun"
msgstr "Revisione"
-#: 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 "Fusione (Merge)"
-#: git-gui.sh:1833 lib/choose_rev.tcl:556
+#: git-gui.sh:1870 lib/choose_rev.tcl:557
msgid "Remote"
msgstr "Remoto"
-#: git-gui.sh:1842
+#: git-gui.sh:1879
msgid "Browse Current Branch's Files"
msgstr "Esplora i file del ramo attuale"
-#: git-gui.sh:1846
+#: git-gui.sh:1883
msgid "Browse Branch Files..."
msgstr "Esplora i file del ramo..."
-#: git-gui.sh:1851
+#: git-gui.sh:1888
msgid "Visualize Current Branch's History"
msgstr "Visualizza la cronologia del ramo attuale"
-#: git-gui.sh:1855
+#: git-gui.sh:1892
msgid "Visualize All Branch History"
msgstr "Visualizza la cronologia di tutti i rami"
-#: git-gui.sh:1862
+#: git-gui.sh:1899
#, tcl-format
msgid "Browse %s's Files"
msgstr "Esplora i file di %s"
-#: git-gui.sh:1864
+#: git-gui.sh:1901
#, tcl-format
msgid "Visualize %s's History"
msgstr "Visualizza la cronologia di %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 "Statistiche dell'archivio"
-#: git-gui.sh:1872 lib/database.tcl:34
+#: git-gui.sh:1909 lib/database.tcl:34
msgid "Compress Database"
msgstr "Comprimi l'archivio"
-#: git-gui.sh:1875
+#: git-gui.sh:1912
msgid "Verify Database"
msgstr "Verifica l'archivio"
-#: 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 "Crea icona desktop"
-#: 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 "Esci"
-#: git-gui.sh:1902
+#: git-gui.sh:1939
msgid "Undo"
msgstr "Annulla"
-#: git-gui.sh:1905
+#: git-gui.sh:1942
msgid "Redo"
msgstr "Ripeti"
-#: git-gui.sh:1909 git-gui.sh:2403
+#: git-gui.sh:1946 git-gui.sh:2443
msgid "Cut"
msgstr "Taglia"
-#: 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 "Copia"
-#: git-gui.sh:1915 git-gui.sh:2409
+#: git-gui.sh:1952 git-gui.sh:2449
msgid "Paste"
msgstr "Incolla"
-#: 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 "Elimina"
-#: 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 "Seleziona tutto"
-#: git-gui.sh:1931
+#: git-gui.sh:1968
msgid "Create..."
msgstr "Crea..."
-#: git-gui.sh:1937
+#: git-gui.sh:1974
msgid "Checkout..."
msgstr "Attiva..."
-#: git-gui.sh:1943
+#: git-gui.sh:1980
msgid "Rename..."
msgstr "Rinomina"
-#: git-gui.sh:1948 git-gui.sh:2048
+#: git-gui.sh:1985 git-gui.sh:2085
msgid "Delete..."
msgstr "Elimina..."
-#: git-gui.sh:1953
+#: git-gui.sh:1990
msgid "Reset..."
msgstr "Ripristina..."
-#: git-gui.sh:1965 git-gui.sh:2350
+#: git-gui.sh:2002 git-gui.sh:2389
msgid "New Commit"
msgstr "Nuova revisione"
-#: git-gui.sh:1973 git-gui.sh:2357
+#: git-gui.sh:2010 git-gui.sh:2396
msgid "Amend Last Commit"
msgstr "Correggi l'ultima revisione"
-#: 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 "Analizza nuovamente"
-#: git-gui.sh:1988
+#: git-gui.sh:2025
msgid "Stage To Commit"
msgstr "Prepara per una nuova revisione"
-#: git-gui.sh:1994
+#: git-gui.sh:2031
msgid "Stage Changed Files To Commit"
msgstr "Prepara i file modificati per una nuova revisione"
-#: git-gui.sh:2000
+#: git-gui.sh:2037
msgid "Unstage From Commit"
msgstr "Annulla preparazione"
-#: git-gui.sh:2005 lib/index.tcl:393
+#: git-gui.sh:2042 lib/index.tcl:395
msgid "Revert Changes"
msgstr "Annulla modifiche"
-#: 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"
-#: git-gui.sh:2016 git-gui.sh:2333
+#: git-gui.sh:2053 git-gui.sh:2372
msgid "Commit@@verb"
msgstr "Nuova revisione"
-#: git-gui.sh:2027
+#: git-gui.sh:2064
msgid "Local Merge..."
msgstr "Fusione locale..."
-#: git-gui.sh:2032
+#: git-gui.sh:2069
msgid "Abort Merge..."
msgstr "Interrompi fusione..."
-#: git-gui.sh:2044
+#: git-gui.sh:2081
msgid "Push..."
msgstr "Propaga..."
-#: git-gui.sh:2055 lib/choose_repository.tcl:40
+#: git-gui.sh:2092 lib/choose_repository.tcl:41
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 "Informazioni su %s"
-#: git-gui.sh:2062
+#: git-gui.sh:2099
msgid "Preferences..."
msgstr "Preferenze..."
-#: git-gui.sh:2070 git-gui.sh:2595
+#: git-gui.sh:2107 git-gui.sh:2639
msgid "Options..."
msgstr "Opzioni..."
-#: git-gui.sh:2076 lib/choose_repository.tcl:46
+#: git-gui.sh:2113 lib/choose_repository.tcl:47
msgid "Help"
msgstr "Aiuto"
-#: git-gui.sh:2117
+#: git-gui.sh:2154
msgid "Online Documentation"
msgstr "Documentazione sul web"
-#: git-gui.sh:2201
+#: git-gui.sh:2238
#, tcl-format
msgid "fatal: cannot stat path %s: No such file or directory"
msgstr ""
"errore grave: impossibile effettuare lo stat del path %s: file o directory "
"non trovata"
-#: git-gui.sh:2234
+#: git-gui.sh:2271
msgid "Current Branch:"
msgstr "Ramo attuale:"
-#: git-gui.sh:2255
+#: git-gui.sh:2292
msgid "Staged Changes (Will Commit)"
msgstr "Modifiche preparate (saranno nella nuova revisione)"
-#: git-gui.sh:2274
+#: git-gui.sh:2312
msgid "Unstaged Changes"
msgstr "Modifiche non preparate"
-#: git-gui.sh:2323
+#: git-gui.sh:2362
msgid "Stage Changed"
msgstr "Prepara modificati"
-#: 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 "Propaga (Push)"
-#: git-gui.sh:2369
+#: git-gui.sh:2408
msgid "Initial Commit Message:"
msgstr "Messaggio di revisione iniziale:"
-#: git-gui.sh:2370
+#: git-gui.sh:2409
msgid "Amended Commit Message:"
msgstr "Messaggio di revisione corretto:"
-#: git-gui.sh:2371
+#: git-gui.sh:2410
msgid "Amended Initial Commit Message:"
msgstr "Messaggio iniziale di revisione corretto:"
-#: git-gui.sh:2372
+#: git-gui.sh:2411
msgid "Amended Merge Commit Message:"
msgstr "Messaggio di fusione corretto:"
-#: git-gui.sh:2373
+#: git-gui.sh:2412
msgid "Merge Commit Message:"
msgstr "Messaggio di fusione:"
-#: git-gui.sh:2374
+#: git-gui.sh:2413
msgid "Commit Message:"
msgstr "Messaggio di revisione:"
-#: 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 "Copia tutto"
-#: git-gui.sh:2443 lib/blame.tcl:104
+#: git-gui.sh:2483 lib/blame.tcl:107
msgid "File:"
msgstr "File:"
-#: git-gui.sh:2545
-msgid "Refresh"
-msgstr "Rinfresca"
-
-#: git-gui.sh:2566
+#: git-gui.sh:2589
msgid "Apply/Reverse Hunk"
msgstr "Applica/Inverti sezione"
-#: git-gui.sh:2572
-msgid "Decrease Font Size"
-msgstr "Diminuisci dimensione caratteri"
-
-#: git-gui.sh:2576
-msgid "Increase Font Size"
-msgstr "Aumenta dimensione caratteri"
-
-#: git-gui.sh:2581
+#: git-gui.sh:2595
msgid "Show Less Context"
msgstr "Mostra meno contesto"
-#: git-gui.sh:2588
+#: git-gui.sh:2602
msgid "Show More Context"
msgstr "Mostra più contesto"
-#: git-gui.sh:2602
+#: git-gui.sh:2610
+msgid "Refresh"
+msgstr "Rinfresca"
+
+#: git-gui.sh:2631
+msgid "Decrease Font Size"
+msgstr "Diminuisci dimensione caratteri"
+
+#: git-gui.sh:2635
+msgid "Increase Font Size"
+msgstr "Aumenta dimensione caratteri"
+
+#: git-gui.sh:2646
msgid "Unstage Hunk From Commit"
msgstr "Sezione non preparata per una nuova revisione"
-#: git-gui.sh:2604
+#: git-gui.sh:2648
msgid "Stage Hunk For Commit"
msgstr "Prepara sezione per una nuova revisione"
-#: git-gui.sh:2623
+#: git-gui.sh:2667
msgid "Initializing..."
msgstr "Inizializzazione..."
-#: git-gui.sh:2718
+#: git-gui.sh:2762
#, tcl-format
msgid ""
"Possible environment issues exist.\n"
@@ -452,7 +452,7 @@ msgstr ""
"da %s:\n"
"\n"
-#: git-gui.sh:2748
+#: git-gui.sh:2792
msgid ""
"\n"
"This is due to a known issue with the\n"
@@ -462,7 +462,7 @@ msgstr ""
"Ciò è dovuto a un problema conosciuto\n"
"causato dall'eseguibile Tcl distribuito da Cygwin."
-#: git-gui.sh:2753
+#: git-gui.sh:2797
#, tcl-format
msgid ""
"\n"
@@ -478,7 +478,7 @@ msgstr ""
"consiste nell'assegnare valori alle variabili di configurazione\n"
"user.name e user.email nel tuo file ~/.gitconfig personale.\n"
-#: lib/about.tcl:25
+#: lib/about.tcl:26
msgid "git-gui - a graphical user interface for Git."
msgstr "git-gui - un'interfaccia grafica per Git."
@@ -490,56 +490,56 @@ msgstr "Mostra file"
msgid "Commit:"
msgstr "Revisione:"
-#: lib/blame.tcl:249
+#: lib/blame.tcl:264
msgid "Copy Commit"
msgstr "Copia revisione"
-#: lib/blame.tcl:369
+#: lib/blame.tcl:384
#, tcl-format
msgid "Reading %s..."
msgstr "Lettura di %s..."
-#: lib/blame.tcl:473
+#: lib/blame.tcl:488
msgid "Loading copy/move tracking annotations..."
msgstr "Caricamento annotazioni per copie/spostamenti..."
-#: lib/blame.tcl:493
+#: lib/blame.tcl:508
msgid "lines annotated"
msgstr "linee annotate"
-#: lib/blame.tcl:674
+#: lib/blame.tcl:689
msgid "Loading original location annotations..."
msgstr "Caricamento annotazioni per posizione originaria..."
-#: lib/blame.tcl:677
+#: lib/blame.tcl:692
msgid "Annotation complete."
msgstr "Annotazione completata."
-#: lib/blame.tcl:731
+#: lib/blame.tcl:746
msgid "Loading annotation..."
msgstr "Caricamento annotazioni..."
-#: lib/blame.tcl:787
+#: lib/blame.tcl:802
msgid "Author:"
msgstr "Autore:"
-#: lib/blame.tcl:791
+#: lib/blame.tcl:806
msgid "Committer:"
msgstr "Revisione creata da:"
-#: lib/blame.tcl:796
+#: lib/blame.tcl:811
msgid "Original File:"
msgstr "File originario:"
-#: lib/blame.tcl:910
+#: lib/blame.tcl:925
msgid "Originally By:"
msgstr "In origine da:"
-#: lib/blame.tcl:916
+#: lib/blame.tcl:931
msgid "In File:"
msgstr "Nel file:"
-#: lib/blame.tcl:921
+#: lib/blame.tcl:936
msgid "Copied Or Moved Here By:"
msgstr "Copiato o spostato qui da:"
@@ -552,17 +552,17 @@ msgid "Checkout"
msgstr "Attiva"
#: 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 "Annulla"
-#: lib/branch_checkout.tcl:32 lib/browser.tcl:286
+#: lib/branch_checkout.tcl:32 lib/browser.tcl:287
msgid "Revision"
msgstr "Revisione"
-#: 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 "Opzioni"
@@ -582,7 +582,7 @@ msgstr "Crea ramo"
msgid "Create New Branch"
msgstr "Crea nuovo ramo"
-#: lib/branch_create.tcl:31 lib/choose_repository.tcl:375
+#: lib/branch_create.tcl:31 lib/choose_repository.tcl:371
msgid "Create"
msgstr "Crea"
@@ -723,24 +723,24 @@ msgstr "Avvio in corso..."
msgid "File Browser"
msgstr "File browser"
-#: lib/browser.tcl:125 lib/browser.tcl:142
+#: lib/browser.tcl:126 lib/browser.tcl:143
#, tcl-format
msgid "Loading %s..."
msgstr "Caricamento %s..."
-#: lib/browser.tcl:186
+#: lib/browser.tcl:187
msgid "[Up To Parent]"
msgstr "[Directory superiore]"
-#: lib/browser.tcl:266 lib/browser.tcl:272
+#: lib/browser.tcl:267 lib/browser.tcl:273
msgid "Browse Branch Files"
msgstr "Esplora i file del ramo"
-#: 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 "Sfoglia"
+msgstr "Esplora"
#: lib/checkout_op.tcl:79
#, tcl-format
@@ -752,7 +752,7 @@ msgstr "Recupero %s da %s"
msgid "fatal: Cannot resolve %s"
msgstr "errore grave: impossibile risolvere %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 "Chiudi"
@@ -811,6 +811,10 @@ msgstr ""
msgid "Updating working directory to '%s'..."
msgstr "Aggiornamento della directory di lavoro a '%s' in corso..."
+#: lib/checkout_op.tcl:323
+msgid "files checked out"
+msgstr "file presenti nella directory di lavoro"
+
#: lib/checkout_op.tcl:353
#, tcl-format
msgid "Aborted checkout of '%s' (file level merging is required)."
@@ -837,7 +841,7 @@ msgstr ""
"Se si vuole rimanere su un ramo, crearne uno ora a partire da 'Questa "
"revisione attiva staccata'."
-#: lib/checkout_op.tcl:446
+#: lib/checkout_op.tcl:446 lib/checkout_op.tcl:450
#, tcl-format
msgid "Checked out '%s'."
msgstr "Attivazione di '%s' completata."
@@ -857,7 +861,7 @@ msgstr "Ricomporre le revisioni perdute potrebbe non essere semplice."
msgid "Reset '%s'?"
msgstr "Ripristinare '%s'?"
-#: lib/checkout_op.tcl:510 lib/merge.tcl:164
+#: lib/checkout_op.tcl:510 lib/merge.tcl:163
msgid "Visualize"
msgstr "Visualizza"
@@ -887,246 +891,246 @@ msgstr "Seleziona"
msgid "Font Family"
msgstr "Famiglia di caratteri"
-#: lib/choose_font.tcl:73
+#: lib/choose_font.tcl:74
msgid "Font Size"
msgstr "Dimensione caratteri"
-#: lib/choose_font.tcl:90
+#: lib/choose_font.tcl:91
msgid "Font Example"
msgstr "Esempio caratteri"
-#: 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 ""
"Questo è un testo d'esempio.\n"
-"Se ti piace questo testo, può essere il carattere giusto."
+"Se ti piace questo testo, scegli questo carattere."
-#: lib/choose_repository.tcl:27
+#: lib/choose_repository.tcl:28
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 "Crea nuovo archivio"
-#: lib/choose_repository.tcl:86
+#: lib/choose_repository.tcl:87
msgid "New..."
msgstr "Nuovo..."
-#: 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 "Clona archivio esistente"
-#: lib/choose_repository.tcl:99
+#: lib/choose_repository.tcl:100
msgid "Clone..."
msgstr "Clona..."
-#: 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 "Apri archivio esistente"
-#: lib/choose_repository.tcl:112
+#: lib/choose_repository.tcl:113
msgid "Open..."
msgstr "Apri..."
-#: lib/choose_repository.tcl:125
+#: lib/choose_repository.tcl:126
msgid "Recent Repositories"
msgstr "Archivi recenti"
-#: lib/choose_repository.tcl:131
+#: lib/choose_repository.tcl:132
msgid "Open Recent Repository:"
msgstr "Apri archivio recente:"
-#: lib/choose_repository.tcl:294
-#, tcl-format
-msgid "Location %s already exists."
-msgstr "La posizione %s esiste già."
-
-#: 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 "Impossibile creare l'archivio %s:"
-#: lib/choose_repository.tcl:385 lib/choose_repository.tcl:486
+#: lib/choose_repository.tcl:381 lib/choose_repository.tcl:478
msgid "Directory:"
msgstr "Directory:"
-#: 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 "Archivio Git"
-#: lib/choose_repository.tcl:430 lib/choose_repository.tcl:437
+#: lib/choose_repository.tcl:437
#, tcl-format
msgid "Directory %s already exists."
msgstr "La directory %s esiste già."
-#: lib/choose_repository.tcl:442
+#: lib/choose_repository.tcl:441
#, tcl-format
msgid "File %s already exists."
msgstr "Il file %s esiste già."
-#: lib/choose_repository.tcl:463
+#: lib/choose_repository.tcl:455
msgid "Clone"
msgstr "Clona"
-#: lib/choose_repository.tcl:476
+#: lib/choose_repository.tcl:468
msgid "URL:"
msgstr "URL:"
-#: lib/choose_repository.tcl:496
+#: lib/choose_repository.tcl:489
msgid "Clone Type:"
msgstr "Tipo di clone:"
-#: lib/choose_repository.tcl:502
+#: lib/choose_repository.tcl:495
msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
msgstr "Standard (veloce, semi-ridondante, con hardlink)"
-#: lib/choose_repository.tcl:508
+#: lib/choose_repository.tcl:501
msgid "Full Copy (Slower, Redundant Backup)"
msgstr "Copia completa (più lento, backup ridondante)"
-#: lib/choose_repository.tcl:514
+#: lib/choose_repository.tcl:507
msgid "Shared (Fastest, Not Recommended, No Backup)"
msgstr "Shared (il più veloce, non raccomandato, nessun 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 "%s non è un archivio Git."
-#: lib/choose_repository.tcl:586
+#: lib/choose_repository.tcl:579
msgid "Standard only available for local repository."
msgstr "Standard è disponibile solo per archivi locali."
-#: lib/choose_repository.tcl:590
+#: lib/choose_repository.tcl:583
msgid "Shared only available for local repository."
msgstr "Shared è disponibile solo per archivi locali."
-#: lib/choose_repository.tcl:617
+#: lib/choose_repository.tcl:604
+#, tcl-format
+msgid "Location %s already exists."
+msgstr "Il file/directory %s esiste già."
+
+#: lib/choose_repository.tcl:615
msgid "Failed to configure origin"
msgstr "Impossibile configurare origin"
-#: lib/choose_repository.tcl:629
+#: lib/choose_repository.tcl:627
msgid "Counting objects"
msgstr "Calcolo oggetti"
-#: lib/choose_repository.tcl:630
+#: lib/choose_repository.tcl:628
msgid "buckets"
msgstr ""
-#: lib/choose_repository.tcl:654
+#: lib/choose_repository.tcl:652
#, tcl-format
msgid "Unable to copy objects/info/alternates: %s"
msgstr "Impossibile copiare oggetti/info/alternate: %s"
-#: lib/choose_repository.tcl:690
+#: lib/choose_repository.tcl:688
#, tcl-format
msgid "Nothing to clone from %s."
msgstr "Niente da clonare da %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 "Il ramo 'master' non è stato inizializzato."
-#: lib/choose_repository.tcl:705
+#: lib/choose_repository.tcl:703
msgid "Hardlinks are unavailable. Falling back to copying."
msgstr "Impossibile utilizzare gli hardlink. Si ricorrerà alla copia."
-#: lib/choose_repository.tcl:717
+#: lib/choose_repository.tcl:715
#, tcl-format
msgid "Cloning from %s"
msgstr "Clonazione da %s"
-#: lib/choose_repository.tcl:748
+#: lib/choose_repository.tcl:746
msgid "Copying objects"
msgstr "Copia degli oggetti"
-#: lib/choose_repository.tcl:749
+#: lib/choose_repository.tcl:747
msgid "KiB"
msgstr "KiB"
-#: lib/choose_repository.tcl:773
+#: lib/choose_repository.tcl:771
#, tcl-format
msgid "Unable to copy object: %s"
msgstr "Impossibile copiare oggetto: %s"
-#: lib/choose_repository.tcl:783
+#: lib/choose_repository.tcl:781
msgid "Linking objects"
msgstr "Collegamento oggetti"
-#: lib/choose_repository.tcl:784
+#: lib/choose_repository.tcl:782
msgid "objects"
msgstr "oggetti"
-#: lib/choose_repository.tcl:792
+#: lib/choose_repository.tcl:790
#, tcl-format
msgid "Unable to hardlink object: %s"
msgstr "Hardlink impossibile sull'oggetto: %s"
-#: lib/choose_repository.tcl:847
+#: lib/choose_repository.tcl:845
msgid "Cannot fetch branches and objects. See console output for details."
msgstr ""
"Impossibile recuperare rami e oggetti. Controllare i dettagli forniti dalla "
"console."
-#: lib/choose_repository.tcl:858
+#: lib/choose_repository.tcl:856
msgid "Cannot fetch tags. See console output for details."
msgstr ""
"Impossibile recuperare le etichette. Controllare i dettagli forniti dalla "
"console."
-#: lib/choose_repository.tcl:882
+#: lib/choose_repository.tcl:880
msgid "Cannot determine HEAD. See console output for details."
msgstr ""
"Impossibile determinare HEAD. Controllare i dettagli forniti dalla console."
-#: lib/choose_repository.tcl:891
+#: lib/choose_repository.tcl:889
#, tcl-format
msgid "Unable to cleanup %s"
msgstr "Impossibile ripulire %s"
-#: lib/choose_repository.tcl:897
+#: lib/choose_repository.tcl:895
msgid "Clone failed."
msgstr "Clonazione non riuscita."
-#: lib/choose_repository.tcl:904
+#: lib/choose_repository.tcl:902
msgid "No default branch obtained."
msgstr "Non è stato trovato un ramo predefinito."
-#: lib/choose_repository.tcl:915
+#: lib/choose_repository.tcl:913
#, tcl-format
msgid "Cannot resolve %s as a commit."
msgstr "Impossibile risolvere %s come una revisione."
-#: lib/choose_repository.tcl:927
+#: lib/choose_repository.tcl:925
msgid "Creating working directory"
msgstr "Creazione directory di lavoro"
-#: 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 "file"
-#: lib/choose_repository.tcl:957
+#: lib/choose_repository.tcl:955
msgid "Initial file checkout failed."
msgstr "Attivazione iniziale non riuscita."
-#: lib/choose_repository.tcl:973
+#: lib/choose_repository.tcl:971
msgid "Open"
msgstr "Apri"
-#: lib/choose_repository.tcl:983
+#: lib/choose_repository.tcl:981
msgid "Repository:"
msgstr "Archivio:"
-#: lib/choose_repository.tcl:1033
+#: lib/choose_repository.tcl:1031
#, tcl-format
msgid "Failed to open repository %s:"
msgstr "Impossibile accedere all'archivio %s:"
@@ -1147,7 +1151,7 @@ msgstr "Ramo locale"
msgid "Tracking Branch"
msgstr "Duplicato locale di ramo remoto"
-#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:537
+#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:538
msgid "Tag"
msgstr "Etichetta"
@@ -1164,11 +1168,11 @@ msgstr "Nessuna revisione selezionata."
msgid "Revision expression is empty."
msgstr "L'espressione di revisione è vuota."
-#: lib/choose_rev.tcl:530
+#: lib/choose_rev.tcl:531
msgid "Updated"
msgstr "Aggiornato"
-#: lib/choose_rev.tcl:558
+#: lib/choose_rev.tcl:559
msgid "URL"
msgstr "URL"
@@ -1268,7 +1272,7 @@ msgid ""
"\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 ""
@@ -1280,16 +1284,45 @@ msgstr ""
"- Seconda linea: vuota.\n"
"- Terza linea: spiega a cosa serve la tua modifica.\n"
-#: lib/commit.tcl:257
+#: lib/commit.tcl:207
+#, tcl-format
+msgid "warning: Tcl does not support encoding '%s'."
+msgstr "attenzione: Tcl non supporta la codifica '%s'."
+
+#: lib/commit.tcl:221
+msgid "Calling pre-commit hook..."
+msgstr "Avvio pre-commit hook..."
+
+#: lib/commit.tcl:236
+msgid "Commit declined by pre-commit hook."
+msgstr "Revisione rifiutata dal pre-commit hook."
+
+#: lib/commit.tcl:259
+msgid "Calling commit-msg hook..."
+msgstr "Avvio commit-msg hook..."
+
+#: lib/commit.tcl:274
+msgid "Commit declined by commit-msg hook."
+msgstr "Revisione rifiutata dal commit-msg hook."
+
+#: lib/commit.tcl:287
+msgid "Committing changes..."
+msgstr "Archiviazione modifiche..."
+
+#: lib/commit.tcl:303
msgid "write-tree failed:"
msgstr "write-tree non riuscito:"
-#: lib/commit.tcl:275
+#: lib/commit.tcl:304 lib/commit.tcl:348 lib/commit.tcl:368
+msgid "Commit failed."
+msgstr "Impossibile creare una nuova revisione."
+
+#: lib/commit.tcl:321
#, tcl-format
msgid "Commit %s appears to be corrupt"
msgstr "La revisione %s sembra essere danneggiata"
-#: lib/commit.tcl:279
+#: lib/commit.tcl:326
msgid ""
"No changes to commit.\n"
"\n"
@@ -1303,37 +1336,32 @@ msgstr ""
"\n"
"Si procederà subito ad una nuova analisi.\n"
-#: lib/commit.tcl:286
+#: lib/commit.tcl:333
msgid "No changes to commit."
msgstr "Nessuna modifica per la nuova revisione."
-#: lib/commit.tcl:303
-#, tcl-format
-msgid "warning: Tcl does not support encoding '%s'."
-msgstr "attenzione: Tcl non supporta la codifica '%s'."
-
-#: lib/commit.tcl:317
+#: lib/commit.tcl:347
msgid "commit-tree failed:"
msgstr "commit-tree non riuscito:"
-#: lib/commit.tcl:339
+#: lib/commit.tcl:367
msgid "update-ref failed:"
msgstr "update-ref non riuscito:"
-#: lib/commit.tcl:430
+#: lib/commit.tcl:454
#, tcl-format
msgid "Created commit %s: %s"
msgstr "Creata revisione %s: %s"
-#: lib/console.tcl:57
+#: lib/console.tcl:59
msgid "Working... please wait..."
msgstr "Elaborazione in corso... attendere..."
-#: lib/console.tcl:183
+#: lib/console.tcl:186
msgid "Success"
msgstr "Successo"
-#: lib/console.tcl:196
+#: lib/console.tcl:200
msgid "Error: Command Failed"
msgstr "Errore: comando non riuscito"
@@ -1444,23 +1472,23 @@ msgstr "* File binario (il contenuto non sarà mostrato)."
msgid "Error loading diff:"
msgstr "Errore nel caricamento delle differenze:"
-#: lib/diff.tcl:302
+#: lib/diff.tcl:303
msgid "Failed to unstage selected hunk."
msgstr "Impossibile rimuovere la sezione scelta dalla nuova revisione."
-#: lib/diff.tcl:309
+#: lib/diff.tcl:310
msgid "Failed to stage selected hunk."
msgstr "Impossibile preparare la sezione scelta per una nuova revisione."
-#: lib/error.tcl:12 lib/error.tcl:102
+#: lib/error.tcl:20 lib/error.tcl:114
msgid "error"
msgstr "errore"
-#: lib/error.tcl:28
+#: lib/error.tcl:36
msgid "warning"
msgstr "attenzione"
-#: lib/error.tcl:81
+#: lib/error.tcl:94
msgid "You must correct the above errors before committing."
msgstr ""
"Bisogna correggere gli errori suddetti prima di creare una nuova revisione."
@@ -1494,6 +1522,10 @@ msgstr "Sblocca l'accesso all'indice"
msgid "Unstaging %s from commit"
msgstr "%s non farà parte della prossima revisione"
+#: lib/index.tcl:313
+msgid "Ready to commit."
+msgstr "Pronto per creare una nuova revisione."
+
#: lib/index.tcl:326
#, tcl-format
msgid "Adding %s"
@@ -1509,13 +1541,13 @@ msgstr "Annullare le modifiche nel file %s?"
msgid "Revert changes in these %i files?"
msgstr "Annullare le modifiche in questi %i file?"
-#: lib/index.tcl:389
+#: lib/index.tcl:391
msgid "Any unstaged changes will be permanently lost by the revert."
msgstr ""
"Tutte le modifiche non preparate per una nuova revisione saranno perse per "
"sempre."
-#: lib/index.tcl:392
+#: lib/index.tcl:394
msgid "Do Nothing"
msgstr "Non fare niente"
@@ -1589,27 +1621,27 @@ msgstr "%s di %s"
#: lib/merge.tcl:119
#, tcl-format
-msgid "Merging %s and %s"
-msgstr "Fusione di %s e %s in corso"
+msgid "Merging %s and %s..."
+msgstr "Fusione di %s e %s in corso..."
-#: lib/merge.tcl:131
+#: lib/merge.tcl:130
msgid "Merge completed successfully."
msgstr "Fusione completata con successo."
-#: lib/merge.tcl:133
+#: lib/merge.tcl:132
msgid "Merge failed. Conflict resolution is required."
msgstr "Fusione non riuscita. Bisogna risolvere i conflitti."
-#: lib/merge.tcl:158
+#: lib/merge.tcl:157
#, tcl-format
msgid "Merge Into %s"
msgstr "Fusione in %s"
-#: lib/merge.tcl:177
+#: lib/merge.tcl:176
msgid "Revision To Merge"
msgstr "Revisione da fondere"
-#: lib/merge.tcl:212
+#: lib/merge.tcl:211
msgid ""
"Cannot abort while amending.\n"
"\n"
@@ -1619,7 +1651,7 @@ msgstr ""
"\n"
"Bisogna finire di correggere questa revisione.\n"
-#: lib/merge.tcl:222
+#: lib/merge.tcl:221
msgid ""
"Abort merge?\n"
"\n"
@@ -1634,7 +1666,7 @@ msgstr ""
"\n"
"Continuare con l'interruzione della fusione attuale?"
-#: lib/merge.tcl:228
+#: lib/merge.tcl:227
msgid ""
"Reset changes?\n"
"\n"
@@ -1649,109 +1681,109 @@ msgstr ""
"\n"
"Continuare con l'annullamento delle modifiche attuali?"
-#: lib/merge.tcl:239
+#: lib/merge.tcl:238
msgid "Aborting"
-msgstr "Interruzione in corso"
+msgstr "Interruzione"
+
+#: lib/merge.tcl:238
+msgid "files reset"
+msgstr "ripristino file"
-#: lib/merge.tcl:266
+#: lib/merge.tcl:265
msgid "Abort failed."
msgstr "Interruzione non riuscita."
-#: lib/merge.tcl:268
+#: lib/merge.tcl:267
msgid "Abort completed. Ready."
msgstr "Interruzione completata. Pronto."
-#: lib/option.tcl:82
+#: lib/option.tcl:95
msgid "Restore Defaults"
msgstr "Ripristina valori predefiniti"
-#: lib/option.tcl:86
+#: lib/option.tcl:99
msgid "Save"
msgstr "Salva"
-#: lib/option.tcl:96
+#: lib/option.tcl:109
#, tcl-format
msgid "%s Repository"
msgstr "Archivio di %s"
-#: lib/option.tcl:97
+#: lib/option.tcl:110
msgid "Global (All Repositories)"
msgstr "Tutti gli archivi"
-#: lib/option.tcl:103
+#: lib/option.tcl:116
msgid "User Name"
msgstr "Nome utente"
-#: lib/option.tcl:104
+#: lib/option.tcl:117
msgid "Email Address"
msgstr "Indirizzo Email"
-#: lib/option.tcl:106
+#: lib/option.tcl:119
msgid "Summarize Merge Commits"
msgstr "Riepilogo nelle revisioni di fusione"
-#: lib/option.tcl:107
+#: lib/option.tcl:120
msgid "Merge Verbosity"
msgstr "Prolissità della fusione"
-#: lib/option.tcl:108
+#: lib/option.tcl:121
msgid "Show Diffstat After Merge"
msgstr "Mostra statistiche delle differenze dopo la fusione"
-#: lib/option.tcl:110
+#: lib/option.tcl:123
msgid "Trust File Modification Timestamps"
msgstr "Fidati delle date di modifica dei file"
-#: lib/option.tcl:111
+#: lib/option.tcl:124
msgid "Prune Tracking Branches During Fetch"
msgstr ""
"Effettua potatura dei duplicati locali di rami remoti durante il recupero"
-#: lib/option.tcl:112
+#: lib/option.tcl:125
msgid "Match Tracking Branches"
msgstr "Appaia duplicati locali di rami remoti"
-#: lib/option.tcl:113
+#: lib/option.tcl:126
msgid "Number of Diff Context Lines"
msgstr "Numero di linee di contesto nelle differenze"
-#: lib/option.tcl:114
+#: lib/option.tcl:127
+msgid "Commit Message Text Width"
+msgstr "Larghezza del messaggio di revisione"
+
+#: lib/option.tcl:128
msgid "New Branch Name Template"
msgstr "Modello per il nome di un nuovo ramo"
-#: lib/option.tcl:176
+#: lib/option.tcl:192
+msgid "Spelling Dictionary:"
+msgstr "Lingua dizionario:"
+
+#: lib/option.tcl:216
msgid "Change Font"
msgstr "Cambia caratteri"
-#: lib/option.tcl:180
+#: lib/option.tcl:220
#, tcl-format
msgid "Choose %s"
msgstr "Scegli %s"
-#: lib/option.tcl:186
+#: lib/option.tcl:226
msgid "pt."
msgstr "pt."
-#: lib/option.tcl:200
+#: lib/option.tcl:240
msgid "Preferences"
msgstr "Preferenze"
-#: lib/option.tcl:235
+#: lib/option.tcl:275
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"
@@ -1836,6 +1868,18 @@ msgstr "Nessun archivio selezionato."
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:"
@@ -1844,6 +1888,43 @@ msgstr "Impossibile scrivere shortcut:"
msgid "Cannot write icon:"
msgstr "Impossibile scrivere icona:"
+#: lib/spellcheck.tcl:57
+msgid "Unsupported spell checker"
+msgstr "Correttore ortografico non supportato"
+
+#: lib/spellcheck.tcl:65
+msgid "Spell checking is unavailable"
+msgstr "Correzione ortografica indisponibile"
+
+#: lib/spellcheck.tcl:68
+msgid "Invalid spell checking configuration"
+msgstr "La configurazione del correttore ortografico non è valida"
+
+#: lib/spellcheck.tcl:70
+#, tcl-format
+msgid "Reverting dictionary to %s."
+msgstr "Il dizionario è stato reimpostato su %s."
+
+#: lib/spellcheck.tcl:73
+msgid "Spell checker silently failed on startup"
+msgstr "Il correttore ortografico ha riportato un errore all'avvio"
+
+#: lib/spellcheck.tcl:80
+msgid "Unrecognized spell checker"
+msgstr "Correttore ortografico sconosciuto"
+
+#: lib/spellcheck.tcl:180
+msgid "No Suggestions"
+msgstr "Nessun suggerimento"
+
+#: lib/spellcheck.tcl:381
+msgid "Unexpected EOF from spell checker"
+msgstr "Il correttore ortografico ha mandato un EOF inaspettato"
+
+#: lib/spellcheck.tcl:385
+msgid "Spell Checker Failed"
+msgstr "Errore nel correttore ortografico"
+
#: lib/status_bar.tcl:83
#, tcl-format
msgid "%s ... %*i of %*i %s (%3i%%)"
diff --git a/git-gui/po/ja.po b/git-gui/po/ja.po
index e2cf5bdc0..28e6d6246 100644
--- a/git-gui/po/ja.po
+++ b/git-gui/po/ja.po
@@ -8,41 +8,41 @@ msgid ""
msgstr ""
"Project-Id-Version: git-gui\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-11-24 10:36+0100\n"
-"PO-Revision-Date: 2007-12-05 06:12+0900\n"
+"POT-Creation-Date: 2008-03-14 07:18+0100\n"
+"PO-Revision-Date: 2008-03-15 20:12+0900\n"
"Last-Translator: しらいし ななこ <nanako3@bluebottle.com>\n"
"Language-Team: Japanese\n"
"MIME-Version: 1.0\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: 致命的なエラー"
-#: git-gui.sh:565
+#: git-gui.sh:593
#, tcl-format
msgid "Invalid font specified in %s:"
msgstr "%s に無効なフォントが指定されています:"
-#: git-gui.sh:590
+#: git-gui.sh:620
msgid "Main Font"
msgstr "主フォント"
-#: git-gui.sh:591
+#: git-gui.sh:621
msgid "Diff/Console Font"
msgstr "diff/コンソール・フォント"
-#: git-gui.sh:605
+#: git-gui.sh:635
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 バージョン名が理解できません:"
-#: git-gui.sh:650
+#: git-gui.sh:680
#, tcl-format
msgid ""
"Git version cannot be determined.\n"
@@ -61,79 +61,79 @@ msgstr ""
"\n"
"'%s' はバージョン 1.5.0 と思って良いですか?\n"
-#: git-gui.sh:888
+#: git-gui.sh:918
msgid "Git directory not found:"
msgstr "Git ディレクトリが見つかりません:"
-#: git-gui.sh:895
+#: git-gui.sh:925
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 ディレクトリは使えません"
-#: git-gui.sh:907
+#: git-gui.sh:937
msgid "No working directory"
msgstr "作業ディレクトリがありません"
-#: git-gui.sh:1054
+#: git-gui.sh:1084 lib/checkout_op.tcl:283
msgid "Refreshing file status..."
msgstr "ファイル状態を更新しています…"
-#: git-gui.sh:1119
+#: git-gui.sh:1149
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 "準備完了"
-#: git-gui.sh:1560
+#: git-gui.sh:1590
msgid "Unmodified"
msgstr "変更無し"
-#: git-gui.sh:1562
+#: git-gui.sh:1592
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 "コミット予定済"
-#: git-gui.sh:1564 git-gui.sh:1569
+#: git-gui.sh:1594 git-gui.sh:1599
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 "コミット予定済、ファイル無し"
-#: git-gui.sh:1567
+#: git-gui.sh:1597
msgid "Untracked, not staged"
msgstr "管理外、コミット未予定"
-#: git-gui.sh:1572
+#: git-gui.sh:1602
msgid "Missing"
msgstr "ファイル無し"
-#: git-gui.sh:1573
+#: git-gui.sh:1603
msgid "Staged for removal"
msgstr "削除予定済"
-#: git-gui.sh:1574
+#: git-gui.sh:1604
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 "要マージ解決"
-#: git-gui.sh:1614
+#: git-gui.sh:1644
msgid "Starting gitk... please wait..."
msgstr "gitk を起動中…お待ち下さい…"
-#: git-gui.sh:1623
+#: git-gui.sh:1653
#, tcl-format
msgid ""
"Unable to start gitk:\n"
@@ -144,297 +144,297 @@ msgstr ""
"\n"
"%s がありません"
-#: git-gui.sh:1823 lib/choose_repository.tcl:35
+#: git-gui.sh:1860 lib/choose_repository.tcl:36
msgid "Repository"
msgstr "リポジトリ"
-#: git-gui.sh:1824
+#: git-gui.sh:1861
msgid "Edit"
msgstr "編集"
-#: git-gui.sh:1826 lib/choose_rev.tcl:560
+#: git-gui.sh:1863 lib/choose_rev.tcl:561
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 "コミット"
-#: 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 "マージ"
-#: git-gui.sh:1833 lib/choose_rev.tcl:556
+#: git-gui.sh:1870 lib/choose_rev.tcl:557
msgid "Remote"
msgstr "リモート"
-#: git-gui.sh:1842
+#: git-gui.sh:1879
msgid "Browse Current Branch's Files"
msgstr "現在のブランチのファイルを見る"
-#: git-gui.sh:1846
+#: git-gui.sh:1883
msgid "Browse Branch Files..."
msgstr "ブランチのファイルを見る…"
-#: git-gui.sh:1851
+#: git-gui.sh:1888
msgid "Visualize Current Branch's History"
msgstr "現在のブランチの履歴を見る"
-#: git-gui.sh:1855
+#: git-gui.sh:1892
msgid "Visualize All Branch History"
msgstr "全てのブランチの履歴を見る"
-#: git-gui.sh:1862
+#: git-gui.sh:1899
#, 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 の履歴を見る"
-#: 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 "データベース統計"
-#: git-gui.sh:1872 lib/database.tcl:34
+#: git-gui.sh:1909 lib/database.tcl:34
msgid "Compress Database"
msgstr "データベース圧縮"
-#: git-gui.sh:1875
+#: git-gui.sh:1912
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 "デスクトップ・アイコンを作る"
-#: 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 "終了"
-#: git-gui.sh:1902
+#: git-gui.sh:1939
msgid "Undo"
msgstr "元に戻す"
-#: git-gui.sh:1905
+#: git-gui.sh:1942
msgid "Redo"
msgstr "やり直し"
-#: git-gui.sh:1909 git-gui.sh:2403
+#: git-gui.sh:1946 git-gui.sh:2443
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 "コピー"
-#: git-gui.sh:1915 git-gui.sh:2409
+#: git-gui.sh:1952 git-gui.sh:2449
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 "削除"
-#: 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 "全て選択"
-#: git-gui.sh:1931
+#: git-gui.sh:1968
msgid "Create..."
msgstr "作成…"
-#: git-gui.sh:1937
+#: git-gui.sh:1974
msgid "Checkout..."
msgstr "チェックアウト"
-#: git-gui.sh:1943
+#: git-gui.sh:1980
msgid "Rename..."
msgstr "名前変更…"
-#: git-gui.sh:1948 git-gui.sh:2048
+#: git-gui.sh:1985 git-gui.sh:2085
msgid "Delete..."
msgstr "削除…"
-#: git-gui.sh:1953
+#: git-gui.sh:1990
msgid "Reset..."
msgstr "リセット…"
-#: git-gui.sh:1965 git-gui.sh:2350
+#: git-gui.sh:2002 git-gui.sh:2389
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 "最新コミットを訂正"
-#: 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 "再スキャン"
-#: git-gui.sh:1988
+#: git-gui.sh:2025
msgid "Stage To Commit"
msgstr "コミット予定する"
-#: git-gui.sh:1994
+#: git-gui.sh:2031
msgid "Stage Changed Files To Commit"
msgstr "変更されたファイルをコミット予定"
-#: git-gui.sh:2000
+#: git-gui.sh:2037
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 "変更を元に戻す"
-#: 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 "署名"
-#: git-gui.sh:2016 git-gui.sh:2333
+#: git-gui.sh:2053 git-gui.sh:2372
msgid "Commit@@verb"
msgstr "コミット"
-#: git-gui.sh:2027
+#: git-gui.sh:2064
msgid "Local Merge..."
msgstr "ローカル・マージ…"
-#: git-gui.sh:2032
+#: git-gui.sh:2069
msgid "Abort Merge..."
msgstr "マージ中止…"
-#: git-gui.sh:2044
+#: git-gui.sh:2081
msgid "Push..."
msgstr "プッシュ…"
-#: git-gui.sh:2055 lib/choose_repository.tcl:40
+#: git-gui.sh:2092 lib/choose_repository.tcl:41
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 について"
-#: git-gui.sh:2062
+#: git-gui.sh:2099
msgid "Preferences..."
msgstr "設定…"
-#: git-gui.sh:2070 git-gui.sh:2595
+#: git-gui.sh:2107 git-gui.sh:2639
msgid "Options..."
msgstr "オプション…"
-#: git-gui.sh:2076 lib/choose_repository.tcl:46
+#: git-gui.sh:2113 lib/choose_repository.tcl:47
msgid "Help"
msgstr "ヘルプ"
-#: git-gui.sh:2117
+#: git-gui.sh:2154
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 できません。そのようなファイルやディレクトリはありま"
"せん"
-#: git-gui.sh:2234
+#: git-gui.sh:2271
msgid "Current Branch:"
msgstr "現在のブランチ"
-#: git-gui.sh:2255
+#: git-gui.sh:2292
msgid "Staged Changes (Will Commit)"
msgstr "ステージングされた(コミット予定済の)変更"
-#: git-gui.sh:2274
+#: git-gui.sh:2312
msgid "Unstaged Changes"
msgstr "コミット予定に入っていない変更"
-#: git-gui.sh:2323
+#: git-gui.sh:2362
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 "プッシュ"
-#: git-gui.sh:2369
+#: git-gui.sh:2408
msgid "Initial Commit Message:"
msgstr "最初のコミットメッセージ:"
-#: git-gui.sh:2370
+#: git-gui.sh:2409
msgid "Amended Commit Message:"
msgstr "訂正したコミットメッセージ:"
-#: git-gui.sh:2371
+#: git-gui.sh:2410
msgid "Amended Initial Commit Message:"
msgstr "訂正した最初のコミットメッセージ:"
-#: git-gui.sh:2372
+#: git-gui.sh:2411
msgid "Amended Merge Commit Message:"
msgstr "訂正したマージコミットメッセージ:"
-#: git-gui.sh:2373
+#: git-gui.sh:2412
msgid "Merge Commit Message:"
msgstr "マージコミットメッセージ:"
-#: git-gui.sh:2374
+#: git-gui.sh:2413
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 "全てコピー"
-#: git-gui.sh:2443 lib/blame.tcl:104
+#: git-gui.sh:2483 lib/blame.tcl:107
msgid "File:"
msgstr "ファイル:"
-#: git-gui.sh:2545
-msgid "Refresh"
-msgstr "再読み込み"
-
-#: git-gui.sh:2566
+#: git-gui.sh:2589
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 "文脈を少なく"
-#: git-gui.sh:2588
+#: git-gui.sh:2602
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 "パッチをコミット予定から外す"
-#: git-gui.sh:2604
+#: git-gui.sh:2648
msgid "Stage Hunk For Commit"
msgstr "パッチをコミット予定に加える"
-#: git-gui.sh:2623
+#: git-gui.sh:2667
msgid "Initializing..."
msgstr "初期化しています…"
-#: git-gui.sh:2718
+#: git-gui.sh:2762
#, tcl-format
msgid ""
"Possible environment issues exist.\n"
@@ -449,7 +449,7 @@ msgstr ""
"以下の環境変数は %s が起動する Git サブプロセスによって無視されるでしょう:\n"
"\n"
-#: git-gui.sh:2748
+#: git-gui.sh:2792
msgid ""
"\n"
"This is due to a known issue with the\n"
@@ -459,7 +459,7 @@ msgstr ""
"これは Cygwin で配布されている Tcl バイナリに\n"
"関しての既知の問題によります"
-#: git-gui.sh:2753
+#: git-gui.sh:2797
#, tcl-format
msgid ""
"\n"
@@ -474,7 +474,7 @@ msgstr ""
"個人的な ~/.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"
@@ -486,56 +486,56 @@ msgstr "ファイルピューワ"
msgid "Commit:"
msgstr "コミット:"
-#: lib/blame.tcl:249
+#: lib/blame.tcl:264
msgid "Copy Commit"
msgstr "コミットをコピー"
-#: lib/blame.tcl:369
+#: lib/blame.tcl:384
#, tcl-format
msgid "Reading %s..."
msgstr "%s を読んでいます…"
-#: lib/blame.tcl:473
+#: lib/blame.tcl:488
msgid "Loading copy/move tracking annotations..."
msgstr "コピー・移動追跡データを読んでいます…"
-#: lib/blame.tcl:493
+#: lib/blame.tcl:508
msgid "lines annotated"
msgstr "行を注釈しました"
-#: lib/blame.tcl:674
+#: lib/blame.tcl:689
msgid "Loading original location annotations..."
msgstr "元位置行の注釈データを読んでいます…"
-#: lib/blame.tcl:677
+#: lib/blame.tcl:692
msgid "Annotation complete."
msgstr "注釈完了しました"
-#: lib/blame.tcl:731
+#: lib/blame.tcl:746
msgid "Loading annotation..."
msgstr "注釈を読み込んでいます…"
-#: lib/blame.tcl:787
+#: lib/blame.tcl:802
msgid "Author:"
msgstr "作者:"
-#: lib/blame.tcl:791
+#: lib/blame.tcl:806
msgid "Committer:"
msgstr "コミット者:"
-#: lib/blame.tcl:796
+#: lib/blame.tcl:811
msgid "Original File:"
msgstr "元ファイル"
-#: lib/blame.tcl:910
+#: lib/blame.tcl:925
msgid "Originally By:"
msgstr "原作者:"
-#: lib/blame.tcl:916
+#: lib/blame.tcl:931
msgid "In File:"
msgstr "ファイル:"
-#: lib/blame.tcl:921
+#: lib/blame.tcl:936
msgid "Copied Or Moved Here By:"
msgstr "複写・移動者:"
@@ -548,17 +548,17 @@ msgid "Checkout"
msgstr "チェックアウト"
#: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35
-#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl: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 "中止"
-#: lib/branch_checkout.tcl:32 lib/browser.tcl:286
+#: lib/branch_checkout.tcl:32 lib/browser.tcl:287
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 "オプション"
@@ -578,7 +578,7 @@ 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 "作成"
@@ -718,22 +718,22 @@ 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 をロード中…"
-#: lib/browser.tcl:186
+#: lib/browser.tcl:187
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 "現在のブランチのファイルを見る"
-#: 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 "ブラウズ"
@@ -747,7 +747,7 @@ msgstr "%s から %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 "閉じる"
@@ -804,6 +804,10 @@ msgstr ""
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)."
@@ -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' をチェックアウトしました"
@@ -849,7 +853,7 @@ msgstr "失なわれたコミットを回復するのは簡単ではありませ
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 "可視化"
@@ -877,15 +881,15 @@ msgstr "選択"
msgid "Font Family"
msgstr "フォント・ファミリー"
-#: lib/choose_font.tcl:73
+#: lib/choose_font.tcl:74
msgid "Font Size"
msgstr "フォントの大きさ"
-#: lib/choose_font.tcl:90
+#: lib/choose_font.tcl:91
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."
@@ -893,225 +897,225 @@ msgstr ""
"これはサンプル文です。\n"
"このフォントが気に入ればお使いになれます。"
-#: lib/choose_repository.tcl:27
+#: lib/choose_repository.tcl:28
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 "新しいリポジトリを作る"
-#: lib/choose_repository.tcl:86
+#: lib/choose_repository.tcl:87
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 "既存リポジトリを複製する"
-#: lib/choose_repository.tcl:99
+#: lib/choose_repository.tcl:100
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 "既存リポジトリを開く"
-#: lib/choose_repository.tcl:112
+#: lib/choose_repository.tcl:113
msgid "Open..."
msgstr "開く…"
-#: lib/choose_repository.tcl:125
+#: lib/choose_repository.tcl:126
msgid "Recent Repositories"
msgstr "最近使ったリポジトリ"
-#: lib/choose_repository.tcl:131
+#: lib/choose_repository.tcl:132
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 を作製できません:"
-#: lib/choose_repository.tcl:385 lib/choose_repository.tcl:486
+#: lib/choose_repository.tcl:381 lib/choose_repository.tcl:478
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 リポジトリ"
-#: lib/choose_repository.tcl:430 lib/choose_repository.tcl:437
+#: lib/choose_repository.tcl:437
#, 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' は既に存在します。"
-#: lib/choose_repository.tcl:463
+#: lib/choose_repository.tcl:455
msgid "Clone"
msgstr "複製"
-#: lib/choose_repository.tcl:476
+#: lib/choose_repository.tcl:468
msgid "URL:"
msgstr "URL:"
-#: lib/choose_repository.tcl:496
+#: lib/choose_repository.tcl:489
msgid "Clone Type:"
msgstr "複製方式:"
-#: lib/choose_repository.tcl:502
+#: lib/choose_repository.tcl:495
msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
msgstr "標準(高速・中冗長度・ハードリンク)"
-#: lib/choose_repository.tcl:508
+#: lib/choose_repository.tcl:501
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 "共有(最高速・非推奨・バックアップ無し)"
-#: 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"
-#: lib/choose_repository.tcl:586
+#: lib/choose_repository.tcl:579
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 "共有方式は同一計算機上のリポジトリにのみ使えます。"
-#: 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 を設定できませんでした"
-#: lib/choose_repository.tcl:629
+#: lib/choose_repository.tcl:627
msgid "Counting objects"
msgstr "オブジェクトを数えています"
-#: lib/choose_repository.tcl:630
+#: lib/choose_repository.tcl:628
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"
-#: lib/choose_repository.tcl:690
+#: lib/choose_repository.tcl:688
#, 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' ブランチが初期化されていません"
-#: lib/choose_repository.tcl:705
+#: lib/choose_repository.tcl:703
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 から複製しています"
-#: lib/choose_repository.tcl:748
+#: lib/choose_repository.tcl:746
msgid "Copying objects"
msgstr "オブジェクトを複写しています"
-#: lib/choose_repository.tcl:749
+#: lib/choose_repository.tcl:747
msgid "KiB"
msgstr "KiB"
-#: lib/choose_repository.tcl:773
+#: lib/choose_repository.tcl:771
#, tcl-format
msgid "Unable to copy object: %s"
msgstr "オブジェクトを複写できません: %s"
-#: lib/choose_repository.tcl:783
+#: lib/choose_repository.tcl:781
msgid "Linking objects"
msgstr "オブジェクトを連結しています"
-#: lib/choose_repository.tcl:784
+#: lib/choose_repository.tcl:782
msgid "objects"
msgstr "オブジェクト"
-#: lib/choose_repository.tcl:792
+#: lib/choose_repository.tcl:790
#, 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 "ブランチやオブジェクトを取得できません。コンソール出力を見て下さい"
-#: lib/choose_repository.tcl:858
+#: lib/choose_repository.tcl:856
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 を確定できません。コンソール出力を見て下さい"
-#: lib/choose_repository.tcl:891
+#: lib/choose_repository.tcl:889
#, tcl-format
msgid "Unable to cleanup %s"
msgstr "%s を掃除できません"
-#: lib/choose_repository.tcl:897
+#: lib/choose_repository.tcl:895
msgid "Clone failed."
msgstr "複写に失敗しました。"
-#: lib/choose_repository.tcl:904
+#: lib/choose_repository.tcl:902
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 をコミットとして解釈できません"
-#: lib/choose_repository.tcl:927
+#: lib/choose_repository.tcl:925
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/choose_repository.tcl:957
+#: lib/choose_repository.tcl:955
msgid "Initial file checkout failed."
msgstr "初期チェックアウトに失敗しました"
-#: lib/choose_repository.tcl:973
+#: lib/choose_repository.tcl:971
msgid "Open"
msgstr "開く"
-#: lib/choose_repository.tcl:983
+#: lib/choose_repository.tcl:981
msgid "Repository:"
msgstr "リポジトリ:"
-#: lib/choose_repository.tcl:1033
+#: lib/choose_repository.tcl:1031
#, tcl-format
msgid "Failed to open repository %s:"
msgstr "リポジトリ %s を開けません:"
@@ -1132,7 +1136,7 @@ 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 "タグ"
@@ -1149,11 +1153,11 @@ msgstr "リビジョンが未選択です。"
msgid "Revision expression is empty."
msgstr "リビジョン式が空です。"
-#: lib/choose_rev.tcl:530
+#: lib/choose_rev.tcl:531
msgid "Updated"
msgstr "更新しました"
-#: lib/choose_rev.tcl:558
+#: lib/choose_rev.tcl:559
msgid "URL"
msgstr "URL"
@@ -1262,16 +1266,45 @@ msgstr ""
"- 第2行: 空白\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 が失敗しました:"
-#: lib/commit.tcl:275
+#: lib/commit.tcl:304 lib/commit.tcl:348 lib/commit.tcl:368
+msgid "Commit failed."
+msgstr "コミットに失敗しました。"
+
+#: lib/commit.tcl:321
#, 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"
@@ -1285,37 +1318,32 @@ msgstr ""
"\n"
"自動的に再スキャンを開始します。\n"
-#: lib/commit.tcl:286
+#: lib/commit.tcl:333
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 が失敗しました:"
-#: lib/commit.tcl:339
+#: lib/commit.tcl:367
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"
-#: lib/console.tcl:57
+#: lib/console.tcl:59
msgid "Working... please wait..."
msgstr "実行中…お待ち下さい…"
-#: lib/console.tcl:183
+#: lib/console.tcl:186
msgid "Success"
msgstr "成功"
-#: lib/console.tcl:196
+#: lib/console.tcl:200
msgid "Error: Command Failed"
msgstr "エラー: コマンドが失敗しました"
@@ -1425,23 +1453,23 @@ msgstr "* バイナリファイル(内容は表示しません)"
msgid "Error loading diff:"
msgstr "diff を読む際のエラーです:"
-#: lib/diff.tcl:302
+#: lib/diff.tcl:303
msgid "Failed to unstage selected hunk."
msgstr "選択されたパッチをコミット予定から外せません。"
-#: lib/diff.tcl:309
+#: lib/diff.tcl:310
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 "エラー"
-#: lib/error.tcl:28
+#: lib/error.tcl:36
msgid "warning"
msgstr "警告"
-#: lib/error.tcl:81
+#: lib/error.tcl:94
msgid "You must correct the above errors before committing."
msgstr "コミットする前に、以上のエラーを修正して下さい"
@@ -1457,7 +1485,9 @@ msgstr "索引エラー"
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"
@@ -1472,6 +1502,10 @@ msgstr "インデックスのロック解除"
msgid "Unstaging %s from commit"
msgstr "コミットから '%s' を降ろす"
+#: lib/index.tcl:313
+msgid "Ready to commit."
+msgstr "コミット準備完了"
+
#: lib/index.tcl:326
#, tcl-format
msgid "Adding %s"
@@ -1487,11 +1521,11 @@ msgstr "ファイル %s にした変更を元に戻しますか?"
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 "変更を元に戻すとコミット予定していない変更は全て失われます。"
-#: lib/index.tcl:392
+#: lib/index.tcl:394
msgid "Do Nothing"
msgstr "何もしない"
@@ -1562,27 +1596,27 @@ msgstr "%s の %s ブランチ"
#: lib/merge.tcl:119
#, tcl-format
-msgid "Merging %s and %s"
-msgstr "%s と %s をマージします"
+msgid "Merging %s and %s..."
+msgstr "%s と %s をマージ中・・・"
-#: lib/merge.tcl:131
+#: lib/merge.tcl:130
msgid "Merge completed successfully."
msgstr "マージが完了しました"
-#: lib/merge.tcl:133
+#: lib/merge.tcl:132
msgid "Merge failed. Conflict resolution is required."
msgstr "マージが失敗しました。衝突の解決が必要です。"
-#: lib/merge.tcl:158
+#: lib/merge.tcl:157
#, tcl-format
msgid "Merge Into %s"
msgstr "%s にマージ"
-#: lib/merge.tcl:177
+#: lib/merge.tcl:176
msgid "Revision To Merge"
msgstr "マージするリビジョン"
-#: lib/merge.tcl:212
+#: lib/merge.tcl:211
msgid ""
"Cannot abort while amending.\n"
"\n"
@@ -1592,7 +1626,7 @@ msgstr ""
"\n"
"まず今のコミット訂正を完了させて下さい。\n"
-#: lib/merge.tcl:222
+#: lib/merge.tcl:221
msgid ""
"Abort merge?\n"
"\n"
@@ -1606,7 +1640,7 @@ msgstr ""
"\n"
"マージを中断してよろしいですか?"
-#: lib/merge.tcl:228
+#: lib/merge.tcl:227
msgid ""
"Reset changes?\n"
"\n"
@@ -1620,93 +1654,105 @@ msgstr ""
"\n"
"リセットしてよろしいですか?"
-#: lib/merge.tcl:239
+#: lib/merge.tcl:238
msgid "Aborting"
msgstr "中断しています"
-#: lib/merge.tcl:266
+#: lib/merge.tcl:238
+msgid "files reset"
+msgstr "リセットしたファイル"
+
+#: lib/merge.tcl:265
msgid "Abort failed."
msgstr "中断に失敗しました。"
-#: lib/merge.tcl:268
+#: lib/merge.tcl:267
msgid "Abort completed. Ready."
msgstr "中断完了。"
-#: lib/option.tcl:82
+#: lib/option.tcl:95
msgid "Restore Defaults"
msgstr "既定値に戻す"
-#: lib/option.tcl:86
+#: lib/option.tcl:99
msgid "Save"
msgstr "保存"
-#: lib/option.tcl:96
+#: lib/option.tcl:109
#, tcl-format
msgid "%s Repository"
msgstr "%s リポジトリ"
-#: lib/option.tcl:97
+#: lib/option.tcl:110
msgid "Global (All Repositories)"
msgstr "大域(全てのリポジトリ)"
-#: lib/option.tcl:103
+#: lib/option.tcl:116
msgid "User Name"
msgstr "ユーザ名"
-#: lib/option.tcl:104
+#: lib/option.tcl:117
msgid "Email Address"
msgstr "電子メールアドレス"
-#: lib/option.tcl:106
+#: lib/option.tcl:119
msgid "Summarize Merge Commits"
msgstr "マージコミットの要約"
-#: lib/option.tcl:107
+#: lib/option.tcl:120
msgid "Merge Verbosity"
msgstr "マージの冗長度"
-#: lib/option.tcl:108
+#: lib/option.tcl:121
msgid "Show Diffstat After Merge"
msgstr "マージ後に diffstat を表示"
-#: lib/option.tcl:110
+#: lib/option.tcl:123
msgid "Trust File Modification Timestamps"
msgstr "ファイル変更時刻を信頼する"
-#: lib/option.tcl:111
+#: lib/option.tcl:124
msgid "Prune Tracking Branches During Fetch"
msgstr "フェッチ中にトラッキングブランチを刈る"
-#: lib/option.tcl:112
+#: lib/option.tcl:125
msgid "Match Tracking Branches"
msgstr "トラッキングブランチを合わせる"
-#: lib/option.tcl:113
+#: lib/option.tcl:126
msgid "Number of Diff Context Lines"
msgstr "diff の文脈行数"
-#: lib/option.tcl:114
+#: lib/option.tcl:127
+msgid "Commit Message Text Width"
+msgstr "コミットメッセージのテキスト幅"
+
+#: lib/option.tcl:128
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 "フォントを変更"
-#: lib/option.tcl:180
+#: lib/option.tcl:220
#, tcl-format
msgid "Choose %s"
msgstr "%s を選択"
-#: lib/option.tcl:186
+#: lib/option.tcl:226
msgid "pt."
msgstr "ポイント"
-#: lib/option.tcl:200
+#: lib/option.tcl:240
msgid "Preferences"
msgstr "設定"
-#: lib/option.tcl:235
+#: lib/option.tcl:275
msgid "Failed to completely save options:"
msgstr "完全にオプションを保存できません:"
@@ -1814,6 +1860,43 @@ 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 "辞書を %s に巻き戻します"
+
+#: 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 "スペルチェッカーが予想外の EOF を返しました"
+
+#: lib/spellcheck.tcl:385
+msgid "Spell Checker Failed"
+msgstr "スペルチェック失敗"
+
#: lib/status_bar.tcl:83
#, tcl-format
msgid "%s ... %*i of %*i %s (%3i%%)"
@@ -1881,3 +1964,6 @@ msgstr "Thin Pack を使う(遅いネットワーク接続)"
#: lib/transport.tcl:168
msgid "Include tags"
msgstr "タグを含める"
+
+#~ msgid "Not connected to aspell"
+#~ msgstr "aspell に接続していません"
diff --git a/git-gui/po/ru.po b/git-gui/po/ru.po
index 6727a832e..db55b3e0a 100644
--- a/git-gui/po/ru.po
+++ b/git-gui/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: git-gui\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-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"
@@ -15,33 +15,33 @@ msgstr ""
"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: критическая ошибка"
-#: git-gui.sh:558
+#: git-gui.sh:593
#, tcl-format
msgid "Invalid font specified in %s:"
msgstr "В %s установлен неверный шрифт:"
-#: git-gui.sh:583
+#: git-gui.sh:620
msgid "Main Font"
msgstr "Шрифт интерфейса"
-#: git-gui.sh:584
+#: git-gui.sh:621
msgid "Diff/Console Font"
msgstr "Шрифт консоли и изменений (diff)"
-#: git-gui.sh:598
+#: git-gui.sh:635
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: "
-#: git-gui.sh:643
+#: git-gui.sh:680
#, tcl-format
msgid ""
"Git version cannot be determined.\n"
@@ -59,79 +59,79 @@ msgstr ""
"\n"
"Принять '%s' как версию 1.5.0?\n"
-#: git-gui.sh:881
+#: git-gui.sh:918
msgid "Git directory not found:"
msgstr "Каталог Git не найден:"
-#: git-gui.sh:888
+#: git-gui.sh:925
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 испорчен: "
-#: git-gui.sh:900
+#: git-gui.sh:937
msgid "No working directory"
msgstr "Отсутствует рабочий каталог"
-#: git-gui.sh:1047
+#: git-gui.sh:1084 lib/checkout_op.tcl:283
msgid "Refreshing file status..."
msgstr "Обновление информации о состоянии файлов..."
-#: git-gui.sh:1112
+#: git-gui.sh:1149
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 "Готово."
-#: git-gui.sh:1553
+#: git-gui.sh:1590
msgid "Unmodified"
msgstr "Не изменено"
-#: git-gui.sh:1555
+#: git-gui.sh:1592
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 "Подготовлено для сохранения"
-#: git-gui.sh:1557 git-gui.sh:1562
+#: git-gui.sh:1594 git-gui.sh:1599
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 "Подготовлено для сохранения, отсутствует"
-#: git-gui.sh:1560
+#: git-gui.sh:1597
msgid "Untracked, not staged"
msgstr "Не отслеживается, не подготовлено"
-#: git-gui.sh:1565
+#: git-gui.sh:1602
msgid "Missing"
msgstr "Отсутствует"
-#: git-gui.sh:1566
+#: git-gui.sh:1603
msgid "Staged for removal"
msgstr "Подготовлено для удаления"
-#: git-gui.sh:1567
+#: git-gui.sh:1604
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 "Требуется разрешение конфликта при объединении"
-#: git-gui.sh:1607
+#: git-gui.sh:1644
msgid "Starting gitk... please wait..."
msgstr "Запускается gitk... пожалуйста, ждите..."
-#: git-gui.sh:1616
+#: git-gui.sh:1653
#, tcl-format
msgid ""
"Unable to start gitk:\n"
@@ -142,295 +142,295 @@ msgstr ""
"\n"
"%s не существует"
-#: git-gui.sh:1816 lib/choose_repository.tcl:35
+#: git-gui.sh:1860 lib/choose_repository.tcl:36
msgid "Repository"
msgstr "Репозиторий"
-#: git-gui.sh:1817
+#: git-gui.sh:1861
msgid "Edit"
msgstr "Редактировать"
-#: git-gui.sh:1819 lib/choose_rev.tcl:560
+#: git-gui.sh:1863 lib/choose_rev.tcl:561
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 "Состояние"
-#: 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 "Объединить"
-#: git-gui.sh:1826 lib/choose_rev.tcl:556
+#: git-gui.sh:1870 lib/choose_rev.tcl:557
msgid "Remote"
msgstr "Внешние репозитории"
-#: git-gui.sh:1835
+#: git-gui.sh:1879
msgid "Browse Current Branch's Files"
msgstr "Просмотреть файлы текущей ветви"
-#: git-gui.sh:1839
+#: git-gui.sh:1883
msgid "Browse Branch Files..."
msgstr "Показать файлы ветви..."
-#: git-gui.sh:1844
+#: git-gui.sh:1888
msgid "Visualize Current Branch's History"
msgstr "История текущей ветви наглядно"
-#: git-gui.sh:1848
+#: git-gui.sh:1892
msgid "Visualize All Branch History"
msgstr "История всех ветвей наглядно"
-#: git-gui.sh:1855
+#: git-gui.sh:1899
#, 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 наглядно"
-#: 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 "Статистика базы данных"
-#: git-gui.sh:1865 lib/database.tcl:34
+#: git-gui.sh:1909 lib/database.tcl:34
msgid "Compress Database"
msgstr "Сжать базу данных"
-#: git-gui.sh:1868
+#: git-gui.sh:1912
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 "Создать ярлык на рабочем столе"
-#: 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 "Выход"
-#: git-gui.sh:1895
+#: git-gui.sh:1939
msgid "Undo"
msgstr "Отменить"
-#: git-gui.sh:1898
+#: git-gui.sh:1942
msgid "Redo"
msgstr "Повторить"
-#: git-gui.sh:1902 git-gui.sh:2395
+#: git-gui.sh:1946 git-gui.sh:2443
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 "Копировать"
-#: git-gui.sh:1908 git-gui.sh:2401
+#: git-gui.sh:1952 git-gui.sh:2449
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 "Удалить"
-#: 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 "Выделить все"
-#: git-gui.sh:1924
+#: git-gui.sh:1968
msgid "Create..."
msgstr "Создать..."
-#: git-gui.sh:1930
+#: git-gui.sh:1974
msgid "Checkout..."
msgstr "Перейти..."
-#: git-gui.sh:1936
+#: git-gui.sh:1980
msgid "Rename..."
msgstr "Переименовать..."
-#: git-gui.sh:1941 git-gui.sh:2040
+#: git-gui.sh:1985 git-gui.sh:2085
msgid "Delete..."
msgstr "Удалить..."
-#: git-gui.sh:1946
+#: git-gui.sh:1990
msgid "Reset..."
msgstr "Сбросить..."
-#: git-gui.sh:1958 git-gui.sh:2342
+#: git-gui.sh:2002 git-gui.sh:2389
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 "Исправить последнее состояние"
-#: 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 "Перечитать"
-#: git-gui.sh:1981
+#: git-gui.sh:2025
msgid "Stage To Commit"
msgstr "Подготовить для сохранения"
-#: git-gui.sh:1986
+#: git-gui.sh:2031
msgid "Stage Changed Files To Commit"
msgstr "Подготовить измененные файлы для сохранения"
-#: git-gui.sh:1992
+#: git-gui.sh:2037
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 "Отменить изменения"
-#: 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 "Подписать"
-#: git-gui.sh:2008 git-gui.sh:2325
+#: git-gui.sh:2053 git-gui.sh:2372
msgid "Commit@@verb"
msgstr "Сохранить"
-#: git-gui.sh:2019
+#: git-gui.sh:2064
msgid "Local Merge..."
msgstr "Локальное объединение..."
-#: git-gui.sh:2024
+#: git-gui.sh:2069
msgid "Abort Merge..."
msgstr "Прервать объединение..."
-#: git-gui.sh:2036
+#: git-gui.sh:2081
msgid "Push..."
msgstr "Отправить..."
-#: git-gui.sh:2047 lib/choose_repository.tcl:40
+#: git-gui.sh:2092 lib/choose_repository.tcl:41
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"
-#: git-gui.sh:2054
+#: git-gui.sh:2099
msgid "Preferences..."
msgstr "Настройки..."
-#: git-gui.sh:2062 git-gui.sh:2587
+#: git-gui.sh:2107 git-gui.sh:2639
msgid "Options..."
msgstr "Настройки..."
-#: git-gui.sh:2068 lib/choose_repository.tcl:46
+#: git-gui.sh:2113 lib/choose_repository.tcl:47
msgid "Help"
msgstr "Помощь"
-#: git-gui.sh:2109
+#: git-gui.sh:2154
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: нет такого файла или каталога"
-#: git-gui.sh:2226
+#: git-gui.sh:2271
msgid "Current Branch:"
msgstr "Текущая ветвь:"
-#: git-gui.sh:2247
+#: git-gui.sh:2292
msgid "Staged Changes (Will Commit)"
msgstr "Подготовлено (будет сохранено)"
-#: git-gui.sh:2266
+#: git-gui.sh:2312
msgid "Unstaged Changes"
msgstr "Изменено (не будет сохранено)"
-#: git-gui.sh:2315
+#: git-gui.sh:2362
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 "Отправить"
-#: git-gui.sh:2361
+#: git-gui.sh:2408
msgid "Initial Commit Message:"
msgstr "Комментарий к первому состоянию:"
-#: git-gui.sh:2362
+#: git-gui.sh:2409
msgid "Amended Commit Message:"
msgstr "Комментарий к исправленному состоянию:"
-#: git-gui.sh:2363
+#: git-gui.sh:2410
msgid "Amended Initial Commit Message:"
msgstr "Комментарий к исправленному первоначальному состоянию:"
-#: git-gui.sh:2364
+#: git-gui.sh:2411
msgid "Amended Merge Commit Message:"
msgstr "Комментарий к исправленному объединению:"
-#: git-gui.sh:2365
+#: git-gui.sh:2412
msgid "Merge Commit Message:"
msgstr "Комментарий к объединению:"
-#: git-gui.sh:2366
+#: git-gui.sh:2413
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 "Копировать все"
-#: git-gui.sh:2435 lib/blame.tcl:104
+#: git-gui.sh:2483 lib/blame.tcl:107
msgid "File:"
msgstr "Файл:"
-#: git-gui.sh:2537
-msgid "Refresh"
-msgstr "Обновить"
-
-#: git-gui.sh:2558
+#: git-gui.sh:2589
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 "Меньше контекста"
-#: git-gui.sh:2580
+#: git-gui.sh:2602
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 "Не сохранять часть"
-#: git-gui.sh:2596
+#: git-gui.sh:2648
msgid "Stage Hunk For Commit"
msgstr "Подготовить часть для сохранения"
-#: git-gui.sh:2615
+#: git-gui.sh:2667
msgid "Initializing..."
msgstr "Инициализация..."
-#: git-gui.sh:2706
+#: git-gui.sh:2762
#, tcl-format
msgid ""
"Possible environment issues exist.\n"
@@ -447,7 +447,7 @@ msgstr ""
"запущенными из %s\n"
"\n"
-#: git-gui.sh:2736
+#: git-gui.sh:2792
msgid ""
"\n"
"This is due to a known issue with the\n"
@@ -457,7 +457,7 @@ msgstr ""
"Это известная проблема с Tcl,\n"
"распространяемым Cygwin."
-#: git-gui.sh:2741
+#: git-gui.sh:2797
#, tcl-format
msgid ""
"\n"
@@ -474,7 +474,7 @@ msgstr ""
"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."
@@ -486,56 +486,56 @@ msgstr "Просмотр файла"
msgid "Commit:"
msgstr "Сохраненное состояние:"
-#: lib/blame.tcl:249
+#: lib/blame.tcl:264
msgid "Copy Commit"
msgstr "Скопировать SHA-1"
-#: lib/blame.tcl:369
+#: lib/blame.tcl:384
#, tcl-format
msgid "Reading %s..."
msgstr "Чтение %s..."
-#: lib/blame.tcl:473
+#: lib/blame.tcl:488
msgid "Loading copy/move tracking annotations..."
msgstr "Загрузка аннотации копирований/переименований..."
-#: lib/blame.tcl:493
+#: lib/blame.tcl:508
msgid "lines annotated"
msgstr "строк прокомментировано"
-#: lib/blame.tcl:674
+#: lib/blame.tcl:689
msgid "Loading original location annotations..."
msgstr "Загрузка аннотаций первоначального положения объекта..."
-#: lib/blame.tcl:677
+#: lib/blame.tcl:692
msgid "Annotation complete."
msgstr "Аннотация завершена."
-#: lib/blame.tcl:731
+#: lib/blame.tcl:746
msgid "Loading annotation..."
msgstr "Загрузка аннотации..."
-#: lib/blame.tcl:787
+#: lib/blame.tcl:802
msgid "Author:"
msgstr "Автор:"
-#: lib/blame.tcl:791
+#: lib/blame.tcl:806
msgid "Committer:"
msgstr "Сохранил:"
-#: lib/blame.tcl:796
+#: lib/blame.tcl:811
msgid "Original File:"
msgstr "Исходный файл:"
-#: lib/blame.tcl:910
+#: lib/blame.tcl:925
msgid "Originally By:"
msgstr "Источник:"
-#: lib/blame.tcl:916
+#: lib/blame.tcl:931
msgid "In File:"
msgstr "Файл:"
-#: lib/blame.tcl:921
+#: lib/blame.tcl:936
msgid "Copied Or Moved Here By:"
msgstr "Скопировано/перемещено в:"
@@ -548,17 +548,17 @@ msgid "Checkout"
msgstr "Перейти"
#: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35
-#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl: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 "Отменить"
-#: lib/branch_checkout.tcl:32 lib/browser.tcl:286
+#: lib/branch_checkout.tcl:32 lib/browser.tcl:287
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 "Настройки"
@@ -578,7 +578,7 @@ 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 "Создать"
@@ -718,22 +718,22 @@ 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..."
-#: lib/browser.tcl:186
+#: lib/browser.tcl:187
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 "Показать файлы ветви"
-#: 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 "Показать"
@@ -747,7 +747,7 @@ msgstr "Получение %s из %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 "Закрыть"
@@ -804,6 +804,10 @@ msgstr ""
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)."
@@ -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' сделана текущей."
@@ -849,7 +853,7 @@ msgstr "Восстановить потерянные сохраненные с
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 "Наглядно"
@@ -878,15 +882,15 @@ msgstr "Выбрать"
msgid "Font Family"
msgstr "Шрифт"
-#: lib/choose_font.tcl:73
+#: lib/choose_font.tcl:74
msgid "Font Size"
msgstr "Размер шрифта"
-#: lib/choose_font.tcl:90
+#: lib/choose_font.tcl:91
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."
@@ -894,226 +898,226 @@ msgstr ""
"Это пример текста.\n"
"Если Вам нравится этот текст, это может быть Ваш шрифт."
-#: lib/choose_repository.tcl:27
+#: lib/choose_repository.tcl:28
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 "Создать новый репозиторий"
-#: lib/choose_repository.tcl:86
+#: lib/choose_repository.tcl:87
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 "Склонировать существующий репозиторий"
-#: lib/choose_repository.tcl:99
+#: lib/choose_repository.tcl:100
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 "Выбрать существующий репозиторий"
-#: lib/choose_repository.tcl:112
+#: lib/choose_repository.tcl:113
msgid "Open..."
msgstr "Открыть..."
-#: lib/choose_repository.tcl:125
+#: lib/choose_repository.tcl:126
msgid "Recent Repositories"
msgstr "Недавние репозитории"
-#: lib/choose_repository.tcl:131
+#: lib/choose_repository.tcl:132
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:"
-#: lib/choose_repository.tcl:385 lib/choose_repository.tcl:486
+#: lib/choose_repository.tcl:381 lib/choose_repository.tcl:478
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 "Репозиторий"
-#: lib/choose_repository.tcl:430 lib/choose_repository.tcl:437
+#: lib/choose_repository.tcl:437
#, 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' уже существует."
-#: lib/choose_repository.tcl:463
+#: lib/choose_repository.tcl:455
msgid "Clone"
msgstr "Склонировать"
-#: lib/choose_repository.tcl:476
+#: lib/choose_repository.tcl:468
msgid "URL:"
msgstr "Ссылка:"
-#: lib/choose_repository.tcl:496
+#: lib/choose_repository.tcl:489
msgid "Clone Type:"
msgstr "Тип клона:"
-#: lib/choose_repository.tcl:502
+#: lib/choose_repository.tcl:495
msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
msgstr "Стандартный (Быстрый, полуизбыточный, \"жесткие\" ссылки)"
-#: lib/choose_repository.tcl:508
+#: lib/choose_repository.tcl:501
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 "Общий (Самый быстрый, не рекомендуется, без резервной копии)"
-#: 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"
-#: lib/choose_repository.tcl:586
+#: lib/choose_repository.tcl:579
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 "Общий клон возможен только для локального репозитория."
-#: 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 "Не могу сконфигурировать исходный репозиторий."
-#: lib/choose_repository.tcl:629
+#: lib/choose_repository.tcl:627
msgid "Counting objects"
msgstr "Считаю объекты"
-#: lib/choose_repository.tcl:630
+#: lib/choose_repository.tcl:628
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"
-#: lib/choose_repository.tcl:690
+#: lib/choose_repository.tcl:688
#, 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'."
-#: lib/choose_repository.tcl:705
+#: lib/choose_repository.tcl:703
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"
-#: lib/choose_repository.tcl:748
+#: lib/choose_repository.tcl:746
msgid "Copying objects"
msgstr "Копирование objects"
-#: lib/choose_repository.tcl:749
+#: lib/choose_repository.tcl:747
msgid "KiB"
msgstr "КБ"
-#: lib/choose_repository.tcl:773
+#: lib/choose_repository.tcl:771
#, 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"
-#: lib/choose_repository.tcl:784
+#: lib/choose_repository.tcl:782
msgid "objects"
msgstr "объекты"
-#: lib/choose_repository.tcl:792
+#: lib/choose_repository.tcl:790
#, 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 ""
"Не могу получить ветви и объекты. Дополнительная информация на консоли."
-#: lib/choose_repository.tcl:858
+#: lib/choose_repository.tcl:856
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. Дополнительная информация на консоли."
-#: lib/choose_repository.tcl:891
+#: lib/choose_repository.tcl:889
#, tcl-format
msgid "Unable to cleanup %s"
msgstr "Не могу очистить %s"
-#: lib/choose_repository.tcl:897
+#: lib/choose_repository.tcl:895
msgid "Clone failed."
msgstr "Клонирование не удалось."
-#: lib/choose_repository.tcl:904
+#: lib/choose_repository.tcl:902
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 как состояние."
-#: lib/choose_repository.tcl:927
+#: lib/choose_repository.tcl:925
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/choose_repository.tcl:957
+#: lib/choose_repository.tcl:955
msgid "Initial file checkout failed."
msgstr "Не удалось получить начальное состояние файлов репозитория."
-#: lib/choose_repository.tcl:973
+#: lib/choose_repository.tcl:971
msgid "Open"
msgstr "Открыть"
-#: lib/choose_repository.tcl:983
+#: lib/choose_repository.tcl:981
msgid "Repository:"
msgstr "Репозиторий:"
-#: lib/choose_repository.tcl:1033
+#: lib/choose_repository.tcl:1031
#, tcl-format
msgid "Failed to open repository %s:"
msgstr "Не удалось открыть репозиторий %s:"
@@ -1134,7 +1138,7 @@ 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 "Таг"
@@ -1151,11 +1155,11 @@ msgstr "Версия не указана."
msgid "Revision expression is empty."
msgstr "Пустое выражение для определения версии."
-#: lib/choose_rev.tcl:530
+#: lib/choose_rev.tcl:531
msgid "Updated"
msgstr "Обновлено"
-#: lib/choose_rev.tcl:558
+#: lib/choose_rev.tcl:559
msgid "URL"
msgstr "Ссылка"
@@ -1251,7 +1255,7 @@ msgid ""
"\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 ""
@@ -1263,16 +1267,45 @@ msgstr ""
"- вторая строка пустая\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 "Вызов программы поддержки репозитория pre-commit..."
+
+#: lib/commit.tcl:236
+msgid "Commit declined by pre-commit hook."
+msgstr "Сохранение прервано программой поддержки репозитория pre-commit"
+
+#: lib/commit.tcl:259
+msgid "Calling commit-msg hook..."
+msgstr "Вызов программы поддержки репозитория commit-msg..."
+
+#: lib/commit.tcl:274
+msgid "Commit declined by commit-msg hook."
+msgstr "Сохранение прервано программой поддержки репозитория commit-msg"
+
+#: lib/commit.tcl:287
+msgid "Committing changes..."
+msgstr "Сохранение изменений..."
+
+#: lib/commit.tcl:303
msgid "write-tree failed:"
msgstr "Программа write-tree завершилась с ошибкой:"
-#: lib/commit.tcl:275
+#: lib/commit.tcl:304 lib/commit.tcl:348 lib/commit.tcl:368
+msgid "Commit failed."
+msgstr "Сохранить состояние не удалось."
+
+#: lib/commit.tcl:321
#, 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"
@@ -1286,37 +1319,32 @@ msgstr ""
"\n"
"Сейчас автоматически запустится перечитывание репозитория.\n"
-#: lib/commit.tcl:286
+#: lib/commit.tcl:333
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 завершилась с ошибкой:"
-#: lib/commit.tcl:339
+#: lib/commit.tcl:367
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 "
-#: lib/console.tcl:57
+#: lib/console.tcl:59
msgid "Working... please wait..."
msgstr "В процессе... пожалуйста, ждите..."
-#: lib/console.tcl:183
+#: lib/console.tcl:186
msgid "Success"
msgstr "Процесс успешно завершен"
-#: lib/console.tcl:196
+#: lib/console.tcl:200
msgid "Error: Command Failed"
msgstr "Ошибка: не удалось выполнить команду"
@@ -1426,23 +1454,23 @@ msgstr "* Двоичный файл (содержимое не показано)
msgid "Error loading diff:"
msgstr "Ошибка загрузки diff:"
-#: lib/diff.tcl:302
+#: lib/diff.tcl:303
msgid "Failed to unstage selected hunk."
msgstr "Не удалось исключить выбранную часть."
-#: lib/diff.tcl:309
+#: lib/diff.tcl:310
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 "ошибка"
-#: lib/error.tcl:28
+#: lib/error.tcl:36
msgid "warning"
msgstr "предупреждение"
-#: lib/error.tcl:81
+#: lib/error.tcl:94
msgid "You must correct the above errors before committing."
msgstr "Прежде чем сохранить, исправьте вышеуказанные ошибки."
@@ -1459,8 +1487,8 @@ msgid ""
"Updating the Git index failed. A rescan will be automatically started to "
"resynchronize git-gui."
msgstr ""
-"Не удалось обновить индекс Git. Состояние репозитория будет"
-"перечитано автоматически."
+"Не удалось обновить индекс Git. Состояние репозитория будетперечитано "
+"автоматически."
#: lib/index.tcl:27
msgid "Continue"
@@ -1475,6 +1503,10 @@ msgstr "Разблокировать индекс"
msgid "Unstaging %s from commit"
msgstr "Удаление %s из подготовленного"
+#: lib/index.tcl:313
+msgid "Ready to commit."
+msgstr "Подготовлено для сохранения"
+
#: lib/index.tcl:326
#, tcl-format
msgid "Adding %s"
@@ -1490,13 +1522,13 @@ msgstr "Отменить изменения в файле %s?"
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 ""
"Любые изменения, не подготовленные к сохранению, будут потеряны при данной "
"операции."
-#: lib/index.tcl:392
+#: lib/index.tcl:394
msgid "Do Nothing"
msgstr "Ничего не делать"
@@ -1567,28 +1599,27 @@ msgid "%s of %s"
msgstr "%s из %s"
#: lib/merge.tcl:119
-#, tcl-format
-msgid "Merging %s and %s"
-msgstr "Объединение %s и %s"
+msgid "Merging %s and %s..."
+msgstr "Объединение %s и %s..."
-#: lib/merge.tcl:131
+#: lib/merge.tcl:130
msgid "Merge completed successfully."
msgstr "Объединение успешно завершено."
-#: lib/merge.tcl:133
+#: lib/merge.tcl:132
msgid "Merge failed. Conflict resolution is required."
msgstr "Не удалось завершить объединение. Требуется разрешение конфликта."
-#: lib/merge.tcl:158
+#: lib/merge.tcl:157
#, tcl-format
msgid "Merge Into %s"
msgstr "Объединить с %s"
-#: lib/merge.tcl:177
+#: lib/merge.tcl:176
msgid "Revision To Merge"
msgstr "Версия для объединения"
-#: lib/merge.tcl:212
+#: lib/merge.tcl:211
msgid ""
"Cannot abort while amending.\n"
"\n"
@@ -1598,7 +1629,7 @@ msgstr ""
"\n"
"Завершите текущее исправление сохраненного состояния.\n"
-#: lib/merge.tcl:222
+#: lib/merge.tcl:221
msgid ""
"Abort merge?\n"
"\n"
@@ -1612,7 +1643,7 @@ msgstr ""
"\n"
"Продолжить?"
-#: lib/merge.tcl:228
+#: lib/merge.tcl:227
msgid ""
"Reset changes?\n"
"\n"
@@ -1626,94 +1657,106 @@ msgstr ""
"\n"
"Продолжить?"
-#: lib/merge.tcl:239
+#: lib/merge.tcl:238
msgid "Aborting"
msgstr "Прерываю"
-#: lib/merge.tcl:266
+#: lib/merge.tcl:238
+msgid "files reset"
+msgstr "изменения в файлах отменены"
+
+#: lib/merge.tcl:265
msgid "Abort failed."
msgstr "Прервать не удалось."
-#: lib/merge.tcl:268
+#: lib/merge.tcl:267
msgid "Abort completed. Ready."
msgstr "Прервано."
-#: lib/option.tcl:82
+#: lib/option.tcl:95
msgid "Restore Defaults"
msgstr "Восстановить настройки по умолчанию"
-#: lib/option.tcl:86
+#: lib/option.tcl:99
msgid "Save"
msgstr "Сохранить"
-#: lib/option.tcl:96
+#: lib/option.tcl:109
#, tcl-format
msgid "%s Repository"
msgstr "для репозитория %s"
-#: lib/option.tcl:97
+#: lib/option.tcl:110
msgid "Global (All Repositories)"
msgstr "Общие (для всех репозиториев)"
-#: lib/option.tcl:103
+#: lib/option.tcl:116
msgid "User Name"
msgstr "Имя пользователя"
-#: lib/option.tcl:104
+#: lib/option.tcl:117
msgid "Email Address"
-msgstr "Адес электронной почты"
+msgstr "Адрес электронной почты"
-#: lib/option.tcl:106
+#: lib/option.tcl:119
msgid "Summarize Merge Commits"
msgstr "Суммарный комментарий при объединении"
-#: lib/option.tcl:107
+#: lib/option.tcl:120
msgid "Merge Verbosity"
msgstr "Уровень детальности сообщений при объединении"
-#: lib/option.tcl:108
+#: lib/option.tcl:121
msgid "Show Diffstat After Merge"
msgstr "Показать отчет об изменениях после объединения"
-#: lib/option.tcl:110
+#: lib/option.tcl:123
msgid "Trust File Modification Timestamps"
msgstr "Доверять времени модификации файла"
-#: lib/option.tcl:111
+#: lib/option.tcl:124
msgid "Prune Tracking Branches During Fetch"
msgstr "Чистка ветвей слежения при получении изменений"
-#: lib/option.tcl:112
+#: lib/option.tcl:125
msgid "Match Tracking Branches"
msgstr "Имя новой ветви взять из имен ветвей слежения"
-#: lib/option.tcl:113
+#: lib/option.tcl:126
msgid "Number of Diff Context Lines"
msgstr "Число строк в контексте diff"
-#: lib/option.tcl:114
+#: lib/option.tcl:127
+msgid "Commit Message Text Width"
+msgstr "Ширина комментария к состоянию:"
+
+#: lib/option.tcl:128
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 "Изменить шрифт"
-#: lib/option.tcl:180
+#: lib/option.tcl:220
#, tcl-format
msgid "Choose %s"
msgstr "Выберите %s"
# carbon copy
-#: lib/option.tcl:186
+#: lib/option.tcl:226
msgid "pt."
msgstr ""
-#: lib/option.tcl:200
+#: lib/option.tcl:240
msgid "Preferences"
msgstr "Настройки"
-#: lib/option.tcl:235
+#: lib/option.tcl:275
msgid "Failed to completely save options:"
msgstr "Не удалось полностью сохранить настройки:"
@@ -1820,6 +1863,43 @@ 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 "Словарь вернут к %s."
+
+#: 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%%)"
diff --git a/git-gui/po/sv.po b/git-gui/po/sv.po
index cd3f40b4a..4da687bb4 100644
--- a/git-gui/po/sv.po
+++ b/git-gui/po/sv.po
@@ -7,42 +7,41 @@ msgid ""
msgstr ""
"Project-Id-Version: sv\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-11-24 10:36+0100\n"
-"PO-Revision-Date: 2008-01-12 09:27+0100\n"
+"POT-Creation-Date: 2008-03-14 07:18+0100\n"
+"PO-Revision-Date: 2008-03-14 07:23+0100\n"
"Last-Translator: Peter Karlsson <peter@softwolves.pp.se>\n"
-"Language-Team: Swedish <sv@li.org>\n"
+"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
+"Content-Transfer-Encoding: 8bit"
-#: 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: ödesdigert fel"
-#: git-gui.sh:565
+#: git-gui.sh:593
#, tcl-format
msgid "Invalid font specified in %s:"
msgstr "Ogiltigt teckensnitt angivet i %s:"
-#: git-gui.sh:590
+#: git-gui.sh:620
msgid "Main Font"
msgstr "Huvudteckensnitt"
-#: git-gui.sh:591
+#: git-gui.sh:621
msgid "Diff/Console Font"
msgstr "Diff/konsolteckensnitt"
-#: git-gui.sh:605
+#: git-gui.sh:635
msgid "Cannot find git in PATH."
msgstr "Hittar inte git i PATH."
-#: git-gui.sh:632
+#: git-gui.sh:662
msgid "Cannot parse Git version string:"
msgstr "Kan inte tolka versionssträng från Git:"
-#: git-gui.sh:650
+#: git-gui.sh:680
#, tcl-format
msgid ""
"Git version cannot be determined.\n"
@@ -61,79 +60,79 @@ msgstr ""
"\n"
"Anta att \"%s\" är version 1.5.0?\n"
-#: git-gui.sh:888
+#: git-gui.sh:918
msgid "Git directory not found:"
msgstr "Git-katalogen hittades inte:"
-#: git-gui.sh:895
+#: git-gui.sh:925
msgid "Cannot move to top of working directory:"
msgstr "Kan inte gå till början på arbetskatalogen:"
-#: git-gui.sh:902
+#: git-gui.sh:932
msgid "Cannot use funny .git directory:"
msgstr "Kan inte använda underlig .git-katalog:"
-#: git-gui.sh:907
+#: git-gui.sh:937
msgid "No working directory"
msgstr "Ingen arbetskatalog"
-#: git-gui.sh:1054
+#: git-gui.sh:1084 lib/checkout_op.tcl:283
msgid "Refreshing file status..."
msgstr "Uppdaterar filstatus..."
-#: git-gui.sh:1119
+#: git-gui.sh:1149
msgid "Scanning for modified files ..."
msgstr "Söker efter ändrade filer..."
-#: git-gui.sh:1294 lib/browser.tcl:245
+#: git-gui.sh:1324 lib/browser.tcl:246
msgid "Ready."
msgstr "Klar."
-#: git-gui.sh:1560
+#: git-gui.sh:1590
msgid "Unmodified"
msgstr "Oförändrade"
-#: git-gui.sh:1562
+#: git-gui.sh:1592
msgid "Modified, not staged"
msgstr "Förändrade, ej köade"
-#: git-gui.sh:1563 git-gui.sh:1568
+#: git-gui.sh:1593 git-gui.sh:1598
msgid "Staged for commit"
msgstr "Köade för incheckning"
-#: git-gui.sh:1564 git-gui.sh:1569
+#: git-gui.sh:1594 git-gui.sh:1599
msgid "Portions staged for commit"
msgstr "Delar köade för incheckning"
-#: git-gui.sh:1565 git-gui.sh:1570
+#: git-gui.sh:1595 git-gui.sh:1600
msgid "Staged for commit, missing"
msgstr "Köade för incheckning, saknade"
-#: git-gui.sh:1567
+#: git-gui.sh:1597
msgid "Untracked, not staged"
msgstr "Ej spårade, ej köade"
-#: git-gui.sh:1572
+#: git-gui.sh:1602
msgid "Missing"
msgstr "Saknade"
-#: git-gui.sh:1573
+#: git-gui.sh:1603
msgid "Staged for removal"
msgstr "Köade för borttagning"
-#: git-gui.sh:1574
+#: git-gui.sh:1604
msgid "Staged for removal, still present"
msgstr "Köade för borttagning, fortfarande närvarande"
-#: 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 "Kräver konflikthantering efter sammanslagning"
-#: git-gui.sh:1614
+#: git-gui.sh:1644
msgid "Starting gitk... please wait..."
msgstr "Startar gitk... vänta..."
-#: git-gui.sh:1623
+#: git-gui.sh:1653
#, tcl-format
msgid ""
"Unable to start gitk:\n"
@@ -144,295 +143,296 @@ msgstr ""
"\n"
"%s finns inte"
-#: git-gui.sh:1823 lib/choose_repository.tcl:35
+#: git-gui.sh:1860 lib/choose_repository.tcl:36
msgid "Repository"
msgstr "Arkiv"
-#: git-gui.sh:1824
+#: git-gui.sh:1861
msgid "Edit"
msgstr "Redigera"
-#: git-gui.sh:1826 lib/choose_rev.tcl:560
+#: git-gui.sh:1863 lib/choose_rev.tcl:561
msgid "Branch"
msgstr "Gren"
-#: git-gui.sh:1829 lib/choose_rev.tcl:547
+#: git-gui.sh:1866 lib/choose_rev.tcl:548
msgid "Commit@@noun"
msgstr "Incheckning"
-#: 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 "Slå ihop"
-#: git-gui.sh:1833 lib/choose_rev.tcl:556
+#: git-gui.sh:1870 lib/choose_rev.tcl:557
msgid "Remote"
msgstr "Fjärr"
-#: git-gui.sh:1842
+#: git-gui.sh:1879
msgid "Browse Current Branch's Files"
msgstr "Bläddra i grenens filer"
-#: git-gui.sh:1846
+#: git-gui.sh:1883
msgid "Browse Branch Files..."
msgstr "Bläddra filer på gren..."
-#: git-gui.sh:1851
+#: git-gui.sh:1888
msgid "Visualize Current Branch's History"
msgstr "Visualisera grenens historik"
-#: git-gui.sh:1855
+#: git-gui.sh:1892
msgid "Visualize All Branch History"
msgstr "Visualisera alla grenars historik"
-#: git-gui.sh:1862
+#: git-gui.sh:1899
#, tcl-format
msgid "Browse %s's Files"
msgstr "Bläddra i filer för %s"
-#: git-gui.sh:1864
+#: git-gui.sh:1901
#, tcl-format
msgid "Visualize %s's History"
msgstr "Visualisera historik för %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 "Databasstatistik"
-#: git-gui.sh:1872 lib/database.tcl:34
+#: git-gui.sh:1909 lib/database.tcl:34
msgid "Compress Database"
msgstr "Komprimera databas"
-#: git-gui.sh:1875
+#: git-gui.sh:1912
msgid "Verify Database"
msgstr "Verifiera databas"
-#: 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 "Skapa skrivbordsikon"
-#: 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 "Avsluta"
-#: git-gui.sh:1902
+#: git-gui.sh:1939
msgid "Undo"
msgstr "Ångra"
-#: git-gui.sh:1905
+#: git-gui.sh:1942
msgid "Redo"
msgstr "Gör om"
-#: git-gui.sh:1909 git-gui.sh:2403
+#: git-gui.sh:1946 git-gui.sh:2443
msgid "Cut"
msgstr "Klipp ut"
-#: 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 "Kopiera"
-#: git-gui.sh:1915 git-gui.sh:2409
+#: git-gui.sh:1952 git-gui.sh:2449
msgid "Paste"
msgstr "Klistra in"
-#: 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 "Ta bort"
-#: 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 "Markera alla"
-#: git-gui.sh:1931
+#: git-gui.sh:1968
msgid "Create..."
msgstr "Skapa..."
-#: git-gui.sh:1937
+#: git-gui.sh:1974
msgid "Checkout..."
msgstr "Checka ut..."
-#: git-gui.sh:1943
+#: git-gui.sh:1980
msgid "Rename..."
msgstr "Byt namn..."
-#: git-gui.sh:1948 git-gui.sh:2048
+#: git-gui.sh:1985 git-gui.sh:2085
msgid "Delete..."
msgstr "Ta bort..."
-#: git-gui.sh:1953
+#: git-gui.sh:1990
msgid "Reset..."
msgstr "Återställ..."
-#: git-gui.sh:1965 git-gui.sh:2350
+#: git-gui.sh:2002 git-gui.sh:2389
msgid "New Commit"
msgstr "Ny incheckning"
-#: git-gui.sh:1973 git-gui.sh:2357
+#: git-gui.sh:2010 git-gui.sh:2396
msgid "Amend Last Commit"
msgstr "Lägg till föregående incheckning"
-#: 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 "Sök på nytt"
-#: git-gui.sh:1988
+#: git-gui.sh:2025
msgid "Stage To Commit"
msgstr "Köa för incheckning"
-#: git-gui.sh:1994
+#: git-gui.sh:2031
msgid "Stage Changed Files To Commit"
msgstr "Köa ändrade filer för incheckning"
-#: git-gui.sh:2000
+#: git-gui.sh:2037
msgid "Unstage From Commit"
msgstr "Ta bort från incheckningskö"
-#: git-gui.sh:2005 lib/index.tcl:393
+#: git-gui.sh:2042 lib/index.tcl:395
msgid "Revert Changes"
msgstr "Återställ ändringar"
-#: 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 "Skriv under"
-#: git-gui.sh:2016 git-gui.sh:2333
+#: git-gui.sh:2053 git-gui.sh:2372
msgid "Commit@@verb"
msgstr "Checka in"
-#: git-gui.sh:2027
+#: git-gui.sh:2064
msgid "Local Merge..."
msgstr "Lokal sammanslagning..."
-#: git-gui.sh:2032
+#: git-gui.sh:2069
msgid "Abort Merge..."
msgstr "Avbryt sammanslagning..."
-#: git-gui.sh:2044
+#: git-gui.sh:2081
msgid "Push..."
msgstr "Sänd..."
-#: git-gui.sh:2055 lib/choose_repository.tcl:40
+#: git-gui.sh:2092 lib/choose_repository.tcl:41
msgid "Apple"
msgstr "Äpple"
-#: 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 "Om %s"
-#: git-gui.sh:2062
+#: git-gui.sh:2099
msgid "Preferences..."
msgstr "Inställningar..."
-#: git-gui.sh:2070 git-gui.sh:2595
+#: git-gui.sh:2107 git-gui.sh:2639
msgid "Options..."
msgstr "Alternativ..."
-#: git-gui.sh:2076 lib/choose_repository.tcl:46
+#: git-gui.sh:2113 lib/choose_repository.tcl:47
msgid "Help"
msgstr "Hjälp"
-#: git-gui.sh:2117
+#: git-gui.sh:2154
msgid "Online Documentation"
msgstr "Webbdokumentation"
-#: git-gui.sh:2201
+#: git-gui.sh:2238
#, tcl-format
msgid "fatal: cannot stat path %s: No such file or directory"
-msgstr "ödesdigert: kunde inte ta status på sökvägen %s: Fil eller katalog saknas"
+msgstr ""
+"ödesdigert: kunde inte ta status på sökvägen %s: Fil eller katalog saknas"
-#: git-gui.sh:2234
+#: git-gui.sh:2271
msgid "Current Branch:"
msgstr "Aktuell gren:"
-#: git-gui.sh:2255
+#: git-gui.sh:2292
msgid "Staged Changes (Will Commit)"
msgstr "Köade ändringar (kommer att checkas in)"
-#: git-gui.sh:2274
+#: git-gui.sh:2312
msgid "Unstaged Changes"
msgstr "Oköade ändringar"
-#: git-gui.sh:2323
+#: git-gui.sh:2362
msgid "Stage Changed"
msgstr "Köa ändrade"
-#: 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 "Sänd"
-#: git-gui.sh:2369
+#: git-gui.sh:2408
msgid "Initial Commit Message:"
msgstr "Inledande incheckningsmeddelande:"
-#: git-gui.sh:2370
+#: git-gui.sh:2409
msgid "Amended Commit Message:"
msgstr "Utökat incheckningsmeddelande:"
-#: git-gui.sh:2371
+#: git-gui.sh:2410
msgid "Amended Initial Commit Message:"
msgstr "Utökat inledande incheckningsmeddelande:"
-#: git-gui.sh:2372
+#: git-gui.sh:2411
msgid "Amended Merge Commit Message:"
msgstr "Utökat incheckningsmeddelande för sammanslagning:"
-#: git-gui.sh:2373
+#: git-gui.sh:2412
msgid "Merge Commit Message:"
msgstr "Incheckningsmeddelande för sammanslagning:"
-#: git-gui.sh:2374
+#: git-gui.sh:2413
msgid "Commit Message:"
msgstr "Incheckningsmeddelande:"
-#: 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 "Kopiera alla"
-#: git-gui.sh:2443 lib/blame.tcl:104
+#: git-gui.sh:2483 lib/blame.tcl:107
msgid "File:"
msgstr "Fil:"
-#: git-gui.sh:2545
-msgid "Refresh"
-msgstr "Uppdatera"
-
-#: git-gui.sh:2566
+#: git-gui.sh:2589
msgid "Apply/Reverse Hunk"
msgstr "Använd/återställ del"
-#: git-gui.sh:2572
-msgid "Decrease Font Size"
-msgstr "Minska teckensnittsstorlek"
-
-#: git-gui.sh:2576
-msgid "Increase Font Size"
-msgstr "Öka teckensnittsstorlek"
-
-#: git-gui.sh:2581
+#: git-gui.sh:2595
msgid "Show Less Context"
msgstr "Visa mindre sammanhang"
-#: git-gui.sh:2588
+#: git-gui.sh:2602
msgid "Show More Context"
msgstr "Visa mer sammanhang"
-#: git-gui.sh:2602
+#: git-gui.sh:2610
+msgid "Refresh"
+msgstr "Uppdatera"
+
+#: git-gui.sh:2631
+msgid "Decrease Font Size"
+msgstr "Minska teckensnittsstorlek"
+
+#: git-gui.sh:2635
+msgid "Increase Font Size"
+msgstr "Öka teckensnittsstorlek"
+
+#: git-gui.sh:2646
msgid "Unstage Hunk From Commit"
msgstr "Ta bort del ur incheckningskö"
-#: git-gui.sh:2604
+#: git-gui.sh:2648
msgid "Stage Hunk For Commit"
msgstr "Ställ del i incheckningskö"
-#: git-gui.sh:2623
+#: git-gui.sh:2667
msgid "Initializing..."
msgstr "Initierar..."
-#: git-gui.sh:2718
+#: git-gui.sh:2762
#, tcl-format
msgid ""
"Possible environment issues exist.\n"
@@ -449,7 +449,7 @@ msgstr ""
"av %s:\n"
"\n"
-#: git-gui.sh:2748
+#: git-gui.sh:2792
msgid ""
"\n"
"This is due to a known issue with the\n"
@@ -459,7 +459,7 @@ msgstr ""
"Detta beror på ett känt problem med\n"
"Tcl-binären som följer med Cygwin."
-#: git-gui.sh:2753
+#: git-gui.sh:2797
#, tcl-format
msgid ""
"\n"
@@ -476,7 +476,7 @@ msgstr ""
"user.name och user.email i din personliga\n"
"~/.gitconfig-fil.\n"
-#: lib/about.tcl:25
+#: lib/about.tcl:26
msgid "git-gui - a graphical user interface for Git."
msgstr "git-gui - ett grafiskt användargränssnitt för Git."
@@ -488,56 +488,56 @@ msgstr "Filvisare"
msgid "Commit:"
msgstr "Incheckning:"
-#: lib/blame.tcl:249
+#: lib/blame.tcl:264
msgid "Copy Commit"
msgstr "Kopiera incheckning"
-#: lib/blame.tcl:369
+#: lib/blame.tcl:384
#, tcl-format
msgid "Reading %s..."
msgstr "Läser %s..."
-#: lib/blame.tcl:473
+#: lib/blame.tcl:488
msgid "Loading copy/move tracking annotations..."
msgstr "Läser annoteringar för kopiering/flyttning..."
-#: lib/blame.tcl:493
+#: lib/blame.tcl:508
msgid "lines annotated"
msgstr "rader annoterade"
-#: lib/blame.tcl:674
+#: lib/blame.tcl:689
msgid "Loading original location annotations..."
msgstr "Läser in annotering av originalplacering..."
-#: lib/blame.tcl:677
+#: lib/blame.tcl:692
msgid "Annotation complete."
msgstr "Annotering fullbordad."
-#: lib/blame.tcl:731
+#: lib/blame.tcl:746
msgid "Loading annotation..."
msgstr "Läser in annotering..."
-#: lib/blame.tcl:787
+#: lib/blame.tcl:802
msgid "Author:"
msgstr "Författare:"
-#: lib/blame.tcl:791
+#: lib/blame.tcl:806
msgid "Committer:"
msgstr "Incheckare:"
-#: lib/blame.tcl:796
+#: lib/blame.tcl:811
msgid "Original File:"
msgstr "Ursprunglig fil:"
-#: lib/blame.tcl:910
+#: lib/blame.tcl:925
msgid "Originally By:"
msgstr "Ursprungligen av:"
-#: lib/blame.tcl:916
+#: lib/blame.tcl:931
msgid "In File:"
msgstr "I filen:"
-#: lib/blame.tcl:921
+#: lib/blame.tcl:936
msgid "Copied Or Moved Here By:"
msgstr "Kopierad eller flyttad hit av:"
@@ -550,17 +550,17 @@ msgid "Checkout"
msgstr "Checka ut"
#: 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 "Avbryt"
-#: lib/branch_checkout.tcl:32 lib/browser.tcl:286
+#: lib/branch_checkout.tcl:32 lib/browser.tcl:287
msgid "Revision"
msgstr "Revision"
-#: 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 "Alternativ"
@@ -580,7 +580,7 @@ msgstr "Skapa gren"
msgid "Create New Branch"
msgstr "Skapa ny gren"
-#: lib/branch_create.tcl:31 lib/choose_repository.tcl:375
+#: lib/branch_create.tcl:31 lib/choose_repository.tcl:371
msgid "Create"
msgstr "Skapa"
@@ -720,22 +720,22 @@ msgstr "Startar..."
msgid "File Browser"
msgstr "Filbläddrare"
-#: lib/browser.tcl:125 lib/browser.tcl:142
+#: lib/browser.tcl:126 lib/browser.tcl:143
#, tcl-format
msgid "Loading %s..."
msgstr "Läser %s..."
-#: lib/browser.tcl:186
+#: lib/browser.tcl:187
msgid "[Up To Parent]"
msgstr "[Upp till förälder]"
-#: lib/browser.tcl:266 lib/browser.tcl:272
+#: lib/browser.tcl:267 lib/browser.tcl:273
msgid "Browse Branch Files"
msgstr "Bläddra filer på grenen"
-#: 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äddra"
@@ -749,7 +749,7 @@ msgstr "Hämtar %s från %s"
msgid "fatal: Cannot resolve %s"
msgstr "ödesdigert: Kunde inte slå upp %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 "Stäng"
@@ -796,8 +796,8 @@ msgid ""
msgstr ""
"Det senaste inlästa tillståndet motsvarar inte tillståndet i arkivet.\n"
"\n"
-"Ett annat Git-program har ändrat arkivet sedan senaste avsökningen. Du "
-"måste utföra en ny sökning innan den aktuella grenen kan ändras.\n"
+"Ett annat Git-program har ändrat arkivet sedan senaste avsökningen. Du måste "
+"utföra en ny sökning innan den aktuella grenen kan ändras.\n"
"\n"
"Sökningen kommer att startas automatiskt nu.\n"
@@ -806,6 +806,10 @@ msgstr ""
msgid "Updating working directory to '%s'..."
msgstr "Uppdaterar arbetskatalogen till \"%s\"..."
+#: lib/checkout_op.tcl:323
+msgid "files checked out"
+msgstr "filer utcheckade"
+
#: lib/checkout_op.tcl:353
#, tcl-format
msgid "Aborted checkout of '%s' (file level merging is required)."
@@ -829,10 +833,10 @@ msgid ""
msgstr ""
"Du är inte längre på en lokal gren.\n"
"\n"
-"Om du ville vara på en gren skapar du en nu, baserad på \"Denna "
-"frånkopplade utcheckning\"."
+"Om du ville vara på en gren skapar du en nu, baserad på \"Denna frånkopplade "
+"utcheckning\"."
-#: lib/checkout_op.tcl:446
+#: lib/checkout_op.tcl:446 lib/checkout_op.tcl:450
#, tcl-format
msgid "Checked out '%s'."
msgstr "Checkade ut \"%s\"."
@@ -840,7 +844,8 @@ msgstr "Checkade ut \"%s\"."
#: lib/checkout_op.tcl:478
#, tcl-format
msgid "Resetting '%s' to '%s' will lose the following commits:"
-msgstr "Om du återställer \"%s\" till \"%s\" får följande incheckningar förlorade:"
+msgstr ""
+"Om du återställer \"%s\" till \"%s\" går följande incheckningar förlorade:"
#: lib/checkout_op.tcl:500
msgid "Recovering lost commits may not be easy."
@@ -851,7 +856,7 @@ msgstr "Det kanske inte är så enkelt att återskapa förlorade incheckningar."
msgid "Reset '%s'?"
msgstr "Återställa \"%s\"?"
-#: lib/checkout_op.tcl:510 lib/merge.tcl:164
+#: lib/checkout_op.tcl:510 lib/merge.tcl:163
msgid "Visualize"
msgstr "Visualisera"
@@ -867,8 +872,8 @@ msgid ""
msgstr ""
"Kunde inte ställa in aktuell gren.\n"
"\n"
-"Arbetskatalogen har bara växlats delvis. Vi uppdaterade filerna "
-"utan problem, men kunde inte uppdatera en intern fil i Git.\n"
+"Arbetskatalogen har bara växlats delvis. Vi uppdaterade filerna utan "
+"problem, men kunde inte uppdatera en intern fil i Git.\n"
"\n"
"Detta skulle inte ha hänt. %s kommer nu stängas och ge upp."
@@ -880,15 +885,15 @@ msgstr "Välj"
msgid "Font Family"
msgstr "Teckensnittsfamilj"
-#: lib/choose_font.tcl:73
+#: lib/choose_font.tcl:74
msgid "Font Size"
msgstr "Storlek"
-#: lib/choose_font.tcl:90
+#: lib/choose_font.tcl:91
msgid "Font Example"
msgstr "Exempel"
-#: 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."
@@ -896,225 +901,225 @@ msgstr ""
"Detta är en exempeltext.\n"
"Om du tycker om den här texten kan den vara ditt teckensnitt."
-#: lib/choose_repository.tcl:27
+#: lib/choose_repository.tcl:28
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 "Skapa nytt arkiv"
-#: lib/choose_repository.tcl:86
+#: lib/choose_repository.tcl:87
msgid "New..."
msgstr "Nytt..."
-#: 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 "Klona befintligt arkiv"
-#: lib/choose_repository.tcl:99
+#: lib/choose_repository.tcl:100
msgid "Clone..."
msgstr "Klona..."
-#: 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 "Öppna befintligt arkiv"
-#: lib/choose_repository.tcl:112
+#: lib/choose_repository.tcl:113
msgid "Open..."
msgstr "Öppna..."
-#: lib/choose_repository.tcl:125
+#: lib/choose_repository.tcl:126
msgid "Recent Repositories"
msgstr "Senaste arkiven"
-#: lib/choose_repository.tcl:131
+#: lib/choose_repository.tcl:132
msgid "Open Recent Repository:"
msgstr "Öppna tidigare arkiv:"
-#: lib/choose_repository.tcl:294
-#, tcl-format
-msgid "Location %s already exists."
-msgstr "Platsen %s finns redan."
-
-#: 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 "Kunde inte skapa arkivet %s:"
-#: lib/choose_repository.tcl:385 lib/choose_repository.tcl:486
+#: lib/choose_repository.tcl:381 lib/choose_repository.tcl:478
msgid "Directory:"
msgstr "Katalog:"
-#: 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 "Gitarkiv"
-#: lib/choose_repository.tcl:430 lib/choose_repository.tcl:437
+#: lib/choose_repository.tcl:437
#, tcl-format
msgid "Directory %s already exists."
msgstr "Katalogen %s finns redan."
-#: lib/choose_repository.tcl:442
+#: lib/choose_repository.tcl:441
#, tcl-format
msgid "File %s already exists."
msgstr "Filen %s finns redan."
-#: lib/choose_repository.tcl:463
+#: lib/choose_repository.tcl:455
msgid "Clone"
msgstr "Klona"
-#: lib/choose_repository.tcl:476
+#: lib/choose_repository.tcl:468
msgid "URL:"
msgstr "Webbadress:"
-#: lib/choose_repository.tcl:496
+#: lib/choose_repository.tcl:489
msgid "Clone Type:"
msgstr "Typ av klon:"
-#: lib/choose_repository.tcl:502
+#: lib/choose_repository.tcl:495
msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
msgstr "Standard (snabb, semiredundant, hårda länkar)"
-#: lib/choose_repository.tcl:508
+#: lib/choose_repository.tcl:501
msgid "Full Copy (Slower, Redundant Backup)"
msgstr "Full kopia (långsammare, redundant säkerhetskopia)"
-#: lib/choose_repository.tcl:514
+#: lib/choose_repository.tcl:507
msgid "Shared (Fastest, Not Recommended, No Backup)"
msgstr "Delad (snabbast, rekommenderas ej, ingen säkerhetskopia)"
-#: 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 "Inte ett Gitarkiv: %s"
-#: lib/choose_repository.tcl:586
+#: lib/choose_repository.tcl:579
msgid "Standard only available for local repository."
msgstr "Standard är endast tillgängligt för lokala arkiv."
-#: lib/choose_repository.tcl:590
+#: lib/choose_repository.tcl:583
msgid "Shared only available for local repository."
msgstr "Delat är endast tillgängligt för lokala arkiv."
-#: lib/choose_repository.tcl:617
+#: lib/choose_repository.tcl:604
+#, tcl-format
+msgid "Location %s already exists."
+msgstr "Platsen %s finns redan."
+
+#: lib/choose_repository.tcl:615
msgid "Failed to configure origin"
msgstr "Kunde inte konfigurera ursprung"
-#: lib/choose_repository.tcl:629
+#: lib/choose_repository.tcl:627
msgid "Counting objects"
msgstr "Räknar objekt"
-#: lib/choose_repository.tcl:630
+#: lib/choose_repository.tcl:628
msgid "buckets"
msgstr "hinkar"
-#: lib/choose_repository.tcl:654
+#: lib/choose_repository.tcl:652
#, tcl-format
msgid "Unable to copy objects/info/alternates: %s"
msgstr "Kunde inte kopiera objekt/info/alternativ: %s"
-#: lib/choose_repository.tcl:690
+#: lib/choose_repository.tcl:688
#, tcl-format
msgid "Nothing to clone from %s."
msgstr "Ingenting att klona från %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 "Grenen \"master\" har inte initierats."
-#: lib/choose_repository.tcl:705
+#: lib/choose_repository.tcl:703
msgid "Hardlinks are unavailable. Falling back to copying."
msgstr "Hårda länkar är inte tillgängliga. Faller tillbaka på kopiering."
-#: lib/choose_repository.tcl:717
+#: lib/choose_repository.tcl:715
#, tcl-format
msgid "Cloning from %s"
msgstr "Klonar från %s"
-#: lib/choose_repository.tcl:748
+#: lib/choose_repository.tcl:746
msgid "Copying objects"
msgstr "Kopierar objekt"
-#: lib/choose_repository.tcl:749
+#: lib/choose_repository.tcl:747
msgid "KiB"
msgstr "KiB"
-#: lib/choose_repository.tcl:773
+#: lib/choose_repository.tcl:771
#, tcl-format
msgid "Unable to copy object: %s"
msgstr "Kunde inte kopiera objekt: %s"
-#: lib/choose_repository.tcl:783
+#: lib/choose_repository.tcl:781
msgid "Linking objects"
msgstr "Länkar objekt"
-#: lib/choose_repository.tcl:784
+#: lib/choose_repository.tcl:782
msgid "objects"
msgstr "objekt"
-#: lib/choose_repository.tcl:792
+#: lib/choose_repository.tcl:790
#, tcl-format
msgid "Unable to hardlink object: %s"
msgstr "Kunde inte hårdlänka objekt: %s"
-#: lib/choose_repository.tcl:847
+#: lib/choose_repository.tcl:845
msgid "Cannot fetch branches and objects. See console output for details."
msgstr "Kunde inte hämta grenar och objekt. Se konsolutdata för detaljer."
-#: lib/choose_repository.tcl:858
+#: lib/choose_repository.tcl:856
msgid "Cannot fetch tags. See console output for details."
msgstr "Kunde inte hämta taggar. Se konsolutdata för detaljer."
-#: lib/choose_repository.tcl:882
+#: lib/choose_repository.tcl:880
msgid "Cannot determine HEAD. See console output for details."
msgstr "Kunde inte avgöra HEAD. Se konsolutdata för detaljer."
-#: lib/choose_repository.tcl:891
+#: lib/choose_repository.tcl:889
#, tcl-format
msgid "Unable to cleanup %s"
msgstr "Kunde inte städa upp %s"
-#: lib/choose_repository.tcl:897
+#: lib/choose_repository.tcl:895
msgid "Clone failed."
msgstr "Kloning misslyckades."
-#: lib/choose_repository.tcl:904
+#: lib/choose_repository.tcl:902
msgid "No default branch obtained."
msgstr "Hämtade ingen standardgren."
-#: lib/choose_repository.tcl:915
+#: lib/choose_repository.tcl:913
#, tcl-format
msgid "Cannot resolve %s as a commit."
msgstr "Kunde inte slå upp %s till någon incheckning."
-#: lib/choose_repository.tcl:927
+#: lib/choose_repository.tcl:925
msgid "Creating working directory"
msgstr "Skapar arbetskatalog"
-#: 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 "filer"
-#: lib/choose_repository.tcl:957
+#: lib/choose_repository.tcl:955
msgid "Initial file checkout failed."
msgstr "Inledande filutcheckning misslyckades."
-#: lib/choose_repository.tcl:973
+#: lib/choose_repository.tcl:971
msgid "Open"
msgstr "Öppna"
-#: lib/choose_repository.tcl:983
+#: lib/choose_repository.tcl:981
msgid "Repository:"
msgstr "Arkiv:"
-#: lib/choose_repository.tcl:1033
+#: lib/choose_repository.tcl:1031
#, tcl-format
msgid "Failed to open repository %s:"
msgstr "Kunde inte öppna arkivet %s:"
@@ -1135,7 +1140,7 @@ msgstr "Lokal gren"
msgid "Tracking Branch"
msgstr "Spårande gren"
-#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:537
+#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:538
msgid "Tag"
msgstr "Tagg"
@@ -1152,11 +1157,11 @@ msgstr "Ingen revision vald."
msgid "Revision expression is empty."
msgstr "Revisionsuttrycket är tomt."
-#: lib/choose_rev.tcl:530
+#: lib/choose_rev.tcl:531
msgid "Updated"
msgstr "Uppdaterad"
-#: lib/choose_rev.tcl:558
+#: lib/choose_rev.tcl:559
msgid "URL"
msgstr "Webbadress"
@@ -1182,9 +1187,9 @@ msgid ""
msgstr ""
"Kan inte utöka vid sammanslagning.\n"
"\n"
-"Du är i mitten av en sammanslagning som inte är fullbordad. Du kan "
-"inte utöka tidigare incheckningar om du inte först avbryter den "
-"pågående sammanslagningen.\n"
+"Du är i mitten av en sammanslagning som inte är fullbordad. Du kan inte "
+"utöka tidigare incheckningar om du inte först avbryter den pågående "
+"sammanslagningen.\n"
#: lib/commit.tcl:49
msgid "Error loading commit data for amend:"
@@ -1209,8 +1214,8 @@ msgid ""
msgstr ""
"Det senaste inlästa tillståndet motsvarar inte tillståndet i arkivet.\n"
"\n"
-"Ett annat Git-program har ändrat arkivet sedan senaste avsökningen. Du "
-"måste utföra en ny sökning innan du kan göra en ny incheckning.\n"
+"Ett annat Git-program har ändrat arkivet sedan senaste avsökningen. Du måste "
+"utföra en ny sökning innan du kan göra en ny incheckning.\n"
"\n"
"Sökningen kommer att startas automatiskt nu.\n"
@@ -1266,16 +1271,45 @@ msgstr ""
"- Andra raden: Tom\n"
"- Följande rader: Beskriv varför det här är en bra ändring.\n"
-#: lib/commit.tcl:257
+#: lib/commit.tcl:207
+#, tcl-format
+msgid "warning: Tcl does not support encoding '%s'."
+msgstr "varning: Tcl stöder inte teckenkodningen \"%s\"."
+
+#: lib/commit.tcl:221
+msgid "Calling pre-commit hook..."
+msgstr "Anropar krok före incheckning..."
+
+#: lib/commit.tcl:236
+msgid "Commit declined by pre-commit hook."
+msgstr "Incheckningen avvisades av krok före incheckning."
+
+#: lib/commit.tcl:259
+msgid "Calling commit-msg hook..."
+msgstr "Anropar krok för incheckningsmeddelande..."
+
+#: lib/commit.tcl:274
+msgid "Commit declined by commit-msg hook."
+msgstr "Incheckning avvisad av krok för incheckningsmeddelande."
+
+#: lib/commit.tcl:287
+msgid "Committing changes..."
+msgstr "Checkar in ändringar..."
+
+#: lib/commit.tcl:303
msgid "write-tree failed:"
msgstr "write-tree misslyckades:"
-#: lib/commit.tcl:275
+#: lib/commit.tcl:304 lib/commit.tcl:348 lib/commit.tcl:368
+msgid "Commit failed."
+msgstr "Incheckningen misslyckades."
+
+#: lib/commit.tcl:321
#, tcl-format
msgid "Commit %s appears to be corrupt"
msgstr "Incheckningen %s verkar vara trasig"
-#: lib/commit.tcl:279
+#: lib/commit.tcl:326
msgid ""
"No changes to commit.\n"
"\n"
@@ -1289,37 +1323,32 @@ msgstr ""
"\n"
"En sökning kommer att startas automatiskt nu.\n"
-#: lib/commit.tcl:286
+#: lib/commit.tcl:333
msgid "No changes to commit."
msgstr "Inga ändringar att checka in."
-#: lib/commit.tcl:303
-#, tcl-format
-msgid "warning: Tcl does not support encoding '%s'."
-msgstr "varning: Tcl stöder inte teckenkodningen \"%s\"."
-
-#: lib/commit.tcl:317
+#: lib/commit.tcl:347
msgid "commit-tree failed:"
msgstr "commit-tree misslyckades:"
-#: lib/commit.tcl:339
+#: lib/commit.tcl:367
msgid "update-ref failed:"
msgstr "update-ref misslyckades:"
-#: lib/commit.tcl:430
+#: lib/commit.tcl:454
#, tcl-format
msgid "Created commit %s: %s"
msgstr "Skapade incheckningen %s: %s"
-#: lib/console.tcl:57
+#: lib/console.tcl:59
msgid "Working... please wait..."
msgstr "Arbetar... vänta..."
-#: lib/console.tcl:183
+#: lib/console.tcl:186
msgid "Success"
msgstr "Lyckades"
-#: lib/console.tcl:196
+#: lib/console.tcl:200
msgid "Error: Command Failed"
msgstr "Fel: Kommando misslyckades"
@@ -1398,8 +1427,8 @@ msgstr ""
"\n"
"%s innehåller inga ändringar.\n"
"\n"
-"Modifieringsdatum för filen uppdaterades av ett annat program, men innehållet "
-"i filen har inte ändrats.\n"
+"Modifieringsdatum för filen uppdaterades av ett annat program, men "
+"innehållet i filen har inte ändrats.\n"
"\n"
"En sökning kommer automatiskt att startas för att hitta andra filer som kan "
"vara i samma tillstånd."
@@ -1430,23 +1459,23 @@ msgstr "* Binärfil (visar inte innehållet)."
msgid "Error loading diff:"
msgstr "Fel vid inläsning av differens:"
-#: lib/diff.tcl:302
+#: lib/diff.tcl:303
msgid "Failed to unstage selected hunk."
msgstr "Kunde inte ta bort den valda delen från kön."
-#: lib/diff.tcl:309
+#: lib/diff.tcl:310
msgid "Failed to stage selected hunk."
msgstr "Kunde inte lägga till den valda delen till kön."
-#: lib/error.tcl:12 lib/error.tcl:102
+#: lib/error.tcl:20 lib/error.tcl:114
msgid "error"
msgstr "fel"
-#: lib/error.tcl:28
+#: lib/error.tcl:36
msgid "warning"
msgstr "varning"
-#: lib/error.tcl:81
+#: lib/error.tcl:94
msgid "You must correct the above errors before committing."
msgstr "Du måste rätta till felen ovan innan du checkar in."
@@ -1479,6 +1508,10 @@ msgstr "Lås upp index"
msgid "Unstaging %s from commit"
msgstr "Tar bort %s för incheckningskön"
+#: lib/index.tcl:313
+msgid "Ready to commit."
+msgstr "Redo att checka in."
+
#: lib/index.tcl:326
#, tcl-format
msgid "Adding %s"
@@ -1494,11 +1527,12 @@ msgstr "Återställ ändringarna i filen %s?"
msgid "Revert changes in these %i files?"
msgstr "Återställ ändringarna i dessa %i filer?"
-#: lib/index.tcl:389
+#: lib/index.tcl:391
msgid "Any unstaged changes will be permanently lost by the revert."
-msgstr "Alla oköade ändringar kommer permanent gå förlorade vid återställningen."
+msgstr ""
+"Alla oköade ändringar kommer permanent gå förlorade vid återställningen."
-#: lib/index.tcl:392
+#: lib/index.tcl:394
msgid "Do Nothing"
msgstr "Gör ingenting"
@@ -1510,7 +1544,7 @@ msgid ""
msgstr ""
"Kan inte slå ihop vid utökning.\n"
"\n"
-"Du måste föra färdig utökningen av incheckningen innan du påbörjar någon "
+"Du måste göra färdig utökningen av incheckningen innan du påbörjar någon "
"slags sammanslagning.\n"
#: lib/merge.tcl:27
@@ -1524,8 +1558,8 @@ msgid ""
msgstr ""
"Det senaste inlästa tillståndet motsvarar inte tillståndet i arkivet.\n"
"\n"
-"Ett annat Git-program har ändrat arkivet sedan senaste avsökningen. Du "
-"måste utföra en ny sökning innan du kan utföra en sammanslagning.\n"
+"Ett annat Git-program har ändrat arkivet sedan senaste avsökningen. Du måste "
+"utföra en ny sökning innan du kan utföra en sammanslagning.\n"
"\n"
"Sökningen kommer att startas automatiskt nu.\n"
@@ -1571,27 +1605,27 @@ msgstr "%s av %s"
#: lib/merge.tcl:119
#, tcl-format
-msgid "Merging %s and %s"
-msgstr "Slår ihop %s och %s"
+msgid "Merging %s and %s..."
+msgstr "Slår ihop %s och %s..."
-#: lib/merge.tcl:131
+#: lib/merge.tcl:130
msgid "Merge completed successfully."
msgstr "Sammanslagningen avslutades framgångsrikt."
-#: lib/merge.tcl:133
+#: lib/merge.tcl:132
msgid "Merge failed. Conflict resolution is required."
msgstr "Sammanslagningen misslyckades. Du måste lösa konflikterna."
-#: lib/merge.tcl:158
+#: lib/merge.tcl:157
#, tcl-format
msgid "Merge Into %s"
msgstr "Slå ihop i %s"
-#: lib/merge.tcl:177
+#: lib/merge.tcl:176
msgid "Revision To Merge"
msgstr "Revisioner att slå ihop"
-#: lib/merge.tcl:212
+#: lib/merge.tcl:211
msgid ""
"Cannot abort while amending.\n"
"\n"
@@ -1601,7 +1635,7 @@ msgstr ""
"\n"
"Du måste göra dig färdig med att utöka incheckningen.\n"
-#: lib/merge.tcl:222
+#: lib/merge.tcl:221
msgid ""
"Abort merge?\n"
"\n"
@@ -1611,12 +1645,12 @@ msgid ""
msgstr ""
"Avbryt sammanslagning?\n"
"\n"
-"Om du avbryter sammanslagningen kommer *ALLA* ej incheckade ändringar att "
-"gå förlorade.\n"
+"Om du avbryter sammanslagningen kommer *ALLA* ej incheckade ändringar att gå "
+"förlorade.\n"
"\n"
"Gå vidare med att avbryta den aktuella sammanslagningen?"
-#: lib/merge.tcl:228
+#: lib/merge.tcl:227
msgid ""
"Reset changes?\n"
"\n"
@@ -1626,98 +1660,110 @@ msgid ""
msgstr ""
"Återställ ändringar?\n"
"\n"
-"Om du återställer ändringarna kommer *ALLA* ej incheckade ändringar att "
-"gå förlorade.\n"
+"Om du återställer ändringarna kommer *ALLA* ej incheckade ändringar att gå "
+"förlorade.\n"
"\n"
"Gå vidare med att återställa de aktuella ändringarna?"
-#: lib/merge.tcl:239
+#: lib/merge.tcl:238
msgid "Aborting"
msgstr "Avbryter"
-#: lib/merge.tcl:266
+#: lib/merge.tcl:238
+msgid "files reset"
+msgstr "filer återställda"
+
+#: lib/merge.tcl:265
msgid "Abort failed."
msgstr "Misslyckades avbryta."
-#: lib/merge.tcl:268
+#: lib/merge.tcl:267
msgid "Abort completed. Ready."
msgstr "Avbrytning fullbordad. Redo."
-#: lib/option.tcl:82
+#: lib/option.tcl:95
msgid "Restore Defaults"
msgstr "Återställ standardvärden"
-#: lib/option.tcl:86
+#: lib/option.tcl:99
msgid "Save"
msgstr "Spara"
-#: lib/option.tcl:96
+#: lib/option.tcl:109
#, tcl-format
msgid "%s Repository"
msgstr "Arkivet %s"
-#: lib/option.tcl:97
+#: lib/option.tcl:110
msgid "Global (All Repositories)"
msgstr "Globalt (alla arkiv)"
-#: lib/option.tcl:103
+#: lib/option.tcl:116
msgid "User Name"
msgstr "Användarnamn"
-#: lib/option.tcl:104
+#: lib/option.tcl:117
msgid "Email Address"
msgstr "E-postadress"
-#: lib/option.tcl:106
+#: lib/option.tcl:119
msgid "Summarize Merge Commits"
msgstr "Summera sammanslagningsincheckningar"
-#: lib/option.tcl:107
+#: lib/option.tcl:120
msgid "Merge Verbosity"
msgstr "Pratsamhet för sammanslagningar"
-#: lib/option.tcl:108
+#: lib/option.tcl:121
msgid "Show Diffstat After Merge"
msgstr "Visa diffstatistik efter sammanslagning"
-#: lib/option.tcl:110
+#: lib/option.tcl:123
msgid "Trust File Modification Timestamps"
msgstr "Lita på filändringstidsstämplar"
-#: lib/option.tcl:111
+#: lib/option.tcl:124
msgid "Prune Tracking Branches During Fetch"
msgstr "Städa spårade grenar vid hämtning"
-#: lib/option.tcl:112
+#: lib/option.tcl:125
msgid "Match Tracking Branches"
msgstr "Matcha spårade grenar"
-#: lib/option.tcl:113
+#: lib/option.tcl:126
msgid "Number of Diff Context Lines"
msgstr "Antal rader sammanhang i differenser"
-#: lib/option.tcl:114
+#: lib/option.tcl:127
+msgid "Commit Message Text Width"
+msgstr "Textbredd för incheckningsmeddelande"
+
+#: lib/option.tcl:128
msgid "New Branch Name Template"
msgstr "Mall för namn på nya grenar"
-#: lib/option.tcl:176
+#: lib/option.tcl:192
+msgid "Spelling Dictionary:"
+msgstr "Stavningsordlista:"
+
+#: lib/option.tcl:216
msgid "Change Font"
msgstr "Byt teckensnitt"
-#: lib/option.tcl:180
+#: lib/option.tcl:220
#, tcl-format
msgid "Choose %s"
msgstr "Välj %s"
-#: lib/option.tcl:186
+#: lib/option.tcl:226
msgid "pt."
msgstr "p."
-#: lib/option.tcl:200
+#: lib/option.tcl:240
msgid "Preferences"
msgstr "Inställningar"
-#: lib/option.tcl:235
+#: lib/option.tcl:275
msgid "Failed to completely save options:"
msgstr "Misslyckades med att helt spara alternativ:"
@@ -1774,8 +1820,8 @@ msgid ""
"One or more of the merge tests failed because you have not fetched the "
"necessary commits. Try fetching from %s first."
msgstr ""
-"En eller flera av sammanslagningstesterna misslyckades eftersom du inte "
-"har hämtat de nödvändiga incheckningarna. Försök hämta från %s först."
+"En eller flera av sammanslagningstesterna misslyckades eftersom du inte har "
+"hämtat de nödvändiga incheckningarna. Försök hämta från %s först."
#: lib/remote_branch_delete.tcl:207
msgid "Please select one or more branches to delete."
@@ -1787,7 +1833,7 @@ msgid ""
"\n"
"Delete the selected branches?"
msgstr ""
-"Det kan vara svårt att återställa grenar.\n"
+"Det kan vara svårt att återställa borttagna grenar.\n"
"\n"
"Ta bort de valda grenarna?"
@@ -1825,6 +1871,43 @@ msgstr "Kan inte skriva genväg:"
msgid "Cannot write icon:"
msgstr "Kan inte skriva ikon:"
+#: lib/spellcheck.tcl:57
+msgid "Unsupported spell checker"
+msgstr "Stavningskontrollprogrammet stöds inte"
+
+#: lib/spellcheck.tcl:65
+msgid "Spell checking is unavailable"
+msgstr "Stavningskontroll är ej tillgänglig"
+
+#: lib/spellcheck.tcl:68
+msgid "Invalid spell checking configuration"
+msgstr "Ogiltig inställning för stavningskontroll"
+
+#: lib/spellcheck.tcl:70
+#, tcl-format
+msgid "Reverting dictionary to %s."
+msgstr "Återställer ordlistan till %s."
+
+#: lib/spellcheck.tcl:73
+msgid "Spell checker silently failed on startup"
+msgstr "Stavningskontroll misslyckades tyst vid start"
+
+#: lib/spellcheck.tcl:80
+msgid "Unrecognized spell checker"
+msgstr "Stavningskontrollprogrammet känns inte igen"
+
+#: lib/spellcheck.tcl:180
+msgid "No Suggestions"
+msgstr "Inga förslag"
+
+#: lib/spellcheck.tcl:381
+msgid "Unexpected EOF from spell checker"
+msgstr "Oväntat filslut från stavningskontroll"
+
+#: lib/spellcheck.tcl:385
+msgid "Spell Checker Failed"
+msgstr "Stavningskontroll misslyckades"
+
#: lib/status_bar.tcl:83
#, tcl-format
msgid "%s ... %*i of %*i %s (%3i%%)"
@@ -1893,3 +1976,5 @@ msgstr "Använd tunt paket (för långsamma nätverksanslutningar)"
msgid "Include tags"
msgstr "Ta med taggar"
+#~ msgid "Not connected to aspell"
+#~ msgstr "Inte ansluten till aspell"
diff --git a/git-gui/po/zh_cn.po b/git-gui/po/zh_cn.po
index f8697216f..d2c686667 100644
--- a/git-gui/po/zh_cn.po
+++ b/git-gui/po/zh_cn.po
@@ -15,7 +15,7 @@
# fast forward 快速合并(??)
# stage 缓存 (译自 index/cache)
# amend 修正
-# reset 复位
+# reset 复位
#
# 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"
-"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"
@@ -33,33 +33,33 @@ msgstr ""
"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: 致命错误"
-#: git-gui.sh:565
+#: git-gui.sh:593
#, tcl-format
msgid "Invalid font specified in %s:"
msgstr "%s 中指定的字体无效:"
-#: git-gui.sh:590
+#: git-gui.sh:620
msgid "Main Font"
msgstr "主要字体"
-#: git-gui.sh:591
+#: git-gui.sh:621
msgid "Diff/Console Font"
msgstr "Diff/控制终端字体"
-#: git-gui.sh:605
+#: git-gui.sh:635
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 的版本信息:"
-#: git-gui.sh:650
+#: git-gui.sh:680
#, tcl-format
msgid ""
"Git version cannot be determined.\n"
@@ -78,79 +78,79 @@ msgstr ""
"\n"
"是否假定 '%s' 为版本 1.5.0?\n"
-#: git-gui.sh:888
+#: git-gui.sh:918
msgid "Git directory not found:"
msgstr "Git 目录无法找到:"
-#: git-gui.sh:895
+#: git-gui.sh:925
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 目录:"
-#: git-gui.sh:907
+#: git-gui.sh:937
msgid "No working directory"
msgstr "没有工作目录"
-#: git-gui.sh:1054
+#: git-gui.sh:1084 lib/checkout_op.tcl:283
msgid "Refreshing file status..."
msgstr "更新文件状态..."
-#: git-gui.sh:1119
+#: git-gui.sh:1149
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 "就绪"
-#: git-gui.sh:1560
+#: git-gui.sh:1590
msgid "Unmodified"
msgstr "未修改"
-#: git-gui.sh:1562
+#: git-gui.sh:1592
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 "缓存为提交"
-#: git-gui.sh:1564 git-gui.sh:1569
+#: git-gui.sh:1594 git-gui.sh:1599
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 "缓存为提交, 不存在"
-#: git-gui.sh:1567
+#: git-gui.sh:1597
msgid "Untracked, not staged"
msgstr "未跟踪, 未缓存"
-#: git-gui.sh:1572
+#: git-gui.sh:1602
msgid "Missing"
msgstr "不存在"
-#: git-gui.sh:1573
+#: git-gui.sh:1603
msgid "Staged for removal"
msgstr "缓存为删除"
-#: git-gui.sh:1574
+#: git-gui.sh:1604
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 "需要解决合并冲突"
-#: git-gui.sh:1614
+#: git-gui.sh:1644
msgid "Starting gitk... please wait..."
msgstr "启动 gitk... 请等待..."
-#: git-gui.sh:1623
+#: git-gui.sh:1653
#, tcl-format
msgid ""
"Unable to start gitk:\n"
@@ -161,295 +161,295 @@ msgstr ""
"\n"
"%s 不存在"
-#: git-gui.sh:1823 lib/choose_repository.tcl:35
+#: git-gui.sh:1860 lib/choose_repository.tcl:36
msgid "Repository"
msgstr "版本库(repository)"
-#: git-gui.sh:1824
+#: git-gui.sh:1861
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)"
-#: git-gui.sh:1829 lib/choose_rev.tcl:547
+#: git-gui.sh:1866 lib/choose_rev.tcl:548
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)"
-#: git-gui.sh:1833 lib/choose_rev.tcl:556
+#: git-gui.sh:1870 lib/choose_rev.tcl:557
msgid "Remote"
msgstr "远端(remote)"
-#: git-gui.sh:1842
+#: git-gui.sh:1879
msgid "Browse Current Branch's Files"
msgstr "浏览当前分支上的文件"
-#: git-gui.sh:1846
+#: git-gui.sh:1883
msgid "Browse Branch Files..."
msgstr "浏览分支上的文件..."
-#: git-gui.sh:1851
+#: git-gui.sh:1888
msgid "Visualize Current Branch's History"
msgstr "图示当前分支的历史"
-#: git-gui.sh:1855
+#: git-gui.sh:1892
msgid "Visualize All Branch History"
msgstr "图示所有分支的历史"
-#: git-gui.sh:1862
+#: git-gui.sh:1899
#, 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 分支的历史"
-#: 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 "数据库统计信息"
-#: git-gui.sh:1872 lib/database.tcl:34
+#: git-gui.sh:1909 lib/database.tcl:34
msgid "Compress Database"
msgstr "压缩数据库"
-#: git-gui.sh:1875
+#: git-gui.sh:1912
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 "创建桌面图标"
-#: 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 "退出"
-#: git-gui.sh:1902
+#: git-gui.sh:1939
msgid "Undo"
msgstr "撤销"
-#: git-gui.sh:1905
+#: git-gui.sh:1942
msgid "Redo"
msgstr "重做"
-#: git-gui.sh:1909 git-gui.sh:2403
+#: git-gui.sh:1946 git-gui.sh:2443
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 "复制"
-#: git-gui.sh:1915 git-gui.sh:2409
+#: git-gui.sh:1952 git-gui.sh:2449
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 "删除"
-#: 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 "全选"
-#: git-gui.sh:1931
+#: git-gui.sh:1968
msgid "Create..."
msgstr "新建..."
-#: git-gui.sh:1937
+#: git-gui.sh:1974
msgid "Checkout..."
msgstr "Checkout..."
-#: git-gui.sh:1943
+#: git-gui.sh:1980
msgid "Rename..."
msgstr "更名..."
-#: git-gui.sh:1948 git-gui.sh:2048
+#: git-gui.sh:1985 git-gui.sh:2085
msgid "Delete..."
msgstr "删除..."
-#: git-gui.sh:1953
+#: git-gui.sh:1990
msgid "Reset..."
msgstr "复位(Reset)..."
-#: git-gui.sh:1965 git-gui.sh:2350
+#: git-gui.sh:2002 git-gui.sh:2389
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 "修正上次提交"
-#: 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 "重新扫描"
-#: git-gui.sh:1988
+#: git-gui.sh:2025
msgid "Stage To Commit"
msgstr "缓存为提交"
-#: git-gui.sh:1994
+#: git-gui.sh:2031
msgid "Stage Changed Files To Commit"
msgstr "缓存修改的文件为提交"
-#: git-gui.sh:2000
+#: git-gui.sh:2037
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 "撤销修改"
-#: 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)"
-#: git-gui.sh:2016 git-gui.sh:2333
+#: git-gui.sh:2053 git-gui.sh:2372
msgid "Commit@@verb"
msgstr "提交"
-#: git-gui.sh:2027
+#: git-gui.sh:2064
msgid "Local Merge..."
msgstr "本地合并..."
-#: git-gui.sh:2032
+#: git-gui.sh:2069
msgid "Abort Merge..."
msgstr "中止合并..."
-#: git-gui.sh:2044
+#: git-gui.sh:2081
msgid "Push..."
msgstr "上传..."
-#: git-gui.sh:2055 lib/choose_repository.tcl:40
+#: git-gui.sh:2092 lib/choose_repository.tcl:41
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"
-#: git-gui.sh:2062
+#: git-gui.sh:2099
msgid "Preferences..."
msgstr "首选项..."
-#: git-gui.sh:2070 git-gui.sh:2595
+#: git-gui.sh:2107 git-gui.sh:2639
msgid "Options..."
msgstr "选项..."
-#: git-gui.sh:2076 lib/choose_repository.tcl:46
+#: git-gui.sh:2113 lib/choose_repository.tcl:47
msgid "Help"
msgstr "帮助"
-#: git-gui.sh:2117
+#: git-gui.sh:2154
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 的信息: 该文件或目录不存在"
-#: git-gui.sh:2234
+#: git-gui.sh:2271
msgid "Current Branch:"
msgstr "当前分支:"
-#: git-gui.sh:2255
+#: git-gui.sh:2292
msgid "Staged Changes (Will Commit)"
msgstr "已缓存的改动 (将被提交)"
-#: git-gui.sh:2274
+#: git-gui.sh:2312
msgid "Unstaged Changes"
msgstr "未缓存的改动"
-#: git-gui.sh:2323
+#: git-gui.sh:2362
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 "上传"
-#: git-gui.sh:2369
+#: git-gui.sh:2408
msgid "Initial Commit Message:"
msgstr "初始的提交描述:"
-#: git-gui.sh:2370
+#: git-gui.sh:2409
msgid "Amended Commit Message:"
msgstr "修正的提交描述:"
-#: git-gui.sh:2371
+#: git-gui.sh:2410
msgid "Amended Initial Commit Message:"
msgstr "修正的初始提交描述:"
-#: git-gui.sh:2372
+#: git-gui.sh:2411
msgid "Amended Merge Commit Message:"
msgstr "修正的合并提交描述:"
-#: git-gui.sh:2373
+#: git-gui.sh:2412
msgid "Merge Commit Message:"
msgstr "合并提交描述:"
-#: git-gui.sh:2374
+#: git-gui.sh:2413
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 "全部复制"
-#: git-gui.sh:2443 lib/blame.tcl:104
+#: git-gui.sh:2483 lib/blame.tcl:107
msgid "File:"
msgstr "文件:"
-#: git-gui.sh:2545
-msgid "Refresh"
-msgstr "刷新"
-
-#: git-gui.sh:2566
+#: git-gui.sh:2589
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 "显示更少上下文"
-#: git-gui.sh:2588
+#: git-gui.sh:2602
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 "从提交中撤除修改块"
-#: git-gui.sh:2604
+#: git-gui.sh:2648
msgid "Stage Hunk For Commit"
msgstr "缓存修改块为提交"
-#: git-gui.sh:2623
+#: git-gui.sh:2667
msgid "Initializing..."
msgstr "初始化..."
-#: git-gui.sh:2718
+#: git-gui.sh:2762
#, tcl-format
msgid ""
"Possible environment issues exist.\n"
@@ -464,7 +464,7 @@ msgstr ""
"由 %s 执行的 Git 子进程可能忽略下列环境变量:\n"
"\n"
-#: git-gui.sh:2748
+#: git-gui.sh:2792
msgid ""
"\n"
"This is due to a known issue with the\n"
@@ -474,7 +474,7 @@ msgstr ""
"这是由 Cygwin 发布的 Tcl 代码中一个\n"
"已知问题所引起."
-#: git-gui.sh:2753
+#: git-gui.sh:2797
#, tcl-format
msgid ""
"\n"
@@ -489,7 +489,7 @@ msgstr ""
"%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 的图形化用户界面"
@@ -501,56 +501,56 @@ msgstr "文件查看器"
msgid "Commit:"
msgstr "提交:"
-#: lib/blame.tcl:249
+#: lib/blame.tcl:264
msgid "Copy Commit"
msgstr "复制提交"
-#: lib/blame.tcl:369
+#: lib/blame.tcl:384
#, tcl-format
msgid "Reading %s..."
msgstr "读取 %s..."
-#: lib/blame.tcl:473
+#: lib/blame.tcl:488
msgid "Loading copy/move tracking annotations..."
msgstr "装载复制/移动跟踪标注..."
-#: lib/blame.tcl:493
+#: lib/blame.tcl:508
msgid "lines annotated"
msgstr "标注行"
-#: lib/blame.tcl:674
+#: lib/blame.tcl:689
msgid "Loading original location annotations..."
msgstr "装载原始位置标注..."
-#: lib/blame.tcl:677
+#: lib/blame.tcl:692
msgid "Annotation complete."
msgstr "标注完成."
-#: lib/blame.tcl:731
+#: lib/blame.tcl:746
msgid "Loading annotation..."
msgstr "裝載标注..."
-#: lib/blame.tcl:787
+#: lib/blame.tcl:802
msgid "Author:"
msgstr "作者:"
-#: lib/blame.tcl:791
+#: lib/blame.tcl:806
msgid "Committer:"
msgstr "提交者:"
-#: lib/blame.tcl:796
+#: lib/blame.tcl:811
msgid "Original File:"
msgstr "原始文件:"
-#: lib/blame.tcl:910
+#: lib/blame.tcl:925
msgid "Originally By:"
msgstr "最初由:"
-#: lib/blame.tcl:916
+#: lib/blame.tcl:931
msgid "In File:"
msgstr "在文件:"
-#: lib/blame.tcl:921
+#: lib/blame.tcl:936
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
-#: 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 "取消"
-#: lib/branch_checkout.tcl:32 lib/browser.tcl:286
+#: lib/branch_checkout.tcl:32 lib/browser.tcl:287
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 "选项..."
@@ -593,7 +593,7 @@ 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 "新建"
@@ -733,22 +733,22 @@ 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..."
-#: lib/browser.tcl:186
+#: lib/browser.tcl:187
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 "浏览分支文件"
-#: 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 "浏览"
@@ -762,7 +762,7 @@ msgstr "获取 %s 自 %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 "关闭"
@@ -819,6 +819,10 @@ msgstr ""
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)."
@@ -844,7 +848,7 @@ msgstr ""
"\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"
@@ -863,7 +867,7 @@ msgstr "恢复丢失的提交是比较困难的."
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 "图示"
@@ -892,15 +896,15 @@ msgstr "选择"
msgid "Font Family"
msgstr "字体族"
-#: lib/choose_font.tcl:73
+#: lib/choose_font.tcl:74
msgid "Font Size"
msgstr "字体大小"
-#: lib/choose_font.tcl:90
+#: lib/choose_font.tcl:91
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."
@@ -908,226 +912,226 @@ msgstr ""
"这是样例文本.\n"
"如果你喜欢, 你可以设置该字体."
-#: lib/choose_repository.tcl:27
+#: lib/choose_repository.tcl:28
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 "创建新的版本库"
-#: lib/choose_repository.tcl:86
+#: lib/choose_repository.tcl:87
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 "克隆已有版本库"
-#: lib/choose_repository.tcl:99
+#: lib/choose_repository.tcl:100
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 "打开已有版本库"
-#: lib/choose_repository.tcl:112
+#: lib/choose_repository.tcl:113
msgid "Open..."
msgstr "打开..."
-#: lib/choose_repository.tcl:125
+#: lib/choose_repository.tcl:126
msgid "Recent Repositories"
msgstr "最近版本库"
-#: lib/choose_repository.tcl:131
+#: lib/choose_repository.tcl:132
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:"
-#: lib/choose_repository.tcl:385 lib/choose_repository.tcl:486
+#: lib/choose_repository.tcl:381 lib/choose_repository.tcl:478
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 版本库"
-#: lib/choose_repository.tcl:430 lib/choose_repository.tcl:437
+#: lib/choose_repository.tcl:437
#, 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 已经存在."
-#: lib/choose_repository.tcl:463
+#: lib/choose_repository.tcl:455
msgid "Clone"
msgstr "克隆"
-#: lib/choose_repository.tcl:476
+#: lib/choose_repository.tcl:468
msgid "URL:"
msgstr "URL:"
-#: lib/choose_repository.tcl:496
+#: lib/choose_repository.tcl:489
msgid "Clone Type:"
msgstr "克隆类型:"
-#: lib/choose_repository.tcl:502
+#: lib/choose_repository.tcl:495
msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
msgstr "标准方式 (快速, 部分备份, 作硬连接)"
-#: lib/choose_repository.tcl:508
+#: lib/choose_repository.tcl:501
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 "共享方式 (最快, 不推荐, 不做备份)"
-#: 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"
-#: lib/choose_repository.tcl:586
+#: lib/choose_repository.tcl:579
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 "共享方式仅当是本地版本库时有效."
-#: 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"
-#: lib/choose_repository.tcl:629
+#: lib/choose_repository.tcl:627
msgid "Counting objects"
msgstr "清点对象"
-#: lib/choose_repository.tcl:630
+#: lib/choose_repository.tcl:628
#, 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"
-#: lib/choose_repository.tcl:690
+#: lib/choose_repository.tcl:688
#, 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'分支尚未初始化."
-#: lib/choose_repository.tcl:705
+#: lib/choose_repository.tcl:703
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 克隆"
-#: lib/choose_repository.tcl:748
+#: lib/choose_repository.tcl:746
msgid "Copying objects"
msgstr "复制 objects"
-#: lib/choose_repository.tcl:749
+#: lib/choose_repository.tcl:747
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"
-#: lib/choose_repository.tcl:783
+#: lib/choose_repository.tcl:781
msgid "Linking objects"
msgstr "链接 objects"
-#: lib/choose_repository.tcl:784
+#: lib/choose_repository.tcl:782
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"
-#: lib/choose_repository.tcl:847
+#: lib/choose_repository.tcl:845
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 "无法获取标签. 请查看控制终端的输出."
-#: lib/choose_repository.tcl:882
+#: lib/choose_repository.tcl:880
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"
-#: lib/choose_repository.tcl:897
+#: lib/choose_repository.tcl:895
msgid "Clone failed."
msgstr "克隆失败."
-#: lib/choose_repository.tcl:904
+#: lib/choose_repository.tcl:902
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 为提交."
-#: lib/choose_repository.tcl:927
+#: lib/choose_repository.tcl:925
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/choose_repository.tcl:957
+#: lib/choose_repository.tcl:955
msgid "Initial file checkout failed."
msgstr "初始的文件checkout失败"
-#: lib/choose_repository.tcl:973
+#: lib/choose_repository.tcl:971
msgid "Open"
msgstr "打开"
-#: lib/choose_repository.tcl:983
+#: lib/choose_repository.tcl:981
msgid "Repository:"
msgstr "版本库"
-#: lib/choose_repository.tcl:1033
+#: lib/choose_repository.tcl:1031
#, tcl-format
msgid "Failed to open repository %s:"
msgstr "无法打开版本库 %s:"
@@ -1148,7 +1152,7 @@ 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 "标签"
@@ -1165,11 +1169,11 @@ msgstr "没有选择版本."
msgid "Revision expression is empty."
msgstr "版本表达式为空."
-#: lib/choose_rev.tcl:530
+#: lib/choose_rev.tcl:531
msgid "Updated"
msgstr "已更新"
-#: lib/choose_rev.tcl:558
+#: lib/choose_rev.tcl:559
msgid "URL"
msgstr "URL"
@@ -1276,16 +1280,46 @@ msgstr ""
"- 第二行: 空行\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 失败:"
-#: 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 似乎已损坏"
-#: lib/commit.tcl:279
+#: lib/commit.tcl:326
msgid ""
"No changes to commit.\n"
"\n"
@@ -1299,37 +1333,32 @@ msgstr ""
"\n"
"重新扫描将自动开始.\n"
-#: lib/commit.tcl:286
+#: lib/commit.tcl:333
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 失败:"
-#: lib/commit.tcl:339
+#: lib/commit.tcl:367
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"
-#: lib/console.tcl:57
+#: lib/console.tcl:59
msgid "Working... please wait..."
msgstr "工作中... 请等待..."
-#: lib/console.tcl:183
+#: lib/console.tcl:186
msgid "Success"
msgstr "成功"
-#: lib/console.tcl:196
+#: lib/console.tcl:200
msgid "Error: Command Failed"
msgstr "错误: 命令失败"
@@ -1435,23 +1464,23 @@ msgstr "* 二进制文件 (不显示内容)."
msgid "Error loading diff:"
msgstr "装载 diff 错误:"
-#: lib/diff.tcl:302
+#: lib/diff.tcl:303
msgid "Failed to unstage selected hunk."
msgstr "无法将选择的代码段从缓存中删除."
-#: lib/diff.tcl:309
+#: lib/diff.tcl:310
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 "错误"
-#: lib/error.tcl:28
+#: lib/error.tcl:36
msgid "warning"
msgstr "警告"
-#: lib/error.tcl:81
+#: lib/error.tcl:94
msgid "You must correct the above errors before committing."
msgstr "你必须在提交前修正上述错误."
@@ -1482,6 +1511,11 @@ msgstr "解锁 Index"
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"
@@ -1497,11 +1531,11 @@ msgstr "撤销文件 %s 中的改动?"
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 "任何未缓存的改动将在这次撤销中永久丢失."
-#: lib/index.tcl:392
+#: lib/index.tcl:394
msgid "Do Nothing"
msgstr "不做操作"
@@ -1562,8 +1596,8 @@ msgstr ""
"\n"
"文件 %s 已被修改.\n"
"\n"
-"你必须完成当前的提交后才能开始合并. 如果需要, 这么做将有助于"
-"中止一次失败的合并.\n"
+"你必须完成当前的提交后才能开始合并. 如果需要, 这么做将有助于中止一次失败的合"
+"并.\n"
#: lib/merge.tcl:106
#, tcl-format
@@ -1571,28 +1605,28 @@ msgid "%s of %s"
msgstr ""
#: lib/merge.tcl:119
-#, tcl-format
-msgid "Merging %s and %s"
+#, fuzzy, tcl-format
+msgid "Merging %s and %s..."
msgstr "合并 %s 和 %s"
-#: lib/merge.tcl:131
+#: lib/merge.tcl:130
msgid "Merge completed successfully."
msgstr "合并成功完成."
-#: lib/merge.tcl:133
+#: lib/merge.tcl:132
msgid "Merge failed. Conflict resolution is required."
msgstr "合并失败. 需要解决冲突."
-#: lib/merge.tcl:158
+#: lib/merge.tcl:157
#, tcl-format
msgid "Merge Into %s"
msgstr "合并到 %s"
-#: lib/merge.tcl:177
+#: lib/merge.tcl:176
msgid "Revision To Merge"
msgstr "要合并的版本"
-#: lib/merge.tcl:212
+#: lib/merge.tcl:211
msgid ""
"Cannot abort while amending.\n"
"\n"
@@ -1602,7 +1636,7 @@ msgstr ""
"\n"
"你必须先完成本次修正操作.\n"
-#: lib/merge.tcl:222
+#: lib/merge.tcl:221
msgid ""
"Abort merge?\n"
"\n"
@@ -1616,7 +1650,7 @@ msgstr ""
"\n"
"是否要继续中止当前的合并操作?"
-#: lib/merge.tcl:228
+#: lib/merge.tcl:227
msgid ""
"Reset changes?\n"
"\n"
@@ -1630,93 +1664,107 @@ msgstr ""
"\n"
"是否要继续复位当前的改动?"
-#: lib/merge.tcl:239
+#: lib/merge.tcl:238
msgid "Aborting"
msgstr "中止"
-#: lib/merge.tcl:266
+#: lib/merge.tcl:238
+#, fuzzy
+msgid "files reset"
+msgstr "文件"
+
+#: lib/merge.tcl:265
msgid "Abort failed."
msgstr "中止失败"
-#: lib/merge.tcl:268
+#: lib/merge.tcl:267
msgid "Abort completed. Ready."
msgstr "中止完成. 就绪."
-#: lib/option.tcl:82
+#: lib/option.tcl:95
msgid "Restore Defaults"
msgstr "恢复默认值"
-#: lib/option.tcl:86
+#: lib/option.tcl:99
msgid "Save"
msgstr "保存"
-#: lib/option.tcl:96
+#: lib/option.tcl:109
#, tcl-format
msgid "%s Repository"
msgstr "%s 版本库"
-#: lib/option.tcl:97
+#: lib/option.tcl:110
msgid "Global (All Repositories)"
msgstr "全局 (所有版本库)"
-#: lib/option.tcl:103
+#: lib/option.tcl:116
msgid "User Name"
msgstr "用户名"
-#: lib/option.tcl:104
+#: lib/option.tcl:117
msgid "Email Address"
msgstr "Email 地址"
-#: lib/option.tcl:106
+#: lib/option.tcl:119
msgid "Summarize Merge Commits"
msgstr "概述合并提交:"
-#: lib/option.tcl:107
+#: lib/option.tcl:120
msgid "Merge Verbosity"
msgstr "合并冗余度"
-#: lib/option.tcl:108
+#: lib/option.tcl:121
msgid "Show Diffstat After Merge"
msgstr "在合并后显示 Diffstat"
-#: lib/option.tcl:110
+#: lib/option.tcl:123
msgid "Trust File Modification Timestamps"
msgstr "相信文件的改动时间"
-#: lib/option.tcl:111
+#: lib/option.tcl:124
msgid "Prune Tracking Branches During Fetch"
msgstr "获取时清除跟踪分支"
-#: lib/option.tcl:112
+#: lib/option.tcl:125
msgid "Match Tracking Branches"
msgstr "匹配跟踪分支"
-#: lib/option.tcl:113
+#: lib/option.tcl:126
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 "新建分支命名模板"
-#: lib/option.tcl:176
+#: lib/option.tcl:192
+msgid "Spelling Dictionary:"
+msgstr ""
+
+#: lib/option.tcl:216
msgid "Change Font"
msgstr "更改字体"
-#: lib/option.tcl:180
+#: lib/option.tcl:220
#, tcl-format
msgid "Choose %s"
msgstr "选择 %s"
-#: lib/option.tcl:186
+#: lib/option.tcl:226
msgid "pt."
msgstr "磅"
-#: lib/option.tcl:200
+#: lib/option.tcl:240
msgid "Preferences"
msgstr "首选项"
-#: lib/option.tcl:235
+#: lib/option.tcl:275
msgid "Failed to completely save options:"
msgstr "无法完全保存选项:"
@@ -1823,6 +1871,43 @@ 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%%)"