[Aptitude-devel] Inconsistent help message

Sun Mar 30 16:14:18 UTC 2008

  Resending this to the list too.

On Sun, Mar 30, 2008 at 09:45:25AM +0200, Christian Perrier <bubulle at debian.org> was heard to say:
> I have a problem with the po/ directory for aptitude...

  So, I ran a diff of the pot file after running "make update-po" to see
what the differences are that I would check in.  I've deleted all the
stanzas that just change line numbers.

daniel at alpaca:~/programming/aptitude/head$ hg diff po/aptitude.pot
> diff -r 7d1a4a4d43db po/aptitude.pot
> --- a/po/aptitude.pot	Sun Mar 30 14:24:28 2008 +0200
> +++ b/po/aptitude.pot	Sun Mar 30 08:25:13 2008 -0700
> -#: src/cmdline/cmdline_why.cc:291
> +#: src/cmdline/cmdline_why.cc:286
> +msgid "InstallNotCurrent"
> +msgstr ""
> +
> +#: src/cmdline/cmdline_why.cc:294
> msgid "allow_choices"
> msgstr ""

  These add the new string "InstallNotCurrent".

> -#: src/cmdline/cmdline_why.cc:478
> +#: src/cmdline/cmdline_why.cc:492
> +msgid "    ++   --> skipping, the dep is satisfied by the current version\n"
> +msgstr ""
> +
> +#: src/cmdline/cmdline_why.cc:522
> msgid "    ++   --> ENQUEUING\n"
> msgstr ""

  These add a new string.

> -#: src/cmdline/cmdline_why.cc:913
> -#, c-format
> -msgid "No justification for removing %s could be constructed.\n"
> -msgstr ""
> -
> -#: src/cmdline/cmdline_why.cc:915
> -#, c-format
> -msgid "No justification for %s could be constructed.\n"
> -msgstr ""
> -
> -#: src/cmdline/cmdline_why.cc:960 src/cmdline/cmdline_why.cc:986
> -#: src/cmdline/cmdline_why.cc:1048
> +#: src/cmdline/cmdline_why.cc:957
> +#, c-format
> +msgid "Unable to find a reason to remove %s.\n"
> +msgstr ""
> +
> +#: src/cmdline/cmdline_why.cc:959
> +#, c-format
> +msgid "Unable to find a reason to install %s.\n"
> +msgstr ""
> +
> +#: src/cmdline/cmdline_why.cc:1004 src/cmdline/cmdline_why.cc:1030
> +#: src/cmdline/cmdline_why.cc:1092

  These strings were modified to improve their wording.

> -#: src/download_bar.cc:55 src/download_list.cc:342 src/download_screen.cc:62
> -#, c-format
> -msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
> -msgstr ""
> -
> -#: src/download_bar.cc:72 src/generic/apt/acqprogress.cc:65
> -msgid "Hit "
> -msgstr ""
> -
> -#: src/download_bar.cc:83
> -msgid "Downloading "
> -msgstr ""
> -
> -#: src/download_bar.cc:94
> -msgid "Got "
> -msgstr ""
> -
> -#: src/download_bar.cc:144
> -msgid "Downloading..."
> -msgstr ""
> -

  download_bar no longer exists; neither does download_screen.

> +#: src/download_list.cc:342
> +#, c-format
> +msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
> +msgstr ""
> +
> +#: src/download_list.cc:349
> msgid "Abort"
> msgstr ""

  This is the message from above that was in download_list as well as
download_bar and download_screen.

> -#: src/download_screen.cc:188
> -#, c-format
> -msgid "Downloaded %sB in %ss (%sB/s)."
> -msgstr ""
> -

  Another string from download_screen.

> +msgstr ""
> +
> +#: src/generic/apt/acqprogress.cc:65
> +msgid "Hit "
> msgstr ""

  Another shared string that's less shared now.

> -#: src/generic/apt/download_update_manager.cc:326
> -#, c-format
> -msgid ""
> -"The debtags command (%s) does not exist; perhaps you need to install the "
> -"debtags package?"
> -msgstr ""
> -
> -#: src/generic/apt/download_update_manager.cc:329

  This message was removed because it was annoying.

