german translation bug

"Arbeitsverzeichnis leer" means "working directory empty" which is obviously wrong.

It should say

"Arbeitsverzeichnis sauber"

wr@s5:~/src/linux$ git status # Auf Zweig drm-intel-testing Nichts zum Einreichen, Arbeitsverzeichnis leer wr@s5:~/src/linux$ LANG=C git status # On branch drm-intel-testing nothing to commit, working directory clean

On Wed, Dec 25, 2013 at 8:53 PM, Wolfgang Rohdewald <wolfgang@rohdewald.de> wrote:

This message is currently translated as "nichts zu committen, Arbeitsverzeichnis unverändert". Before it was translated as "nichts einzutragen, Arbeitsverzeichnis sauber". According to the log of git.git, it was never translated as you wrote, so it seems that your system uses a different German translation than upstream Git. What version of Git do you use? What distro in what version do you use?

Am Mittwoch, 25. Dezember 2013, 21:59:10 schrieb Ralf Thielow:

freshly installed kubuntu 13.10. The package language-pack-de mentioned at the end of this mail is installed.

I suppose I should open a KDE bug report?

i5:~ ((unknown)) git --version git version 1.8.3.2

wr@s5:~/kajongg/src$ grep -a 'Nichts zum Einreichen' /usr/share/locale-langpack/de/LC_MESSAGES/git.mo Nichts zum Einreichen Nichts zum Einreichen, Arbeitsverzeichnis leer

root@s5:~/kajongg/src# apt-file search /de/ | grep /git.mo language-pack-de-base: /usr/share/locale-langpack/de/LC_MESSAGES/git.mo

root@s5:~/kajongg/src# LANG=C dpkg --info /var/cache/apt/archives/language-pack-de-base_1%3a13.10+20131012_all.deb
 new debian package, version 2.0.
 size 3346634 bytes: control archive=7323 bytes.
     955 bytes,    19 lines      control              
   20278 bytes,   231 lines      md5sums              
     125 bytes,     9 lines   *  postinst             #!/bin/sh
     121 bytes,     9 lines   *  postrm               #!/bin/sh
 Package: language-pack-de-base
 Version: 1:13.10+20131012
 Architecture: all
 Maintainer: Language pack maintainers <language-packs@ubuntu.com>
 Installed-Size: 11247
 Pre-Depends: dpkg (>= 1.10.27ubuntu1)
 Depends: locales (>= 2.3.6), language-pack-de (>= 1:13.10+20131012)
 Recommends: firefox-locale-de
 Conflicts: language-pack-de (<< 1:13.10+20131012)
 Replaces: language-pack-de (<< 1:13.10+20131012), language-pack-de-base (<< 1:13.10+20131012), language-pack-gnome-de (<< 1:13.10+20131012), language-pack-gnome-de-base (<< 1:13.10+20131012), language-pack-kde-de (<< 1:13.10+20131012), language-pack-kde-de-base (<< 1:13.10+20131012)
 Section: translations
 Priority: optional
 Description: translations for language German
  Translation data for all supported packages for:
  German
  .
  This package provides the bulk of translation data and is updated
  only seldom. language-pack-de provides frequent
  translation updates, so you should install this as well.

Am Mittwoch, 25. Dezember 2013, 22:53:29 schrieb Wolfgang Rohdewald:

I meant a ubuntu bug report of course.

Hi,

Wolfgang Rohdewald wrote:

Yes, please.  Feel free to cc me if doing so.

In generally, I'm a bit uncomfortable lately at how Ubuntu's translation system works for Git. They are trying to solve a real problem: old Ubuntu releases stick to old versions of git that do not have as complete translations as the latest version. But their solution to this problem does not seem to work well and creates a lot of confusion. Worse, it creates duplicated effort, as their custom translations don't seem to have been submitted upstream for review or inclusion.

Jonathan Nieder <jrnieder@gmail.com> writes:

Even worse, the German one under discussion uses an entirely different vocabulary to describe git concepts:

  ubuntu (from OP):
    wr@s5:~/src/linux$ git status
    # Auf Zweig drm-intel-testing
    Nichts zum Einreichen, Arbeitsverzeichnis leer

  de.po current:
    msgid "nothing to commit, working directory clean\n"
    msgstr "nichts zu committen, Arbeitsverzeichnis unverändert\n"

  de.po before the big vocabulary change:
     msgid "nothing to commit, working directory clean\n"
     msgstr "nichts einzutragen, Arbeitsverzeichnis sauber\n"

So their word for "commit (v.)" is "einreichen", whereas we had "committen" and before that "eintragen". As if there weren't enough confusion around German terminology yet.

