Re: [PATCH/RFC] l10n: de.po: translate 39 new messages

2013-04-17 Thread Thomas Rast
Ralf Thielow ralf.thie...@gmail.com writes:

   #: sequencer.c:536
   #, c-format
   msgid could not revert %s... %s
   msgstr Konnte %s nicht zurücksetzen... %s

   #: sequencer.c:1016
   msgid Can't revert as initial commit
   msgstr Kann nicht zu initialer Version zurücksetzen.

 which I don't really like either now that you mention it -- I would
 re-translate it as 'reset'.  But either way they should be consistent.


 I'm not sure I understand. We currently translate reset as neu
 setzen/umsetzen,
 which is fine if it means a branch or HEAD ('git reset'), but for commits?
 What about zurücknehmen?

Sorry for the confusion -- what I meant is: given only zurücksetzen
and no context, I would probably infer that the original message related
to 'reset'.  Which it doesn't, so that would be confusing.

Zurücknehmen works for me, or in the same vein you could try
widerrufen.


You can add

  Acked-by: Thomas Rast tr...@inf.ethz.ch

when you reroll.

Thanks for your work!

-- 
Thomas Rast
trast@{inf,student}.ethz.ch
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: [PATCH/RFC] l10n: de.po: translate 39 new messages

2013-04-17 Thread Thomas Rast
Ralf Thielow ralf.thie...@gmail.com writes:

 Hi,

 Thanks for review!

 On Mon, Apr 15, 2013 at 9:26 PM, Christian Stimming stimm...@tuhh.dewrote:

 Thanks for the regular update! This is great work.

 One issue with the plural form messages, though:

 Am Montag, 15. April 2013, 18:27:40 schrieb Ralf Thielow:
   #: bundle.c:186
  -#, fuzzy, c-format
  +#, c-format
   msgid The bundle contains this ref:
   msgid_plural The bundle contains these %d refs:
  -msgstr[0] Das Paket enthält %d Referenz
  -msgstr[1] Das Paket enthält %d Referenzen
  +msgstr[0] Das Paket enthält diese Referenz:
  +msgstr[1] Das Paket enthält diese %d Referenzen:

 The msgstr[0] must still contain a %d conversion specifier (which will be
 filled with the number 1) even though the translated sentence wouldn't need
 the 1 anymore. The previous msgstr[0] was correct; the English singular
 msgid
 is not.

 That made me wonder, too. I've played around a bit with this, and it seems
 to be OK as long as one of those strings contain at least one format
 specifier.

C printf() only knows about the number and types of arguments from the
format string, so *ignoring* arguments is not a problem for correctness.

-- 
Thomas Rast
trast@{inf,student}.ethz.ch
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: [PATCH/RFC] l10n: de.po: translate 39 new messages

2013-04-17 Thread Christian Stimming
Am Mittwoch, 17. April 2013, 10:09:29 schrieb Thomas Rast:
msgid The bundle contains this ref:
msgid_plural The bundle contains these %d refs:
   
   -msgstr[0] Das Paket enthält %d Referenz
   -msgstr[1] Das Paket enthält %d Referenzen
   +msgstr[0] Das Paket enthält diese Referenz:
   +msgstr[1] Das Paket enthält diese %d Referenzen:
  
  The msgstr[0] must still contain a %d conversion specifier (which will
  be filled with the number 1) even though the translated sentence
  wouldn't need the 1 anymore. The previous msgstr[0] was correct; the
  English singular msgid
  is not.
  
  That made me wonder, too. I've played around a bit with this, and it
  seems to be OK as long as one of those strings contain at least one
  format specifier.
 
 C printf() only knows about the number and types of arguments from the
 format string, so *ignoring* arguments is not a problem for correctness.

Indeed both of you are correct and I learned something new. 

http://stackoverflow.com/questions/3578970/passing-too-many-arguments-to-
printf

where the second answer quotes  Online C Draft Standard (n1256), section 
7.19.6.1, paragraph 2: If the format is exhausted while arguments remain, the 
excess arguments are evaluated (as always) but are otherwise ignored.

Hence, it is indeed safe to skip unneeded conversion specifiers both in 
general ngettext messages and also in their respective translation. This is an 
explanation which has yet to be added to ngettext's documentation.

Best Regards,

Christian
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: [PATCH/RFC] l10n: de.po: translate 39 new messages

