{"thread":{"id":"12141","subject":"[PATCH] git-gui: (i18n) Add newly added translation strings to template.","startedAt":"2008-02-16T20:56:22Z","lastAt":"2008-02-17T07:27:26Z","messageCount":3,"participants":["Christian Stimming","Shawn O. Pearce"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"68933","messageId":"200802162156.23436.stimming@tuhh.de","threadId":"12141","inReplyTo":null,"subject":"[PATCH] git-gui: (i18n) Add newly added translation strings to template.","fromName":"Christian Stimming","fromEmail":"stimming@tuhh.de","sentAt":"2008-02-16T20:56:22Z","receivedAt":"2008-02-16T20:56:22Z","isPatch":true,"sender":{"key":"stimming@tuhh.de","avatar":"https://avatars.githubusercontent.com/u/227778?v=4"},"body":"And markup one missing string for translation.\n\nSigned-off-by: Christian Stimming <stimming@tuhh.de>\n---\n\n lib/spellcheck.tcl |    4 ++--\n po/git-gui.pot     |   32 ++++++++++++++++++++++++++++----\n 2 files changed, 30 insertions(+), 6 deletions(-)\n\ndiff --git a/lib/spellcheck.tcl b/lib/spellcheck.tcl\nindex 7f018e4..a67a5f7 100644\n--- a/lib/spellcheck.tcl\n+++ b/lib/spellcheck.tcl\n@@ -333,11 +333,11 @@ method _read {} {\n \tfconfigure $s_fd -block 1\n \tif {[eof $s_fd]} {\n \t\tif {![catch {close $s_fd} err]} {\n-\t\t\tset err [mc \"unexpected eof from aspell\"]\n+\t\t\tset err [mc \"Unexpected EOF from aspell\"]\n \t\t}\n \t\tcatch {after cancel $s_i}\n \t\t$w_text tag remove misspelled 1.0 end\n-\t\terror_popup [strcat \"Spell Checker Failed\" \"\\n\\n\" $err]\n+\t\terror_popup [strcat [mc \"Spell Checker Failed\"] \"\\n\\n\" $err]\n \t\treturn\n \t}\n \tfconfigure $s_fd -block 0\ndiff --git a/po/git-gui.pot b/po/git-gui.pot\nindex 3f139da..2e33284 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: 2008-02-02 10:14+0100\\n\"\n+\"POT-Creation-Date: 2008-02-16 21:24+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@@ -1474,10 +1474,10 @@ msgstr \"\"\n \n #: lib/merge.tcl:119\n #, tcl-format\n-msgid \"Merging %s and %s\"\n+msgid \"Merging %s and %s...\"\n msgstr \"\"\n \n-#: lib/merge.tcl:131\n+#: lib/merge.tcl:130\n msgid \"Merge completed successfully.\"\n msgstr \"\"\n \n@@ -1592,7 +1592,11 @@ msgstr \"\"\n msgid \"New Branch Name Template\"\n msgstr \"\"\n \n-#: lib/option.tcl:176\n+#: lib/option.tcl:191\n+msgid \"Spelling Dictionary:\"\n+msgstr \"\"\n+\n+#: lib/option.tcl:215\n msgid \"Change Font\"\n msgstr \"\"\n \n@@ -1709,6 +1713,26 @@ msgstr \"\"\n msgid \"Cannot write icon:\"\n msgstr \"\"\n \n+#: lib/spellcheck.tcl:37\n+msgid \"Not connected to aspell\"\n+msgstr \"\"\n+\n+#: lib/spellcheck.tcl:41\n+msgid \"Unrecognized aspell version\"\n+msgstr \"\"\n+\n+#: lib/spellcheck.tcl:135\n+msgid \"No Suggestions\"\n+msgstr \"\"\n+\n+#: lib/spellcheck.tcl:336\n+msgid \"Unexpected EOF from aspell\"\n+msgstr \"\"\n+\n+#: lib/spellcheck.tcl:340\n+msgid \"Spell Checker Failed\"\n+msgstr \"\"\n+\n #: lib/status_bar.tcl:83\n #, tcl-format\n msgid \"%s ... %*i of %*i %s (%3i%%)\"\n-- \n1.5.4.2.g41ac4\n"},{"id":"68934","messageId":"200802162158.22924.stimming@tuhh.de","threadId":"12141","inReplyTo":"200802162156.23436.stimming@tuhh.de","subject":"[PATCH] git-gui: Update German translation.","fromName":"Christian Stimming","fromEmail":"stimming@tuhh.de","sentAt":"2008-02-16T20:58:22Z","receivedAt":"2008-02-16T20:58:22Z","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---\nAttached this and previous patch as tarball because of \nwhitespace yadda yadda :-)\n\n po/de.po          |   70 +++++++++++++++++++++++++++++++++++-----------------\n po/glossary/de.po |    4 +-\n 2 files changed, 49 insertions(+), 25 deletions(-)\n\ndiff --git a/po/de.po b/po/de.po\nindex d7c38f9..e84e1c7 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: 2008-02-02 10:14+0100\\n\"\n-\"PO-Revision-Date: 2008-02-02 10:18+0100\\n\"\n+\"POT-Creation-Date: 2008-02-16 21:24+0100\\n\"\n+\"PO-Revision-Date: 2008-02-16 21:52+0100\\n\"\n \"Last-Translator: Christian Stimming <stimming@tuhh.de>\\n\"\n \"Language-Team: German\\n\"\n \"MIME-Version: 1.0\\n\"\n@@ -653,7 +653,7 @@ msgstr \"Lokale Zweige\"\n \n #: lib/branch_delete.tcl:52\n msgid \"Delete Only If Merged Into\"\n-msgstr \"Nur löschen, wenn darin zusammengeführt\"\n+msgstr \"Nur löschen, wenn zusammengeführt nach\"\n \n #: lib/branch_delete.tcl:54\n msgid \"Always (Do not perform merge test.)\"\n@@ -1292,19 +1292,19 @@ 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+msgstr \"Aufrufen der Vor-Eintragen-Kontrolle...\"\n \n #: lib/commit.tcl:236\n msgid \"Commit declined by pre-commit hook.\"\n-msgstr \"\"\n+msgstr \"Eintragen abgelehnt durch Vor-Eintragen-Kontrolle (»pre-commit hook«).\"\n \n #: lib/commit.tcl:259\n msgid \"Calling commit-msg hook...\"\n-msgstr \"\"\n+msgstr \"Aufrufen der Versionsbeschreibungs-Kontrolle...\"\n \n #: lib/commit.tcl:274\n msgid \"Commit declined by commit-msg hook.\"\n-msgstr \"\"\n+msgstr \"Eintragen abgelehnt durch Versionsbeschreibungs-Kontrolle (»commit-message hook«).\"\n \n #: lib/commit.tcl:287\n msgid \"Committing changes...\"\n@@ -1389,7 +1389,7 @@ msgstr \"Festplattenplatz von komprimierten Objekten\"\n \n #: lib/database.tcl:48\n msgid \"Packed objects waiting for pruning\"\n-msgstr \"Komprimierte Objekte, die zum Entfernen vorgesehen sind\"\n+msgstr \"Komprimierte Objekte, die zum Aufräumen vorgesehen sind\"\n \n #: lib/database.tcl:49\n msgid \"Garbage files\"\n@@ -1622,10 +1622,10 @@ msgstr \"%s von %s\"\n \n #: lib/merge.tcl:119\n #, tcl-format\n-msgid \"Merging %s and %s\"\n-msgstr \"Zusammenführen von %s und %s\"\n+msgid \"Merging %s and %s...\"\n+msgstr \"Zusammenführen von %s und %s...\"\n \n-#: lib/merge.tcl:131\n+#: lib/merge.tcl:130\n msgid \"Merge completed successfully.\"\n msgstr \"Zusammenführen erfolgreich abgeschlossen.\"\n \n@@ -1636,7 +1636,7 @@ msgstr \"Zusammenführen fehlgeschlagen. Konfliktauflösung ist notwendig.\"\n #: lib/merge.tcl:158\n #, tcl-format\n msgid \"Merge Into %s\"\n-msgstr \"Zusammenführen in %s\"\n+msgstr \"Zusammenführen in »%s«\"\n \n #: lib/merge.tcl:177\n msgid \"Revision To Merge\"\n@@ -1741,7 +1741,7 @@ msgstr \"Auf Dateiänderungsdatum verlassen\"\n \n #: lib/option.tcl:111\n msgid \"Prune Tracking Branches During Fetch\"\n-msgstr \"Übernahmezweige entfernen während Anforderung\"\n+msgstr \"Übernahmezweige aufräumen während Anforderung\"\n \n #: lib/option.tcl:112\n msgid \"Match Tracking Branches\"\n@@ -1755,7 +1755,11 @@ msgstr \"Anzahl der Kontextzeilen beim Vergleich\"\n msgid \"New Branch Name Template\"\n msgstr \"Namensvorschlag für neue Zweige\"\n \n-#: lib/option.tcl:176\n+#: lib/option.tcl:191\n+msgid \"Spelling Dictionary:\"\n+msgstr \"Wörterbuch Rechtschreibprüfung:\"\n+\n+#: lib/option.tcl:215\n msgid \"Change Font\"\n msgstr \"Schriftart ändern\"\n \n@@ -1778,11 +1782,11 @@ msgstr \"Optionen konnten nicht gespeichert werden:\"\n \n #: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34\n msgid \"Delete Remote Branch\"\n-msgstr \"Zweig aus anderem Projektarchiv löschen\"\n+msgstr \"Zweig in anderem Projektarchiv löschen\"\n \n #: lib/remote_branch_delete.tcl:47\n msgid \"From Repository\"\n-msgstr \"Von Projektarchiv\"\n+msgstr \"In Projektarchiv\"\n \n #: lib/remote_branch_delete.tcl:50 lib/transport.tcl:123\n msgid \"Remote:\"\n@@ -1790,7 +1794,7 @@ msgstr \"Anderes Archiv:\"\n \n #: lib/remote_branch_delete.tcl:66 lib/transport.tcl:138\n msgid \"Arbitrary URL:\"\n-msgstr \"Kommunikation mit URL:\"\n+msgstr \"Archiv-URL:\"\n \n #: lib/remote_branch_delete.tcl:84\n msgid \"Branches\"\n@@ -1798,11 +1802,11 @@ msgstr \"Zweige\"\n \n #: lib/remote_branch_delete.tcl:109\n msgid \"Delete Only If\"\n-msgstr \"Löschen, falls\"\n+msgstr \"Nur löschen, wenn\"\n \n #: lib/remote_branch_delete.tcl:111\n msgid \"Merged Into:\"\n-msgstr \"Zusammenführen mit:\"\n+msgstr \"Zusammengeführt mit:\"\n \n #: lib/remote_branch_delete.tcl:119\n msgid \"Always (Do not perform merge checks)\"\n@@ -1864,7 +1868,7 @@ msgstr \"»%s« laden...\"\n \n #: lib/remote.tcl:165\n msgid \"Prune from\"\n-msgstr \"Entfernen von\"\n+msgstr \"Aufräumen von\"\n \n #: lib/remote.tcl:170\n msgid \"Fetch from\"\n@@ -1882,6 +1886,26 @@ msgstr \"Fehler beim Schreiben der Verknüpfung:\"\n msgid \"Cannot write icon:\"\n msgstr \"Fehler beim Erstellen des Icons:\"\n \n+#: lib/spellcheck.tcl:37\n+msgid \"Not connected to aspell\"\n+msgstr \"Keine Verbindung zu »aspell«\"\n+\n+#: lib/spellcheck.tcl:41\n+msgid \"Unrecognized aspell version\"\n+msgstr \"Unbekannte Version von »aspell«\"\n+\n+#: lib/spellcheck.tcl:135\n+msgid \"No Suggestions\"\n+msgstr \"Keine Vorschläge\"\n+\n+#: lib/spellcheck.tcl:336\n+msgid \"Unexpected EOF from aspell\"\n+msgstr \"Unerwartetes EOF von »aspell«\"\n+\n+#: lib/spellcheck.tcl:340\n+msgid \"Spell Checker Failed\"\n+msgstr \"Rechtschreibprüfung fehlgeschlagen\"\n+\n #: lib/status_bar.tcl:83\n #, tcl-format\n msgid \"%s ... %*i of %*i %s (%3i%%)\"\n@@ -1900,12 +1924,12 @@ msgstr \"Neue Änderungen von »%s« holen\"\n #: lib/transport.tcl:18\n #, tcl-format\n msgid \"remote prune %s\"\n-msgstr \"Entfernen von »%s« aus anderem Archiv\"\n+msgstr \"Aufräumen von »%s«\"\n \n #: lib/transport.tcl:19\n #, tcl-format\n msgid \"Pruning tracking branches deleted from %s\"\n-msgstr \"Übernahmezweige entfernen, die in »%s« gelöscht wurden\"\n+msgstr \"Übernahmezweige aufräumen und entfernen, die in »%s« gelöscht wurden\"\n \n #: lib/transport.tcl:25 lib/transport.tcl:71\n #, tcl-format\n@@ -1928,7 +1952,7 @@ msgstr \"Zweige versenden\"\n \n #: lib/transport.tcl:103\n msgid \"Source Branches\"\n-msgstr \"Herkunftszweige\"\n+msgstr \"Lokale Zweige\"\n \n #: lib/transport.tcl:120\n msgid \"Destination Repository\"\ndiff --git a/po/glossary/de.po b/po/glossary/de.po\nindex 0b33c57..35764d1 100644\n--- a/po/glossary/de.po\n+++ b/po/glossary/de.po\n@@ -7,7 +7,7 @@ msgid \"\"\n msgstr \"\"\n \"Project-Id-Version: git-gui glossary\\n\"\n \"POT-Creation-Date: 2008-01-07 21:20+0100\\n\"\n-\"PO-Revision-Date: 2008-01-15 20:32+0100\\n\"\n+\"PO-Revision-Date: 2008-02-16 21:48+0100\\n\"\n \"Last-Translator: Christian Stimming <stimming@tuhh.de>\\n\"\n \"Language-Team: German \\n\"\n \"MIME-Version: 1.0\\n\"\n@@ -114,7 +114,7 @@ msgstr \"Beschreibung (Meldung?, Nachricht?; Source Safe: Kommentar)\"\n \n #. \"Deletes all stale tracking branches under <name>. These stale branches have already been removed from the remote repository referenced by <name>, but are still locally available in 'remotes/<name>'.\"\n msgid \"prune\"\n-msgstr \"entfernen\"\n+msgstr \"aufräumen (entfernen?)\"\n \n #. \"Pulling a branch means to fetch it and merge it.\"\n msgid \"pull\"\n-- \n1.5.4.2.g41ac4\n\n"},{"id":"68953","messageId":"20080217072726.GN24004@spearce.org","threadId":"12141","inReplyTo":"200802162158.22924.stimming@tuhh.de","subject":"Re: [PATCH] git-gui: Update German translation.","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2008-02-17T07:27:26Z","receivedAt":"2008-02-17T07:27:26Z","isPatch":true,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Christian Stimming <stimming@tuhh.de> wrote:\n> Signed-off-by: Christian Stimming <stimming@tuhh.de>\n> ---\n> Attached this and previous patch as tarball because of \n> whitespace yadda yadda :-)\n\nI really don't mind getting i18n patches to the po/*.po files as\ncompressed attachments, because the whitespace and or character\nencodings often do get messed up and the patch doesn't apply.\nBetter to just work with the attachment that I know is good.\n\nBut please don't tar it.  I spent waaaay too much time tonight\nbecause I kept missing the fact that git-am won't accept a .tgz.\nMaybe I'm just really tired.  :)\n\nUsually just attached .patch works, or gzip the .patch.  But please\ndon't tar it if you are going to the trouble of sending one patch\nper email anyway.  Thanks.\n \n>  po/de.po          |   70 +++++++++++++++++++++++++++++++++++-----------------\n>  po/glossary/de.po |    4 +-\n>  2 files changed, 49 insertions(+), 25 deletions(-)\n\n-- \nShawn.\n"}]}