> -#: src/generic/util/threads.cc:32
> -msgid "Not enough resources to create thread"
> -msgstr ""
> -

  This message was removed because the code no longer exists in aptitude
(moved to cwidget).

> -#: src/pkg_info_screen.cc:157
> -msgid "Versions"
> +#: src/pkg_info_screen.cc:162
> +#, c-format
> +msgid "Versions of %s"
> msgstr ""

  Message improvement.

> +#: src/pkg_subtree.cc:159
> +#, c-format
> +msgid "This group contains %d package."
> +msgid_plural "This group contains %d packages."
> +msgstr[0] ""
> +msgstr[1] ""
> +

  New message.

> -#: src/ui.cc:2184
> +#: src/ui.cc:2186
> +msgid "C^ycle Package Information"
> +msgstr ""
> +
> +#: src/ui.cc:2187
> +msgid ""
> +"Cycle through the modes of the package information area: it can show the "
> +"package's long description, a summary of its dependency status, or an "
> +"analysis of why the package is required."
> +msgstr ""
> +
> +#: src/ui.cc:2190

  New message.

> -#: src/vscreen/config/column_definition.cc:105
> -#: src/vscreen/config/column_definition.cc:123
> -msgid "Formatting marker with missing format code"
> -msgstr ""
> -
> -#: src/vscreen/config/column_definition.cc:132
> -#: src/vscreen/config/column_definition.cc:178
> -#, c-format
> -msgid "Bad number in format string: '%ls'"
> -msgstr ""
> -
> -#: src/vscreen/config/column_definition.cc:160
> -msgid "Missing parameter number in format string"
> -msgstr ""
> -
> -#: src/vscreen/config/column_definition.cc:185
> -#, c-format
> -msgid "Parameter numbers must be 1 or greater, not %ld"
> -msgstr ""
> -
> -#: src/vscreen/config/column_definition.cc:211
> -#, c-format
> -msgid "Unknown formatting code '%lc'"
> -msgstr ""
> -
> -#: src/vscreen/config/column_definition.cc:261
> -msgid "Bad format parameter"
> -msgstr ""
> -
> -#: src/vscreen/config/keybindings.cc:333
> -#, c-format
> -msgid "Cannot parse key description: %ls"
> -msgstr ""
> -
> -#: src/vscreen/config/keybindings.cc:343
> -msgid "Invalid null keybinding"
> -msgstr ""
> -
> -#: src/vscreen/config/keybindings.cc:351
> -msgid "Sorry, control modifiers may not be used with unprintable characters"
> -msgstr ""
> -
> -#: src/vscreen/vscreen.cc:125
> -#, c-format
> -msgid "Ouch!  Got SIGTERM, dying..\n"
> -msgstr ""
> -
> -#: src/vscreen/vscreen.cc:128
> -#, c-format
> -msgid "Ouch!  Got SIGSEGV, dying..\n"
> -msgstr ""
> -
> -#: src/vscreen/vscreen.cc:131
> -#, c-format
> -msgid "Ouch!  Got SIGABRT, dying..\n"
> -msgstr ""
> -
> -#: src/vscreen/vscreen.cc:134
> -#, c-format
> -msgid "Ouch!  Got SIGQUIT, dying..\n"
> -msgstr ""
> -
> -#: src/vscreen/vs_pager.cc:439
> -#, c-format
> -msgid ""
> -"Unable to load filename: the string %ls has no multibyte representation."
> -msgstr ""
> -
> -#: src/vscreen/vs_tree.cc:942
> -msgid "TOP LEVEL"
> -msgstr ""

  More stuff that moved to cwidget.

  I don't see anything that's wrong.  If I look over your "put the
translations back" change, I see a whole bunch of files that don't exist
being put into the translation.  Where are those coming from?  e.g.,
your commit puts in a bunch of messages from src/download_bar.cc, which
doesn't even exist in the tree.  Do you have this changeset in your
branch?

changeset:   1211:d88902e73978
user:        Daniel Burrows <dburrows at debian.org>
date:        Thu Feb 21 07:12:15 2008 -0800
summary:     Remove the legacy download_bar and download_screen modules.

  Does the file src/download_bar.cc exist for you?

    Thanks,
  Daniel