Merge branch 'master' of git://git.kernel.org/pub/scm/gitk/gitk

* 'master' of git://git.kernel.org/pub/scm/gitk/gitk:
  [PATCH] gitk: use user-configured background in view definition dialog
  [PATCH] gitk: Update German translation
  [PATCH] gitk: Update and fix Makefile
  gitk: Restore some widget options whose defaults changed in Tk 8.5
  gitk: Recode de.po to UTF-8
  [PATCH] gitk i18n: Recode gitk from latin1 to utf8 so that the (c) copyright character is valid utf8.
  [PATCH] gitk i18n: More markup -- various options menus
  [PATCH] gitk i18n: Initial German translation
  [PATCH] gitk i18n: Markup several strings for translation
  [PATCH] gitk i18n: Import msgcat for message string translation; load translation catalogs
  [PATCH] gitk i18n: Add Makefile with rules for po file creation and installation
This commit is contained in:
Junio C Hamano 2008-01-08 22:41:15 -08:00
commit f85fd3f0d1
3 changed files with 1031 additions and 294 deletions

View File

@ -3,6 +3,11 @@ all::
prefix ?= $(HOME)
bindir ?= $(prefix)/bin
sharedir ?= $(prefix)/share
gitk_libdir ?= $(sharedir)/gitk/lib
msgsdir ?= $(gitk_libdir)/msgs
msgsdir_SQ = $(subst ','\'',$(msgsdir))
TCLTK_PATH ?= wish
INSTALL ?= install
RM ?= rm -f
@ -11,19 +16,43 @@ DESTDIR_SQ = $(subst ','\'',$(DESTDIR))
bindir_SQ = $(subst ','\'',$(bindir))
TCLTK_PATH_SQ = $(subst ','\'',$(TCLTK_PATH))
## po-file creation rules
XGETTEXT ?= xgettext
MSGFMT ?= msgfmt
PO_TEMPLATE = po/gitk.pot
ALL_POFILES = $(wildcard po/*.po)
ALL_MSGFILES = $(subst .po,.msg,$(ALL_POFILES))
ifndef V
QUIET = @
QUIET_GEN = $(QUIET)echo ' ' GEN $@ &&
endif
all:: gitk-wish
all:: gitk-wish $(ALL_MSGFILES)
install:: all
$(INSTALL) gitk-wish '$(DESTDIR_SQ)$(bindir_SQ)'/gitk
$(INSTALL) -d '$(DESTDIR_SQ)$(msgsdir_SQ)'
$(foreach p,$(ALL_MSGFILES), $(INSTALL) $p '$(DESTDIR_SQ)$(msgsdir_SQ)' &&) true
uninstall::
$(foreach p,$(ALL_MSGFILES), $(RM) '$(DESTDIR_SQ)$(msgsdir_SQ)'/$(notdir $p) &&) true
$(RM) '$(DESTDIR_SQ)$(bindir_SQ)'/gitk
clean::
$(RM) gitk-wish
$(RM) gitk-wish po/*.msg
gitk-wish: gitk
$(QUIET_GEN)$(RM) $@ $@+ && \
sed -e '1,3s|^exec .* "$$0"|exec $(subst |,'\|',$(TCLTK_PATH_SQ)) "$$0"|' <gitk >$@+ && \
chmod +x $@+ && \
mv -f $@+ $@
$(PO_TEMPLATE): gitk
$(XGETTEXT) -kmc -LTcl -o $@ gitk
update-po:: $(PO_TEMPLATE)
$(foreach p, $(ALL_POFILES), echo Updating $p ; msgmerge -U $p $(PO_TEMPLATE) ; )
$(ALL_MSGFILES): %.msg : %.po
@echo Generating catalog $@
$(MSGFMT) --statistics --tcl $< -l $(basename $(notdir $<)) -d $(dir $@)

File diff suppressed because it is too large Load Diff

703
gitk-git/po/de.po Normal file
View File

@ -0,0 +1,703 @@
# Translation of gitk to German.
# Copyright (C) 2007 Paul Mackerras.
# This file is distributed under the same license as the gitk package.
# Christian Stimming <stimming@tuhh.de>, 2007
#
msgid ""
msgstr ""
"Project-Id-Version: git-gui\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2007-12-21 12:04+0100\n"
"PO-Revision-Date: 2008-01-08 21:48+0100\n"
"Last-Translator: Christian Stimming <stimming@tuhh.de>\n"
"Language-Team: German\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: gitk:101
msgid "Error executing git rev-list:"
msgstr ""
#: gitk:114
msgid "Reading"
msgstr "Lesen"
#: gitk:141 gitk:2151
msgid "Reading commits..."
msgstr "Versionen lesen..."
#: gitk:264
msgid "Can't parse git log output:"
msgstr "Git log Ausgabe kann nicht erkannt werden:"
#: gitk:375 gitk:2155
msgid "No commits selected"
msgstr "Keine Versionen ausgewählt."
#: gitk:486
msgid "No commit information available"
msgstr ""
#: gitk:585 gitk:607 gitk:1914 gitk:6374 gitk:7875 gitk:8035
msgid "OK"
msgstr "Ok"
#: gitk:609 gitk:1916 gitk:6054 gitk:6125 gitk:6226 gitk:6272 gitk:6376
#: gitk:7877 gitk:8037
msgid "Cancel"
msgstr "Abbrechen"
#: gitk:633
msgid "File"
msgstr "Datei"
#: gitk:636
msgid "Update"
msgstr "Aktualisieren"
#: gitk:637
msgid "Reread references"
msgstr "Zweige neu laden"
#: gitk:638
msgid "List references"
msgstr "Zweige auflisten"
#: gitk:639
msgid "Quit"
msgstr "Beenden"
#: gitk:642
msgid "Edit"
msgstr "Bearbeiten"
#: gitk:643
msgid "Preferences"
msgstr "Einstellungen"
#: gitk:647
msgid "View"
msgstr "Ansicht"
#: gitk:648
msgid "New view..."
msgstr "Neue Ansicht..."
#: gitk:649 gitk:2093 gitk:8666
msgid "Edit view..."
msgstr "Ansicht bearbeiten..."
#: gitk:651 gitk:2094 gitk:8667
msgid "Delete view"
msgstr "Ansicht löschen"
#: gitk:653
msgid "All files"
msgstr "Alle Dateien"
#: gitk:657
msgid "Help"
msgstr "Hilfe"
#: gitk:658 gitk:1280
msgid "About gitk"
msgstr "Über gitk"
#: gitk:659
msgid "Key bindings"
msgstr "Tastenkürzel"
#: gitk:716
msgid "SHA1 ID: "
msgstr ""
#: gitk:766
msgid "Find"
msgstr "Suche"
#: gitk:767
msgid "next"
msgstr "nächste"
#: gitk:768
msgid "prev"
msgstr "vorige"
#: gitk:769
msgid "commit"
msgstr "Version"
#: gitk:772 gitk:774 gitk:2316 gitk:2339 gitk:2363 gitk:4265 gitk:4328
msgid "containing:"
msgstr "enthaltend:"
#: gitk:775 gitk:1746 gitk:1751 gitk:2391
msgid "touching paths:"
msgstr "Pfad betreffend:"
#: gitk:776 gitk:2396
msgid "adding/removing string:"
msgstr "String dazu/löschen:"
#: gitk:787 gitk:789
msgid "Exact"
msgstr "Exakt"
#: gitk:789 gitk:2474 gitk:4233
msgid "IgnCase"
msgstr "Kein Groß/Klein"
#: gitk:789 gitk:2365 gitk:2472 gitk:4229
msgid "Regexp"
msgstr "Regexp"
#: gitk:793 gitk:794 gitk:2493 gitk:2523 gitk:2530 gitk:4339 gitk:4395
msgid "All fields"
msgstr "Alle Felder"
#: gitk:794 gitk:2491 gitk:2523 gitk:4295
msgid "Headline"
msgstr "Überschrift"
#: gitk:795 gitk:2491 gitk:4295 gitk:4395 gitk:4783
msgid "Comments"
msgstr "Beschreibung"
#: gitk:795 gitk:2491 gitk:2495 gitk:2530 gitk:4295 gitk:4719 gitk:5903
#: gitk:5918
msgid "Author"
msgstr "Autor"
#: gitk:795 gitk:2491 gitk:4295 gitk:4721
msgid "Committer"
msgstr "Eintragender"
#: gitk:825
msgid "Search"
msgstr "Suche"
#: gitk:833
msgid "Diff"
msgstr "Vergleich"
#: gitk:835
msgid "Old version"
msgstr "Alte Version"
#: gitk:837
msgid "New version"
msgstr "Neue Version"
#: gitk:839
msgid "Lines of context"
msgstr "Kontextzeilen"
#: gitk:898
msgid "Patch"
msgstr ""
#: gitk:901
msgid "Tree"
msgstr "Baum"
#: gitk:1018 gitk:1033 gitk:5969
msgid "Diff this -> selected"
msgstr "Vergleich diese -> gewählte"
#: gitk:1020 gitk:1035 gitk:5970
msgid "Diff selected -> this"
msgstr "Vergleich gewählte -> diese"
#: gitk:1022 gitk:1037 gitk:5971
msgid "Make patch"
msgstr "Patch erstellen"
#: gitk:1023 gitk:6109
msgid "Create tag"
msgstr "Markierung erstellen"
#: gitk:1024 gitk:6206
msgid "Write commit to file"
msgstr "Version in Datei schreiben"
#: gitk:1025 gitk:6260
msgid "Create new branch"
msgstr "Neuen Zweig erstellen"
#: gitk:1026
msgid "Cherry-pick this commit"
msgstr "Diese Version pflücken"
#: gitk:1028
msgid "Reset HEAD branch to here"
msgstr "HEAD-Zweig auf diese Version zurücksetzen"
#: gitk:1044
msgid "Check out this branch"
msgstr "Auf diesen Zweig umstellen"
#: gitk:1046
msgid "Remove this branch"
msgstr "Zweig löschen"
#: gitk:1052
msgid "Highlight this too"
msgstr ""
#: gitk:1054
msgid "Highlight this only"
msgstr ""
#: gitk:1281
msgid ""
"\n"
"Gitk - a commit viewer for git\n"
"\n"
"Copyright © 2005-2006 Paul Mackerras\n"
"\n"
"Use and redistribute under the terms of the GNU General Public License"
msgstr ""
#: gitk:1290 gitk:1354 gitk:6532
msgid "Close"
msgstr "Schließen"
#: gitk:1311
msgid "Gitk key bindings"
msgstr ""
#: gitk:1863
msgid "Gitk view definition"
msgstr ""
#: gitk:1888
msgid "Name"
msgstr "Name"
#: gitk:1891
msgid "Remember this view"
msgstr "Diese Ansicht speichern"
#: gitk:1895
msgid "Commits to include (arguments to git rev-list):"
msgstr ""
#: gitk:1901
msgid "Enter files and directories to include, one per line:"
msgstr ""
#: gitk:1950
msgid "Error in commit selection arguments:"
msgstr ""
#: gitk:2001 gitk:2087 gitk:2543 gitk:2557 gitk:3740 gitk:8635 gitk:8636
msgid "None"
msgstr "Keine"
#: gitk:2491 gitk:4295 gitk:5905 gitk:5920
msgid "Date"
msgstr "Datum"
#: gitk:2491 gitk:4295
msgid "CDate"
msgstr "Eintragedatum"
#: gitk:2640 gitk:2645
msgid "Descendent"
msgstr ""
#: gitk:2641
msgid "Not descendent"
msgstr ""
#: gitk:2648 gitk:2653
msgid "Ancestor"
msgstr ""
#: gitk:2649
msgid "Not ancestor"
msgstr ""
#: gitk:2883
msgid "Local changes checked in to index but not committed"
msgstr "Lokale Änderungen bereitgestellt, aber nicht eingetragen"
#: gitk:2913
msgid "Local uncommitted changes, not checked in to index"
msgstr "Lokale Änderungen, nicht bereitgestellt"
#: gitk:4264
msgid "Searching"
msgstr "Suchen"
#: gitk:4723
msgid "Tags:"
msgstr "Markierungen:"
#: gitk:4740 gitk:4746 gitk:5898
msgid "Parent"
msgstr "Eltern"
#: gitk:4751
msgid "Child"
msgstr "Kind"
#: gitk:4760
msgid "Branch"
msgstr "Zweig"
#: gitk:4763
msgid "Follows"
msgstr ""
#: gitk:4766
msgid "Precedes"
msgstr ""
#: gitk:5048
msgid "Error getting merge diffs:"
msgstr "Fehler beim Laden des Vergleichs:"
#: gitk:5725
msgid "Goto:"
msgstr ""
#: gitk:5727
msgid "SHA1 ID:"
msgstr ""
#: gitk:5752
#, tcl-format
msgid "Short SHA1 id %s is ambiguous"
msgstr ""
#: gitk:5764
#, tcl-format
msgid "SHA1 id %s is not known"
msgstr ""
#: gitk:5766
#, tcl-format
msgid "Tag/Head %s is not known"
msgstr ""
#: gitk:5908
msgid "Children"
msgstr "Kinder"
#: gitk:5965
#, tcl-format
msgid "Reset %s branch to here"
msgstr "Zweig »%s« hierher zurücksetzen"
#: gitk:5996
msgid "Top"
msgstr "Oben"
#: gitk:5997
msgid "From"
msgstr "Von"
#: gitk:6002
msgid "To"
msgstr "bis"
#: gitk:6025
msgid "Generate patch"
msgstr "Patch erstellen"
#: gitk:6027
msgid "From:"
msgstr "Von:"
#: gitk:6036
msgid "To:"
msgstr "bis:"
#: gitk:6045
msgid "Reverse"
msgstr "Umgekehrt"
#: gitk:6047 gitk:6220
msgid "Output file:"
msgstr ""
#: gitk:6053
msgid "Generate"
msgstr "Erzeugen"
#: gitk:6089
msgid "Error creating patch:"
msgstr ""
#: gitk:6111 gitk:6208 gitk:6262
msgid "ID:"
msgstr ""
#: gitk:6120
msgid "Tag name:"
msgstr "Markierungsname:"
#: gitk:6124 gitk:6271
msgid "Create"
msgstr "Erstellen"
#: gitk:6139
msgid "No tag name specified"
msgstr ""
#: gitk:6143
#, tcl-format
msgid "Tag \"%s\" already exists"
msgstr "Markierung »%s« existiert bereits."
#: gitk:6153
msgid "Error creating tag:"
msgstr ""
#: gitk:6217
msgid "Command:"
msgstr ""
#: gitk:6225
msgid "Write"
msgstr "Schreiben"
#: gitk:6241
msgid "Error writing commit:"
msgstr ""
#: gitk:6267
msgid "Name:"
msgstr "Name:"
#: gitk:6286
msgid "Please specify a name for the new branch"
msgstr ""
#: gitk:6315
#, tcl-format
msgid "Commit %s is already included in branch %s -- really re-apply it?"
msgstr ""
#: gitk:6320
msgid "Cherry-picking"
msgstr "Version pflücken"
#: gitk:6332
msgid "No changes committed"
msgstr "Keine Änderungen eingetragen"
#: gitk:6355
msgid "Confirm reset"
msgstr "Zurücksetzen bestätigen"
#: gitk:6357
#, tcl-format
msgid "Reset branch %s to %s?"
msgstr "Zweig »%s« auf »%s« zurücksetzen?"
#: gitk:6361
msgid "Reset type:"
msgstr "Art des Zurücksetzens:"
#: gitk:6365
msgid "Soft: Leave working tree and index untouched"
msgstr "Harmlos: Arbeitskopie und Bereitstellung unverändert"
#: gitk:6368
msgid "Mixed: Leave working tree untouched, reset index"
msgstr ""
"Gemischt: Arbeitskopie unverändert,\n"
"Bereitstellung zurückgesetzt"
#: gitk:6371
msgid ""
"Hard: Reset working tree and index\n"
"(discard ALL local changes)"
msgstr ""
"Hart: Arbeitskopie und Bereitstellung\n"
"(Alle lokalen Änderungen werden gelöscht)"
#: gitk:6387
msgid "Resetting"
msgstr "Zurücksetzen"
#: gitk:6444
msgid "Checking out"
msgstr "Umstellen"
#: gitk:6474
msgid "Cannot delete the currently checked-out branch"
msgstr "Der Zweig, auf den die Arbeitskopie momentan umgestellt ist, kann nicht gelöscht werden."
#: gitk:6480
#, tcl-format
msgid ""
"The commits on branch %s aren't on any other branch.\n"
"Really delete branch %s?"
msgstr ""
#: gitk:6511
#, tcl-format
msgid "Tags and heads: %s"
msgstr ""
#: gitk:6525
msgid "Filter"
msgstr ""
#: gitk:6820
msgid ""
"Error reading commit topology information; branch and preceding/following "
"tag information will be incomplete."
msgstr ""
#: gitk:7804
msgid "Tag"
msgstr "Markierung"
#: gitk:7804
msgid "Id"
msgstr ""
#: gitk:7844
msgid "Gitk font chooser"
msgstr ""
#: gitk:7861
msgid "B"
msgstr "F"
#: gitk:7864
msgid "I"
msgstr "K"
#: gitk:7959
msgid "Gitk preferences"
msgstr "Gitk Einstellungen"
#: gitk:7960
msgid "Commit list display options"
msgstr "Anzeige Versionsliste"
#: gitk:7964
msgid "Maximum graph width (lines)"
msgstr "Maximale Graphenbreite (Zeilen)"
#: gitk:7968
#, tcl-format
msgid "Maximum graph width (% of pane)"
msgstr "Maximale Graphenbreite (% des Fensters)"
#: gitk:7973
msgid "Show local changes"
msgstr "Lokale Änderungen anzeigen"
#: gitk:7978
msgid "Diff display options"
msgstr "Anzeige Vergleich"
#: gitk:7981
msgid "Tab spacing"
msgstr "Tabulatorbreite"
#: gitk:7985
msgid "Display nearby tags"
msgstr ""
#: gitk:7990
msgid "Limit diffs to listed paths"
msgstr "Vergleich nur für angezeigte Pfade"
#: gitk:7995
msgid "Colors: press to choose"
msgstr "Farben: Klicken zum Wählen"
#: gitk:7999
msgid "Background"
msgstr "Vordergrund"
#: gitk:8003
msgid "Foreground"
msgstr "Hintergrund"
#: gitk:8007
msgid "Diff: old lines"
msgstr "Vergleich: Alte Zeilen"
#: gitk:8012
msgid "Diff: new lines"
msgstr "Vergleich: Neue Zeilen"
#: gitk:8017
msgid "Diff: hunk header"
msgstr "Vergleich: Änderungstitel"
#: gitk:8023
msgid "Select bg"
msgstr "Hintergrundfarbe Auswählen"
#: gitk:8027
msgid "Fonts: press to choose"
msgstr "Schriftart: Klicken zum Wählen"
#: gitk:8030
msgid "Main font"
msgstr "Programmschriftart"
#: gitk:8031
msgid "Diff display font"
msgstr "Vergleich"
#: gitk:8032
msgid "User interface font"
msgstr "Beschriftungen"
#: gitk:8050
#, tcl-format
msgid "Gitk: choose color for %s"
msgstr "Gitk: Farbe wählen für %s"
#: gitk:8431
msgid ""
"Sorry, gitk cannot run with this version of Tcl/Tk.\n"
" Gitk requires at least Tcl/Tk 8.4."
msgstr ""
#: gitk:8516
msgid "Cannot find a git repository here."
msgstr "Kein Git-Projektarchiv gefunden."
#: gitk:8520
#, tcl-format
msgid "Cannot find the git directory \"%s\"."
msgstr ""
#: gitk:8559
#, tcl-format
msgid "Ambiguous argument '%s': both revision and filename"
msgstr ""
#: gitk:8571
msgid "Bad arguments to gitk:"
msgstr ""
#: gitk:8583
msgid "Couldn't get list of unmerged files:"
msgstr ""
#: gitk:8599
msgid "No files selected: --merge specified but no files are unmerged."
msgstr ""
#: gitk:8602
msgid ""
"No files selected: --merge specified but no unmerged files are within file "
"limit."
msgstr ""
#: gitk:8661
msgid "Command line"
msgstr "Kommandozeile"