Merge pull request #292 from chegong18/master

update new translation files

Author: ChenHuajun

postgresql/doc/src/sgml/oid2name.sgml

@@ -9,7 +9,7 @@ ____________________________________________________________________________-->
  <indexterm zone="oid2name">
   <primary>oid2name</primary>
  </indexterm>
- 
+
 <!--==========================orignal english content==========================
  <refmeta>
   <refentrytitle>oid2name</refentrytitle>
@@ -106,46 +106,53 @@ ____________________________________________________________________________-->
    <variablelist>
 
     <varlistentry>
-     <term><option>-f</option> <replaceable>filenode</replaceable></term>
-     <listitem><para>show info for table with filenode <replaceable>filenode</replaceable></para></listitem>
+     <term><option>-f <replaceable class="parameter">filenode</replaceable></option></term>
+     <term><option>--filenode=<replaceable class="parameter">filenode</replaceable></option></term>
+     <listitem><para>show info for table with filenode <replaceable>filenode</replaceable>.</para></listitem>
     </varlistentry>
 
     <varlistentry>
      <term><option>-i</option></term>
-     <listitem><para>include indexes and sequences in the listing</para></listitem>
+     <term><option>--indexes</option></term>
+     <listitem><para>include indexes and sequences in the listing.</para></listitem>
     </varlistentry>
 
     <varlistentry>
-     <term><option>-o</option> <replaceable>oid</replaceable></term>
-     <listitem><para>show info for table with OID <replaceable>oid</replaceable></para></listitem>
+     <term><option>-o <replaceable class="parameter">oid</replaceable></option></term>
+     <term><option>--oid=<replaceable class="parameter">oid</replaceable></option></term>
+     <listitem><para>show info for table with OID <replaceable>oid</replaceable>.</para></listitem>
     </varlistentry>
 
     <varlistentry>
      <term><option>-q</option></term>
-     <listitem><para>omit headers (useful for scripting)</para></listitem>
+     <term><option>--quiet</option></term>
+     <listitem><para>omit headers (useful for scripting).</para></listitem>
     </varlistentry>
 
     <varlistentry>
      <term><option>-s</option></term>
-     <listitem><para>show tablespace OIDs</para></listitem>
+     <term><option>--tablespaces</option></term>
+     <listitem><para>show tablespace OIDs.</para></listitem>
     </varlistentry>
 
     <varlistentry>
      <term><option>-S</option></term>
+     <term><option>--system-objects</option></term>
      <listitem><para>include system objects (those in
       <option>information_schema</option>, <option>pg_toast</option>
-      and <option>pg_catalog</option> schemas)
+      and <option>pg_catalog</option> schemas).
      </para></listitem>
     </varlistentry>
 
     <varlistentry>
-     <term><option>-t</option> <replaceable>tablename_pattern</replaceable></term>
-     <listitem><para>show info for table(s) matching <replaceable>tablename_pattern</replaceable></para></listitem>
+     <term><option>-t <replaceable class="parameter">tablename_pattern</replaceable></option></term>
+     <term><option>--table=<replaceable class="parameter">tablename_pattern</replaceable></option></term>
+     <listitem><para>show info for table(s) matching <replaceable class="parameter">tablename_pattern</replaceable>.</para></listitem>
     </varlistentry>
 
     <varlistentry>
      <term><option>-V</option></term>
-     <term><option>-&minus;version</option></term>
+     <term><option>--version</option></term>
      <listitem>
       <para>
        Print the <application>oid2name</application> version and exit.
@@ -155,8 +162,9 @@ ____________________________________________________________________________-->
 
     <varlistentry>
      <term><option>-x</option></term>
+     <term><option>--extended</option></term>
      <listitem><para>display more information about each object shown: tablespace name,
-      schema name, and OID
+      schema name, and OID.
      </para></listitem>
     </varlistentry>
 
@@ -179,40 +187,48 @@ ____________________________________________________________________________-->
    <variablelist>
 
     <varlistentry>
-     <term><option>-f</option> <replaceable>filenode</replaceable></term>
-     <listitem><para>显示具有文件结点<replaceable>filenode</replaceable>的表的信息</para></listitem>
+     <term><option>-f <replaceable class="parameter">filenode</replaceable></option></term>
+     <term><option>--filenode=<replaceable class="parameter">filenode</replaceable></option></term>
+     <listitem><para>显示具有文件结点的表的信息<replaceable>filenode</replaceable>.</para></listitem>
     </varlistentry>
 
     <varlistentry>
      <term><option>-i</option></term>