2013-04-17 Thread Junio C Hamano
Christian Stimming stimm...@tuhh.de writes:

 Thanks for the regular update! This is great work.

 One issue with the plural form messages, though:

 Am Montag, 15. April 2013, 18:27:40 schrieb Ralf Thielow:
  #: bundle.c:186
 -#, fuzzy, c-format
 +#, c-format
  msgid The bundle contains this ref:
  msgid_plural The bundle contains these %d refs:
 -msgstr[0] Das Paket enthält %d Referenz
 -msgstr[1] Das Paket enthält %d Referenzen
 +msgstr[0] Das Paket enthält diese Referenz:
 +msgstr[1] Das Paket enthält diese %d Referenzen:

 The msgstr[0] must still contain a %d conversion specifier (which will be 
 filled with the number 1) even though the translated sentence wouldn't need 
 the 1 anymore. The previous msgstr[0] was correct; the English singular msgid 
 is not.

 Technical background: The ngettext function chooses only the string itself, 
 which will then be fed to printf() as a second step. If the printf sees more 
 variadic arguments than conversion specifiers in the string, it will be 
 unhappy. At least that's what I remembered about the ngettext things...

 http://www.gnu.org/software/libc/manual/html_node/Advanced-gettext-
 functions.html

This vaguely sounds familiar:

  http://thread.gmane.org/gmane.comp.version-control.git/218173
  http://www.gnu.org/software/gettext/manual/gettext.html#Plural-forms

In the English singular case, the number – always 1 – can be
replaced with one:

  printf (ngettext (One file removed, %d files removed, n), n);

This works because the ‘printf’ function discards excess arguments
that are not consumed by the format string.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: [PATCH/RFC] l10n: de.po: translate 39 new messages

2013-04-16 Thread Thomas Rast
Ralf Thielow ralf.thie...@gmail.com writes:

  msgid You are currently reverting commit %s.
 -msgstr Sie sind gerade bei einer binären Suche in Zweig '%s'.
 +msgstr Sie kehren gerade Version '%s' um.

Is revert-umkehren new?  I can see it's in the glossary, but

  #: sequencer.c:536
  #, c-format
  msgid could not revert %s... %s
  msgstr Konnte %s nicht zurücksetzen... %s

  #: sequencer.c:1016
  msgid Can't revert as initial commit
  msgstr Kann nicht zu initialer Version zurücksetzen.

which I don't really like either now that you mention it -- I would
re-translate it as 'reset'.  But either way they should be consistent.

  msgid Commit %s has an untrusted GPG signature, allegedly by %s.
 -msgstr 
 +msgstr Version %s hat eine nicht vertrauenswürdige GPG-Signatur, 
 +vermeintlich von %s.
  
  msgid Commit %s has a bad GPG signature allegedly by %s.
 -msgstr 
 +msgstr Version %s hat eine ungültige GPG-Signatur, vermeintlich von %s.

You could say angeblich instead, which is more to the point.

  #: git-submodule.sh:626
 -#, fuzzy, sh-format
 +#, sh-format
  msgid Submodule '$name' ($url) unregistered for path '$sm_path'
 -msgstr Unterprojekt '$name' ($url) ist für Pfad '$sm_path' registriert
 +msgstr Unterprojekt '$name' ($url) ist nicht für Pfad '$sm_path' 
 registriert.

This is in cmd_deinit(), and the comment for the enclosing block says

  # Remove the whole section so we have a clean state when
  # the user later decides to init this submodule again

So it would seem to use unregister as a verb, not an adjective, and
the correct translation is

  msgstr Unterprojekt '$name' ($url) für '$sm_path' deregistriert.

or some such.  Deregistriert is not very nice; in the absence of
context I would suggest ausgetragen, but that problably collides with
our use of eintragen.  Perhaps you can go the long way for this
isolated use and just say aus der Konfiguration entfernt (and
similarly for 'register').

In any case you should also add 'register' and 'unregister' to the
glossary once you've settled on something.

-- 
Thomas Rast
trast@{inf,student}.ethz.ch
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: [PATCH/RFC] l10n: de.po: translate 39 new messages

2013-04-16 Thread Ralf Thielow
Hi,

Thanks for Review!

2013/4/15 Christian Stimming stimm...@tuhh.de:
 Thanks for the regular update! This is great work.

 One issue with the plural form messages, though:

 Am Montag, 15. April 2013, 18:27:40 schrieb Ralf Thielow:
  #: bundle.c:186
 -#, fuzzy, c-format
 +#, c-format
  msgid The bundle contains this ref:
  msgid_plural The bundle contains these %d refs:
 -msgstr[0] Das Paket enthält %d Referenz
 -msgstr[1] Das Paket enthält %d Referenzen
 +msgstr[0] Das Paket enthält diese Referenz:
 +msgstr[1] Das Paket enthält diese %d Referenzen:

 The msgstr[0] must still contain a %d conversion specifier (which will be
 filled with the number 1) even though the translated sentence wouldn't need
 the 1 anymore. The previous msgstr[0] was correct; the English singular msgid
 is not.


