Hi Osamu, this is round 3 of my proposals for the DR.
You may want to fix at least one point before the next upload: see line 189 of attached diff. Cheers Holger -- = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = Created with Sylpheed 3.0.2 under D e b i a n G N U / L I N U X 6.0 ( S q u e e z e ) Registered LinuxUser #311290 - http://linuxcounter.net/ = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =
--- debian-reference.pot 2013-04-06 22:24:42.259034246 +0200 +++ debian-reference_proposed-changes.pot 2013-04-06 23:24:13.787035964 +0200 @@ -4,13 +4,13 @@ # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2013-04-06 22:23+0300\n" +"POT-Creation-Date: 2013-01-10 21:56+0900\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <l...@li.org>\n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -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 "" #. type: Content of: <book><chapter><table><title> msgid "List of Debian package management tools" msgstr "" @@ -9407,13 +9409,15 @@ #. type: Content of: <book><chapter><table><tgroup><tbody><row><entry> msgid "package management system for Debian" msgstr "" #. 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 "" #. type: Content of: <book><chapter><table><tgroup><tbody><row><entry> msgid "" "APT utility programs: <citerefentry><refentrytitle>apt-extracttemplates</" "refentrytitle><manvolnum>1</manvolnum></citerefentry>, " @@ -9485,13 +9489,13 @@ "responsible for the risk containment." msgstr "" #. 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 "" #. type: Content of: <book><chapter><section><section><title> msgid "Basic precautions" msgstr "" @@ -9587,13 +9591,13 @@ #. type: Content of: <book><chapter><section><section><itemizedlist><listitem><itemizedlist><listitem><para> msgid "" "You as the system administrator are responsible for your system in the end." msgstr "" #. 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 "" #. type: Content of: <book><chapter><section><section><title> msgid "Life with eternal upgrades" msgstr "" @@ -10072,13 +10076,13 @@ msgid "codename = <literal>&codename-nexttesting;</literal>" msgstr "" #. 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 "" #. type: Content of: <book><chapter><section><section><para> msgid "" "In the stricter Debian archive terminology, the word \"section\" is " @@ -10086,15 +10090,15 @@ "area. (Although, the word \"main section\" may sometimes be used to " "describe the Debian archive area named as \"main\".)" msgstr "" #. 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 "" #. type: Content of: <book><chapter><section><section><para> msgid "" @@ -10214,13 +10218,13 @@ #. type: Content of: <book><chapter><section><section><para> msgid "Debian is 100% free software because of the followings:" msgstr "" #. 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 "" #. type: Content of: <book><chapter><section><section><itemizedlist><listitem><para> msgid "Debian provides only free software in <literal>main</literal>." msgstr "" @@ -10328,14 +10332,14 @@ #. type: Content of: <book><chapter><section><section><itemizedlist><listitem><para> msgid "contamination of your 100% free Debian system" msgstr "" #. 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 "" #. type: Content of: <book><chapter><section><section><para> @@ -10489,13 +10493,13 @@ "This is declared when this package provide all of the files and " "functionality in the listed packages." msgstr "" #. 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 "" #. type: Content of: <book><chapter><section><section><para> @@ -10671,13 +10675,14 @@ #. type: Content of: <book><chapter><section><section><table><tgroup><tbody><row><entry> msgid "<literal>sensible-browser \"http://bugs.debian.org/\"</literal>" msgstr "" #. 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 "" #. type: Content of: <book><chapter><section><section><table><tgroup><tbody><row><entry> msgid "" "<literal>sensible-browser \"http://bugs.debian.org/<package_name>\"</" "literal>" @@ -10929,13 +10934,14 @@ #. type: Content of: <book><chapter><section><section><table><tgroup><tbody><row><entry> msgid "<literal>aptitude full-upgrade</literal>" msgstr "" #. 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 "" #. type: Content of: <book><chapter><section><section><table><tgroup><tbody><row><entry> msgid "" "install candidate version of installed packages while removing other " "packages if needed" @@ -10961,13 +10967,13 @@ #. type: Content of: <book><chapter><section><section><table><tgroup><tbody><row><entry> msgid "<literal>apt-get autoremove</literal>" msgstr "" #. 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 "" #. type: Content of: <book><chapter><section><section><table><tgroup><tbody><row><entry> msgid "<literal>aptitude purge foo</literal>" msgstr "" @@ -11007,13 +11013,14 @@ #. type: Content of: <book><chapter><section><section><table><tgroup><tbody><row><entry> msgid "<literal>aptitude show foo</literal>" msgstr "" #. 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 "" #. type: Content of: <book><chapter><section><section><table><tgroup><tbody><row><entry> msgid "display detailed information about \"<literal>foo</literal>\" package" msgstr "" @@ -11150,13 +11157,13 @@ "$ sudo aptitude -u\n" "Password:" msgstr "" #. 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 "" #. type: Content of: <book><chapter><section><section><tip><para> msgid "" @@ -11436,12 +11443,18 @@ #. type: Content of: <book><chapter><section><section><table><tgroup><tbody><row><entry> msgid "<literal>Audit Recommendations</literal>" msgstr "" #. 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 "" #. 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 "" #. type: Content of: <book><chapter><section><section><table><tgroup><tbody><row><entry> @@ -11687,13 +11706,19 @@ #. type: Content of: <book><chapter><section><section><table><tgroup><tbody><row><entry> msgid "match archive" msgstr "" #. 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 "" #. type: Content of: <book><chapter><section><section><table><tgroup><tbody><row><entry> msgid "match origin" msgstr "" @@ -11749,13 +11774,13 @@ msgid "<literal>~i</literal>" msgstr "" #. 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 "" #. type: Content of: <book><chapter><section><section><table><tgroup><tbody><row><entry> msgid "<literal>~M</literal>" msgstr "" @@ -11907,12 +11932,17 @@ "citerefentry>, <citerefentry><refentrytitle>awk</refentrytitle><manvolnum>1</" "manvolnum></citerefentry> and <citerefentry><refentrytitle>perl</" "refentrytitle><manvolnum>1</manvolnum></citerefentry>." msgstr "" #. 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 "" #. type: Content of: <book><chapter><section><section><itemizedlist><listitem><para> @@ -11973,13 +12003,13 @@ #. 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 "" #. 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 "" #. 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 "" #. type: Content of: <book><chapter><section><section><para> msgid "This technique is quite handy and works for many other command keys." @@ -12181,13 +12220,13 @@ msgstr "" #. 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 "" #. type: Content of: <book><chapter><section><section><orderedlist><listitem><para> msgid "Exit <literal>aptitude</literal>." msgstr "" @@ -12389,12 +12428,16 @@ #. type: Content of: <book><chapter><section><section><table><tgroup><tbody><row><entry> msgid "<literal>COLUMNS=120 dpkg -l <package_name_pattern></literal>" msgstr "" #. 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 "" #. type: Content of: <book><chapter><section><section><table><tgroup><tbody><row><entry> msgid "<literal>dpkg -L <package_name></literal>" msgstr "" @@ -12616,13 +12659,13 @@ msgstr "" #. 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 " "dependencies. Dpkg's commandline options \"<literal>--force-all</literal>\" " "and similar (see <citerefentry><refentrytitle>dpkg</" "refentrytitle><manvolnum>1</manvolnum></citerefentry>) are intended to be " "used by experts only. Using them without fully understanding their effects " "may break your whole system." msgstr "" @@ -12673,12 +12716,17 @@ "\" and \"<literal>apt-cache showsrc</literal>\" commands require " "\"<literal>deb-src</literal>\" entry in \"<literal>/etc/apt/sources.list</" "literal>\"." msgstr "" #. 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 "" #. 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." msgstr "" #. type: Content of: <book><chapter><section><section><para>