-     <listitem><para>在列举中包括索引和序列</para></listitem>
+     <term><option>--indexes</option></term>
+     <listitem><para>在列表中包括索引和序列.</para></listitem>
     </varlistentry>
 
     <varlistentry>
-     <term><option>-o</option> <replaceable>oid</replaceable></term>
-     <listitem><para>显示具有 OID <replaceable>oid</replaceable>的表的信息</para></listitem>
+     <term><option>-o <replaceable class="parameter">oid</replaceable></option></term>
+     <term><option>--oid=<replaceable class="parameter">oid</replaceable></option></term>
+     <listitem><para>显示具有OID的表的信息 <replaceable>oid</replaceable>.</para></listitem>
     </varlistentry>
 
     <varlistentry>
      <term><option>-q</option></term>
-     <listitem><para>忽略头部（用于脚本）</para></listitem>
+     <term><option>--quiet</option></term>
+     <listitem><para>忽略头部（用于脚本）.</para></listitem>
     </varlistentry>
 
     <varlistentry>
      <term><option>-s</option></term>
-     <listitem><para>显示表空间 OID</para></listitem>
+     <term><option>--tablespaces</option></term>
+     <listitem><para>显示表空间 OIDs.</para></listitem>
     </varlistentry>
 
     <varlistentry>
      <term><option>-S</option></term>
+     <term><option>--system-objects</option></term>
      <listitem><para>包括系统对象（位于
-      <option>information_schema</option>、<option>pg_toast</option>和<option>pg_catalog</option>模式中）
+      <option>information_schema</option>, <option>pg_toast</option>
+      和 <option>pg_catalog</option> 模式).
      </para></listitem>
     </varlistentry>
 
     <varlistentry>
-     <term><option>-t</option> <replaceable>tablename_pattern</replaceable></term>
-     <listitem><para>显示匹配<replaceable>tablename_pattern</replaceable>的表的信息</para></listitem>
+     <term><option>-t <replaceable class="parameter">tablename_pattern</replaceable></option></term>
+     <term><option>--table=<replaceable class="parameter">tablename_pattern</replaceable></option></term>
+     <listitem><para>显示匹配的表的信息 <replaceable class="parameter">tablename_pattern</replaceable>.</para></listitem>
     </varlistentry>
 
     <varlistentry>
@@ -227,7 +243,9 @@ ____________________________________________________________________________-->
 
     <varlistentry>
      <term><option>-x</option></term>
-     <listitem><para>为要显示的每个对象显示更多信息：表空间名、模式名以及 OID
+     <term><option>--extended</option></term>
+     <listitem><para>显示关于每个对象所展现的更多信息: 表空间名，
+      模式名，以及 OID。
      </para></listitem>
     </varlistentry>
 
@@ -250,29 +268,34 @@ ____________________________________________________________________________-->
 
    <variablelist>
     <varlistentry>
-     <term><option>-d</option> <replaceable>database</replaceable></term>
-     <listitem><para>database to connect to</para></listitem>
+     <term><option>-d <replaceable class="parameter">database</replaceable></option></term>
+     <term><option>--dbname=<replaceable class="parameter">database</replaceable></option></term>
+     <listitem><para>database to connect to.</para></listitem>
     </varlistentry>
 
     <varlistentry>
-     <term><option>-H</option> <replaceable>host</replaceable></term>
-     <listitem><para>database server's host</para></listitem>
+     <term><option>-h <replaceable class="parameter">host</replaceable></option></term>
+     <term><option>--host=<replaceable class="parameter">host</replaceable></option></term>
+     <listitem><para>database server's host.</para></listitem>
     </varlistentry>
 
     <varlistentry>
-     <term><option>-p</option> <replaceable>port</replaceable></term>
-     <listitem><para>database server's port</para></listitem>
+     <term><option>-H <replaceable class="parameter">host</replaceable></option></term>
+     <listitem><para>database server's host.  Use of this parameter is
+     <emphasis>deprecated</emphasis> as of
+     <productname>PostgreSQL</productname> 12.</para></listitem>
     </varlistentry>
 
     <varlistentry>
-     <term><option>-U</option> <replaceable>username</replaceable></term>
-     <listitem><para>user name to connect as</para></listitem>
+     <term><option>-p <replaceable class="parameter">port</replaceable></option></term>
+     <term><option>--port=<replaceable class="parameter">port</replaceable></option></term>
+     <listitem><para>database server's port.</para></listitem>
     </varlistentry>
 
     <varlistentry>
