{"thread":{"id":"11833","subject":"[PATCH] [git-gui] i18n: Fix a bunch of still untranslated strings.","startedAt":"2008-02-02T09:20:17Z","lastAt":"2008-02-04T02:25:00Z","messageCount":3,"participants":["Christian Stimming","Shawn O. Pearce"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"67093","messageId":"200802021020.18017.stimming@tuhh.de","threadId":"11833","inReplyTo":null,"subject":"[PATCH] [git-gui] i18n: Fix a bunch of still untranslated strings.","fromName":"Christian Stimming","fromEmail":"stimming@tuhh.de","sentAt":"2008-02-02T09:20:17Z","receivedAt":"2008-02-02T09:20:17Z","isPatch":true,"sender":{"key":"stimming@tuhh.de","avatar":"https://avatars.githubusercontent.com/u/227778?v=4"},"body":"\nI'm unsure about the hunk in lib/index.tcl, though - this\nmight have to be rewritten. All others are rather trivial.\n\nSigned-off-by: Christian Stimming <stimming@tuhh.de>\n---\n lib/checkout_op.tcl |    6 ++--\n lib/commit.tcl      |   16 +++++-----\n lib/index.tcl       |    2 +-\n lib/merge.tcl       |    5 +--\n po/git-gui.pot      |   82 ++++++++++++++++++++++++++++++++++++--------------\n 5 files changed, 73 insertions(+), 38 deletions(-)\n\ndiff --git a/lib/checkout_op.tcl b/lib/checkout_op.tcl\nindex f243966..6e14117 100644\n--- a/lib/checkout_op.tcl\n+++ b/lib/checkout_op.tcl\n@@ -280,7 +280,7 @@ The rescan will be automatically started now.\n \t} elseif {[is_config_true gui.trustmtime]} {\n \t\t_readtree $this\n \t} else {\n-\t\tui_status {Refreshing file status...}\n+\t\tui_status [mc \"Refreshing file status...\"]\n \t\tset fd [git_read update-index \\\n \t\t\t-q \\\n \t\t\t--unmerged \\\n@@ -320,7 +320,7 @@ method _readtree {} {\n \tset readtree_d {}\n \t$::main_status start \\\n \t\t[mc \"Updating working directory to '%s'...\" [_name $this]] \\\n-\t\t{files checked out}\n+\t\t[mc \"files checked out\"]\n \n \tset fd [git_read --stderr read-tree \\\n \t\t-m \\\n@@ -447,7 +447,7 @@ If you wanted to be on a branch, create one now starting from 'This Detached Che\n \t} else {\n \t\trepository_state commit_type HEAD MERGE_HEAD\n \t\tset PARENT $HEAD\n-\t\tui_status \"Checked out '$name'.\"\n+\t\tui_status [mc \"Checked out '%s'.\" $name]\n \t}\n \tdelete_this\n }\ndiff --git a/lib/commit.tcl b/lib/commit.tcl\nindex 947b201..40a7103 100644\n--- a/lib/commit.tcl\n+++ b/lib/commit.tcl\n@@ -218,7 +218,7 @@ A good commit message has the following format:\n \t\treturn\n \t}\n \n-\tui_status {Calling pre-commit hook...}\n+\tui_status [mc \"Calling pre-commit hook...\"]\n \tset pch_error {}\n \tfconfigure $fd_ph -blocking 0 -translation binary -eofchar {}\n \tfileevent $fd_ph readable \\\n@@ -233,7 +233,7 @@ proc commit_prehook_wait {fd_ph curHEAD msg_p} {\n \tif {[eof $fd_ph]} {\n \t\tif {[catch {close $fd_ph}]} {\n \t\t\tcatch {file delete $msg_p}\n-\t\t\tui_status {Commit declined by pre-commit hook.}\n+\t\t\tui_status [mc \"Commit declined by pre-commit hook.\"]\n \t\t\thook_failed_popup pre-commit $pch_error\n \t\t\tunlock_index\n \t\t} else {\n@@ -256,7 +256,7 @@ proc commit_commitmsg {curHEAD msg_p} {\n \t\treturn\n \t}\n \n-\tui_status {Calling commit-msg hook...}\n+\tui_status [mc \"Calling commit-msg hook...\"]\n \tset pch_error {}\n \tfconfigure $fd_ph -blocking 0 -translation binary -eofchar {}\n \tfileevent $fd_ph readable \\\n@@ -271,7 +271,7 @@ proc commit_commitmsg_wait {fd_ph curHEAD msg_p} {\n \tif {[eof $fd_ph]} {\n \t\tif {[catch {close $fd_ph}]} {\n \t\t\tcatch {file delete $msg_p}\n-\t\t\tui_status {Commit declined by commit-msg hook.}\n+\t\t\tui_status [mc \"Commit declined by commit-msg hook.\"]\n \t\t\thook_failed_popup commit-msg $pch_error\n \t\t\tunlock_index\n \t\t} else {\n@@ -284,7 +284,7 @@ proc commit_commitmsg_wait {fd_ph curHEAD msg_p} {\n }\n \n proc commit_writetree {curHEAD msg_p} {\n-\tui_status {Committing changes...}\n+\tui_status [mc \"Committing changes...\"]\n \tset fd_wt [git_read write-tree]\n \tfileevent $fd_wt readable \\\n \t\t[list commit_committree $fd_wt $curHEAD $msg_p]\n@@ -301,7 +301,7 @@ proc commit_committree {fd_wt curHEAD msg_p} {\n \tif {[catch {close $fd_wt} err]} {\n \t\tcatch {file delete $msg_p}\n \t\terror_popup [strcat [mc \"write-tree failed:\"] \"\\n\\n$err\"]\n-\t\tui_status {Commit failed.}\n+\t\tui_status [mc \"Commit failed.\"]\n \t\tunlock_index\n \t\treturn\n \t}\n@@ -345,7 +345,7 @@ A rescan will be automatically started now.\n \tif {[catch {set cmt_id [eval git $cmd]} err]} {\n \t\tcatch {file delete $msg_p}\n \t\terror_popup [strcat [mc \"commit-tree failed:\"] \"\\n\\n$err\"]\n-\t\tui_status {Commit failed.}\n+\t\tui_status [mc \"Commit failed.\"]\n \t\tunlock_index\n \t\treturn\n \t}\n@@ -365,7 +365,7 @@ A rescan will be automatically started now.\n \t\t} err]} {\n \t\tcatch {file delete $msg_p}\n \t\terror_popup [strcat [mc \"update-ref failed:\"] \"\\n\\n$err\"]\n-\t\tui_status {Commit failed.}\n+\t\tui_status [mc \"Commit failed.\"]\n \t\tunlock_index\n \t\treturn\n \t}\ndiff --git a/lib/index.tcl b/lib/index.tcl\nindex 30a244c..3c1fce7 100644\n--- a/lib/index.tcl\n+++ b/lib/index.tcl\n@@ -310,7 +310,7 @@ proc add_helper {txt paths} {\n \t\tupdate_index \\\n \t\t\t$txt \\\n \t\t\t$pathList \\\n-\t\t\t[concat $after {ui_status {Ready to commit.}}]\n+\t\t\t[concat $after {ui_status [mc \"Ready to commit.\"]}]\n \t}\n }\n \ndiff --git a/lib/merge.tcl b/lib/merge.tcl\nindex 63e1427..cc26b07 100644\n--- a/lib/merge.tcl\n+++ b/lib/merge.tcl\n@@ -116,8 +116,7 @@ method _start {} {\n \tlappend cmd HEAD\n \tlappend cmd $name\n \n-\tset msg [mc \"Merging %s and %s\" $current_branch $stitle]\n-\tui_status \"$msg...\"\n+\tui_status [mc \"Merging %s and %s...\" $current_branch $stitle]\n \tset cons [console::new [mc \"Merge\"] \"merge $stitle\"]\n \tconsole::exec $cons $cmd [cb _finish $cons]\n \n@@ -236,7 +235,7 @@ Continue with resetting the current changes?\"]\n \t\tset fd [git_read --stderr read-tree --reset -u -v HEAD]\n \t\tfconfigure $fd -blocking 0 -translation binary\n \t\tfileevent $fd readable [namespace code [list _reset_wait $fd]]\n-\t\t$::main_status start [mc \"Aborting\"] {files reset}\n+\t\t$::main_status start [mc \"Aborting\"] [mc \"files reset\"]\n \t} else {\n \t\tunlock_index\n \t}\ndiff --git a/po/git-gui.pot b/po/git-gui.pot\nindex dfa48ae..3f139da 100644\n--- a/po/git-gui.pot\n+++ b/po/git-gui.pot\n@@ -8,7 +8,7 @@ msgid \"\"\n msgstr \"\"\n \"Project-Id-Version: PACKAGE VERSION\\n\"\n \"Report-Msgid-Bugs-To: \\n\"\n-\"POT-Creation-Date: 2007-11-24 10:36+0100\\n\"\n+\"POT-Creation-Date: 2008-02-02 10:14+0100\\n\"\n \"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\\n\"\n \"Last-Translator: FULL NAME <EMAIL@ADDRESS>\\n\"\n \"Language-Team: LANGUAGE <LL@li.org>\\n\"\n@@ -386,31 +386,31 @@ msgstr \"\"\n msgid \"File:\"\n msgstr \"\"\n \n-#: git-gui.sh:2545\n-msgid \"Refresh\"\n+#: git-gui.sh:2573\n+msgid \"Apply/Reverse Hunk\"\n msgstr \"\"\n \n-#: git-gui.sh:2566\n-msgid \"Apply/Reverse Hunk\"\n+#: git-gui.sh:2579\n+msgid \"Show Less Context\"\n msgstr \"\"\n \n-#: git-gui.sh:2572\n-msgid \"Decrease Font Size\"\n+#: git-gui.sh:2586\n+msgid \"Show More Context\"\n msgstr \"\"\n \n-#: git-gui.sh:2576\n-msgid \"Increase Font Size\"\n+#: git-gui.sh:2594\n+msgid \"Refresh\"\n msgstr \"\"\n \n-#: git-gui.sh:2581\n-msgid \"Show Less Context\"\n+#: git-gui.sh:2615\n+msgid \"Decrease Font Size\"\n msgstr \"\"\n \n-#: git-gui.sh:2588\n-msgid \"Show More Context\"\n+#: git-gui.sh:2619\n+msgid \"Increase Font Size\"\n msgstr \"\"\n \n-#: git-gui.sh:2602\n+#: git-gui.sh:2630\n msgid \"Unstage Hunk From Commit\"\n msgstr \"\"\n \n@@ -766,6 +766,10 @@ msgstr \"\"\n msgid \"Updating working directory to '%s'...\"\n msgstr \"\"\n \n+#: lib/checkout_op.tcl:323\n+msgid \"files checked out\"\n+msgstr \"\"\n+\n #: lib/checkout_op.tcl:353\n #, tcl-format\n msgid \"Aborted checkout of '%s' (file level merging is required).\"\n@@ -1182,11 +1186,40 @@ msgid \"\"\n \"- Remaining lines: Describe why this change is good.\\n\"\n msgstr \"\"\n \n-#: lib/commit.tcl:257\n+#: lib/commit.tcl:207\n+#, tcl-format\n+msgid \"warning: Tcl does not support encoding '%s'.\"\n+msgstr \"\"\n+\n+#: lib/commit.tcl:221\n+msgid \"Calling pre-commit hook...\"\n+msgstr \"\"\n+\n+#: lib/commit.tcl:236\n+msgid \"Commit declined by pre-commit hook.\"\n+msgstr \"\"\n+\n+#: lib/commit.tcl:259\n+msgid \"Calling commit-msg hook...\"\n+msgstr \"\"\n+\n+#: lib/commit.tcl:274\n+msgid \"Commit declined by commit-msg hook.\"\n+msgstr \"\"\n+\n+#: lib/commit.tcl:287\n+msgid \"Committing changes...\"\n+msgstr \"\"\n+\n+#: lib/commit.tcl:303\n msgid \"write-tree failed:\"\n msgstr \"\"\n \n-#: lib/commit.tcl:275\n+#: lib/commit.tcl:304 lib/commit.tcl:348 lib/commit.tcl:368\n+msgid \"Commit failed.\"\n+msgstr \"\"\n+\n+#: lib/commit.tcl:321\n #, tcl-format\n msgid \"Commit %s appears to be corrupt\"\n msgstr \"\"\n@@ -1204,12 +1237,7 @@ msgstr \"\"\n msgid \"No changes to commit.\"\n msgstr \"\"\n \n-#: lib/commit.tcl:303\n-#, tcl-format\n-msgid \"warning: Tcl does not support encoding '%s'.\"\n-msgstr \"\"\n-\n-#: lib/commit.tcl:317\n+#: lib/commit.tcl:347\n msgid \"commit-tree failed:\"\n msgstr \"\"\n \n@@ -1373,6 +1401,10 @@ msgstr \"\"\n msgid \"Unstaging %s from commit\"\n msgstr \"\"\n \n+#: lib/index.tcl:313\n+msgid \"Ready to commit.\"\n+msgstr \"\"\n+\n #: lib/index.tcl:326\n #, tcl-format\n msgid \"Adding %s\"\n@@ -1491,7 +1523,11 @@ msgstr \"\"\n msgid \"Aborting\"\n msgstr \"\"\n \n-#: lib/merge.tcl:266\n+#: lib/merge.tcl:238\n+msgid \"files reset\"\n+msgstr \"\"\n+\n+#: lib/merge.tcl:265\n msgid \"Abort failed.\"\n msgstr \"\"\n \n-- \n1.5.4.rc4\n"},{"id":"67094","messageId":"200802021021.38566.stimming@tuhh.de","threadId":"11833","inReplyTo":"200802021020.18017.stimming@tuhh.de","subject":"[PATCH] [git-gui] Update German translation.","fromName":"Christian Stimming","fromEmail":"stimming@tuhh.de","sentAt":"2008-02-02T09:21:38Z","receivedAt":"2008-02-02T09:21:38Z","isPatch":true,"sender":{"key":"stimming@tuhh.de","avatar":"https://avatars.githubusercontent.com/u/227778?v=4"},"body":"Signed-off-by: Christian Stimming <stimming@tuhh.de>\n---\nAlso attached as gzip because of whitespace yadda yadda.\n\n po/de.po |  129 ++++++++++++++++++++++++++++++++++++++++++-------------------\n 1 files changed, 89 insertions(+), 40 deletions(-)\n\ndiff --git a/po/de.po b/po/de.po\nindex 2dfe07e..d7c38f9 100644\n--- a/po/de.po\n+++ b/po/de.po\n@@ -7,8 +7,8 @@ msgid \"\"\n msgstr \"\"\n \"Project-Id-Version: git-gui\\n\"\n \"Report-Msgid-Bugs-To: \\n\"\n-\"POT-Creation-Date: 2007-11-24 10:36+0100\\n\"\n-\"PO-Revision-Date: 2008-01-15 20:33+0100\\n\"\n+\"POT-Creation-Date: 2008-02-02 10:14+0100\\n\"\n+\"PO-Revision-Date: 2008-02-02 10:18+0100\\n\"\n \"Last-Translator: Christian Stimming <stimming@tuhh.de>\\n\"\n \"Language-Team: German\\n\"\n \"MIME-Version: 1.0\\n\"\n@@ -343,7 +343,9 @@ msgstr \"Online-Dokumentation\"\n #: git-gui.sh:2201\n #, tcl-format\n msgid \"fatal: cannot stat path %s: No such file or directory\"\n-msgstr \"Fehler: Verzeichnis »%s« kann nicht gelesen werden: Datei oder Verzeichnis nicht gefunden\"\n+msgstr \"\"\n+\"Fehler: Verzeichnis »%s« kann nicht gelesen werden: Datei oder Verzeichnis \"\n+\"nicht gefunden\"\n \n #: git-gui.sh:2234\n msgid \"Current Branch:\"\n@@ -371,19 +373,19 @@ msgstr \"Erste Versionsbeschreibung:\"\n \n #: git-gui.sh:2370\n msgid \"Amended Commit Message:\"\n-msgstr \"Nachgebesserte Versionsbeschreibung:\"\n+msgstr \"Nachgebesserte Beschreibung:\"\n \n #: git-gui.sh:2371\n msgid \"Amended Initial Commit Message:\"\n-msgstr \"Nachgebesserte erste Versionsbeschreibung:\"\n+msgstr \"Nachgebesserte erste Beschreibung:\"\n \n #: git-gui.sh:2372\n msgid \"Amended Merge Commit Message:\"\n-msgstr \"Nachgebesserte Zusammenführungs-Versionsbeschreibung:\"\n+msgstr \"Nachgebesserte Zusammenführungs-Beschreibung:\"\n \n #: git-gui.sh:2373\n msgid \"Merge Commit Message:\"\n-msgstr \"Zusammenführungs-Versionsbeschreibung:\"\n+msgstr \"Zusammenführungs-Beschreibung:\"\n \n #: git-gui.sh:2374\n msgid \"Commit Message:\"\n@@ -397,31 +399,31 @@ msgstr \"Alle kopieren\"\n msgid \"File:\"\n msgstr \"Datei:\"\n \n-#: git-gui.sh:2545\n-msgid \"Refresh\"\n-msgstr \"Aktualisieren\"\n-\n-#: git-gui.sh:2566\n+#: git-gui.sh:2573\n msgid \"Apply/Reverse Hunk\"\n msgstr \"Kontext anwenden/umkehren\"\n \n-#: git-gui.sh:2572\n-msgid \"Decrease Font Size\"\n-msgstr \"Schriftgröße verkleinern\"\n-\n-#: git-gui.sh:2576\n-msgid \"Increase Font Size\"\n-msgstr \"Schriftgröße vergrößern\"\n-\n-#: git-gui.sh:2581\n+#: git-gui.sh:2579\n msgid \"Show Less Context\"\n msgstr \"Weniger Zeilen anzeigen\"\n \n-#: git-gui.sh:2588\n+#: git-gui.sh:2586\n msgid \"Show More Context\"\n msgstr \"Mehr Zeilen anzeigen\"\n \n-#: git-gui.sh:2602\n+#: git-gui.sh:2594\n+msgid \"Refresh\"\n+msgstr \"Aktualisieren\"\n+\n+#: git-gui.sh:2615\n+msgid \"Decrease Font Size\"\n+msgstr \"Schriftgröße verkleinern\"\n+\n+#: git-gui.sh:2619\n+msgid \"Increase Font Size\"\n+msgstr \"Schriftgröße vergrößern\"\n+\n+#: git-gui.sh:2630\n msgid \"Unstage Hunk From Commit\"\n msgstr \"Kontext aus Bereitstellung herausnehmen\"\n \n@@ -542,7 +544,7 @@ msgstr \"Kopiert oder verschoben durch:\"\n \n #: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19\n msgid \"Checkout Branch\"\n-msgstr \"Zweig umstellen\"\n+msgstr \"Auf Zweig umstellen\"\n \n #: lib/branch_checkout.tcl:23\n msgid \"Checkout\"\n@@ -805,11 +807,15 @@ msgstr \"\"\n msgid \"Updating working directory to '%s'...\"\n msgstr \"Arbeitskopie umstellen auf »%s«...\"\n \n+#: lib/checkout_op.tcl:323\n+msgid \"files checked out\"\n+msgstr \"Dateien aktualisiert\"\n+\n #: lib/checkout_op.tcl:353\n #, tcl-format\n msgid \"Aborted checkout of '%s' (file level merging is required).\"\n msgstr \"\"\n-\"Zweig umstellen von »%s« abgebrochen (Zusammenführen der Dateien ist \"\n+\"Auf Zweig »%s« umstellen abgebrochen (Zusammenführen der Dateien ist \"\n \"notwendig).\"\n \n #: lib/checkout_op.tcl:354\n@@ -1069,15 +1075,21 @@ msgstr \"Für Objekt konnte kein Hardlink erstellt werden: %s\"\n \n #: lib/choose_repository.tcl:847\n msgid \"Cannot fetch branches and objects.  See console output for details.\"\n-msgstr \"Zweige und Objekte konnten nicht angefordert werden.  Kontrollieren Sie die Ausgaben auf der Konsole für weitere Angaben.\"\n+msgstr \"\"\n+\"Zweige und Objekte konnten nicht angefordert werden.  Kontrollieren Sie die \"\n+\"Ausgaben auf der Konsole für weitere Angaben.\"\n \n #: lib/choose_repository.tcl:858\n msgid \"Cannot fetch tags.  See console output for details.\"\n-msgstr \"Markierungen konnten nicht angefordert werden.  Kontrollieren Sie die Ausgaben auf der Konsole für weitere Angaben.\"\n+msgstr \"\"\n+\"Markierungen konnten nicht angefordert werden.  Kontrollieren Sie die \"\n+\"Ausgaben auf der Konsole für weitere Angaben.\"\n \n #: lib/choose_repository.tcl:882\n msgid \"Cannot determine HEAD.  See console output for details.\"\n-msgstr \"Die Zweigspitze (HEAD) konnte nicht gefunden werden.  Kontrollieren Sie die Ausgaben auf der Konsole für weitere Angaben.\"\n+msgstr \"\"\n+\"Die Zweigspitze (HEAD) konnte nicht gefunden werden.  Kontrollieren Sie die \"\n+\"Ausgaben auf der Konsole für weitere Angaben.\"\n \n #: lib/choose_repository.tcl:891\n #, tcl-format\n@@ -1273,11 +1285,40 @@ msgstr \"\"\n \"\\n\"\n \"- Rest: Eine ausführliche Beschreibung, warum diese Änderung hilfreich ist.\\n\"\n \n-#: lib/commit.tcl:257\n+#: lib/commit.tcl:207\n+#, tcl-format\n+msgid \"warning: Tcl does not support encoding '%s'.\"\n+msgstr \"Warning: Tcl/Tk unterstützt die Zeichencodierung »%s« nicht.\"\n+\n+#: lib/commit.tcl:221\n+msgid \"Calling pre-commit hook...\"\n+msgstr \"\"\n+\n+#: lib/commit.tcl:236\n+msgid \"Commit declined by pre-commit hook.\"\n+msgstr \"\"\n+\n+#: lib/commit.tcl:259\n+msgid \"Calling commit-msg hook...\"\n+msgstr \"\"\n+\n+#: lib/commit.tcl:274\n+msgid \"Commit declined by commit-msg hook.\"\n+msgstr \"\"\n+\n+#: lib/commit.tcl:287\n+msgid \"Committing changes...\"\n+msgstr \"Änderungen eintragen...\"\n+\n+#: lib/commit.tcl:303\n msgid \"write-tree failed:\"\n msgstr \"write-tree fehlgeschlagen:\"\n \n-#: lib/commit.tcl:275\n+#: lib/commit.tcl:304 lib/commit.tcl:348 lib/commit.tcl:368\n+msgid \"Commit failed.\"\n+msgstr \"Eintragen fehlgeschlagen.\"\n+\n+#: lib/commit.tcl:321\n #, tcl-format\n msgid \"Commit %s appears to be corrupt\"\n msgstr \"Version »%s« scheint beschädigt zu sein\"\n@@ -1301,12 +1342,7 @@ msgstr \"\"\n msgid \"No changes to commit.\"\n msgstr \"Keine Änderungen, die eingetragen werden können.\"\n \n-#: lib/commit.tcl:303\n-#, tcl-format\n-msgid \"warning: Tcl does not support encoding '%s'.\"\n-msgstr \"Warning: Tcl/Tk unterstützt die Zeichencodierung »%s« nicht.\"\n-\n-#: lib/commit.tcl:317\n+#: lib/commit.tcl:347\n msgid \"commit-tree failed:\"\n msgstr \"commit-tree fehlgeschlagen:\"\n \n@@ -1440,7 +1476,8 @@ msgstr \"Fehler beim Laden des Vergleichs:\"\n \n #: lib/diff.tcl:302\n msgid \"Failed to unstage selected hunk.\"\n-msgstr \"Fehler beim Herausnehmen des gewählten Kontexts aus der Bereitstellung.\"\n+msgstr \"\"\n+\"Fehler beim Herausnehmen des gewählten Kontexts aus der Bereitstellung.\"\n \n #: lib/diff.tcl:309\n msgid \"Failed to stage selected hunk.\"\n@@ -1471,7 +1508,10 @@ msgstr \"Fehler in Bereitstellung\"\n msgid \"\"\n \"Updating the Git index failed.  A rescan will be automatically started to \"\n \"resynchronize git-gui.\"\n-msgstr \"Das Aktualisieren der Git-Bereitstellung ist fehlgeschlagen. Eine allgemeine Git-Aktualisierung wird jetzt gestartet, um git-gui wieder mit git zu synchronisieren.\"\n+msgstr \"\"\n+\"Das Aktualisieren der Git-Bereitstellung ist fehlgeschlagen. Eine allgemeine \"\n+\"Git-Aktualisierung wird jetzt gestartet, um git-gui wieder mit git zu \"\n+\"synchronisieren.\"\n \n #: lib/index.tcl:27\n msgid \"Continue\"\n@@ -1486,6 +1526,10 @@ msgstr \"Bereitstellung freigeben\"\n msgid \"Unstaging %s from commit\"\n msgstr \"Datei »%s« aus der Bereitstellung herausnehmen\"\n \n+#: lib/index.tcl:313\n+msgid \"Ready to commit.\"\n+msgstr \"Bereit zum Eintragen.\"\n+\n #: lib/index.tcl:326\n #, tcl-format\n msgid \"Adding %s\"\n@@ -1503,7 +1547,8 @@ msgstr \"Änderungen in den gewählten %i Dateien verwerfen?\"\n \n #: lib/index.tcl:389\n msgid \"Any unstaged changes will be permanently lost by the revert.\"\n-msgstr \"Alle nicht bereitgestellten Änderungen werden beim Verwerfen verloren gehen.\"\n+msgstr \"\"\n+\"Alle nicht bereitgestellten Änderungen werden beim Verwerfen verloren gehen.\"\n \n #: lib/index.tcl:392\n msgid \"Do Nothing\"\n@@ -1641,7 +1686,11 @@ msgstr \"\"\n msgid \"Aborting\"\n msgstr \"Abbruch\"\n \n-#: lib/merge.tcl:266\n+#: lib/merge.tcl:238\n+msgid \"files reset\"\n+msgstr \"Dateien zurückgesetzt\"\n+\n+#: lib/merge.tcl:265\n msgid \"Abort failed.\"\n msgstr \"Abbruch fehlgeschlagen.\"\n \n-- \n1.5.4.rc4\n\n"},{"id":"67312","messageId":"20080204022500.GK24004@spearce.org","threadId":"11833","inReplyTo":"200802021020.18017.stimming@tuhh.de","subject":"Re: [PATCH] [git-gui] i18n: Fix a bunch of still untranslated strings.","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2008-02-04T02:25:00Z","receivedAt":"2008-02-04T02:25:00Z","isPatch":true,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Christian Stimming <stimming@tuhh.de> wrote:\n> \n> I'm unsure about the hunk in lib/index.tcl, though - this\n> might have to be rewritten. All others are rather trivial.\n\nThat hunk should be OK.  The [mc] call is happening later on,\nas we eval the script in {} at the global level while we try\nto invoke rescan.\n\nThanks.\n \n-- \nShawn.\n"}]}