That made me wonder, too. I've played around a bit with this, and it seems
to be OK as long as one of those strings contain at least one format specifier.

 Technical background: The ngettext function chooses only the string itself,
 which will then be fed to printf() as a second step. If the printf sees more
 variadic arguments than conversion specifiers in the string, it will be
 unhappy. At least that's what I remembered about the ngettext things...

 http://www.gnu.org/software/libc/manual/html_node/Advanced-gettext-
 functions.html

 Regards,

 Christian

--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: [PATCH/RFC] l10n: de.po: translate 39 new messages

2013-04-16 Thread Ralf Thielow
Hi,

Thanks for review!

2013/4/16 Thomas Rast tr...@inf.ethz.ch:
 Ralf Thielow ralf.thie...@gmail.com writes:

  msgid You are currently reverting commit %s.
 -msgstr Sie sind gerade bei einer binären Suche in Zweig '%s'.
 +msgstr Sie kehren gerade Version '%s' um.

 Is revert-umkehren new?  I can see it's in the glossary, but


Yes, I've added it recently to the glossary. I've only checked the
glossary and didn't find it. I didn't check de.po for past usages, though.

   #: sequencer.c:536
   #, c-format
   msgid could not revert %s... %s
   msgstr Konnte %s nicht zurücksetzen... %s

   #: sequencer.c:1016
   msgid Can't revert as initial commit
   msgstr Kann nicht zu initialer Version zurücksetzen.

 which I don't really like either now that you mention it -- I would
 re-translate it as 'reset'.  But either way they should be consistent.


I'm not sure I understand. We currently translate reset as neu
setzen/umsetzen,
which is fine if it means a branch or HEAD ('git reset'), but for commits?
What about zurücknehmen?

  msgid Commit %s has an untrusted GPG signature, allegedly by %s.
 -msgstr 
 +msgstr Version %s hat eine nicht vertrauenswürdige GPG-Signatur, 
 +vermeintlich von %s.

  msgid Commit %s has a bad GPG signature allegedly by %s.
 -msgstr 
 +msgstr Version %s hat eine ungültige GPG-Signatur, vermeintlich von %s.

 You could say angeblich instead, which is more to the point.


Yes. Thanks.

  #: git-submodule.sh:626
 -#, fuzzy, sh-format
 +#, sh-format
  msgid Submodule '$name' ($url) unregistered for path '$sm_path'
 -msgstr Unterprojekt '$name' ($url) ist für Pfad '$sm_path' registriert
 +msgstr Unterprojekt '$name' ($url) ist nicht für Pfad '$sm_path' 
 registriert.

 This is in cmd_deinit(), and the comment for the enclosing block says

   # Remove the whole section so we have a clean state when
   # the user later decides to init this submodule again

 So it would seem to use unregister as a verb, not an adjective, and
 the correct translation is

   msgstr Unterprojekt '$name' ($url) für '$sm_path' deregistriert.

 or some such.  Deregistriert is not very nice; in the absence of
 context I would suggest ausgetragen, but that problably collides with
 our use of eintragen.  Perhaps you can go the long way for this
 isolated use and just say aus der Konfiguration entfernt (and
 similarly for 'register').


Thanks. I prefer your aus der Konfiguration entfernt/eingetragen.

 In any case you should also add 'register' and 'unregister' to the
 glossary once you've settled on something.


Yes, I'll do.

 --
 Thomas Rast
 trast@{inf,student}.ethz.ch
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: [PATCH/RFC] l10n: de.po: translate 39 new messages

2013-04-15 Thread Christian Stimming
Thanks for the regular update! This is great work.

One issue with the plural form messages, though:

Am Montag, 15. April 2013, 18:27:40 schrieb Ralf Thielow:
  #: bundle.c:186
 -#, fuzzy, c-format
 +#, c-format
  msgid The bundle contains this ref:
  msgid_plural The bundle contains these %d refs:
 -msgstr[0] Das Paket enthält %d Referenz
 -msgstr[1] Das Paket enthält %d Referenzen
 +msgstr[0] Das Paket enthält diese Referenz:
 +msgstr[1] Das Paket enthält diese %d Referenzen:

The msgstr[0] must still contain a %d conversion specifier (which will be 
filled with the number 1) even though the translated sentence wouldn't need 
the 1 anymore. The previous msgstr[0] was correct; the English singular msgid 
is not.

Technical background: The ngettext function chooses only the string itself, 
which will then be fed to printf() as a second step. If the printf sees more 
variadic arguments than conversion specifiers in the string, it will be 
unhappy. At least that's what I remembered about the ngettext things...

http://www.gnu.org/software/libc/manual/html_node/Advanced-gettext-
functions.html

Regards,

Christian

--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html