-     <term><option>-P</option> <replaceable>password</replaceable></term>
-     <listitem><para>password (deprecated &mdash; putting this on the command line
-      is a security hazard)</para></listitem>
+     <term><option>-U <replaceable class="parameter">username</replaceable></option></term>
+     <term><option>--username=<replaceable class="parameter">username</replaceable></option></term>
+     <listitem><para>user name to connect as.</para></listitem>
     </varlistentry>
 
    </variablelist>
@@ -283,28 +306,33 @@ ____________________________________________________________________________-->
 
    <variablelist>
     <varlistentry>
-     <term><option>-d</option> <replaceable>database</replaceable></term>
-     <listitem><para>要连接的数据库</para></listitem>
+     <term><option>-d <replaceable class="parameter">database</replaceable></option></term>
+     <term><option>--dbname=<replaceable class="parameter">database</replaceable></option></term>
+     <listitem><para>要连接的数据库。</para></listitem>
     </varlistentry>
 
     <varlistentry>
-     <term><option>-H</option> <replaceable>host</replaceable></term>
-     <listitem><para>数据库服务器的主机</para></listitem>
+     <term><option>-h <replaceable class="parameter">host</replaceable></option></term>
+     <term><option>--host=<replaceable class="parameter">host</replaceable></option></term>
+     <listitem><para>数据库服务器的主机。</para></listitem>
     </varlistentry>
 
     <varlistentry>
-     <term><option>-p</option> <replaceable>port</replaceable></term>
-     <listitem><para>数据库服务器的端口</para></listitem>
+     <term><option>-H <replaceable class="parameter">host</replaceable></option></term>
+     <listitem><para>数据库服务器的主机。这个参数在
+     <productname>PostgreSQL</productname> 12中已经<emphasis>不推荐</emphasis> 。</para></listitem>
     </varlistentry>
 
     <varlistentry>
-     <term><option>-U</option> <replaceable>username</replaceable></term>
-     <listitem><para>用于连接的用户名</para></listitem>
+     <term><option>-p <replaceable class="parameter">port</replaceable></option></term>
+     <term><option>--port=<replaceable class="parameter">port</replaceable></option></term>
+     <listitem><para>数据库服务器的端口。</para></listitem>
     </varlistentry>
 
     <varlistentry>
-     <term><option>-P</option> <replaceable>password</replaceable></term>
-     <listitem><para>口令（弃用 &mdash; 把口令放在命令行上是安全灾难）</para></listitem>
+     <term><option>-U <replaceable class="parameter">username</replaceable></option></term>
+     <term><option>--username=<replaceable class="parameter">username</replaceable></option></term>
+     <listitem><para>用于连接的用户名。</para></listitem>
     </varlistentry>
 
    </variablelist>
@@ -356,6 +384,52 @@ ____________________________________________________________________________-->
   </para>
  </refsect1>
 
+ <refsect1>
+<!--==========================orignal english content==========================
+  <title>Environment</title>
+____________________________________________________________________________-->
+  <title>环境</title>
+
+  <variablelist>
+   <varlistentry>
+<!--==========================orignal english content==========================
+    <term><envar>PGHOST</envar></term>
+____________________________________________________________________________-->
+    <term><envar>PGHOST</envar></term>
+<!--==========================orignal english content==========================
+    <term><envar>PGPORT</envar></term>
+____________________________________________________________________________-->
+    <term><envar>PGPORT</envar></term>
+<!--==========================orignal english content==========================
+    <term><envar>PGUSER</envar></term>
+____________________________________________________________________________-->
+    <term><envar>PGUSER</envar></term>
+
+    <listitem>
+<!--==========================orignal english content==========================
+     <para>
+      Default connection parameters.
+     </para>
+____________________________________________________________________________-->
+     <para>
+      默认连接参数。
+     </para>
+    </listitem>
+   </varlistentry>
+  </variablelist>
+
+<!--==========================orignal english content==========================
+  <para>
+   This utility, like most other <productname>PostgreSQL</productname>
+   utilities, also uses the environment variables supported by
+   <application>libpq</application> (see <xref linkend="libpq-envars"/>).
+  </para>
+____________________________________________________________________________-->
+  <para>
+   与大多数其他 <productname>PostgreSQL</productname>的实用程序一样，这个实用程序也使用<application>libpq</application> 支持的环境变量 (参见 <xref linkend="libpq-envars"/>)。
+  </para>
+ </refsect1>
+
  <refsect1>
 <!--==========================orignal english content==========================
   <title>Notes</title>