Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Jul 27, 2012
  1. @jiangxin @gitster

    rebase: remove obsolete and unused LONG_USAGE which breaks xgettext

    jiangxin authored gitster committed
    Since there is a modern OPTIONS_SPEC variable in use in this script,
    the obsolete USAGE and LONG_USAGE variables are no longer used.
    Remove them.
    
    In addition, the obsolete LONG_USAGE variable has the following
    message in it:
    
        A'\''--B'\''--C'\''
    
    And such complex LONG_USAGE message will break xgettext when
    extracting l10n messages (but if single quotes are removed from the
    message, xgettext works fine on 'git-rebase.sh').
    
    Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
    Reviewed-by: Stefano Lattarini <stefano.lattarini@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @jiangxin @gitster

    i18n: Rewrite gettext messages start with dash

    jiangxin authored gitster committed
    Gettext message in a shell script should not start with '-', one
    workaround is adding '--' between gettext and the message, like:
    
        gettext -- "--exec option ..."
    
    But due to a bug in the xgettext extraction, xgettext can not
    extract the actual message for this case. Rewriting the message
    is a simpler and better solution.
    
    Reported-by: Vincent van Ravesteijn <vfr@lyx.org>
    Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
    Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
    Reviewed-by: Stefano Lattarini <stefano.lattarini@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jul 25, 2012
  1. @jiangxin @gitster

    i18n: rebase: mark messages for translation

    jiangxin authored gitster committed
    Mark messages in git-rebase.sh for translation.  While doing this
    Jonathan noticed that the comma usage and sentence structure of the
    resolvemsg was not quite right, so correct that and its cousins in
    git-am.sh and t/t0201-gettext-fallbacks.sh at the same time.
    
    Some tests would start to fail with GETTEXT_POISON turned on after
    this update.  Use test_i18ncmp and test_i18ngrep where appropriate
    to mark strings that should only be checked in the C locale output
    to avoid such issues.
    
    Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
    Reviewed-by: Stefano Lattarini <stefano.lattarini@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Something went wrong with that request. Please try again.