{"thread":{"id":"13346","subject":"[PATCH] gitk: Update German translation","startedAt":"2008-05-01T19:42:09Z","lastAt":"2008-05-25T21:57:08Z","messageCount":15,"participants":["Christian Stimming","Stephan Beyer","Paul Mackerras"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"75779","messageId":"200805012142.10151.stimming@tuhh.de","threadId":"13346","inReplyTo":null,"subject":"[PATCH] gitk: Update German translation","fromName":"Christian Stimming","fromEmail":"stimming@tuhh.de","sentAt":"2008-05-01T19:42:09Z","receivedAt":"2008-05-01T19:42:09Z","isPatch":true,"sender":{"key":"stimming@tuhh.de","avatar":"https://avatars.githubusercontent.com/u/227778?v=4"},"body":"Attached to avoid whitespace problems. This patch is against master of \ngitk.git at git.kernel.org.\n\nBy the way, the following two keybinding explanations seem ambiguous to me:\n\n>   <Home>  Move to first commit\n>   <End>   Move to last commit\n\nWhat happens is that <home> jumps to the newest commit and <end> jumps to the \noldest commit. Whether the \"first\" commit should be the newest or the oldest \nis, well, somewhat ambiguous. I'd propose to talk about the newest or topmost \ncommit, but rather not about the \"first\".\n\nRegards,\n\nChristian\n\n\nFrom 73e062a073c429f199af84d855c784b94a70220f Mon Sep 17 00:00:00 2001\nFrom: Christian Stimming <stimming@tuhh.de>\nDate: Thu, 1 May 2008 21:38:37 +0200\nSubject: [PATCH] gitk: Update German translation\n\n---\n po/de.po |  505 +++++++++++++++++++++++++++++++++++++++++---------------------\n 1 files changed, 338 insertions(+), 167 deletions(-)\n\ndiff --git a/po/de.po b/po/de.po\nindex 5ee2fca..58b342a 100644\n--- a/po/de.po\n+++ b/po/de.po\n@@ -7,249 +7,253 @@ msgid \"\"\n msgstr \"\"\n \"Project-Id-Version: git-gui\\n\"\n \"Report-Msgid-Bugs-To: \\n\"\n-\"POT-Creation-Date: 2008-01-09 22:20+0100\\n\"\n-\"PO-Revision-Date: 2008-01-09 22:21+0100\\n\"\n+\"POT-Creation-Date: 2008-05-01 11:54+0200\\n\"\n+\"PO-Revision-Date: 2008-05-01 21:32+0200\\n\"\n \"Last-Translator: Christian Stimming <stimming@tuhh.de>\\n\"\n \"Language-Team: German\\n\"\n \"MIME-Version: 1.0\\n\"\n \"Content-Type: text/plain; charset=UTF-8\\n\"\n \"Content-Transfer-Encoding: 8bit\\n\"\n \n-#: gitk:101\n+#: gitk:111\n msgid \"Error executing git rev-list:\"\n msgstr \"Fehler beim Ausf��hren von git-rev-list:\"\n \n-#: gitk:114\n+#: gitk:124\n msgid \"Reading\"\n msgstr \"Lesen\"\n \n-#: gitk:141 gitk:2143\n+#: gitk:151 gitk:2191\n msgid \"Reading commits...\"\n msgstr \"Versionen lesen...\"\n \n-#: gitk:264\n+#: gitk:275\n msgid \"Can't parse git log output:\"\n msgstr \"Git log Ausgabe kann nicht erkannt werden:\"\n \n-#: gitk:375 gitk:2147\n+#: gitk:386 gitk:2195\n msgid \"No commits selected\"\n msgstr \"Keine Versionen ausgew��hlt.\"\n \n-#: gitk:486\n+#: gitk:500\n msgid \"No commit information available\"\n msgstr \"Keine Versionsinformation verf��gbar\"\n \n-#: gitk:585 gitk:607 gitk:1908 gitk:6366 gitk:7866 gitk:8020\n+#: gitk:599 gitk:621 gitk:1955 gitk:6424 gitk:7924 gitk:8083\n msgid \"OK\"\n msgstr \"Ok\"\n \n-#: gitk:609 gitk:1909 gitk:6046 gitk:6117 gitk:6218 gitk:6264 gitk:6368\n-#: gitk:7867 gitk:8021\n+#: gitk:623 gitk:1956 gitk:6108 gitk:6179 gitk:6276 gitk:6322 gitk:6426\n+#: gitk:7925 gitk:8084\n msgid \"Cancel\"\n msgstr \"Abbrechen\"\n \n-#: gitk:646\n+#: gitk:661\n msgid \"File\"\n msgstr \"Datei\"\n \n-#: gitk:648\n+#: gitk:663\n msgid \"Update\"\n msgstr \"Aktualisieren\"\n \n-#: gitk:649\n+#: gitk:664\n msgid \"Reread references\"\n msgstr \"Zweige neu laden\"\n \n-#: gitk:650\n+#: gitk:665\n msgid \"List references\"\n msgstr \"Zweige auflisten\"\n \n-#: gitk:651\n+#: gitk:666\n msgid \"Quit\"\n msgstr \"Beenden\"\n \n-#: gitk:653\n+#: gitk:668\n msgid \"Edit\"\n msgstr \"Bearbeiten\"\n \n-#: gitk:654\n+#: gitk:669\n msgid \"Preferences\"\n msgstr \"Einstellungen\"\n \n-#: gitk:657\n+#: gitk:672 gitk:1892\n msgid \"View\"\n msgstr \"Ansicht\"\n \n-#: gitk:658\n+#: gitk:673\n msgid \"New view...\"\n msgstr \"Neue Ansicht...\"\n \n-#: gitk:659 gitk:2085 gitk:8651\n+#: gitk:674 gitk:2133 gitk:8723\n msgid \"Edit view...\"\n msgstr \"Ansicht bearbeiten...\"\n \n-#: gitk:661 gitk:2086 gitk:8652\n+#: gitk:676 gitk:2134 gitk:8724\n msgid \"Delete view\"\n msgstr \"Ansicht l��schen\"\n \n-#: gitk:663\n+#: gitk:678\n msgid \"All files\"\n msgstr \"Alle Dateien\"\n \n-#: gitk:667\n+#: gitk:682\n msgid \"Help\"\n msgstr \"Hilfe\"\n \n-#: gitk:668 gitk:1280\n+#: gitk:683 gitk:1317\n msgid \"About gitk\"\n msgstr \"��ber gitk\"\n \n-#: gitk:669\n+#: gitk:684\n msgid \"Key bindings\"\n msgstr \"Tastenk��rzel\"\n \n-#: gitk:726\n+#: gitk:741\n msgid \"SHA1 ID: \"\n msgstr \"SHA1:\"\n \n-#: gitk:776\n+#: gitk:791\n msgid \"Find\"\n msgstr \"Suche\"\n \n-#: gitk:777\n+#: gitk:792\n msgid \"next\"\n msgstr \"n��chste\"\n \n-#: gitk:778\n+#: gitk:793\n msgid \"prev\"\n msgstr \"vorige\"\n \n-#: gitk:779\n+#: gitk:794\n msgid \"commit\"\n msgstr \"Version\"\n \n-#: gitk:782 gitk:784 gitk:2308 gitk:2331 gitk:2355 gitk:4257 gitk:4320\n+#: gitk:797 gitk:799 gitk:2356 gitk:2379 gitk:2403 gitk:4306 gitk:4369\n msgid \"containing:\"\n msgstr \"enthaltend:\"\n \n-#: gitk:785 gitk:1741 gitk:1746 gitk:2383\n+#: gitk:800 gitk:1778 gitk:1783 gitk:2431\n msgid \"touching paths:\"\n msgstr \"Pfad betreffend:\"\n \n-#: gitk:786 gitk:2388\n+#: gitk:801 gitk:2436\n msgid \"adding/removing string:\"\n msgstr \"String dazu/l��schen:\"\n \n-#: gitk:795 gitk:797\n+#: gitk:810 gitk:812\n msgid \"Exact\"\n msgstr \"Exakt\"\n \n-#: gitk:797 gitk:2466 gitk:4225\n+#: gitk:812 gitk:2514 gitk:4274\n msgid \"IgnCase\"\n msgstr \"Kein Gro��/Klein\"\n \n-#: gitk:797 gitk:2357 gitk:2464 gitk:4221\n+#: gitk:812 gitk:2405 gitk:2512 gitk:4270\n msgid \"Regexp\"\n msgstr \"Regexp\"\n \n-#: gitk:799 gitk:800 gitk:2485 gitk:2515 gitk:2522 gitk:4331 gitk:4387\n+#: gitk:814 gitk:815 gitk:2533 gitk:2563 gitk:2570 gitk:4380 gitk:4436\n msgid \"All fields\"\n msgstr \"Alle Felder\"\n \n-#: gitk:800 gitk:2483 gitk:2515 gitk:4287\n+#: gitk:815 gitk:2531 gitk:2563 gitk:4336\n msgid \"Headline\"\n msgstr \"��berschrift\"\n \n-#: gitk:801 gitk:2483 gitk:4287 gitk:4387 gitk:4775\n+#: gitk:816 gitk:2531 gitk:4336 gitk:4436 gitk:4827\n msgid \"Comments\"\n msgstr \"Beschreibung\"\n \n-#: gitk:801 gitk:2483 gitk:2487 gitk:2522 gitk:4287 gitk:4711 gitk:5895\n-#: gitk:5910\n+#: gitk:816 gitk:2531 gitk:2535 gitk:2570 gitk:4336 gitk:4763 gitk:5957\n+#: gitk:5972\n msgid \"Author\"\n msgstr \"Autor\"\n \n-#: gitk:801 gitk:2483 gitk:4287 gitk:4713\n+#: gitk:816 gitk:2531 gitk:4336 gitk:4765\n msgid \"Committer\"\n msgstr \"Eintragender\"\n \n-#: gitk:829\n+#: gitk:845\n msgid \"Search\"\n msgstr \"Suche\"\n \n-#: gitk:836\n+#: gitk:852\n msgid \"Diff\"\n msgstr \"Vergleich\"\n \n-#: gitk:838\n+#: gitk:854\n msgid \"Old version\"\n msgstr \"Alte Version\"\n \n-#: gitk:840\n+#: gitk:856\n msgid \"New version\"\n msgstr \"Neue Version\"\n \n-#: gitk:842\n+#: gitk:858\n msgid \"Lines of context\"\n msgstr \"Kontextzeilen\"\n \n-#: gitk:900\n+#: gitk:868\n+msgid \"Ignore space change\"\n+msgstr \"Leerzeichen��nderungen ignorieren\"\n+\n+#: gitk:926\n msgid \"Patch\"\n msgstr \"Patch\"\n \n-#: gitk:902\n+#: gitk:928\n msgid \"Tree\"\n msgstr \"Baum\"\n \n-#: gitk:1018 gitk:1033 gitk:5961\n+#: gitk:1053 gitk:1068 gitk:6023\n msgid \"Diff this -> selected\"\n msgstr \"Vergleich diese -> gew��hlte\"\n \n-#: gitk:1020 gitk:1035 gitk:5962\n+#: gitk:1055 gitk:1070 gitk:6024\n msgid \"Diff selected -> this\"\n msgstr \"Vergleich gew��hlte -> diese\"\n \n-#: gitk:1022 gitk:1037 gitk:5963\n+#: gitk:1057 gitk:1072 gitk:6025\n msgid \"Make patch\"\n msgstr \"Patch erstellen\"\n \n-#: gitk:1023 gitk:6101\n+#: gitk:1058 gitk:6163\n msgid \"Create tag\"\n msgstr \"Markierung erstellen\"\n \n-#: gitk:1024 gitk:6198\n+#: gitk:1059 gitk:6256\n msgid \"Write commit to file\"\n msgstr \"Version in Datei schreiben\"\n \n-#: gitk:1025 gitk:6252\n+#: gitk:1060 gitk:6310\n msgid \"Create new branch\"\n msgstr \"Neuen Zweig erstellen\"\n \n-#: gitk:1026\n+#: gitk:1061\n msgid \"Cherry-pick this commit\"\n msgstr \"Diese Version pfl��cken\"\n \n-#: gitk:1028\n+#: gitk:1063\n msgid \"Reset HEAD branch to here\"\n msgstr \"HEAD-Zweig auf diese Version zur��cksetzen\"\n \n-#: gitk:1044\n+#: gitk:1079\n msgid \"Check out this branch\"\n msgstr \"Auf diesen Zweig umstellen\"\n \n-#: gitk:1046\n+#: gitk:1081\n msgid \"Remove this branch\"\n msgstr \"Zweig l��schen\"\n \n-#: gitk:1052\n+#: gitk:1087\n msgid \"Highlight this too\"\n msgstr \"Diesen auch hervorheben\"\n \n-#: gitk:1054\n+#: gitk:1089\n msgid \"Highlight this only\"\n msgstr \"Nur diesen hervorheben\"\n \n-#: gitk:1281\n+#: gitk:1318\n msgid \"\"\n \"\\n\"\n \"Gitk - a commit viewer for git\\n\"\n@@ -267,262 +271,425 @@ msgstr \"\"\n \"License\\n\"\n \"        \"\n \n-#: gitk:1289 gitk:1350 gitk:6524\n+#: gitk:1326 gitk:1387 gitk:6582\n msgid \"Close\"\n msgstr \"Schlie��en\"\n \n-#: gitk:1308\n+#: gitk:1345\n msgid \"Gitk key bindings\"\n msgstr \"Gitk Tastaturbelegung\"\n \n-#: gitk:1858\n+#: gitk:1347\n+msgid \"Gitk key bindings:\"\n+msgstr \"Gitk Tastaturbelegung:\"\n+\n+#: gitk:1349\n+#, tcl-format\n+msgid \"<%s-Q>\\t\\tQuit\"\n+msgstr \"<%s-Q>\\t\\tBeenden\"\n+\n+#: gitk:1350\n+msgid \"<Home>\\t\\tMove to first commit\"\n+msgstr \"<Pos1>\\t\\tZur neuesten Version springen\"\n+\n+#: gitk:1351\n+msgid \"<End>\\t\\tMove to last commit\"\n+msgstr \"<Ende>\\t\\tZur ��ltesten Version springen\"\n+\n+#: gitk:1352\n+msgid \"<Up>, p, i\\tMove up one commit\"\n+msgstr \"<Hoch>, p, i\\tN��chste neuere Version\"\n+\n+#: gitk:1353\n+msgid \"<Down>, n, k\\tMove down one commit\"\n+msgstr \"<Runter>, n, k\\tN��chste ��ltere Version\"\n+\n+#: gitk:1354\n+msgid \"<Left>, z, j\\tGo back in history list\"\n+msgstr \"<Links>, z, j\\tEine Version zur��ck gehen\"\n+\n+#: gitk:1355\n+msgid \"<Right>, x, l\\tGo forward in history list\"\n+msgstr \"<Rechts>, x, l\\tEine Version nach vorne gehen\"\n+\n+#: gitk:1356\n+msgid \"<PageUp>\\tMove up one page in commit list\"\n+msgstr \"<BildHoch>\\tEine Seite nach oben bl��ttern\"\n+\n+#: gitk:1357\n+msgid \"<PageDown>\\tMove down one page in commit list\"\n+msgstr \"<BildRunter>\\tEine Seite nach unten bl��ttern\"\n+\n+#: gitk:1358\n+#, tcl-format\n+msgid \"<%s-Home>\\tScroll to top of commit list\"\n+msgstr \"<%s-Pos1>\\tZum oberen Ende der Versionsliste bl��ttern\"\n+\n+#: gitk:1359\n+#, tcl-format\n+msgid \"<%s-End>\\tScroll to bottom of commit list\"\n+msgstr \"<%s-Ende>\\tZum unteren Ende der Versionsliste bl��ttern\"\n+\n+#: gitk:1360\n+#, tcl-format\n+msgid \"<%s-Up>\\tScroll commit list up one line\"\n+msgstr \"<%s-Hoch>\\tVersionsliste eine Zeile nach oben bl��ttern\"\n+\n+#: gitk:1361\n+#, tcl-format\n+msgid \"<%s-Down>\\tScroll commit list down one line\"\n+msgstr \"<%s-Runter>\\tVersionsliste eine Zeile nach unten bl��ttern\"\n+\n+#: gitk:1362\n+#, tcl-format\n+msgid \"<%s-PageUp>\\tScroll commit list up one page\"\n+msgstr \"<%s-BildHoch>\\tVersionsliste eine Seite hoch bl��ttern\"\n+\n+#: gitk:1363\n+#, tcl-format\n+msgid \"<%s-PageDown>\\tScroll commit list down one page\"\n+msgstr \"<%s-BildRunter>\\tVersionsliste eine Seite nach unten bl��ttern\"\n+\n+#: gitk:1364\n+msgid \"<Shift-Up>\\tFind backwards (upwards, later commits)\"\n+msgstr \"<Umschalt-Hoch>\\tR��ckw��rts suchen (nach oben; neuere Versionen)\"\n+\n+#: gitk:1365\n+msgid \"<Shift-Down>\\tFind forwards (downwards, earlier commits)\"\n+msgstr \"<Umschalt-Runter> Suchen (nach unten; ��ltere Versionen)\"\n+\n+#: gitk:1366\n+msgid \"<Delete>, b\\tScroll diff view up one page\"\n+msgstr \"<Entf>, b\\t\\tVergleich eine Seite nach oben bl��ttern\"\n+\n+#: gitk:1367\n+msgid \"<Backspace>\\tScroll diff view up one page\"\n+msgstr \"<L��schtaste>\\tVergleich eine Seite nach oben bl��ttern\"\n+\n+#: gitk:1368\n+msgid \"<Space>\\t\\tScroll diff view down one page\"\n+msgstr \"<Leertaste>\\tVergleich eine Seite nach unten bl��ttern\"\n+\n+#: gitk:1369\n+msgid \"u\\t\\tScroll diff view up 18 lines\"\n+msgstr \"u\\t\\tVergleich um 18 Zeilen nach oben (��up��) bl��ttern\"\n+\n+#: gitk:1370\n+msgid \"d\\t\\tScroll diff view down 18 lines\"\n+msgstr \"d\\t\\tVergleich um 18 Zeilen nach unten (��down��) bl��ttern\"\n+\n+#: gitk:1371\n+#, tcl-format\n+msgid \"<%s-F>\\t\\tFind\"\n+msgstr \"<%s-F>\\t\\tSuchen\"\n+\n+#: gitk:1372\n+#, tcl-format\n+msgid \"<%s-G>\\t\\tMove to next find hit\"\n+msgstr \"<%s-G>\\t\\tWeitersuchen\"\n+\n+#: gitk:1373\n+msgid \"<Return>\\tMove to next find hit\"\n+msgstr \"<Eingabetaste>\\tWeitersuchen\"\n+\n+#: gitk:1374\n+msgid \"/\\t\\tMove to next find hit, or redo find\"\n+msgstr \"/\\t\\tWeitersuchen oder neue Suche beginnen\"\n+\n+#: gitk:1375\n+msgid \"?\\t\\tMove to previous find hit\"\n+msgstr \"?\\t\\tR��ckw��rts weitersuchen\"\n+\n+#: gitk:1376\n+msgid \"f\\t\\tScroll diff view to next file\"\n+msgstr \"f\\t\\tVergleich zur n��chsten Datei (��file��) bl��ttern\"\n+\n+#: gitk:1377\n+#, tcl-format\n+msgid \"<%s-S>\\t\\tSearch for next hit in diff view\"\n+msgstr \"<%s-S>\\t\\tWeitersuchen im Vergleich\"\n+\n+#: gitk:1378\n+#, tcl-format\n+msgid \"<%s-R>\\t\\tSearch for previous hit in diff view\"\n+msgstr \"<%s-R>\\t\\tR��ckw��rts weitersuchen im Vergleich\"\n+\n+#: gitk:1379\n+#, tcl-format\n+msgid \"<%s-KP+>\\tIncrease font size\"\n+msgstr \"<%s-Nummerblock-Plus>\\tSchriftgr����e vergr����ern\"\n+\n+#: gitk:1380\n+#, tcl-format\n+msgid \"<%s-plus>\\tIncrease font size\"\n+msgstr \"<%s-Plus>\\tSchriftgr����e vergr����ern\"\n+\n+#: gitk:1381\n+#, tcl-format\n+msgid \"<%s-KP->\\tDecrease font size\"\n+msgstr \"<%s-Nummernblock-> Schriftgr����e verkleinern\"\n+\n+#: gitk:1382\n+#, tcl-format\n+msgid \"<%s-minus>\\tDecrease font size\"\n+msgstr \"<%s-Minus>\\tSchriftgr����e verkleinern\"\n+\n+#: gitk:1383\n+msgid \"<F5>\\t\\tUpdate\"\n+msgstr \"<F5>\\t\\tAktualisieren\"\n+\n+#: gitk:1896\n msgid \"Gitk view definition\"\n msgstr \"Gitk Ansichten\"\n \n-#: gitk:1882\n+#: gitk:1921\n msgid \"Name\"\n msgstr \"Name\"\n \n-#: gitk:1885\n+#: gitk:1924\n msgid \"Remember this view\"\n msgstr \"Diese Ansicht speichern\"\n \n-#: gitk:1889\n+#: gitk:1928\n msgid \"Commits to include (arguments to git rev-list):\"\n msgstr \"Versionen anzeigen (Argumente von git-rev-list):\"\n \n-#: gitk:1895\n+#: gitk:1935\n+msgid \"Command to generate more commits to include:\"\n+msgstr \"Versionsliste durch folgendes Kommando erzeugen lassen:\"\n+\n+#: gitk:1942\n msgid \"Enter files and directories to include, one per line:\"\n msgstr \"Folgende Dateien und Verzeichnisse anzeigen (eine pro Zeile):\"\n \n-#: gitk:1942\n+#: gitk:1989\n msgid \"Error in commit selection arguments:\"\n msgstr \"Fehler in den ausgew��hlten Versionen:\"\n \n-#: gitk:1993 gitk:2079 gitk:2535 gitk:2549 gitk:3732 gitk:8620 gitk:8621\n+#: gitk:2043 gitk:2127 gitk:2583 gitk:2597 gitk:3781 gitk:8689 gitk:8690\n msgid \"None\"\n msgstr \"Keine\"\n \n-#: gitk:2483 gitk:4287 gitk:5897 gitk:5912\n+#: gitk:2531 gitk:4336 gitk:5959 gitk:5974\n msgid \"Date\"\n msgstr \"Datum\"\n \n-#: gitk:2483 gitk:4287\n+#: gitk:2531 gitk:4336\n msgid \"CDate\"\n msgstr \"Eintragedatum\"\n \n-#: gitk:2632 gitk:2637\n+#: gitk:2680 gitk:2685\n msgid \"Descendant\"\n msgstr \"Abk��mmling\"\n \n-#: gitk:2633\n+#: gitk:2681\n msgid \"Not descendant\"\n msgstr \"Nicht Abk��mmling\"\n \n-#: gitk:2640 gitk:2645\n+#: gitk:2688 gitk:2693\n msgid \"Ancestor\"\n msgstr \"Vorg��nger\"\n \n-#: gitk:2641\n+#: gitk:2689\n msgid \"Not ancestor\"\n msgstr \"Nicht Vorg��nger\"\n \n-#: gitk:2875\n+#: gitk:2924\n msgid \"Local changes checked in to index but not committed\"\n msgstr \"Lokale ��nderungen bereitgestellt, aber nicht eingetragen\"\n \n-#: gitk:2905\n+#: gitk:2954\n msgid \"Local uncommitted changes, not checked in to index\"\n msgstr \"Lokale ��nderungen, nicht bereitgestellt\"\n \n-#: gitk:4256\n+#: gitk:4305\n msgid \"Searching\"\n msgstr \"Suchen\"\n \n-#: gitk:4715\n+#: gitk:4767\n msgid \"Tags:\"\n msgstr \"Markierungen:\"\n \n-#: gitk:4732 gitk:4738 gitk:5890\n+#: gitk:4784 gitk:4790 gitk:5952\n msgid \"Parent\"\n msgstr \"Eltern\"\n \n-#: gitk:4743\n+#: gitk:4795\n msgid \"Child\"\n msgstr \"Kind\"\n \n-#: gitk:4752\n+#: gitk:4804\n msgid \"Branch\"\n msgstr \"Zweig\"\n \n-#: gitk:4755\n+#: gitk:4807\n msgid \"Follows\"\n msgstr \"Folgt auf\"\n \n-#: gitk:4758\n+#: gitk:4810\n msgid \"Precedes\"\n msgstr \"Vorg��nger von\"\n \n-#: gitk:5040\n+#: gitk:5094\n msgid \"Error getting merge diffs:\"\n msgstr \"Fehler beim Laden des Vergleichs:\"\n \n-#: gitk:5717\n+#: gitk:5779\n msgid \"Goto:\"\n msgstr \"Gehe zu:\"\n \n-#: gitk:5719\n+#: gitk:5781\n msgid \"SHA1 ID:\"\n msgstr \"SHA1 Kennung:\"\n \n-#: gitk:5744\n+#: gitk:5806\n #, tcl-format\n msgid \"Short SHA1 id %s is ambiguous\"\n msgstr \"Kurze SHA1-Kennung ��%s�� ist mehrdeutig\"\n \n-#: gitk:5756\n+#: gitk:5818\n #, tcl-format\n msgid \"SHA1 id %s is not known\"\n msgstr \"SHA1-Kennung ��%s�� unbekannt\"\n \n-#: gitk:5758\n+#: gitk:5820\n #, tcl-format\n msgid \"Tag/Head %s is not known\"\n msgstr \"Markierung/Zweig ��%s�� ist unbekannt\"\n \n-#: gitk:5900\n+#: gitk:5962\n msgid \"Children\"\n msgstr \"Kinder\"\n \n-#: gitk:5957\n+#: gitk:6019\n #, tcl-format\n msgid \"Reset %s branch to here\"\n msgstr \"Zweig ��%s�� hierher zur��cksetzen\"\n \n-#: gitk:5988\n+#: gitk:6050\n msgid \"Top\"\n msgstr \"Oben\"\n \n-#: gitk:5989\n+#: gitk:6051\n msgid \"From\"\n msgstr \"Von\"\n \n-#: gitk:5994\n+#: gitk:6056\n msgid \"To\"\n msgstr \"bis\"\n \n-#: gitk:6017\n+#: gitk:6079\n msgid \"Generate patch\"\n msgstr \"Patch erstellen\"\n \n-#: gitk:6019\n+#: gitk:6081\n msgid \"From:\"\n msgstr \"Von:\"\n \n-#: gitk:6028\n+#: gitk:6090\n msgid \"To:\"\n msgstr \"bis:\"\n \n-#: gitk:6037\n+#: gitk:6099\n msgid \"Reverse\"\n msgstr \"Umgekehrt\"\n \n-#: gitk:6039 gitk:6212\n+#: gitk:6101 gitk:6270\n msgid \"Output file:\"\n msgstr \"Ausgabedatei:\"\n \n-#: gitk:6045\n+#: gitk:6107\n msgid \"Generate\"\n msgstr \"Erzeugen\"\n \n-#: gitk:6081\n+#: gitk:6143\n msgid \"Error creating patch:\"\n msgstr \"Fehler beim Patch erzeugen:\"\n \n-#: gitk:6103 gitk:6200 gitk:6254\n+#: gitk:6165 gitk:6258 gitk:6312\n msgid \"ID:\"\n msgstr \"ID:\"\n \n-#: gitk:6112\n+#: gitk:6174\n msgid \"Tag name:\"\n msgstr \"Markierungsname:\"\n \n-#: gitk:6116 gitk:6263\n+#: gitk:6178 gitk:6321\n msgid \"Create\"\n msgstr \"Erstellen\"\n \n-#: gitk:6131\n+#: gitk:6193\n msgid \"No tag name specified\"\n msgstr \"Kein Markierungsname angegeben\"\n \n-#: gitk:6135\n+#: gitk:6197\n #, tcl-format\n msgid \"Tag \\\"%s\\\" already exists\"\n msgstr \"Markierung ��%s�� existiert bereits.\"\n \n-#: gitk:6145\n+#: gitk:6203\n msgid \"Error creating tag:\"\n msgstr \"Fehler bei Markierung erstellen:\"\n \n-#: gitk:6209\n+#: gitk:6267\n msgid \"Command:\"\n msgstr \"Kommando:\"\n \n-#: gitk:6217\n+#: gitk:6275\n msgid \"Write\"\n msgstr \"Schreiben\"\n \n-#: gitk:6233\n+#: gitk:6291\n msgid \"Error writing commit:\"\n msgstr \"Fehler beim Version eintragen:\"\n \n-#: gitk:6259\n+#: gitk:6317\n msgid \"Name:\"\n msgstr \"Name:\"\n \n-#: gitk:6278\n+#: gitk:6336\n msgid \"Please specify a name for the new branch\"\n msgstr \"Bitte geben Sie einen Namen f��r den neuen Zweig an.\"\n \n-#: gitk:6307\n+#: gitk:6365\n #, tcl-format\n msgid \"Commit %s is already included in branch %s -- really re-apply it?\"\n msgstr \"\"\n \"Version ��%s�� ist bereits im Zweig ��%s�� enthalten -- trotzdem erneut \"\n \"eintragen?\"\n \n-#: gitk:6312\n+#: gitk:6370\n msgid \"Cherry-picking\"\n msgstr \"Version pfl��cken\"\n \n-#: gitk:6324\n+#: gitk:6382\n msgid \"No changes committed\"\n msgstr \"Keine ��nderungen eingetragen\"\n \n-#: gitk:6347\n+#: gitk:6405\n msgid \"Confirm reset\"\n msgstr \"Zur��cksetzen best��tigen\"\n \n-#: gitk:6349\n+#: gitk:6407\n #, tcl-format\n msgid \"Reset branch %s to %s?\"\n msgstr \"Zweig ��%s�� auf ��%s�� zur��cksetzen?\"\n \n-#: gitk:6353\n+#: gitk:6411\n msgid \"Reset type:\"\n msgstr \"Art des Zur��cksetzens:\"\n \n-#: gitk:6357\n+#: gitk:6415\n msgid \"Soft: Leave working tree and index untouched\"\n msgstr \"Harmlos: Arbeitskopie und Bereitstellung unver��ndert\"\n \n-#: gitk:6360\n+#: gitk:6418\n msgid \"Mixed: Leave working tree untouched, reset index\"\n msgstr \"\"\n \"Gemischt: Arbeitskopie unver��ndert,\\n\"\n \"Bereitstellung zur��ckgesetzt\"\n \n-#: gitk:6363\n+#: gitk:6421\n msgid \"\"\n \"Hard: Reset working tree and index\\n\"\n \"(discard ALL local changes)\"\n@@ -530,21 +697,21 @@ msgstr \"\"\n \"Hart: Arbeitskopie und Bereitstellung\\n\"\n \"(Alle lokalen ��nderungen werden gel��scht)\"\n \n-#: gitk:6379\n+#: gitk:6437\n msgid \"Resetting\"\n msgstr \"Zur��cksetzen\"\n \n-#: gitk:6436\n+#: gitk:6494\n msgid \"Checking out\"\n msgstr \"Umstellen\"\n \n-#: gitk:6466\n+#: gitk:6524\n msgid \"Cannot delete the currently checked-out branch\"\n msgstr \"\"\n \"Der Zweig, auf den die Arbeitskopie momentan umgestellt ist, kann nicht \"\n \"gel��scht werden.\"\n \n-#: gitk:6472\n+#: gitk:6530\n #, tcl-format\n msgid \"\"\n \"The commits on branch %s aren't on any other branch.\\n\"\n@@ -553,16 +720,16 @@ msgstr \"\"\n \"Die Versionen auf Zweig ��%s�� existieren auf keinem anderen Zweig.\\n\"\n \"Zweig ��%s�� trotzdem l��schen?\"\n \n-#: gitk:6503\n+#: gitk:6561\n #, tcl-format\n msgid \"Tags and heads: %s\"\n msgstr \"Markierungen und Zweige: %s\"\n \n-#: gitk:6517\n+#: gitk:6575\n msgid \"Filter\"\n msgstr \"Filtern\"\n \n-#: gitk:6811\n+#: gitk:6869\n msgid \"\"\n \"Error reading commit topology information; branch and preceding/following \"\n \"tag information will be incomplete.\"\n@@ -570,113 +737,117 @@ msgstr \"\"\n \"Fehler beim Lesen der Strukturinformationen; Zweige und Vorg��nger/Nachfolger \"\n \"Informationen werden unvollst��ndig sein.\"\n \n-#: gitk:7795\n+#: gitk:7853\n msgid \"Tag\"\n msgstr \"Markierung\"\n \n-#: gitk:7795\n+#: gitk:7853\n msgid \"Id\"\n msgstr \"Id\"\n \n-#: gitk:7835\n+#: gitk:7893\n msgid \"Gitk font chooser\"\n msgstr \"Gitk Schriften w��hlen\"\n \n-#: gitk:7852\n+#: gitk:7910\n msgid \"B\"\n msgstr \"F\"\n \n-#: gitk:7855\n+#: gitk:7913\n msgid \"I\"\n msgstr \"K\"\n \n-#: gitk:7948\n+#: gitk:8006\n msgid \"Gitk preferences\"\n msgstr \"Gitk Einstellungen\"\n \n-#: gitk:7949\n+#: gitk:8007\n msgid \"Commit list display options\"\n msgstr \"Anzeige Versionsliste\"\n \n-#: gitk:7952\n+#: gitk:8010\n msgid \"Maximum graph width (lines)\"\n msgstr \"Maximale Graphenbreite (Zeilen)\"\n \n-#: gitk:7956\n+#: gitk:8014\n #, tcl-format\n msgid \"Maximum graph width (% of pane)\"\n msgstr \"Maximale Graphenbreite (% des Fensters)\"\n \n-#: gitk:7961\n+#: gitk:8019\n msgid \"Show local changes\"\n msgstr \"Lokale ��nderungen anzeigen\"\n \n-#: gitk:7966\n+#: gitk:8024\n+msgid \"Auto-select SHA1\"\n+msgstr \"SHA1 Hashwert automatisch markieren\"\n+\n+#: gitk:8029\n msgid \"Diff display options\"\n msgstr \"Anzeige Vergleich\"\n \n-#: gitk:7968\n+#: gitk:8031\n msgid \"Tab spacing\"\n msgstr \"Tabulatorbreite\"\n \n-#: gitk:7972\n+#: gitk:8035\n msgid \"Display nearby tags\"\n msgstr \"Naheliegende ��berschriften anzeigen\"\n \n-#: gitk:7977\n+#: gitk:8040\n msgid \"Limit diffs to listed paths\"\n msgstr \"Vergleich nur f��r angezeigte Pfade\"\n \n-#: gitk:7982\n+#: gitk:8045\n msgid \"Colors: press to choose\"\n msgstr \"Farben: Klicken zum W��hlen\"\n \n-#: gitk:7985\n+#: gitk:8048\n msgid \"Background\"\n msgstr \"Vordergrund\"\n \n-#: gitk:7989\n+#: gitk:8052\n msgid \"Foreground\"\n msgstr \"Hintergrund\"\n \n-#: gitk:7993\n+#: gitk:8056\n msgid \"Diff: old lines\"\n msgstr \"Vergleich: Alte Zeilen\"\n \n-#: gitk:7998\n+#: gitk:8061\n msgid \"Diff: new lines\"\n msgstr \"Vergleich: Neue Zeilen\"\n \n-#: gitk:8003\n+#: gitk:8066\n msgid \"Diff: hunk header\"\n msgstr \"Vergleich: ��nderungstitel\"\n \n-#: gitk:8009\n+#: gitk:8072\n msgid \"Select bg\"\n msgstr \"Hintergrundfarbe Ausw��hlen\"\n \n-#: gitk:8013\n+#: gitk:8076\n msgid \"Fonts: press to choose\"\n msgstr \"Schriftart: Klicken zum W��hlen\"\n \n-#: gitk:8015\n+#: gitk:8078\n msgid \"Main font\"\n msgstr \"Programmschriftart\"\n \n-#: gitk:8016\n+#: gitk:8079\n msgid \"Diff display font\"\n msgstr \"Vergleich\"\n \n-#: gitk:8017\n+#: gitk:8080\n msgid \"User interface font\"\n msgstr \"Beschriftungen\"\n \n-#: gitk:8033\n+#: gitk:8096\n #, tcl-format\n msgid \"Gitk: choose color for %s\"\n msgstr \"Gitk: Farbe w��hlen f��r %s\"\n \n-#: gitk:8414\n+#: gitk:8477\n msgid \"\"\n \"Sorry, gitk cannot run with this version of Tcl/Tk.\\n\"\n \" Gitk requires at least Tcl/Tk 8.4.\"\n@@ -684,35 +855,35 @@ msgstr \"\"\n \"Gitk l��uft nicht mit dieser Version von Tcl/Tk.\\n\"\n \"Gitk ben��tigt mindestens Tcl/Tk 8.4.\"\n \n-#: gitk:8501\n+#: gitk:8566\n msgid \"Cannot find a git repository here.\"\n msgstr \"Kein Git-Projektarchiv gefunden.\"\n \n-#: gitk:8505\n+#: gitk:8570\n #, tcl-format\n msgid \"Cannot find the git directory \\\"%s\\\".\"\n msgstr \"Git-Verzeichnis ��%s�� wurde nicht gefunden.\"\n \n-#: gitk:8544\n+#: gitk:8613\n #, tcl-format\n msgid \"Ambiguous argument '%s': both revision and filename\"\n msgstr \"Mehrdeutige Angabe ��%s��: Sowohl Version als auch Dateiname existiert.\"\n \n-#: gitk:8556\n+#: gitk:8625\n msgid \"Bad arguments to gitk:\"\n msgstr \"Falsche Kommandozeilen-Parameter f��r gitk:\"\n \n-#: gitk:8568\n+#: gitk:8637\n msgid \"Couldn't get list of unmerged files:\"\n msgstr \"Liste der nicht-zusammengef��hrten Dateien nicht gefunden:\"\n \n-#: gitk:8584\n+#: gitk:8653\n msgid \"No files selected: --merge specified but no files are unmerged.\"\n msgstr \"\"\n \"Keine Dateien ausgew��hle: --merge angegeben, es existieren aber keine nicht-\"\n \"zusammengef��hrten Dateien.\"\n \n-#: gitk:8587\n+#: gitk:8656\n msgid \"\"\n \"No files selected: --merge specified but no unmerged files are within file \"\n \"limit.\"\n@@ -720,6 +891,6 @@ msgstr \"\"\n \"Keine Dateien ausgew��hle: --merge angegeben, aber keine nicht-\"\n \"zusammengef��hrten Dateien sind in der Dateiauswahl.\"\n \n-#: gitk:8646\n+#: gitk:8717\n msgid \"Command line\"\n msgstr \"Kommandozeile\"\n-- \n1.5.4.2.133.g3d51e\n\n"},{"id":"75783","messageId":"20080501211004.GE7868@leksak.fem-net","threadId":"13346","inReplyTo":"200805012142.10151.stimming@tuhh.de","subject":"Re: [PATCH] gitk: Update German translation","fromName":"Stephan Beyer","fromEmail":"s-beyer@gmx.net","sentAt":"2008-05-01T21:10:04Z","receivedAt":"2008-05-01T21:10:04Z","isPatch":true,"sender":{"key":"s-beyer@gmx.net","avatar":"https://avatars.githubusercontent.com/u/143889?v=4"},"body":"> I'd propose to talk about the newest or topmost commit, \n> but rather not about the \"first\".\n\nI agree, but s/newest/latest/ :)\n\n\nWell.\nAlthough your patch does not cover the translations itself (and although\nI neither use the German translation of gitk and use gitk very seldom at\nall), I've taken a look at the given translations and want to drop some\ncomments/corrections.\n\n> -#: gitk:141 gitk:2143\n> +#: gitk:151 gitk:2191\n>  msgid \"Reading commits...\"\n>  msgstr \"Versionen lesen...\"\n\nIs \"Version\" really the German translation for \"commit\" throughout the\nwhole git suite?\n(Ehh, is git translated at all?)\nI'd recommend \"Commit\" or \"Eintragung\"...\n\n\"Version\" is so CVS/SVN-like.\n\n> -#: gitk:264\n> +#: gitk:275\n>  msgid \"Can't parse git log output:\"\n>  msgstr \"Git log Ausgabe kann nicht erkannt werden:\"\n\n\"git-log-Ausgabe\" oder \"Ausgabe von git-log\"\n\n> -#: gitk:650\n> +#: gitk:665\n>  msgid \"List references\"\n>  msgstr \"Zweige auflisten\"\n\nHm, the button lists branches and tags.\nIs then \"Zweige\" (= branches) only correct?\nWhat about \"Referenzen auflisten\" or \"Zweige/Markierungen auflisten\" \n(or however \"tags\" is translated).\n\n> -#: gitk:782 gitk:784 gitk:2308 gitk:2331 gitk:2355 gitk:4257 gitk:4320\n> +#: gitk:797 gitk:799 gitk:2356 gitk:2379 gitk:2403 gitk:4306 gitk:4369\n>  msgid \"containing:\"\n>  msgstr \"enthaltend:\"\n\n\"enthält:\"\n\n> -#: gitk:785 gitk:1741 gitk:1746 gitk:2383\n> +#: gitk:800 gitk:1778 gitk:1783 gitk:2431\n>  msgid \"touching paths:\"\n>  msgstr \"Pfad betreffend:\"\n\n\"betrifft Pfad:\"\n\n> -#: gitk:786 gitk:2388\n> +#: gitk:801 gitk:2436\n>  msgid \"adding/removing string:\"\n>  msgstr \"String dazu/l??schen:\"\n\n\"ändert Zeichenkette:\"\n\n> -#: gitk:797 gitk:2466 gitk:4225\n> +#: gitk:812 gitk:2514 gitk:4274\n>  msgid \"IgnCase\"\n>  msgstr \"Kein Gro??/Klein\"\n\nThe translation is rather ambiguous. Or is it just me? ;)\n\"Ignoriere Groß-/Kleinschreibung\"  or\n\"Groß-/Kleinschreibung ignorieren\"\n\n> -#: gitk:801 gitk:2483 gitk:4287 gitk:4713\n> +#: gitk:816 gitk:2531 gitk:4336 gitk:4765\n>  msgid \"Committer\"\n>  msgstr \"Eintragender\"\n\n\"Versionierender\" ... No, just a bad joke ;-)\nThe translation is good.\n\n> -#: gitk:1026\n> +#: gitk:1061\n>  msgid \"Cherry-pick this commit\"\n>  msgstr \"Diese Version pfl??cken\"\n\nIf I didn't knew that it means \"cherry-pick\", I'd have no idea\nwhat the function behind that German words does. ;-)\n(That's why I don't have locales set to my mother tongue. Just because I\nonly have to understand the programmer and not the translator first.)\n\n\"Diesen Commit übernehmen\"\n\"Diesen Commit kopieren\"\n\"Diese Eintragung übernehmen\"\n\n> +#: gitk:1354\n> +msgid \"<Left>, z, j\\tGo back in history list\"\n> +msgstr \"<Links>, z, j\\tEine Version zur??ck gehen\"\n\nI think it's still \"zurückgehen\" and not \"zurück gehen\" in the latest\nGerman spelling.\n\n> +#: gitk:1355\n> +msgid \"<Right>, x, l\\tGo forward in history list\"\n> +msgstr \"<Rechts>, x, l\\tEine Version nach vorne gehen\"\n\n\"nach vorne gehen\" sounds so colloquial.\nBetter, perhaps: \"weitergehen\"?\n\n> -#: gitk:5719\n> +#: gitk:5781\n>  msgid \"SHA1 ID:\"\n>  msgstr \"SHA1 Kennung:\"\n\nSomewhere else it has been translated to \"SHA1:\", which is imho better.\nOtherwise it'd be \"SHA1-Kennung\".\n\n> -#: gitk:5744\n> +#: gitk:5806\n>  #, tcl-format\n>  msgid \"Short SHA1 id %s is ambiguous\"\n>  msgstr \"Kurze SHA1-Kennung ??%s?? ist mehrdeutig\"\n\nHere it's correct.\n\n> -#: gitk:6081\n> +#: gitk:6143\n>  msgid \"Error creating patch:\"\n>  msgstr \"Fehler beim Patch erzeugen:\"\n\n\"Fehler bei der Erzeugung des Patches\"\n\n> -#: gitk:6233\n> +#: gitk:6291\n>  msgid \"Error writing commit:\"\n>  msgstr \"Fehler beim Version eintragen:\"\n\n\"Fehler bei der Eintragung:\"\n\"Fehler beim Schreiben der Eintragung:\" (or \"Version\", if really used in\nother places)\n\n> -#: gitk:7966\n> +#: gitk:8024\n> +msgid \"Auto-select SHA1\"\n> +msgstr \"SHA1 Hashwert automatisch markieren\"\n\n\"SHA1-Hashwert\"\n\n> -#: gitk:7985\n> +#: gitk:8048\n>  msgid \"Background\"\n>  msgstr \"Vordergrund\"\n>  \n> -#: gitk:7989\n> +#: gitk:8052\n>  msgid \"Foreground\"\n>  msgstr \"Hintergrund\"\n\nFunny. It's vice versa!\n\nmsgid \"Background\"\nmsgstr \"Hintergrund\"\n\nmsgid \"Foreground\"\nmsgstr \"Vordergrund\"\n\n> -#: gitk:8587\n> +#: gitk:8656\n>  msgid \"\"\n>  \"No files selected: --merge specified but no unmerged files are within file \"\n>  \"limit.\"\n> @@ -720,6 +891,6 @@ msgstr \"\"\n>  \"Keine Dateien ausgew??hle: --merge angegeben, aber keine nicht-\"\n                            ^\n\t\t\t    t\n>  \"zusammengef??hrten Dateien sind in der Dateiauswahl.\"\n\nRegards,\n  Stephan\n\n-- \nStephan Beyer <s-beyer@gmx.net>, PGP 0x6EDDD207FCC5040F\n"},{"id":"75823","messageId":"18458.65466.449698.790306@cargo.ozlabs.ibm.com","threadId":"13346","inReplyTo":"200805012142.10151.stimming@tuhh.de","subject":"Re: [PATCH] gitk: Update German translation","fromName":"Paul Mackerras","fromEmail":"paulus@samba.org","sentAt":"2008-05-02T11:49:14Z","receivedAt":"2008-05-02T11:49:14Z","isPatch":true,"sender":{"key":"paulus@samba.org","avatar":"https://avatars.githubusercontent.com/u/1606439?v=4"},"body":"Christian Stimming writes:\n\n> Attached to avoid whitespace problems. This patch is against master of \n> gitk.git at git.kernel.org.\n\nThanks.\n\n> By the way, the following two keybinding explanations seem ambiguous to me:\n> \n> >   <Home>  Move to first commit\n> >   <End>   Move to last commit\n> \n> What happens is that <home> jumps to the newest commit and <end> jumps to the \n> oldest commit. Whether the \"first\" commit should be the newest or the oldest \n> is, well, somewhat ambiguous. I'd propose to talk about the newest or topmost \n> commit, but rather not about the \"first\".\n\nWell, the commits aren't in date order, strictly speaking, and the\nlast commit isn't necessarily the oldest (though the first commit will\nin fact be the newest).  How about:\n\n<Home>\tMove to head of list\n<End>\tMove to tail of list\n\nWould that be any clearer?\n\nPaul.\n"},{"id":"75832","messageId":"18459.3949.203562.313749@cargo.ozlabs.ibm.com","threadId":"13346","inReplyTo":"200805012142.10151.stimming@tuhh.de","subject":"Re: [PATCH] gitk: Update German translation","fromName":"Paul Mackerras","fromEmail":"paulus@samba.org","sentAt":"2008-05-02T12:56:13Z","receivedAt":"2008-05-02T12:56:13Z","isPatch":true,"sender":{"key":"paulus@samba.org","avatar":"https://avatars.githubusercontent.com/u/1606439?v=4"},"body":"Christian Stimming writes:\n\n> Attached to avoid whitespace problems. This patch is against master of \n> gitk.git at git.kernel.org.\n\nThanks.  Can I have a Signed-off-by from you for it?\n\nPaul.\n"},{"id":"75872","messageId":"200805022030.29761.stimming@tuhh.de","threadId":"13346","inReplyTo":"18459.3949.203562.313749@cargo.ozlabs.ibm.com","subject":"Re: [PATCH] gitk: Update German translation","fromName":"Christian Stimming","fromEmail":"stimming@tuhh.de","sentAt":"2008-05-02T18:30:29Z","receivedAt":"2008-05-02T18:30:29Z","isPatch":true,"sender":{"key":"stimming@tuhh.de","avatar":"https://avatars.githubusercontent.com/u/227778?v=4"},"body":"Am Freitag, 2. Mai 2008 14:56 schrieb Paul Mackerras:\n> Christian Stimming writes:\n> > Attached to avoid whitespace problems. This patch is against master of\n> > gitk.git at git.kernel.org.\n>\n> Thanks.  Can I have a Signed-off-by from you for it?\n\nYes.\n\nChristian\n"},{"id":"75873","messageId":"200805022033.01407.stimming@tuhh.de","threadId":"13346","inReplyTo":"18458.65466.449698.790306@cargo.ozlabs.ibm.com","subject":"Re: [PATCH] gitk: Update German translation","fromName":"Christian Stimming","fromEmail":"stimming@tuhh.de","sentAt":"2008-05-02T18:33:01Z","receivedAt":"2008-05-02T18:33:01Z","isPatch":true,"sender":{"key":"stimming@tuhh.de","avatar":"https://avatars.githubusercontent.com/u/227778?v=4"},"body":"Am Freitag, 2. Mai 2008 13:49 schrieb Paul Mackerras:\n> > By the way, the following two keybinding explanations seem ambiguous to \nme:\n> > >   <Home>  Move to first commit\n> > >   <End>   Move to last commit\n> >\n> > What happens is that <home> jumps to the newest commit and <end> jumps to\n> > the oldest commit. Whether the \"first\" commit should be the newest or the\n> > oldest is, well, somewhat ambiguous. I'd propose to talk about the newest\n> > or topmost commit, but rather not about the \"first\".\n>\n> Well, the commits aren't in date order, strictly speaking, and the\n> last commit isn't necessarily the oldest (though the first commit will\n> in fact be the newest).  How about:\n>\n> <Home>\tMove to head of list\n> <End>\tMove to tail of list\n>\n> Would that be any clearer?\n\nI think \"head of list\" and \"tail of list\" are more the terms about the \nimplementation detail and not so much an explanation that is easily \nunderstood for the user. I think some combination using the word \"top\" should \nrather be used to make it really clear we're talking about the upper end of \nthe window.\n\nChristian\n"},{"id":"75874","messageId":"200805022123.22333.stimming@tuhh.de","threadId":"13346","inReplyTo":"20080501211004.GE7868@leksak.fem-net","subject":"Re: [PATCH] gitk: Update German translation","fromName":"Christian Stimming","fromEmail":"stimming@tuhh.de","sentAt":"2008-05-02T19:23:22Z","receivedAt":"2008-05-02T19:23:22Z","isPatch":true,"sender":{"key":"stimming@tuhh.de","avatar":"https://avatars.githubusercontent.com/u/227778?v=4"},"body":"Am Donnerstag, 1. Mai 2008 23:10 schrieb Stephan Beyer:\n> > I'd propose to talk about the newest or topmost commit,\n> > but rather not about the \"first\".\n>\n> I agree, but s/newest/latest/ :)\n\nBoth is possible, and a third alternative is \"most recent\". I couldn't care \nless, as long as we get away from the ambiguous \"first\".\n\n> Well.\n> Although your patch does not cover the translations itself (and although\n> I neither use the German translation of gitk and use gitk very seldom at\n> all), I've taken a look at the given translations and want to drop some\n> comments/corrections.\n\nThanks for the feedback about the German translation. Indeed there is no git \ntranslation into German, at least none that I know of so far. What exists is \nthe translation of git-gui which includes a glossary of terms that are used \nthroughout git-gui (and git). That glossary and the git-gui translation was \ncreated by myself as well. At the time when the glossary was created, it was \nalso discussed here in the list quite a lot, see \nhttp://article.gmane.org/gmane.comp.version-control.git/53181 and more \nimportantly this whole thread \nhttp://kerneltrap.org/mailarchive/git/2007/9/16/269956 (somehow gmane.org \ndoesn't have this thread available?!?)\n\nHence, translations for terms like \"commit\" have indeed been discussed quite a \nbit, and I'm quite satisfied with the current wording. You're welcome to \npropose alternatives, but please be prepared to give really good reasons as \nfor why an alternative is really better than the current version.\n\nNevertheless thanks a lot for the typos you spotted. I'll list those that are \neasy and I agree upon first, and I'll comment on the other and more difficult \nwords later.\n\n+++ The easy ones:\n\n> > -#: gitk:264\n> > +#: gitk:275\n> >  msgid \"Can't parse git log output:\"\n> >  msgstr \"Git log Ausgabe kann nicht erkannt werden:\"\n>\n> \"git-log-Ausgabe\" oder \"Ausgabe von git-log\"\n\nOk.\n\n> > -#: gitk:650\n> > +#: gitk:665\n> >  msgid \"List references\"\n> >  msgstr \"Zweige auflisten\"\n>\n> Hm, the button lists branches and tags.\n> Is then \"Zweige\" (= branches) only correct?\n> What about \"Referenzen auflisten\" or \"Zweige/Markierungen auflisten\"\n> (or however \"tags\" is translated).\n\nOk.\n\n> > -#: gitk:7966\n> > +#: gitk:8024\n> > +msgid \"Auto-select SHA1\"\n> > +msgstr \"SHA1 Hashwert automatisch markieren\"\n>\n> \"SHA1-Hashwert\"\n\nOk.\n\n> > -#: gitk:7985\n> > +#: gitk:8048\n> >  msgid \"Background\"\n> >  msgstr \"Vordergrund\"\n> >\n> > -#: gitk:7989\n> > +#: gitk:8052\n> >  msgid \"Foreground\"\n> >  msgstr \"Hintergrund\"\n>\n> Funny. It's vice versa!\n\nThanks a lot! No idea why nobody saw this so far, including me.\n\n> > -#: gitk:8587\n> > +#: gitk:8656\n> >  msgid \"\"\n> >  \"No files selected: --merge specified but no unmerged files are within\n> > file \" \"limit.\"\n> > @@ -720,6 +891,6 @@ msgstr \"\"\n> >  \"Keine Dateien ausgew??hle: \n>                             ^\n> \t\t\t    t\n\nOk, thanks.\n\n> > +#: gitk:1354\n> > +msgid \"<Left>, z, j\\tGo back in history list\"\n> > +msgstr \"<Links>, z, j\\tEine Version zur??ck gehen\"\n>\n> I think it's still \"zurückgehen\" and not \"zurück gehen\" in the latest\n> German spelling.\n\nOk.\n\n> > +#: gitk:1355\n> > +msgid \"<Right>, x, l\\tGo forward in history list\"\n> > +msgstr \"<Rechts>, x, l\\tEine Version nach vorne gehen\"\n>\n> \"nach vorne gehen\" sounds so colloquial.\n> Better, perhaps: \"weitergehen\"?\n\nOk. \"weitergehen\" IMHO has a similar problem as the first/last issue - the \nuser doesn't know which direction is meant. But your proposal is better than \nthe colloquial term.\n\n> > -#: gitk:5719\n> > +#: gitk:5781\n> >  msgid \"SHA1 ID:\"\n> >  msgstr \"SHA1 Kennung:\"\n>\n> Somewhere else it has been translated to \"SHA1:\", which is imho better.\n> Otherwise it'd be \"SHA1-Kennung\".\n\nThe latter. Thanks. As for why it was \"SHA1:\" in one string, I'll explain \nbelow.\n\n> > -#: gitk:6233\n> > +#: gitk:6291\n> >  msgid \"Error writing commit:\"\n> >  msgstr \"Fehler beim Version eintragen:\"\n>\n> \"Fehler bei der Eintragung:\"\n> \"Fehler beim Schreiben der Eintragung:\" (or \"Version\", if really used in\n> other places)\n\n\"Fehler beim Schreiben der Version\" it is, thanks.\n\n\n+++ Now the more difficult ones\n\n> > -#: gitk:141 gitk:2143\n> > +#: gitk:151 gitk:2191\n> >  msgid \"Reading commits...\"\n> >  msgstr \"Versionen lesen...\"\n>\n> Is \"Version\" really the German translation for \"commit\" throughout the\n> whole git suite?\n> (Ehh, is git translated at all?)\n> I'd recommend \"Commit\" or \"Eintragung\"...\n>\n> \"Version\" is so CVS/SVN-like.\n\n\"Version\" is what came out as most convincing from last September's \ndiscussion. \"Commit\" is only for those who want the English version anyway, \nhence that's not the target audience of this translation. \"Eintragung\" would \nindeed be one possibility, but when I explain how git works to other Germans, \nI would always talk about the \"Versionen\" that you can browse and merge and \nadd. The word works quite nicely, which is another argument for it. On the \nother hand I don't understand how \"is so CVS-like\" would be any argument in \nfavor or against this particular German word.\n\n> > -#: gitk:782 gitk:784 gitk:2308 gitk:2331 gitk:2355 gitk:4257 gitk:4320\n> > +#: gitk:797 gitk:799 gitk:2356 gitk:2379 gitk:2403 gitk:4306 gitk:4369\n> >  msgid \"containing:\"\n> >  msgstr \"enthaltend:\"\n>\n> \"enthält:\"\n\nNo. Please have a look at the place where this is used. In fact this word is \nused as the part of a full sentence (which in itself is very bad i18n style, \nbut that's another discussion), and the sentence reads \"Suche nächste/vorige \nVersion enthaltend:\". The sentence is already quite \"holprig\" and I'm sorry \nfor that, but at least it is still gramatically correct. Using \"enthält\" \nwould make it gramatically wrong. Same for the other following strings that \nyou mentioned.\n\n> > -#: gitk:786 gitk:2388\n> > +#: gitk:801 gitk:2436\n> >  msgid \"adding/removing string:\"\n> >  msgstr \"String dazu/l??schen:\"\n>\n> \"ändert Zeichenkette:\"\n\nHm... I'd say \"Zeichenkette ändernd\", but thinking about it, I'm not even sure \nanymore whether this is what this criterion will search for?\n\n> > -#: gitk:797 gitk:2466 gitk:4225\n> > +#: gitk:812 gitk:2514 gitk:4274\n> >  msgid \"IgnCase\"\n> >  msgstr \"Kein Gro??/Klein\"\n>\n> The translation is rather ambiguous. Or is it just me? ;)\n> \"Ignoriere Groß-/Kleinschreibung\"  or\n> \"Groß-/Kleinschreibung ignorieren\"\n\nIn principle yes, but again please have a look at where this string actually \nappears in the program. The multichoice box there really must not be very \nwide. That's why I came up with this weird short form \nof \"Groß-/Kleinschreibung ignorieren\", but the original string is just as \nwell already a weird abbreviation.\n\n> > -#: gitk:1026\n> > +#: gitk:1061\n> >  msgid \"Cherry-pick this commit\"\n> >  msgstr \"Diese Version pfl??cken\"\n>\n> If I didn't knew that it means \"cherry-pick\", I'd have no idea\n> what the function behind that German words does. ;-)\n> (That's why I don't have locales set to my mother tongue. Just because I\n> only have to understand the programmer and not the translator first.)\n\nNo, you're missing the point again. If you didn't knew what \"cherry-pick\" \nmeans, you would have no idea what the function behind it does. In other \nwords: Git invented a new word here anyway. Hence, a new word will appear in \nthe translation, too, and it isn't an argument that you didn't recognize it \nas your familiar english word at first. It *is* an argument if the actual \naction can be described in a better and more understandable way by a \ndifferent German word, though.\n\n> \"Diesen Commit übernehmen\"\n> \"Diesen Commit kopieren\"\n> \"Diese Eintragung übernehmen\"\n\n\"Diese Version kopieren\" would be one possibility - but this bears the \nquestion why git itself doesn't call this action \"to copy a commit\". To \nme, \"Version kopieren\" rather sounds like the familiar \"copy to clipboard\" \naction in the Edit menu, but it misses the part that this commit will \nimmediately be committed (heh) to the currently checked out branch.\n\n> > -#: gitk:6081\n> > +#: gitk:6143\n> >  msgid \"Error creating patch:\"\n> >  msgstr \"Fehler beim Patch erzeugen:\"\n>\n> \"Fehler bei der Erzeugung des Patches\"\n\nI agree the original string is sub-optimal, but \"Erzeugung\"? Also not a nice \nword. Anything better?\n\nThank you very much for your feedback!\n\nRegards,\n\nChristian\n"},{"id":"75876","messageId":"200805022136.32372.stimming@tuhh.de","threadId":"13346","inReplyTo":"20080501211004.GE7868@leksak.fem-net","subject":"[PATCH] gitk: German translation again updated","fromName":"Christian Stimming","fromEmail":"stimming@tuhh.de","sentAt":"2008-05-02T19:36:32Z","receivedAt":"2008-05-02T19:36:32Z","isPatch":true,"sender":{"key":"stimming@tuhh.de","avatar":"https://avatars.githubusercontent.com/u/227778?v=4"},"body":"This includes the fixed typos and proposals by Stephan Beyer that were easy to \nagree upon.\n\nThis patch is to be committed on top of yesterday's German translation patch.\n\nRegards,\n\nChristian\n\n(Attached because of whitespace yadda yadda)\n\n\nFrom 980528caeee6565fe477e87b90dfde79a4f29416 Mon Sep 17 00:00:00 2001\nFrom: Christian Stimming <stimming@tuhh.de>\nDate: Fri, 2 May 2008 21:33:34 +0200\nSubject: [PATCH] gitk: German translation again updated\n\nThis includes suggestions by Stephan Beyer.\n---\n po/de.po |   30 ++++++++++++++----------------\n 1 files changed, 14 insertions(+), 16 deletions(-)\n\ndiff --git a/po/de.po b/po/de.po\nindex 58b342a..b9867bf 100644\n--- a/po/de.po\n+++ b/po/de.po\n@@ -8,7 +8,7 @@ msgstr \"\"\n \"Project-Id-Version: git-gui\\n\"\n \"Report-Msgid-Bugs-To: \\n\"\n \"POT-Creation-Date: 2008-05-01 11:54+0200\\n\"\n-\"PO-Revision-Date: 2008-05-01 21:32+0200\\n\"\n+\"PO-Revision-Date: 2008-05-02 21:12+0200\\n\"\n \"Last-Translator: Christian Stimming <stimming@tuhh.de>\\n\"\n \"Language-Team: German\\n\"\n \"MIME-Version: 1.0\\n\"\n@@ -29,7 +29,7 @@ msgstr \"Versionen lesen...\"\n \n #: gitk:275\n msgid \"Can't parse git log output:\"\n-msgstr \"Git log Ausgabe kann nicht erkannt werden:\"\n+msgstr \"Ausgabe von git-log kann nicht erkannt werden:\"\n \n #: gitk:386 gitk:2195\n msgid \"No commits selected\"\n@@ -62,7 +62,7 @@ msgstr \"Zweige neu laden\"\n \n #: gitk:665\n msgid \"List references\"\n-msgstr \"Zweige auflisten\"\n+msgstr \"Zweige/Markierungen auflisten\"\n \n #: gitk:666\n msgid \"Quit\"\n@@ -138,7 +138,7 @@ msgstr \"Pfad betreffend:\"\n \n #: gitk:801 gitk:2436\n msgid \"adding/removing string:\"\n-msgstr \"String dazu/löschen:\"\n+msgstr \"Zeichenkette ändernd:\"\n \n #: gitk:810 gitk:812\n msgid \"Exact\"\n@@ -306,11 +306,11 @@ msgstr \"<Runter>, n, k\\tNächste ältere Version\"\n \n #: gitk:1354\n msgid \"<Left>, z, j\\tGo back in history list\"\n-msgstr \"<Links>, z, j\\tEine Version zurück gehen\"\n+msgstr \"<Links>, z, j\\tEine Version zurückgehen\"\n \n #: gitk:1355\n msgid \"<Right>, x, l\\tGo forward in history list\"\n-msgstr \"<Rechts>, x, l\\tEine Version nach vorne gehen\"\n+msgstr \"<Rechts>, x, l\\tEine Version weitergehen\"\n \n #: gitk:1356\n msgid \"<PageUp>\\tMove up one page in commit list\"\n@@ -540,17 +540,17 @@ msgstr \"Gehe zu:\"\n \n #: gitk:5781\n msgid \"SHA1 ID:\"\n-msgstr \"SHA1 Kennung:\"\n+msgstr \"SHA1-Hashwert:\"\n \n #: gitk:5806\n #, tcl-format\n msgid \"Short SHA1 id %s is ambiguous\"\n-msgstr \"Kurze SHA1-Kennung »%s« ist mehrdeutig\"\n+msgstr \"Kurzer SHA1-Hashwert »%s« ist mehrdeutig\"\n \n #: gitk:5818\n #, tcl-format\n msgid \"SHA1 id %s is not known\"\n-msgstr \"SHA1-Kennung »%s« unbekannt\"\n+msgstr \"SHA1-Hashwert »%s« unbekannt\"\n \n #: gitk:5820\n #, tcl-format\n@@ -641,7 +641,7 @@ msgstr \"Schreiben\"\n \n #: gitk:6291\n msgid \"Error writing commit:\"\n-msgstr \"Fehler beim Version eintragen:\"\n+msgstr \"Fehler beim Schreiben der Version:\"\n \n #: gitk:6317\n msgid \"Name:\"\n@@ -780,7 +780,7 @@ msgstr \"Lokale Änderungen anzeigen\"\n \n #: gitk:8024\n msgid \"Auto-select SHA1\"\n-msgstr \"SHA1 Hashwert automatisch markieren\"\n+msgstr \"SHA1-Hashwert automatisch markieren\"\n \n #: gitk:8029\n msgid \"Diff display options\"\n@@ -804,11 +804,11 @@ msgstr \"Farben: Klicken zum Wählen\"\n \n #: gitk:8048\n msgid \"Background\"\n-msgstr \"Vordergrund\"\n+msgstr \"Hintergrund\"\n \n #: gitk:8052\n msgid \"Foreground\"\n-msgstr \"Hintergrund\"\n+msgstr \"Vordergrund\"\n \n #: gitk:8056\n msgid \"Diff: old lines\"\n@@ -879,9 +879,7 @@ msgstr \"Liste der nicht-zusammengeführten Dateien nicht gefunden:\"\n \n #: gitk:8653\n msgid \"No files selected: --merge specified but no files are unmerged.\"\n-msgstr \"\"\n-\"Keine Dateien ausgewähle: --merge angegeben, es existieren aber keine nicht-\"\n-\"zusammengeführten Dateien.\"\n+msgstr \"Keine Dateien ausgewählt: --merge angegeben, es existieren aber keine nicht-zusammengeführten Dateien.\"\n \n #: gitk:8656\n msgid \"\"\n-- \n1.5.4.2.133.g3d51e\n\n"},{"id":"75900","messageId":"20080503012419.327120@gmx.net","threadId":"13346","inReplyTo":"200805022123.22333.stimming@tuhh.de","subject":"Re: [PATCH] gitk: Update German translation","fromName":"Stephan Beyer","fromEmail":"s-beyer@gmx.net","sentAt":"2008-05-03T01:24:19Z","receivedAt":"2008-05-03T01:24:19Z","isPatch":true,"sender":{"key":"s-beyer@gmx.net","avatar":"https://avatars.githubusercontent.com/u/143889?v=4"},"body":"Hi,\n\n> That glossary and the git-gui translation was created by myself as well.\n\nAnd you did a great job doing it. ;)\n\n> Hence, translations for terms like \"commit\" have indeed been discussed\n> quite a bit,\n\nIt's ok then. I didn't know that there was big discussion about that. \nThanks for the links.\n\n> > >  msgid \"Reading commits...\"\n> > >  msgstr \"Versionen lesen...\"\n> >\n> > Is \"Version\" really the German translation for \"commit\" throughout the\n> > whole git suite?\n> > (Ehh, is git translated at all?)\n> > I'd recommend \"Commit\" or \"Eintragung\"...\n> \n> \"Version\" is what came out as most convincing from last September's \n> discussion. \"Commit\" is only for those who want the English version\n> anyway, hence that's not the target audience of this translation.\n\nI understand the point for using \"Version\" as the German translation for\nthe noun \"commit\" (seems to be the best choice), but I think I have a \ndifferent view on the target audience of the translation. :-)\n\nI think, most of the users of a translated git-gui or gitk are not people\nwho do not understand an English word at all. I think, they just like to\nact in a localized environment.\nBut SCM tool users of any nationality usually know what a \"commit\" is,\nso I see nothing bad in using \"Commit\" in the German translation.\nAnd the German word \"Version\" is a broader term that can lead to some\nmisunderstanding; the English word \"commit\" used in German sentences\nis a clear technical term for SCM tool users.\n\nIt's the typical problem in German technical literature. There is the one\ntype where every technical term is translated to a German word in the hope\nthat it will be easier to understand but could also leave the reader in \nsome confusion because she has another understanding of the known word.\nAnd there is the other type, where technical terms are kept untranslated \nto let the readers easily understand original English literature \nbut also resulting in a lot of \"denglisch\" sentences.\nSo a really good translation of technical literature and its technical \nterms is pretty hard.\n\nThe most German translations in the free software world are translated\nusing the first, the \"translate every term\" paradigm. So it seems good\nto me that gitk/git-gui follows that way. Nevertheless, just because of \nthis paradigm I switched back to the original/English versions. ;)\n\n> > \"nach vorne gehen\" sounds so colloquial.\n> > Better, perhaps: \"weitergehen\"?\n> \n> Ok. \"weitergehen\" IMHO has a similar problem as the first/last issue - the\n> user doesn't know which direction is meant.\n\nMh, I thought that \"nach vorne\" and \"weiter\" have the same meaning here.\nBut perhaps I'm wrong.\n\n> But your proposal is better than the colloquial term.\n\nI don't know if colloquial terms are really bad in software.\nPerhaps it depends on the software. E.g. in games or fun tools it can be nice.\n\n> > > -#: gitk:6081\n> > > +#: gitk:6143\n> > >  msgid \"Error creating patch:\"\n> > >  msgstr \"Fehler beim Patch erzeugen:\"\n> >\n> > \"Fehler bei der Erzeugung des Patches\"\n> \n> I agree the original string is sub-optimal, but \"Erzeugung\"? Also not a\n> nice word. Anything better?\n\nSorry, I meant \"Fehler beim Erzeugen des Patches\"\nas in\n > > >  msgid \"Error writing commit:\"\n > > >  msgstr \"Fehler beim Version eintragen:\"\n > > [...]\n > \"Fehler beim Schreiben der Version\" it is, thanks.\n(which also could be \"Fehler beim Eintragen der Version\")\n\nThe reason for my correction is that \"beim Version eintragen\"\nis wrong according to my last look at the German grammar rules,\nbut note that I'm not up-to-date ;-)\nA correct choice could be something like \"beim Versionseintragen\" \nor \"beim Version-Eintragen\" (or Version-eintragen?) Not sure.\nSo I thought using the Genitive case is a good choice.\n\nBtw, I'm convinced that every German will also understand your\noriginal translation.\n\n> > >  msgid \"containing:\"\n> > >  msgstr \"enthaltend:\"\n> >\n> > \"enthält:\"\n> \n> No. Please have a look at the place where this is used.\n\nI did. But you are right that my proposal is wrong.\n\n> In fact this word is used as the part of a full sentence \n> (which in itself is very bad i18n style, but that's another discussion),\n> and the sentence reads \"Suche nächste/vorige Version enthaltend:\".\n\nMy mistake was that I began reading at \"Version\"... ;)\n\n> The sentence is already quite \"holprig\"\n\nThe original\n \"Find next/prev commit _containing:_ [insert]\"\nshould be translated to\n \"Suche nächste/vorige Version, die [insert] enthält.\"\nBut this is beyond the used techniques for software translation ;-)\n\nLooking at the other two cases:\n \"Find next/prev commit _touching paths:_ [insert]\"\nand\n \"Find next/prev commit _adding/removing String:_ [insert]\"\nand looking what they are actually doing,\nI come to another solution that should make it clear:\n 1. \"Suche nächste/vorige Version _nach Beschreibung:_ [insert]\"\n 2. \"Suche nächste/vorige Version _nach Pfaden:_ [insert]\"\n    (or maybe \"nach Dateien:\", if it's commonly accepted that \n     directories are files, too.)\n 3. \"Suche nächste/vorige Version _nach Änderungen:_ [insert]\"\n(This is btw a very cool feature and a reason to use gitk more often.)\n\n> > >  msgid \"IgnCase\"\n> > >  msgstr \"Kein Gro??/Klein\"\n> >\n> > The translation is rather ambiguous. Or is it just me? ;)\n> > \"Ignoriere Groß-/Kleinschreibung\"  or\n> > \"Groß-/Kleinschreibung ignorieren\"\n> \n> In principle yes, but again please have a look at where this string\n> actually appears in the program. The multichoice box there really must\n> not be very wide.\n\nAh ok. I got in a hurry when writing the last mail, but I wondered\nwhy there's \"IgnCase\" and not \"Ignore case\".\nHmmm, so I'd possibly take \"Groß/klein egal\" which has the same length\nas yours but yours is also good, since it's not ambiguous to me anymore,\nbecause another choice of the multichoice box is \"exakt\" ;-)\n\n> > >  msgid \"Cherry-pick this commit\"\n> > >  msgstr \"Diese Version pfl??cken\"\n> >\n> > If I didn't knew that it means \"cherry-pick\", I'd have no idea\n> > what the function behind that German words does. ;-)\n> \n> No, you're missing the point again. If you didn't knew what \"cherry-pick\" \n> means, you would have no idea what the function behind it does.\n\nRight, but if I know what \"cherry-pick\" means, I could still have no idea\nwhat the function behind \"Version pflücken\" does.\nA word-by-word translation like \"Kirsche pflücken\" would also result in a\ngrinning me (as a user), but I'd recognize it as the 'git-cherry-pick' \nthat I know.\n\n> In other words: Git invented a new word here anyway.\n\nNo, \"cherry picking\" is a commonly used term.\n\nI wonder what a commonly used German phrase with a similar meaning is...\nSomething like \"sich die Rosine(n) herauspicken\"? (Is this a common phrase?)\nBut a translation to \"Diese Rosine herauspicken\" is also confusing.\n(\"Warum ist dieser Commit eine Rosine? \n  Was passiert, wenn ich sie herauspicke?\n  Ist er dann weg?\")\n\n> It *is* an argument if the actual action can be described in a better\n> and more understandable way by a different German word, though.\n\nYes.\nA user of the English version might also need to know what \ngit-cherry-pick does before clicking on \"Cherry-pick this commit\".\nOr does this come by intuition? \n(Hard to see for me, as I'm no native English speaker.)\n\n> > \"Diesen Commit übernehmen\"\n> > \"Diesen Commit kopieren\"\n> > \"Diese Eintragung übernehmen\"\n> \n> \"Diese Version kopieren\" would be one possibility - but this bears the \n> question why git itself doesn't call this action \"to copy a commit\".\n\nTo confuse the translation issue. ;-)\n\n> \"Version kopieren\" rather sounds like the familiar \"copy to clipboard\"\n> action in the Edit menu,\n\nGood point.\n\nBtw, 'man git-cherry-pick' says\n        \"Apply the change introduced by an existing commit\".\nSo why not take this and use\n \"Durch diese Version eingeführte Änderungen übernehmen\" or\n \"Durch diese Version eingeführte Änderungen anwenden\"?\n\nRegards,\n  Stephan\n-- \nGMX startet ShortView.de. Hier findest Du Leute mit Deinen Interessen!\nJetzt dabei sein: http://www.shortview.de/?mc=sv_ext_mf@gmx\n"},{"id":"75904","messageId":"18460.6645.918108.615194@cargo.ozlabs.ibm.com","threadId":"13346","inReplyTo":"200805022033.01407.stimming@tuhh.de","subject":"Re: [PATCH] gitk: Update German translation","fromName":"Paul Mackerras","fromEmail":"paulus@samba.org","sentAt":"2008-05-03T07:53:25Z","receivedAt":"2008-05-03T07:53:25Z","isPatch":true,"sender":{"key":"paulus@samba.org","avatar":"https://avatars.githubusercontent.com/u/1606439?v=4"},"body":"Christian Stimming writes:\n\n> > Well, the commits aren't in date order, strictly speaking, and the\n> > last commit isn't necessarily the oldest (though the first commit will\n> > in fact be the newest).  How about:\n> >\n> > <Home>\tMove to head of list\n> > <End>\tMove to tail of list\n> >\n> > Would that be any clearer?\n> \n> I think \"head of list\" and \"tail of list\" are more the terms about the \n> implementation detail and not so much an explanation that is easily \n> understood for the user. I think some combination using the word \"top\" should \n> rather be used to make it really clear we're talking about the upper end of \n> the window.\n\nThe list isn't just a detail, it's what the user sees in the top pane:\nthe commits, listed in some order.\n\nHow about \"top of list\" and \"bottom of list\"?  Or \"start of list\" and\n\"end of list\"?\n\nPaul.\n"},{"id":"75907","messageId":"200805031003.09458.stimming@tuhh.de","threadId":"13346","inReplyTo":"18460.6645.918108.615194@cargo.ozlabs.ibm.com","subject":"Re: [PATCH] gitk: Update German translation","fromName":"Christian Stimming","fromEmail":"stimming@tuhh.de","sentAt":"2008-05-03T08:03:09Z","receivedAt":"2008-05-03T08:03:09Z","isPatch":true,"sender":{"key":"stimming@tuhh.de","avatar":"https://avatars.githubusercontent.com/u/227778?v=4"},"body":"Am Samstag, 3. Mai 2008 09:53 schrieb Paul Mackerras:\n> Christian Stimming writes:\n> > > Well, the commits aren't in date order, strictly speaking, and the\n> > > last commit isn't necessarily the oldest (though the first commit will\n> > > in fact be the newest).  How about:\n> > >\n> > > <Home>\tMove to head of list\n> > > <End>\tMove to tail of list\n> > >\n> > > Would that be any clearer?\n> >\n> > I think \"head of list\" and \"tail of list\" are more the terms about the\n> > implementation detail and not so much an explanation that is easily\n> > understood for the user. I think some combination using the word \"top\"\n> > should rather be used to make it really clear we're talking about the\n> > upper end of the window.\n>\n> The list isn't just a detail, it's what the user sees in the top pane:\n> the commits, listed in some order.\n>\n> How about \"top of list\" and \"bottom of list\"?  Or \"start of list\" and\n> \"end of list\"?\n\nI think \"top of list\" and \"bottom of list\" would work quite well.\n\nRegards,\n\nChristian\n"},{"id":"76321","messageId":"200805072256.50520.stimming@tuhh.de","threadId":"13346","inReplyTo":"20080503012419.327120@gmx.net","subject":"Re: [PATCH] gitk: Update German translation","fromName":"Christian Stimming","fromEmail":"stimming@tuhh.de","sentAt":"2008-05-07T20:56:50Z","receivedAt":"2008-05-07T20:56:50Z","isPatch":true,"sender":{"key":"stimming@tuhh.de","avatar":"https://avatars.githubusercontent.com/u/227778?v=4"},"body":"Hi Stephan,\n\nthanks for your feedback. I won't have time to answer this in detail until end \nof next week. I'll just highlight a few things:\n\n* Translation \"commit\" - \"Version\": Indeed this depends on the target \naudience. Those who prefer the english terms IMHO are by definition no longer \nthe target audience. That's why I prefer this German word in the translation. \nBy the way, I strongly suggest reading the German TortoiseSVN documentation - \nIMHO they've created a really good translation.\n\nAm Samstag, 3. Mai 2008 03:24 schrieb Stephan Beyer:\n> > In fact this word is used as the part of a full sentence\n> > (which in itself is very bad i18n style, but that's another discussion),\n> > and the sentence reads \"Suche nächste/vorige Version enthaltend:\".\n>\n> My mistake was that I began reading at \"Version\"... ;)\n>\n> > The sentence is already quite \"holprig\"\n>\n> The original\n>  \"Find next/prev commit _containing:_ [insert]\"\n> should be translated to\n>  \"Suche nächste/vorige Version, die [insert] enthält.\"\n> But this is beyond the used techniques for software translation ;-)\n\nYes. But maybe even without GUI modifications this can be translated in a \nbetter way. Eventually, I would expect something like this:\n\n  Suchen: Nächste / vorige Fundstelle mit Kriterium 'Enthält Zeichenkette': \n[insert]\n\nIMHO this shouldn't be one single sentence which is what the current english \nGUI tries to mimic. Instead, this should be something with a heading and a \nchoicebox for the criteria and appropriate labels for those. Maybe we can \ncome up with a translation that already does this - the above sentence was a \nquick thought but there are surely better ways to do this.\n\n> > > >  msgid \"Cherry-pick this commit\"\n> > > >  msgstr \"Diese Version pflücken\"\n>\n> > In other words: Git invented a new word here anyway.\n>\n> No, \"cherry picking\" is a commonly used term.\n>\n> I wonder what a commonly used German phrase with a similar meaning is...\n> Something like \"sich die Rosine(n) herauspicken\"? (Is this a common\n> phrase?) But a translation to \"Diese Rosine herauspicken\" is also\n> confusing. (\"Warum ist dieser Commit eine Rosine?\n>   Was passiert, wenn ich sie herauspicke?\n>   Ist er dann weg?\")\n\nGood point. We shouldn't come up with \"Rosinen\" here. Maybe \"herauspicken\", \nbut then \"pflücken\" can work as well. Branches are called \"Zweige\", so it's \nnot too far-fetched to have an action for \"etwas von einem Zweig pflücken\".\n\n> Btw, 'man git-cherry-pick' says\n>         \"Apply the change introduced by an existing commit\".\n> So why not take this and use\n>  \"Durch diese Version eingeführte Änderungen übernehmen\" or\n>  \"Durch diese Version eingeführte Änderungen anwenden\"?\n\nThis is indeed a case where a better translation can still be found. However, \nall of \"kopieren, übernehmen, anwenden\" IMHO sound too similar to actions \nthat already appear here or there in the version control GUI. Cherry-picking \nis a specialized action and should thus get a specialized German word. \n\nRegards,\n\nChristian\n"},{"id":"77051","messageId":"20080515162052.GC12350@leksak.fem-net","threadId":"13346","inReplyTo":"200805072256.50520.stimming@tuhh.de","subject":"Re: [PATCH] gitk: Update German translation","fromName":"Stephan Beyer","fromEmail":"s-beyer@gmx.net","sentAt":"2008-05-15T16:20:52Z","receivedAt":"2008-05-15T16:20:52Z","isPatch":true,"sender":{"key":"s-beyer@gmx.net","avatar":"https://avatars.githubusercontent.com/u/143889?v=4"},"body":"Hi Christian,\n\n> > The original\n> >  \"Find next/prev commit _containing:_ [insert]\"\n> > should be translated to\n> >  \"Suche nächste/vorige Version, die [insert] enthält.\"\n> > But this is beyond the used techniques for software translation ;-)\n> \n> Yes. But maybe even without GUI modifications this can be translated in a \n> better way. Eventually, I would expect something like this:\n> \n>   Suchen: Nächste / vorige Fundstelle mit Kriterium 'Enthält Zeichenkette':  [insert]\n\nThis can be a choice, but it's very long. ;-)\n\nI want to repeat my suggestions from the last mail:\n  1. \"Suche nächste/vorige Version nach _Beschreibung:_ [insert]\"\n  2. \"Suche nächste/vorige Version nach _Pfaden:_ [insert]\"\n     (or maybe \"nach _Dateien:_\", if it's commonly accepted that \n      directories are files, too.)\n  3. \"Suche nächste/vorige Version nach _Änderungen:_ [insert]\"\nwhich makes it much more clearer than the English original, imho.\n\n> IMHO this shouldn't be one single sentence which is what the current english \n> GUI tries to mimic. Instead, this should be something with a heading and a \n> choicebox for the criteria and appropriate labels for those.\n\nYes, if one single sentence does not work in another language, why keep\nit?  But, one single sentence works here ;-)\n\n> > Btw, 'man git-cherry-pick' says\n> >         \"Apply the change introduced by an existing commit\".\n> > So why not take this and use\n> >  \"Durch diese Version eingeführte Änderungen übernehmen\" or\n> >  \"Durch diese Version eingeführte Änderungen anwenden\"?\n> \n> This is indeed a case where a better translation can still be found. However, \n> all of \"kopieren, übernehmen, anwenden\" IMHO sound too similar to actions \n> that already appear here or there in the version control GUI.\n\nYou are right with \"kopieren\" and \"anwenden\", but where is \"übernehmen\"?\n\nOk, it is used in the glossary for \"pull\", but nowhere in code that is\nactually used.  And I think a better translation for \"pull\" is\nsomething that stresses the fact that \"pull\" = \"fetch\" + \"merge\",\nsomething like \"Holen und Zusammenführen\".\n\n> Cherry-picking is a specialized action and should thus get a specialized \n> German word. \n\nI'm still unsure about this.  But it's your choice. ;-)\n\nKind regards,\n  Stephan\n\n-- \nStephan Beyer <s-beyer@gmx.net>, PGP 0x6EDDD207FCC5040F\n"},{"id":"77670","messageId":"200805242248.23413.stimming@tuhh.de","threadId":"13346","inReplyTo":"20080515162052.GC12350@leksak.fem-net","subject":"Re: [PATCH] gitk: Update German translation","fromName":"Christian Stimming","fromEmail":"stimming@tuhh.de","sentAt":"2008-05-24T20:48:23Z","receivedAt":"2008-05-24T20:48:23Z","isPatch":true,"sender":{"key":"stimming@tuhh.de","avatar":"https://avatars.githubusercontent.com/u/227778?v=4"},"body":"Hi Stephan,\n\nAm Donnerstag, 15. Mai 2008 18:20 schrieb Stephan Beyer:\n> > > The original\n> > >  \"Find next/prev commit _containing:_ [insert]\"\n> > > should be translated to\n> > >  \"Suche nächste/vorige Version, die [insert] enthält.\"\n> > > But this is beyond the used techniques for software translation ;-)\n>\n> I want to repeat my suggestions from the last mail:\n>   1. \"Suche nächste/vorige Version nach _Beschreibung:_ [insert]\"\n>   2. \"Suche nächste/vorige Version nach _Pfaden:_ [insert]\"\n>      (or maybe \"nach _Dateien:_\", if it's commonly accepted that\n>       directories are files, too.)\n>   3. \"Suche nächste/vorige Version nach _Änderungen:_ [insert]\"\n> which makes it much more clearer than the English original, imho.\n\nOkay, I've inserted your suggestions in my translation update. I'm not too \nsure about any translation of this part, but your proposal is maybe better \nthan the existing one.\n\n> > > Btw, 'man git-cherry-pick' says\n> > >         \"Apply the change introduced by an existing commit\".\n> > > So why not take this and use\n> > >  \"Durch diese Version eingeführte Änderungen übernehmen\" or\n> > >  \"Durch diese Version eingeführte Änderungen anwenden\"?\n> >\n> > This is indeed a case where a better translation can still be found.\n> > However, all of \"kopieren, übernehmen, anwenden\" IMHO sound too similar\n> > to actions that already appear here or there in the version control GUI.\n>\n> You are right with \"kopieren\" and \"anwenden\", but where is \"übernehmen\"?\n>\n> Ok, it is used in the glossary for \"pull\", but nowhere in code that is\n> actually used.  \n\nThe glossary is for git-gui, which has GUI items for \"git pull\" but not \"git \ncherry-pick\", currently. OTOH gitk has GUI items only for \"git cherry-pick\" \nbut not \"git pull\", currently.\n\n> And I think a better translation for \"pull\" is \n> something that stresses the fact that \"pull\" = \"fetch\" + \"merge\",\n> something like \"Holen und Zusammenführen\".\n\nThat's indeed an interesting suggestion. (Which bears the question why it is \nbeing called \"pull\" in English in the first place, when it should rather be \ndescribed by \"fetch and merge\". Heh.)\n\n> > Cherry-picking is a specialized action and should thus get a specialized\n> > German word.\n>\n> I'm still unsure about this.  But it's your choice. ;-)\n\nYeah. I'm also not completely sure, but for now I'd still prefer \"pflücken\" \nover the other possibilities we've discussed so far.\n\nRegards,\n\nChristian\n"},{"id":"77724","messageId":"20080525215708.GB9564@leksak.fem-net","threadId":"13346","inReplyTo":"200805242248.23413.stimming@tuhh.de","subject":"Re: [PATCH] gitk: Update German translation","fromName":"Stephan Beyer","fromEmail":"s-beyer@gmx.net","sentAt":"2008-05-25T21:57:08Z","receivedAt":"2008-05-25T21:57:08Z","isPatch":true,"sender":{"key":"s-beyer@gmx.net","avatar":"https://avatars.githubusercontent.com/u/143889?v=4"},"body":"Hi Christian,\n\n> > I want to repeat my suggestions from the last mail:\n> >   1. \"Suche nächste/vorige Version nach _Beschreibung:_ [insert]\"\n> >   2. \"Suche nächste/vorige Version nach _Pfaden:_ [insert]\"\n> >      (or maybe \"nach _Dateien:_\", if it's commonly accepted that\n> >       directories are files, too.)\n> >   3. \"Suche nächste/vorige Version nach _Änderungen:_ [insert]\"\n> > which makes it much more clearer than the English original, imho.\n> \n> Okay, I've inserted your suggestions in my translation update. I'm not too \n> sure about any translation of this part, but your proposal is maybe better \n> than the existing one.\n\nYou can make yourself sure by trying the features or by reading the\nsource code. ;-)\nSince I've translated them in that way, I know what they do and I use them\nmore often.  So I'm pretty sure.\n\n> > And I think a better translation for \"pull\" is \n> > something that stresses the fact that \"pull\" = \"fetch\" + \"merge\",\n> > something like \"Holen und Zusammenführen\".\n> \n> That's indeed an interesting suggestion. (Which bears the question why it is \n> being called \"pull\" in English in the first place,\n\nWell, this seems not to be clear to some users, since there is often\nuncertainty about \"pull\" ;)\n\nRegards,\n  Stephan\n\n-- \nStephan Beyer <s-beyer@gmx.net>, PGP 0x6EDDD207FCC5040F\n"}]}