Hi, Thanks for detailed proof-reading. Great work! I have some question on your patch as below. Your thought is most appreciated.
http://bugs.debian.org/696994 But you know most of them are stylistic changes. Changing them at this moment before the release will cause major breakage to translations. It has been more than several month under freeze for Debian. I have not been changing SVN at this moment. But maybe we can start doing it. (Released version is not exactly ones on public svn-repo). Strategy is to make all typo/plural/article related fixes first. These do not require translation updates. Then work on content fixes. On Sat, Apr 06, 2013 at 11:41:13PM +0200, Holger Wansing wrote: > this is round 3 of my proposals for the DR. Yes I see them at http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=696994 > You may want to fix at least one point before the next upload: > see line 189 of attached diff. FYI: I need to merge all these changes manually to the source files with resideing under the asciidoc directory as *.txt. Diff to that source is easier for me to integrate. > @@ -9352,16 +9352,18 @@ > "<citerefentry><refentrytitle>aptitude</refentrytitle><manvolnum>8</" > "manvolnum></citerefentry> for an interactive text interface to manage the " > "installed packages and to search the available packages." > msgstr "" > > #. type: Content of: <book><chapter><itemizedlist><listitem><para> > +### HW: update-manager works basically under other desktop environments, too. > msgid "" > "<citerefentry><refentrytitle>update-manager</refentrytitle><manvolnum>8</" > -"manvolnum></citerefentry> for keeping your system up-to-date if you're " > -"running the default GNOME desktop." > +"manvolnum></citerefentry> for keeping your system up-to-date; it is mainly " > +"aimed for being used in the default GNOME desktop, but basically works > under " > +"other desktop environments as well." > msgstr "" True. But question is how pedantic we should be. I want to keep it short. Now we have update-manager-gnome ... > #. type: Content of: <book><chapter><table><tgroup><tbody><row><entry> > -msgid "graphical package manager (GNOME front-end for APT)" > +### HW: my proposal for update-manager also applies here: synaptic is also > +### HW: working fine under Xfce for example. > +msgid "graphical package manager (graphical front-end for APT)" > msgstr "" I think we need some generic solution than making every text longer. > #. type: Content of: > <book><chapter><section><section><itemizedlist><listitem><para> > msgid "" > "Esoteric configuration may be manually enabled by the system administrator. > " > -"This may creates interference with popular generic helper programs for the " > +"This may create interferences with popular generic helper programs for the " > "system configuration." > msgstr "" Yes. > #. type: Content of: > <book><chapter><section><section><itemizedlist><listitem><itemizedlist><listitem><para> > -msgid "The long stability history of Debian system is no guarantee by > itself." > +msgid "The long stability history of the Debian system is no guarantee by > itself." > msgstr "" Yes. This is something I need to fix globally. > #. type: Content of: <book><chapter><section><section><para> > msgid "" > "The history of codenames are described in <ulink url=" > -"\"&debianfaqgdbwhiceenusedinthepast;\">Debian FAQ: 6.3.1 Which other " > +"\"&debianfaqgdbwhiceenusedinthepast;\">Debian FAQ: 6.2.1 Which other " > "codenames have been used in the past?</ulink>" > msgstr "" I see. Yes. > #. type: Content of: <book><chapter><section><section><para> > msgid "" > -"Every time a new upload is done by the Debian developer (DD) to the " > +"Every time a new upload is done by a Debian developer (DD) to the " > "<literal>unstable</literal> archive (via <ulink > url=\"&incoming;\">incoming</" > -"ulink> processing), DD is required to ensure uploaded packages to be " > +"ulink> processing), the DD is required to ensure uploaded packages to be " > "compatible with the latest set of packages in the latest > <literal>unstable</" > "literal> archive." > msgstr "" Yes. > #. type: Content of: > <book><chapter><section><section><itemizedlist><listitem><para> > -msgid "Debian installs only free software by default to respect user > freedoms." > +msgid "Debian installs only free software by default to respect user's > freedom." > msgstr "" Yes. > #. type: Content of: <book><chapter><section><section><para> > msgid "" > -"<ulink url=\"&debianfreesoftwareguidelines;\">Debian Free Software " > -"Guidelines</ulink> is the free software standards for <ulink url=\"&debian;" > +"The <ulink url=\"&debianfreesoftwareguidelines;\">Debian Free Software " > +"Guidelines</ulink> are the free software standards for <ulink > url=\"&debian;" > "\">Debian</ulink>. Debian interprets \"software\" in the widest scope " > "including document, firmware, logo, and artwork data in the package. This " > "makes Debian's free software standards very strict ones." > msgstr "" Yes. > #. type: Content of: <book><chapter><section><section><note><para> > msgid "" > -"Please note that defining, \"Provides\", \"Conflicts\" and \"Replaces\" " > +"Please note that defining \"Provides\", \"Conflicts\" and \"Replaces\" " > "simultaneously to an virtual package is the sane configuration. This " > "ensures that only one real package providing this virtual package can be " > "installed at any one time." > msgstr "" Yes. > #. type: Content of: > <book><chapter><section><section><table><tgroup><tbody><row><entry> > -msgid "The bug report of a known package name" > +### HW: http://bugs.debian.org/<package_name> shows all bugs for > <package_name>, not just one > +msgid "The bug reports of a known package name" > msgstr "" Yes. > #. type: Content of: > <book><chapter><section><section><table><tgroup><tbody><row><entry> > -msgid "<literal>apt-get dist-upgrade <package></literal>" > +### HW: there is no need to attach a package name for a dist-upgrade, right? > +msgid "<literal>apt-get dist-upgrade</literal>" > msgstr "" Yes. > #. type: Content of: > <book><chapter><section><section><table><tgroup><tbody><row><entry> > -msgid "remove auto-installed packages which is no longer required" > +msgid "remove auto-installed packages which are no longer required" > msgstr "" Yes. > #. type: Content of: > <book><chapter><section><section><table><tgroup><tbody><row><entry> > -msgid "<literal>apt-cache show <package></literal>" > +### HW: see next string, which refers to " package 'foo' " > +msgid "<literal>apt-cache show foo</literal>" > msgstr "" Yes. > #. type: Content of: <book><chapter><section><section><para> > msgid "" > -"This updates the local copy of the archive information and display the " > +"This updates the local copy of the archive information and displays the " > "package list in the full screen with menu. Aptitude places its " > "configuration at \"<literal>~/.aptitude/config</literal>\"." > msgstr "" Yes. > #. type: Content of: > <book><chapter><section><section><table><tgroup><tbody><row><entry> > +### HW: Either use > +### HW: "list packages which are recommended by some installed packages but > not yet " > +### HW: "installed" > +### HW: or > +### HW: "packages which are recommended by some installed packages but not > yet " > +### HW: "installed are listed" > msgid "" > "list packages which are recommended by some installed packages but not yet " > "installed are listed" > msgstr "" YES. I take the first one for consistency. > #. type: Content of: > <book><chapter><section><section><table><tgroup><tbody><row><entry> > @@ -11502,12 +11515,18 @@ > > #. type: Content of: > <book><chapter><section><section><table><tgroup><tbody><row><entry> > msgid "<literal>Upgradable Packages</literal>" > msgstr "" > > #. type: Content of: > <book><chapter><section><section><table><tgroup><tbody><row><entry> > +### HW: Probably there could some values be added to help the reader to > understand, > +### HW: what is meant (since terms like "area" and "section" are somewhat > common, > +### HW: and their meaning is not obvious in the first shot). > +### HW: For example: > +### HW: "list packages organized as <literal>section (admin, devel, doc > ...)</literal> " > +### HW: "??? <literal>area (main, contrib ...)</literal> ??? > <literal>package</literal>" > msgid "" > "list packages organized as <literal>section</literal> ??? <literal>area</" > "literal> ??? <literal>package</literal>" > msgstr "" I got your point. "area" and "section" are used in very specific way. This needs very careful attention pointing to policy. This is more to do with content... Let me think. I will mark them NEEDS_RETHINK > #. type: Content of: > <book><chapter><section><section><table><tgroup><tbody><row><entry> > -msgid "<literal>~A{sarge,etch,sid</literal>}" > +### HW: sarge and etch are fairly old. Probably use some recent ones? > +### HW: They are only examples, I know, but newbie users from today will > +### HW: not know what "sarge" is supposed to be ... > +### HW: Or maybe use entities (&codename-stable;, &codename-testing;, > &codename-unstable;), > +### HW: so that distribution names are kept actual automatically? > +### HW: This string is the same for all languages anyway. > -msgid "<literal>~A{wheezy,squeeze,sid</literal>}" > +msgid > "<literal>~A{&codename-stable;,&codename-testing;,&codename-unstable;</literal>}" > msgstr "" NEEDS_RETHINK > > #. type: Content of: > <book><chapter><section><section><table><tgroup><tbody><row><entry> > msgid "" > "match installed packages with <emphasis role=\"strong\">A</emphasis>-mark " > -"(auto installed package)" > +"(auto installed packages)" > msgstr "" YES. > #. type: Content of: > <book><chapter><section><section><itemizedlist><listitem><para> > +### HW: a common notation for "depends, predepends, recommends etc." in the > world of > +### HW: Debian is "dependency" (as it is in Chapter 2.1.6 for example), but > here it > +### HW: is suddenly "relation". > +### HW: Change for consistency (globally for the document)? > + > msgid "" > "The relation <type> is one of (depends, predepends, recommends, " > "suggests, conflicts, replaces, provides)." > msgstr "" NEEDS_RETHINK (I think I am following policy text.) > #. type: Content of: <book><chapter><section><section><para> > msgid "" > "The selection of a package in <literal>aptitude</literal> not only pulls in > " > "packages which are defined in its \"<literal>Depends:</literal>\" list but " > "also defined in the \"<literal>Recommends:</literal>\" list if the menu " > -"\"<literal>F10</literal> ??? Options ??? Dependency handling\" is set " > +"\"<literal>F10</literal> ??? Options ??? Preferences ??? Dependency > handling\" is set " > "accordingly. These auto installed packages are removed automatically if " > "they are no longer needed under <literal>aptitude</literal>." > msgstr "" YES. (Maybe new menu structure was introduced. Good catch!) > #. type: Content of: <book><chapter><section><section><note><para> > msgid "" > @@ -12113,24 +12143,33 @@ > msgid "" > "You may want to do the similar in the interactive mode for fine grained " > "control." > msgstr "" > > #. type: Content of: <book><chapter><section><section><para> > +### HW: In the Flat Package View the descripted method does not work: > +### HW: Applying a command (here purge via shortcut "_") on several packages > +### HW: at once does not work in the "New Flat Package View", but it works in > +### HW: the default "Package View" (tested with aptitude 0.6.3 from Squeeze). > +### HW: (or has this behaviour been changed in the aptitude version from > Wheezy?) > msgid "" > -"You provide the regex \"<literal>~c</literal>\" in the \"New Flat Package " > -"List\" view with \"<literal>l</literal>\" prompt. This limits the package " > +"You provide the regex \"<literal>~c</literal>\" in the \"New Package " > +"view\" with \"<literal>l</literal>\" prompt. This limits the package " > "view only to regex matched packages, i.e., \"removed but not purged\". All > " > "these regex matched packages can be shown by pressing > \"<literal>[</literal>" > "\" at top level headings." > msgstr "" I trust you are correct. I need to test it before updating this. DOUBLE_CHECK > #. type: Content of: <book><chapter><section><section><para> > +### HW: Viewing packages under the category "Installed Packages" makes no > +### HW: sense here, since you prompted to set a filter to "~c", which only > +### HW: shows removed, not purged packages. So the category "Installed > +### HW: Packages" is not visible, when filter "~c" is applied. > msgid "" > "Then you press \"<literal>_</literal>\" at top level headings such as " > -"\"Installed Packages\". Only regex matched packages under the heading are " > +"\"Not Installed Packages\". Only regex matched packages under the heading > are " > "marked to be purged by this. You can exclude some packages to be purged by > " > "pressing \"<literal>=</literal>\" interactively for each of them." > msgstr "" DOUBLE_CHECK > #. type: Content of: > <book><chapter><section><section><orderedlist><listitem><para> > msgid "" > "Type \"<literal>l</literal>\" to enter the package display limit as " > "\"<literal>~i</literal>\" and type \"<literal>m</literal>\" over " > -"\"<literal>Tasks</literal>\" as manual installed." > +"\"<literal>Tasks</literal>\", to mark that packages as manual installed." > msgstr "" YES. sounds better! But unsynmetric use of ",". Should I add ";" before "and" for these to make it clearer? Now: Type \"<literal>l</literal>\" to enter the package display limit as \"<literal>~i</literal>\" and type \"<literal>m</literal>\" over \"<literal>Tasks</literal>\", to mark that packages as manual installed. How about use "," and ";": V V Type \"<literal>l</literal>\", to enter the package display limit as \"<literal>~i</literal>\"; and type \"<literal>m</literal>\" over \"<literal>Tasks</literal>\", to mark that packages as manual installed. > #. type: Content of: > <book><chapter><section><section><table><tgroup><tbody><row><entry> > +### HW: 1. dpkg -l also gives an output, if the package is not installed, > which > +### HW: means, that you can get the status for an uninstalled package too > (status > +### HW: is "uninstalled" in that case), so drop that "installed". > +### HW: 2. I cannot see, what the sentence "for the bug report" is about. ??? > msgid "list status of an installed package for the bug report" > msgstr "" Without COLUMNS=120, report tends to be chopped off version string for long version strings. NEEDS_RETHINK > #. type: Content of: <book><chapter><section><section><caution><para> > msgid "" > "Lower level package tools such as \"<literal>dpkg -i ???</literal>\" and " > "\"<literal>debi ???</literal>\" should be carefully used by the system " > -"administrator. It does not automatically take care required package " > +"administrator. They do not automatically take care of required package " YES > #. type: Content of: > <book><chapter><section><section><itemizedlist><listitem><para> > +### HW: reading this string the first time, I understood it as "the package > dget > +### HW: depends on the package devscripts". But hey - that's what dpkg is > about: > +### HW: to solve these dependencies automatically. So I investigated further > and > +### HW: would propose this now: "To use dget, debuild and debi, you need to > install > +### HW: the devscripts package." > msgid "" > "<citerefentry><refentrytitle>dget</refentrytitle><manvolnum>1</manvolnum></" > "citerefentry>, <citerefentry><refentrytitle>debuild</" > "refentrytitle><manvolnum>1</manvolnum></citerefentry>, and " > "<citerefentry><refentrytitle>debi</refentrytitle><manvolnum>1</manvolnum></" > "citerefentry> require <literal>devscripts</literal> package." > @@ -12688,12 +12736,13 @@ > msgid "" > "See (re)packaging procedure using \"<literal>apt-get source</literal>\" in " > "<xref linkend=\"_porting_a_package_to_the_stable_system\"/>." > msgstr "" NEEDS_RETHINK > #. type: Content of: > <book><chapter><section><section><itemizedlist><listitem><para> > +### HW: see above regarding devscripts package. > msgid "" > "<literal>make-kpkg</literal> command requires the <literal>kernel-package</" > "literal> package (see <xref linkend=\"_the_kernel\"/>)." > msgstr "" > > #. type: Content of: > <book><chapter><section><section><itemizedlist><listitem><para> > @@ -12768,13 +12817,13 @@ > "manvolnum></citerefentry> commands can be used to search any file which has > " > "the general format of a Debian package control file." > msgstr "" > > #. type: Content of: <book><chapter><section><section><para> > msgid "" > -"The \"<literal>dpkg -S <file_name_pattern></literal>\" can be used " > +"The \"<literal>dpkg -S <file_name_pattern></literal>\" can be used to > " > "search package names which contain files with the matching name installed > by " > "<literal>dpkg</literal>. But this overlooks files created by the > maintainer " > "scripts." YES. -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