(FWIW I also think it's a terrible choice because it suggests a transaction between multiple people, which to me sounds like it should mean "push".)

On Wed, Dec 25, 2013 at 4:53 PM, Wolfgang Rohdewald <wolfgang@rohdewald.de> wrote:

Git does not use KDE's language packs.

What does dpkg report for info about the installed git package (if you are using the packaged version)?

Am Mittwoch, 25. Dezember 2013, 17:14:31 schrieb Drew Northup:

Sorry, I meant ubuntu. I believe I heard before that they tend to replace upstream translations but I never actually experienced a problem with that.

Yes, I am using the packaged version. This package does not contain any translations.

root@s5:/var/cache/apt/archives# dpkg --info git_1%3a1.8.3.2-1_amd64.deb
 neues Debian-Paket, Version 2.0.
 Größe 8034840 Byte: control-Archiv= 15063 Byte.
      34 Byte,     1 Zeilen      conffiles            
    1741 Byte,    30 Zeilen      control              
   32344 Byte,   427 Zeilen      md5sums              
    1570 Byte,    45 Zeilen   *  postinst             #!/bin/sh
    1080 Byte,    35 Zeilen   *  postrm               #!/bin/sh
    2359 Byte,    68 Zeilen   *  preinst              #!/bin/sh
     478 Byte,    12 Zeilen   *  prerm                #!/bin/sh
 Package: git
 Version: 1:1.8.3.2-1
 Architecture: amd64
 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
 Original-Maintainer: Gerrit Pape <pape@smarden.org>
 Installed-Size: 17972
 Depends: libc6 (>= 2.16), libcurl3-gnutls (>= 7.16.2), libexpat1 (>= 2.0.1), libpcre3 (>= 8.10), zlib1g (>= 1:1.2.0), perl-modules, liberror-perl, git-man (>> 1:1.8.3.2), git-man (<< 1:1.8.3.2-.)
 Recommends: patch, less, rsync, ssh-client
 Suggests: gettext-base, git-daemon-run | git-daemon-sysvinit, git-doc, git-el, git-email, git-gui, gitk, gitweb, git-arch, git-bzr, git-cvs, git-svn
 Breaks: bash-completion (<< 1:1.90-1), cogito (<= 0.18.2+), git-core (<< 1:1.7.0.4-1.), gitosis (<< 0.2+20090917-7), gitpkg (<< 0.15), gitweb (<< 1:1.7.4~rc1), guilt (<< 0.33), stgit (<< 0.15), stgit-contrib (<< 0.15)
 Replaces: git-core (<< 1:1.7.0.4-1.), gitweb (<< 1:1.7.4~rc1)
 Provides: git-completion, git-core
 Section: vcs
 Priority: optional
 Multi-Arch: foreign
 Homepage: http://git-scm.com/
 Description: fast, scalable, distributed revision control system
  Git is popular version control system designed to handle very large
  projects with speed and efficiency; it is used for many high profile
  open source projects, most notably the Linux kernel.
  .
  Git falls in the category of distributed source code management tools.
  Every Git working directory is a full-fledged repository with full
  revision tracking capabilities, not dependent on network access or a
  central server.
  .
  This package provides the git main components with minimal dependencies.
  Additional functionality, e.g. a graphical user interface and revision
  tree visualizer, tools for interoperating with other VCS's, or a web
  interface, is provided as separate git* packages.

On Wed, Dec 25, 2013 at 5:28 PM, Wolfgang Rohdewald <wolfgang@rohdewald.de> wrote:

Wolfgang, My suggestion is to consider compiling Git from sources, as Ubuntu has stopped applying non-security updates (for the most part) to 13.10--which includes most Git updates. That's the best way to ensure you get the latest translations checked out, QA'd and submitted by Ralf.

(I'm probably going to do that with a 13.10 that I have at home when I get a chance--most likely next week.)

On Wed, Dec 25, 2013 at 10:53 PM, Wolfgang Rohdewald <wolfgang@rohdewald.de> wrote:

The Ubuntu translators have already updated the German Git translation for 13.10. So the issue should be fixed in the next language pack update [1].

AFAIK Ubuntu ships the translations aside software packages that they're able to update l10n without updating the software itself. They also maintain the translations for themselves. Issues that's been reported to them also getting fixed by them. However, those fixes do not necessarily find their way to upstream Git translations. The benefit of reporting issues to Git ML is that they can be fixed in both upstream Git and Ubuntu. I'll try to keep an eye to launchpad and fix bugs in German translation reported on the ML on both places in the future.

Thanks for reporting the issue.

[1] https://translations.launchpad.net/ubuntu/saucy/+source/git/+pots/git/de/+translate?batch=10&show=all&search=nothing+to+commit%2C+working+directory+clean

2013/12/27 Ralf Thielow <ralf.thielow@gmail.com>:

I reported the same issue recently, and you can see reply from Canonical in this thread:

* http://thread.gmane.org/gmane.comp.version-control.git/239130