Skip to content

P
Postgres FD Implementation
Commit be18a49d authored by Bruce Momjian's avatar Bruce Momjian
Browse files
Options

> NOTE: in the command.c in three places there (I believe) is a typo: 

>
> "parse error at [the] end of line"
>
> Attached patch also fixes it. I noticed this while editing the po file.
> If I'm wrong, please ignore the command.c.patch. I will revert my translation
> as well then.
>
> --
> Serguei A. Mokhov
parent 9e467671
Hide whitespace changes
Inline Side-by-side
Showing with 98 additions and 103 deletions
src/bin/psql/command.c
View file @ be18a49d
......@@ -3,7 +3,7 @@
*
* Copyright 2000 by PostgreSQL Global Development Group
*
* $Header: /cvsroot/pgsql/src/bin/psql/command.c,v 1.57 2001/09/02 23:52:19 petere Exp $
* $Header: /cvsroot/pgsql/src/bin/psql/command.c,v 1.58 2001/09/10 14:51:33 momjian Exp $
*/
#include "postgres_fe.h"
#include "command.h"
......@@ -889,7 +889,7 @@ scan_option(char **string, enum option_type type, char *quote)
if (options_string[jj] == 0)
{
psql_error("parse error at end of line\n");
psql_error("parse error at the end of line\n");
*string = &options_string[jj];
return NULL;
}
......@@ -963,7 +963,7 @@ scan_option(char **string, enum option_type type, char *quote)
if (options_string[jj] == 0)
{
psql_error("parse error at end of line\n");
psql_error("parse error at the end of line\n");
*string = &options_string[jj];
return NULL;
}
......@@ -991,7 +991,7 @@ scan_option(char **string, enum option_type type, char *quote)
len = strcspn(options_string + pos + 1, "`");
if (options_string[pos + 1 + len] == 0)
{
psql_error("parse error at end of line\n");
psql_error("parse error at the end of line\n");
*string = &options_string[pos + 1 + len];
return NULL;
}
......
src/bin/psql/ru.po
View file @ be18a49d
# PSQL Translated Messages in Russian Language (KOI8-R)
# Serguei A. Mokhov <stgunya@yahoo.com>, August-September 2001.
#
# $Header: /cvsroot/pgsql/src/bin/psql/Attic/ru.po,v 1.1 2001/09/06 11:10:47 petere Exp $
# $Header: /cvsroot/pgsql/src/bin/psql/Attic/ru.po,v 1.2 2001/09/10 14:51:33 momjian Exp $
#
msgid ""
msgstr ""
"Project-Id-Version: PostgreSQL 7.2\n"
"POT-Creation-Date: 2001-09-06 13:10+0200\n"
"PO-Revision-Date: 2001-09-03 14:39-0500\n"
"Last-Translator: Serguei A. Mokhov <StGunya@yahoo.com>\n"
"Language-Team: Serguei A. Mokhov <StGunya@yahoo.com>\n"
"PO-Revision-Date: 2001-09-08 03:45-0500\n"
"Last-Translator: Serguei A. Mokhov <stgunya@yahoo.com>\n"
"Language-Team: Serguei A. Mokhov <stgunya@yahoo.com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=koi8-r\n"
"Content-Transfer-Encoding: 8bit\n"
......@@ -45,7 +45,7 @@ msgstr "
#: command.c:436
#, c-format
msgid "%s: invalid encoding name\n"
msgstr "%s: \n"
msgstr "%s: \n"
#: command.c:445
#, c-format
......@@ -94,7 +94,7 @@ msgid "\\%s: extra argument '%s' ignored\n"
msgstr "\\%s: : '%s' - \n"
#: command.c:892 command.c:966 command.c:994
msgid "parse error at end of line\n"
msgid "parse error at the end of line\n"
msgstr " \n"
#: command.c:1275 command.c:1299 startup.c:183 startup.c:201
......@@ -221,11 +221,11 @@ msgstr "
#: command.c:1808
msgid "Default footer is on."
msgstr " ޣ."
msgstr " ."
#: command.c:1810
msgid "Default footer is off."
msgstr " ޣ."
msgstr " ."
#: command.c:1816
#, c-format
......@@ -239,9 +239,7 @@ msgstr "\\!:
#: common.c:50
#, c-format
msgid "%s: xstrdup: cannot duplicate null pointer (internal error)\n"
msgstr ""
"%s: xstrdup: ( "
")\n"
msgstr "%s: xstrdup: ( )\n"
#: common.c:299 common.c:385
msgid "You are currently not connected to a database.\n"
......@@ -261,7 +259,7 @@ msgstr "
#: common.c:355 common.c:525
msgid "Succeeded.\n"
msgstr ".\n"
msgstr ".\n"
#: common.c:393
#, c-format
......@@ -283,15 +281,13 @@ msgid ""
"Enter data to be copied followed by a newline.\n"
"End with a backslash and a period on a line by itself."
msgstr ""
" "
"(newline).\n"
" (newline).\n"
" ."
#: common.c:531
#, c-format
msgid "Asynchronous NOTIFY '%s' from backend with pid %d received.\n"
msgstr ""
" NOTIFY '%s' - (backend) pid %d.\n"
msgstr " NOTIFY '%s' - (backend) pid %d.\n"
#: copy.c:81
msgid "\\copy: arguments required\n"
......@@ -335,7 +331,7 @@ msgstr "
#: help.c:80
msgid "Usage:"
msgstr ":"
msgstr ":"
#: help.c:81
msgid " psql [options] [dbname [username]]\n"
......@@ -351,19 +347,16 @@ msgstr " -a
#: help.c:84
msgid " -A Unaligned table output mode (-P format=unaligned)"
msgstr ""
" -A (-P format=unaligned)"
msgstr " -A (-P format=unaligned)"
#: help.c:85
msgid " -c COMMAND Run only single command (SQL or internal) and exit"
msgstr ""
" -c (SQL ) "
msgstr " -c (SQL ) "
#: help.c:91
#, c-format
msgid " -d DBNAME Specify database name to connect to (default: %s)\n"
msgstr ""
" -d ( : %s)\n"
msgstr " -d ( : %s)\n"
#: help.c:93
msgid " -e Echo commands sent to server"
......@@ -371,8 +364,7 @@ msgstr " -e
#: help.c:94
msgid " -E Display queries that internal commands generate"
msgstr ""
" -E "
msgstr " -E "
#: help.c:95
msgid " -f FILENAME Execute commands from file, then exit"
......@@ -383,8 +375,7 @@ msgstr " -f
msgid ""
" -F STRING Set field separator (default: \"%s\") (-P fieldsep=)\n"
msgstr ""
" -F ( : \"%s\") (-P "
"fieldsep=)\n"
" -F ( : \"%s\") (-P fieldsep=)\n"
#: help.c:101
#, c-format
......@@ -405,8 +396,7 @@ msgstr " -l
#: help.c:106
msgid " -n Disable enhanced command line editing (readline)"
msgstr ""
" -n (readline)"
msgstr " -n (readline)"
#: help.c:107
msgid " -o FILENAME Send query results to file (or |pipe)"
......@@ -421,21 +411,17 @@ msgstr " -p
msgid ""
" -P VAR[=ARG] Set printing option 'VAR' to 'ARG' (see \\pset command)"
msgstr ""
" -P VAR[=ARG] 'ARG' 'VAR' (. "
"\\pset)"
" -P VAR[=ARG] 'ARG' 'VAR' (. \\pset)"
#: help.c:115
msgid " -q Run quietly (no messages, only query output)"
msgstr ""
" -q \"\" ( , "
")"
msgstr " -q \"\" ( , )"
#: help.c:116
msgid ""
" -R STRING Set record separator (default: newline) (-P recordsep=)"
msgstr ""
" -R ( : "
") (-P recordsep=)"
" -R ( : ) (-P recordsep=)"
#: help.c:117
msgid " -s Single step mode (confirm each query)"
......@@ -443,8 +429,7 @@ msgstr " -s
#: help.c:118
msgid " -S Single line mode (end of line terminates SQL command)"
msgstr ""
" -S ( SQL)"
msgstr " -S ( SQL)"
#: help.c:119
msgid " -t Print rows only (-P tuples_only)"
......@@ -461,14 +446,11 @@ msgstr ""
#: help.c:126
#, c-format
msgid " -U NAME Specify database user name (default: %s)\n"
msgstr ""
" -U ( : %s)\n"
msgstr " -U ( : %s)\n"
#: help.c:128
msgid " -v NAME=VALUE Set psql variable 'NAME' to 'VALUE'"
msgstr ""
" -v NAME=VALUE psql 'NAME' "
"'VALUE'"
msgstr " -v NAME=VALUE psql 'NAME' 'VALUE'"
#: help.c:129
msgid " -V Show version information and exit"
......@@ -476,16 +458,15 @@ msgstr " -V
#: help.c:130
msgid " -W Prompt for password (should happen automatically)"
msgstr ""
" -W ( )"
msgstr " -W ( )"
#: help.c:131
msgid " -x Turn on expanded table output (-P expanded)"
msgstr " -x (-P expanded)"
msgstr " -x (-P expanded)"
#: help.c:132
msgid " -X Do not read startup file (~/.psqlrc)"
msgstr " -X (~/.psqlrc)"
msgstr " -X (~/.psqlrc)"
#: help.c:135
msgid ""
......@@ -497,8 +478,7 @@ msgid ""
"Report bugs to <pgsql-bugs@postgresql.org>."
msgstr ""
"\n"
" \"\\?\" ( ) "
"\"\\help\"\n"
" \"\\?\" ( ) \"\\help\"\n"
"( SQL) psql, psql\n"
" PostgreSQL.\n"
"\n"
......@@ -506,9 +486,7 @@ msgstr ""
#: help.c:194
msgid " \\a toggle between unaligned and aligned output mode\n"
msgstr ""
" \\a "
"\n"
msgstr " \\a \n"
#: help.c:195
#, c-format
......@@ -516,169 +494,179 @@ msgid ""
" \\c[onnect] [DBNAME|- [USER]]\n"
" connect to new database (currently \"%s\")\n"
msgstr ""
" \\c[onnect] [|- []]\n"
" (: \"%s\")\n"
#: help.c:198
msgid " \\C TITLE set table title\n"
msgstr ""
msgstr " \\C \n"
#: help.c:199
msgid " \\cd [DIRNAME] change the current working directory\n"
msgstr ""
msgstr " \\cd [] \n"
#: help.c:200
msgid " \\copy ... perform SQL COPY with data stream to the client host\n"
msgstr ""
msgstr " \\copy ... SQL COPY \n"
#: help.c:201
msgid " \\copyright show PostgreSQL usage and distribution terms\n"
msgstr ""
msgstr " \\copyright PostgreSQL\n"
#: help.c:202
msgid " \\d TABLE describe table (or view, index, sequence)\n"
msgstr ""
msgstr " \\d (, , )\n"
#: help.c:203
msgid " \\d{t|i|s|v}... list tables/indexes/sequences/views\n"
msgstr ""
msgstr " \\d{t|i|s|v}... ///\n"
#: help.c:204
msgid ""
" \\d{p|S|l} list access privileges, system tables, or large objects\n"
msgstr ""
" \\d{p|S|l} , , (LO)\n"
#: help.c:205
msgid " \\da list aggregate functions\n"
msgstr ""
msgstr " \\da \n"
#: help.c:206
msgid " \\dd NAME show comment for table, type, function, or operator\n"
msgstr ""
msgstr " \\dd , , , \n"
#: help.c:207
msgid " \\df list functions\n"
msgstr ""
msgstr " \\df \n"
#: help.c:208
msgid " \\do list operators\n"
msgstr ""
msgstr " \\do \n"
#: help.c:209
msgid " \\dT list data types\n"
msgstr ""
msgstr " \\dT \n"
#: help.c:210
msgid ""
" \\e FILENAME edit the current query buffer or file with external editor\n"
msgstr ""
" \\e \n"
#: help.c:211
msgid " \\echo TEXT write text to standard output\n"
msgstr ""
msgstr " \\echo \n"
#: help.c:212
msgid " \\encoding ENCODING set client encoding\n"
msgstr ""
msgstr " \\encoding \n"
#: help.c:213
msgid " \\f STRING set field separator\n"
msgstr ""
msgstr " \\f \n"
#: help.c:214
msgid ""
" \\g FILENAME send SQL command to server (and write results to file or |"
"pipe)\n"
msgstr ""
" \\g SQL ( |"
")\n"
#: help.c:215
msgid " \\h NAME help on syntax of SQL commands, * for all commands\n"
msgstr ""
msgstr " \\h SQL ; * \n"
#: help.c:216
#, c-format
msgid " \\H toggle HTML output mode (currently %s)\n"
msgstr ""
msgstr " \\H HTML ( : %s)\n"
#: help.c:218
msgid " \\i FILENAME execute commands from file\n"
msgstr ""
msgstr " \\i \n"
#: help.c:219
msgid " \\l list all databases\n"
msgstr ""
msgstr " \\l \n"
#: help.c:220
msgid ""
" \\lo_export, \\lo_import, \\lo_list, \\lo_unlink\n"
" large object operations\n"
msgstr ""
" \\lo_export, \\lo_import, \\lo_list, \\lo_unlink\n"
" \n"
#: help.c:222
msgid " \\o FILENAME send all query results to file or |pipe\n"
msgstr ""
msgstr " \\o |\n"
#: help.c:223
msgid " \\p show the content of the current query buffer\n"
msgstr ""
msgstr " \\p \n"
#: help.c:224
msgid ""
" \\pset VAR set table output option (VAR := {format|border|expanded|\n"
" fieldsep|null|recordsep|tuples_only|title|tableattr|pager})\n"
msgstr ""
" \\pset VAR (VAR := {format|border|expanded|\n"
" fieldsep|null|recordsep|tuples_only|title|tableattr|pager})\n"
#: help.c:226
msgid " \\q quit psql\n"
msgstr ""
msgstr " \\q psql\n"
#: help.c:227
msgid " \\qecho TEXT write text to query output stream (see \\o)\n"
msgstr ""
msgstr " \\qecho (. \\o)\n"
#: help.c:228
msgid " \\r reset (clear) the query buffer\n"
msgstr ""
msgstr " \\r \n"
#: help.c:229
msgid " \\s FILENAME print history or save it to file\n"
msgstr ""
msgstr " \\s ţ \n"
#: help.c:230
msgid " \\set NAME VALUE set internal variable\n"
msgstr ""
msgstr " \\set NAME VALUE ( )\n"
#: help.c:231
#, c-format
msgid " \\t show only rows (currently %s)\n"
msgstr ""
msgstr " \\t ( : %s)\n"
#: help.c:233
msgid " \\T TEXT set HTML table tag attributes\n"
msgstr ""
msgstr " \\T HTML- <table>\n"
#: help.c:234
msgid " \\unset NAME unset (delete) internal variable\n"
msgstr ""
msgstr " \\unset \n"
#: help.c:235
msgid " \\w FILENAME write current query buffer to file\n"
msgstr ""
msgstr " \\w \n"
#: help.c:236
#, c-format
msgid " \\x toggle expanded output (currently %s)\n"
msgstr ""
msgstr " \\x (: %s)\n"
#: help.c:238
msgid " \\z list table access privileges\n"
msgstr ""
msgstr " \\z \n"
#: help.c:239
msgid " \\! [COMMAND] execute command in shell or start interactive shell\n"
msgstr ""
msgstr " \\! [] \n"
#: help.c:266
msgid "Available help:"
msgstr ""
msgstr " :"
#: help.c:297
#, c-format
......@@ -689,6 +677,11 @@ msgid ""
"%s\n"
"\n"
msgstr ""
": %s\n"
": %s\n"
":\n"
"%s\n"
"\n"
#: help.c:308
#, c-format
......@@ -696,67 +689,69 @@ msgid ""
"No help available for '%-.*s'.\n"
"Try \\h with no arguments to see available help.\n"
msgstr ""
" '%-.*s'.\n"
" \\h .\n"
#: input.c:171
#, c-format
msgid "could not save history to %s: %s\n"
msgstr ""
msgstr " %s: %s\n"
#: large_obj.c:66
msgid "Warning: Your transaction in progress has been committed."
msgstr ""
msgstr ": ."
#: large_obj.c:68
msgid "Warning: Your transaction in progress has been rolled back."
msgstr ""
msgstr ": ."
#: large_obj.c:95
msgid "\\lo_export: not connected to a database\n"
msgstr ""
msgstr "\\lo_export: \n"
#: large_obj.c:162
msgid "\\lo_import: not connected to a database\n"
msgstr ""
msgstr "\\lo_import: \n"
#: large_obj.c:276
msgid "\\lo_unlink: not connected to a database\n"
msgstr ""
msgstr "\\lo_unlink: \n"
#: describe.c:57 describe.c:110 describe.c:169 describe.c:221 describe.c:269
#: describe.c:401 describe.c:530 describe.c:1034 large_obj.c:353
msgid "Description"
msgstr ""
msgstr ""
#: large_obj.c:361
msgid "Large objects"
msgstr ""
msgstr " "
#: mainloop.c:242
#, c-format
msgid "Use \"\\q\" to leave %s.\n"
msgstr ""
msgstr " \"\\q\" %s.\n"
#: print.c:370
msgid "(No rows)\n"
msgstr ""
msgstr "( )\n "
#: print.c:1075
msgid "(1 row)"
msgstr ""
msgstr "(1 )"
#: print.c:1077
#, c-format
msgid "(%d rows)"
msgid "(%d )"
msgstr ""
#: startup.c:141 startup.c:615
#, c-format
msgid "%s: out of memory\n"
msgstr ""
msgstr "%s: \n"
#: startup.c:177
msgid "User name: "
msgstr ""
msgstr " : "
#: startup.c:286
#, c-format
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment