[mergeant] Updated Russian translation

[Yuri Myasoedov <ymyasoedov src gnome org>]

commit 4534a77937ca7ffd5a59b2ce120c81d37e2b2e44
Author: Yuri Kozlov <yuray komyakino ru>
Date:   Fri Jun 10 00:03:18 2011 +0400

    Updated Russian translation

 po/ru.po |  776 +++++++++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 510 insertions(+), 266 deletions(-)
---
diff --git a/po/ru.po b/po/ru.po
index 4fcd669..d37a016 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,47 +1,77 @@
-# Copyright (C) 2002-2006 Free Software Foundation, Inc.
-# Valek Filippov <frob df ru>, 2002-2006
-# 
+# translation of mergeant.master.ru.po to Russian
+# Copyright (C) 2002-2006, 2010 Free Software Foundation, Inc.
+#
+# Valek Filippov <frob df ru>, 2002-2006.
+# Yuri Kozlov <yuray komyakino ru>, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: mergeant\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-03 23:41+0400\n"
-"PO-Revision-Date: 2006-07-03 11:23+0400\n"
-"Last-Translator: Valek Filippov <frob df ru>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
+"product=mergeant&component=general\n"
+"POT-Creation-Date: 2010-02-26 07:09+0000\n"
+"PO-Revision-Date: 2010-03-15 20:08+0300\n"
+"Last-Translator: Yuri Kozlov <yuray komyakino ru>\n"
 "Language-Team: Russian <gnome-cyr gnome org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../data/mergeant.keys.in.h:1
-msgid "Documents"
-msgstr "Ð?окÑ?менÑ?Ñ?"
-
-#: ../data/mergeant.keys.in.h:2
+#: ../data/mergeant.xml.in.h:1
 msgid "Mergeant database file"
-msgstr "Файл баз даннÑ?Ñ? Mergeant"
+msgstr "Файл базÑ? даннÑ?Ñ? Mergeant"
 
 #: ../mergeant.desktop.in.h:1
+msgid "Database Administration"
+msgstr "Ð?дминиÑ?Ñ?Ñ?иÑ?ование баз даннÑ?Ñ?"
+
+#: ../mergeant.desktop.in.h:2
 msgid "Maintain and query a SQL database"
 msgstr "УпÑ?авление и запÑ?оÑ?Ñ? длÑ? баз даннÑ?Ñ? SQL"
 
-#: ../mergeant.desktop.in.h:2
+#: ../mergeant.desktop.in.h:3
 msgid "Mergeant Database Administration"
 msgstr "Ð?дминиÑ?Ñ?Ñ?иÑ?ование баз даннÑ?Ñ? Megeant"
 
-#: ../src/GNOME_Mergeant.server.in.in.h:1
-msgid "Database components"
-msgstr "Ð?омпоненÑ?Ñ? базÑ? даннÑ?Ñ?"
+#: ../src/mg-extra-formgrid.c:166
+msgid "Toggle between grid and form presentations"
+msgstr "Ð?еÑ?еклÑ?Ñ?иÑ?Ñ?Ñ?Ñ? междÑ? пÑ?едÑ?Ñ?авлениÑ?ми в виде Ñ?оÑ?мÑ? и Ñ?еÑ?ки"
 
-#: ../src/GNOME_Mergeant.server.in.in.h:2
-msgid "Mergeant application automation interface"
-msgstr ""
+#: ../src/mg-plugin-editor.c:146
+msgid "Data entry type:"
+msgstr "Тип Ñ?леменÑ?а даннÑ?Ñ?:"
 
-#: ../src/query-druid.c:283
-msgid "New query"
-msgstr "Ð?овÑ?й запÑ?оÑ?"
+#: ../src/mg-plugin-editor.c:151
+msgid "Options:"
+msgstr "Ð?аÑ?амеÑ?Ñ?Ñ?:"
+
+#: ../src/mg-plugin-editor.c:156
+msgid "Preview:"
+msgstr "Ð?Ñ?едваÑ?иÑ?елÑ?нÑ?й пÑ?оÑ?моÑ?Ñ?:"
+
+#: ../src/mg-plugin-editor.c:319 ../src/ws-tables.c:765
+msgid "Default"
+msgstr "Ð?о Ñ?молÑ?аниÑ?"
+
+#: ../src/mg-plugin-editor.c:367
+#, c-format
+msgid ""
+"Options '%s' are set for the '%s' plugin, but it does not have any option"
+msgstr "Ð?аÑ?амеÑ?Ñ?Ñ? '%s' задаÑ?Ñ?Ñ?Ñ? длÑ? дополнениÑ? '%s', но Ñ? него неÑ? паÑ?амеÑ?Ñ?ов"
+
+#: ../src/mg-plugin-editor.c:374
+#, c-format
+msgid "Plugin editor cannot handle %s objects"
+msgstr "РедакÑ?оÑ? дополнений не можеÑ? обÑ?абаÑ?Ñ?ваÑ?Ñ? обÑ?екÑ?Ñ? %s"
+
+#: ../src/mg-plugin-editor.c:392
+#, c-format
+msgid "Options '%s=%s' is set but unknown to the plugin used"
+msgstr "УказанÑ? паÑ?амеÑ?Ñ?Ñ? '%s=%s', но иÑ?полÑ?зÑ?еÑ?Ñ?Ñ? неизвеÑ?Ñ?ное дополнение"
 
-#: ../src/query-druid.c:285
+#: ../src/query-druid.c:294
 msgid ""
 "This druid allows you to create a new query.\n"
 "\n"
@@ -52,32 +82,39 @@ msgid ""
 "The query can be created either with a point and click interface or entering "
 "the corresponding SQL statement."
 msgstr ""
+"ЭÑ?оÑ? маÑ?Ñ?еÑ? позволÑ?еÑ? Ñ?оздаÑ?Ñ? новÑ?й запÑ?оÑ?.\n"
+"\n"
+"Ð?апÑ?оÑ? можеÑ? бÑ?Ñ?Ñ? лÑ?бого Ñ?ипа обÑ?абоÑ?ки даннÑ?Ñ? (SELECT, INSERT, UPDATE или "
+"DELETE) и можеÑ? бÑ?Ñ?Ñ? агÑ?егиÑ?Ñ?Ñ?Ñ?им запÑ?оÑ?ом (UNION, INTERSECT или EXCEPT).\n"
+"\n"
+"Ð?апÑ?оÑ? можеÑ? Ñ?оздаваÑ?Ñ?Ñ?Ñ? Ñ? помоÑ?Ñ?Ñ? вÑ?боÑ?а мÑ?Ñ?Ñ?Ñ? или в виде набиÑ?аемого "
+"вÑ?Ñ?ажениÑ? SQL."
 
-#: ../src/query-druid.c:312
-msgid "Query attributes"
-msgstr "Ð?аÑ?амеÑ?Ñ?Ñ? запÑ?оÑ?а"
+#: ../src/query-druid.c:304
+msgid "New query"
+msgstr "Ð?овÑ?й запÑ?оÑ?"
 
-#: ../src/query-druid.c:316
+#: ../src/query-druid.c:325
 msgid "Name and description:"
 msgstr "Ð?азвание и опиÑ?ание:"
 
-#: ../src/query-druid.c:330 ../src/query-editor.c:218 ../src/ws-dbrels.c:436
+#: ../src/query-druid.c:337 ../src/query-editor.c:228 ../src/ws-dbrels.c:527
 msgid "Name:"
 msgstr "Ð?азвание:"
 
-#: ../src/query-druid.c:337
+#: ../src/query-druid.c:343
 msgid "Untitled"
 msgstr "Ð?езÑ?мÑ?ннÑ?й"
 
-#: ../src/query-druid.c:343 ../src/query-editor.c:230 ../src/ws-dbrels.c:442
+#: ../src/query-druid.c:348 ../src/query-editor.c:240 ../src/ws-dbrels.c:533
 msgid "Description:"
 msgstr "Ð?пиÑ?ание:"
 
-#: ../src/query-druid.c:354
+#: ../src/query-druid.c:357
 msgid "Type of query:"
 msgstr "Тип запÑ?оÑ?а:"
 
-#: ../src/query-druid.c:363
+#: ../src/query-druid.c:365
 msgid "Point & click wizard"
 msgstr "Ð?омоÑ?ник \"Укажи-и-нажми\""
 
@@ -85,83 +122,87 @@ msgstr "Ð?омоÑ?ник \"Укажи-и-нажми\""
 msgid "SELECT query"
 msgstr "Ð?апÑ?оÑ? \"SELECT\""
 
-#: ../src/query-druid.c:386
+#: ../src/query-druid.c:385
 msgid "INSERT query"
 msgstr "Ð?апÑ?оÑ? \"INSERT\""
 
-#: ../src/query-druid.c:394
+#: ../src/query-druid.c:392
 msgid "UPDATE query"
 msgstr "Ð?апÑ?оÑ? \"UPDATE\""
 
-#: ../src/query-druid.c:402
+#: ../src/query-druid.c:399
 msgid "DELETE query"
 msgstr "Ð?апÑ?оÑ? \"DELETE\""
 
-#: ../src/query-druid.c:410
+#: ../src/query-druid.c:406
 msgid "Aggreation query (union, intersect or except)"
 msgstr "Ð?гÑ?егиÑ?Ñ?Ñ?Ñ?ий запÑ?оÑ? (union, intersect или except)"
 
-#: ../src/query-druid.c:418
+#: ../src/query-druid.c:413
 msgid "SQL query (of any type)"
 msgstr "Ð?апÑ?оÑ? SQL (лÑ?бого Ñ?ипа)"
 
-#: ../src/query-druid.c:479
-msgid "SELECT query: targets"
-msgstr "Ð?апÑ?оÑ? \"SELECT\": Ñ?ели"
+#: ../src/query-druid.c:427
+msgid "Query attributes"
+msgstr "Ð?аÑ?амеÑ?Ñ?Ñ? запÑ?оÑ?а"
 
-#: ../src/query-druid.c:484
+#: ../src/query-druid.c:482
 msgid "Target selection:"
 msgstr "Ð?Ñ?боÑ? Ñ?ели:"
 
-#: ../src/query-druid.c:485
+#: ../src/query-druid.c:483
 msgid "select the tables and views from which data will be extracted."
 msgstr "Ð?Ñ?бÑ?аÑ?Ñ? Ñ?аблиÑ?Ñ? и окна, из коÑ?оÑ?Ñ?Ñ? бÑ?дÑ?Ñ? извлекаÑ?Ñ?Ñ?Ñ? даннÑ?е."
 
-#: ../src/query-druid.c:499
+#: ../src/query-druid.c:495
 msgid "Tables / Views:"
 msgstr "ТаблиÑ?Ñ? / Ð?кна:"
 
-#: ../src/query-druid.c:509
+#: ../src/query-druid.c:504
 msgid "Query targets:"
 msgstr "Цели запÑ?оÑ?а:"
 
-#: ../src/query-druid.c:714
-msgid "SELECT query: joins"
-msgstr ""
+#: ../src/query-druid.c:581
+msgid "SELECT query: targets"
+msgstr "Ð?апÑ?оÑ? \"SELECT\": Ñ?ели"
 
-#: ../src/query-druid.c:719
+#: ../src/query-druid.c:702
 msgid "Targets' joins:"
-msgstr ""
+msgstr "Цели Ñ?оединений:"
 
-#: ../src/query-druid.c:720
+#: ../src/query-druid.c:703
 msgid ""
 "choose the joins that should be taken into account in the query (most of the "
 "time there are not any target not joined to any other target)"
 msgstr ""
+"вÑ?беÑ?иÑ?е Ñ?оединениÑ?, коÑ?оÑ?Ñ?е должнÑ? Ñ?Ñ?иÑ?Ñ?ваÑ?Ñ?Ñ?Ñ? в запÑ?оÑ?е (обÑ?Ñ?но не "
+"обÑ?одиÑ?Ñ?Ñ? без какой-нибÑ?дÑ? Ñ?ели не Ñ?оединÑ?нной Ñ? дÑ?Ñ?гой Ñ?елÑ?Ñ?)"
 
-#: ../src/query-druid.c:757
-msgid "SELECT query: fields"
-msgstr "Ð?апÑ?оÑ? \"SELECT\": полÑ?"
+#: ../src/query-druid.c:727
+msgid "SELECT query: joins"
+msgstr "Ð?апÑ?оÑ? SELECT: Ñ?оединениÑ?"
 
-#: ../src/query-druid.c:762
+#: ../src/query-druid.c:749
 msgid "Fields selection:"
 msgstr "Ð?Ñ?боÑ? полей:"
 
-#: ../src/query-druid.c:763
+#: ../src/query-druid.c:750
 msgid ""
 "select the fields from the already selected targets. Alternatively fields "
 "can be entered as textual expressions for functions, constants, etc."
 msgstr ""
+"вÑ?беÑ?иÑ?е полÑ? из Ñ?же вÑ?бÑ?аннÑ?Ñ? Ñ?елей. Ð?ли же можно ввеÑ?Ñ?и полÑ? в виде "
+"Ñ?екÑ?Ñ?овÑ?Ñ? вÑ?Ñ?ажений длÑ? опиÑ?аниÑ? Ñ?Ñ?нкÑ?ий, конÑ?Ñ?анÑ? и Ñ?.д."
 
-#: ../src/query-druid.c:778
+#: ../src/query-druid.c:763
 msgid "Possible fields:"
-msgstr "Ð?опÑ?Ñ?Ñ?имÑ?е полÑ?:"
+msgstr "Ð?озможнÑ?е полÑ?:"
 
-#: ../src/query-druid.c:788
+#: ../src/query-druid.c:772
 msgid "Query fields:"
 msgstr "Ð?олÑ? запÑ?оÑ?а:"
 
-#: ../src/query-druid.c:798
+#: ../src/query-druid.c:781
 msgid ""
 "Textual\n"
 "expression:"
@@ -169,134 +210,135 @@ msgstr ""
 "ТекÑ?Ñ?овое\n"
 "вÑ?Ñ?ажение:"
 
-#: ../src/query-druid.c:978 ../src/query-druid.c:987
+#: ../src/query-druid.c:878
+msgid "SELECT query: fields"
+msgstr "Ð?апÑ?оÑ? \"SELECT\": полÑ?"
+
+#: ../src/query-druid.c:950 ../src/query-druid.c:959
 #: ../src/query-fields-menu.c:516 ../src/query-fields-menu.c:525
 msgid "Error parsing/analysing field expression:"
 msgstr "Ð?Ñ?ибка пÑ?и Ñ?азбоÑ?е/анализе вÑ?Ñ?ажениÑ? длÑ? полÑ?:"
 
-#: ../src/query-druid.c:979 ../src/query-druid.c:988 ../src/query-editor.c:631
-#: ../src/query-editor.c:640 ../src/query-fields-editor.c:495
+#: ../src/query-druid.c:951 ../src/query-druid.c:960 ../src/query-editor.c:650
+#: ../src/query-editor.c:659 ../src/query-fields-editor.c:495
 #: ../src/query-fields-editor.c:504 ../src/query-fields-menu.c:517
 #: ../src/query-fields-menu.c:526
 msgid "while parsing"
 msgstr "пÑ?и Ñ?азбоÑ?е"
 
-#: ../src/query-druid.c:1064
-msgid "SELECT query: condition and ordering"
-msgstr ""
-
-#: ../src/query-druid.c:1069
+#: ../src/query-druid.c:1036
 msgid "Selection condition and ordering:"
 msgstr "УÑ?ловиÑ? и поÑ?Ñ?док вÑ?боÑ?а:"
 
-#: ../src/query-druid.c:1070
+#: ../src/query-druid.c:1037
 msgid ""
 "Enter the conditions to apply on the selected rows to filter the final rows, "
 "and the ordering"
 msgstr ""
+"Ð?ведиÑ?е Ñ?Ñ?ловиÑ?, пÑ?именÑ?емÑ?е к вÑ?бÑ?аннÑ?м Ñ?Ñ?Ñ?окам длÑ? Ñ?илÑ?Ñ?Ñ?аÑ?ии конеÑ?нÑ?Ñ? "
+"Ñ?Ñ?Ñ?ок, и поÑ?Ñ?док"
 
-#: ../src/query-druid.c:1094
-msgid "SELECT query: parameters definition"
-msgstr ""
+#: ../src/query-druid.c:1051
+msgid "SELECT query: condition and ordering"
+msgstr "Ð?апÑ?оÑ? SELECT: Ñ?Ñ?ловие и поÑ?Ñ?док"
 
-#: ../src/query-druid.c:1113
-msgid "SELECT query: ready"
-msgstr ""
+#: ../src/query-druid.c:1070
+msgid "SELECT query: parameters definition"
+msgstr "Ð?апÑ?оÑ? SELECT: опÑ?еделение паÑ?амеÑ?Ñ?ов"
 
-#: ../src/query-druid.c:1114
+#: ../src/query-druid.c:1079
 msgid "The selection query is now ready."
-msgstr ""
+msgstr "Ð?апÑ?оÑ? вÑ?боÑ?а гоÑ?ов."
 
-#: ../src/query-druid.c:1135
-msgid "SQL statement Query"
-msgstr "Ð?апÑ?оÑ? в виде SQL-вÑ?Ñ?ажениÑ?"
+#: ../src/query-druid.c:1082
+msgid "Query: ready"
+msgstr "Ð?апÑ?оÑ?: гоÑ?ов"
 
-#: ../src/query-druid.c:1139
+#: ../src/query-druid.c:1102
 msgid "Enter the SQL statement representing the query:"
 msgstr "Ð?ведиÑ?е вÑ?Ñ?ажение SQL пÑ?едÑ?Ñ?авлÑ?Ñ?Ñ?ее запÑ?оÑ?:"
 
-#: ../src/query-druid.c:1155
+#: ../src/query-druid.c:1120
 msgid "Test query validity"
 msgstr "Ð?Ñ?овеÑ?иÑ?Ñ? допÑ?Ñ?Ñ?имоÑ?Ñ?Ñ? запÑ?оÑ?а"
 
-#: ../src/query-druid.c:1175 ../src/query-druid.c:1179
+#: ../src/query-druid.c:1127
+msgid "SQL statement Query"
+msgstr "Ð?апÑ?оÑ? в виде вÑ?Ñ?ажениÑ? SQL"
+
+#: ../src/query-druid.c:1149 ../src/query-druid.c:1153
 msgid "Parsing/analyzing error:"
 msgstr "Ð?Ñ?ибка Ñ?азбоÑ?а/анализа:"
 
-#: ../src/query-druid.c:1180
+#: ../src/query-druid.c:1154
 msgid "The query has an error"
 msgstr "Ð?апÑ?оÑ? Ñ?одеÑ?жиÑ? оÑ?ибкÑ?"
 
-#: ../src/query-druid.c:1192
+#: ../src/query-druid.c:1166
 msgid "No error parsing and analyzing the query"
 msgstr "РазбоÑ? и анализ запÑ?оÑ?а пÑ?оÑ?ли без оÑ?ибок"
 
-#: ../src/query-druid.c:1217
-msgid "To be implemented"
-msgstr "Ð?Ñ?деÑ? Ñ?еализовано"
-
-#: ../src/query-druid.c:1221
-msgid "This functionality is not yet implemented"
-msgstr "ЭÑ?а возможноÑ?Ñ?Ñ? еÑ?Ñ? не Ñ?еализована"
-
-#: ../src/query-editor.c:198
+#: ../src/query-editor.c:208
 msgid "Query attributes:"
-msgstr "Ð?Ñ?Ñ?Ñ?ибÑ?Ñ?Ñ? запÑ?оÑ?а:"
+msgstr "Ð?Ñ?Ñ?ибÑ?Ñ?Ñ? запÑ?оÑ?а:"
 
-#: ../src/query-editor.c:242
+#: ../src/query-editor.c:252
 msgid "SQL"
 msgstr "SQL"
 
-#: ../src/query-editor.c:264
+#: ../src/query-editor.c:274
 msgid "SQL statement representing the query:"
 msgstr "Ð?Ñ?Ñ?ажение SQL пÑ?едÑ?Ñ?авлÑ?Ñ?Ñ?ее запÑ?оÑ?:"
 
-#: ../src/query-editor.c:265
+#: ../src/query-editor.c:275
 msgid "Click on the \"Apply\" button to validate any modification in the text"
-msgstr ""
+msgstr "Ð?ажмиÑ?е кнопкÑ? \"Ð?Ñ?имениÑ?Ñ?\", Ñ?Ñ?обÑ? пÑ?овеÑ?иÑ?Ñ? изменениÑ? в Ñ?екÑ?Ñ?е"
 
-#: ../src/query-editor.c:322
+#: ../src/query-editor.c:332
 msgid "Query targets and their joining rules:"
-msgstr ""
+msgstr "Цели запÑ?оÑ?а и пÑ?авила иÑ? Ñ?оединениÑ?:"
 
-#: ../src/query-editor.c:358
+#: ../src/query-editor.c:376
 msgid "Query fields and their properties:"
 msgstr "Ð?олÑ? запÑ?оÑ?а и иÑ? Ñ?войÑ?Ñ?ва:"
 
-#: ../src/query-editor.c:381
+#: ../src/query-editor.c:399
 msgid "Other properties:"
 msgstr "Ð?Ñ?Ñ?гие Ñ?войÑ?Ñ?ва:"
 
-#: ../src/query-editor.c:401
+#: ../src/query-editor.c:419
 msgid "Global WHERE filter rule:"
-msgstr ""
+msgstr "Ð?Ñ?авила глобалÑ?ного Ñ?илÑ?Ñ?Ñ?а WHERE:"
 
-#: ../src/query-editor.c:427
+#: ../src/query-editor.c:445
 msgid "Query parameters:"
 msgstr "Ð?аÑ?амеÑ?Ñ?Ñ? запÑ?оÑ?а:"
 
-#: ../src/query-editor.c:545
+#: ../src/query-editor.c:564
 msgid "Error (no details available)."
 msgstr "Ð?Ñ?ибка (подÑ?обноÑ?Ñ?и не доÑ?Ñ?Ñ?пнÑ?)."
 
-#: ../src/query-editor.c:555
+#: ../src/query-editor.c:574
 msgid "SQL query analyse warning:"
 msgstr "Ð?Ñ?едÑ?пÑ?еждение пÑ?и анализе SQL запÑ?оÑ?а:"
 
-#: ../src/query-editor.c:556
+#: ../src/query-editor.c:575
 msgid ""
 "This prevents extra treatments, such as graphical edition of this query, "
 "which will be considered as a SQL statement specific to the connected "
 "database."
 msgstr ""
+"ЭÑ?о оÑ?Ñ?анавливаеÑ? дополниÑ?елÑ?нÑ?е инÑ?еÑ?пÑ?еÑ?аÑ?ии, Ñ?акие пÑ?авка запÑ?оÑ?а Ñ?еÑ?ез "
+"гÑ?аÑ?иÑ?еÑ?кий инÑ?еÑ?Ñ?ейÑ?а; он бÑ?деÑ? Ñ?аÑ?Ñ?маÑ?Ñ?иваÑ?Ñ?Ñ?Ñ? как вÑ?Ñ?ажение SQL, "
+"иÑ?полÑ?зÑ?емой Ñ?олÑ?ко в подклÑ?Ñ?енной базе даннÑ?Ñ?."
 
-#: ../src/query-editor.c:559
+#: ../src/query-editor.c:578
 msgid "Do you still want to use that SQL for the query?"
-msgstr ""
+msgstr "Ð?Ñ?Ñ? еÑ?Ñ? Ñ?оÑ?иÑ?е иÑ?полÑ?зоваÑ?Ñ? Ñ?Ñ?о вÑ?Ñ?ажение SQL длÑ? запÑ?оÑ?а?"
 
-#: ../src/query-editor.c:630 ../src/query-editor.c:639
+#: ../src/query-editor.c:649 ../src/query-editor.c:658
 msgid "Error parsing/analysing WHERE expression:"
-msgstr ""
+msgstr "Ð?Ñ?ибка Ñ?азбоÑ?а/анализа вÑ?Ñ?ажениÑ? WHERE:"
 
 #: ../src/query-fields-editor.c:244
 msgid "Field"
@@ -304,7 +346,7 @@ msgstr "Ð?оле"
 
 #: ../src/query-fields-editor.c:257
 msgid "Shown & alias"
-msgstr ""
+msgstr "Ð?оказаннÑ?е и пÑ?евдонимÑ?"
 
 #: ../src/query-fields-editor.c:280
 msgid "Filter"
@@ -316,7 +358,7 @@ msgstr "Ð?оÑ?Ñ?док"
 
 #: ../src/query-fields-editor.c:494 ../src/query-fields-editor.c:503
 msgid "Error parsing/analysing condition expression:"
-msgstr ""
+msgstr "Ð?Ñ?ибка Ñ?азбоÑ?а/анализа Ñ?Ñ?ловного вÑ?Ñ?ажениÑ?:"
 
 #. add a menu item for field creation from a textual expression
 #: ../src/query-fields-menu.c:333
@@ -330,7 +372,7 @@ msgstr "*"
 
 #: ../src/query-fields-menu.c:473
 msgid "Add a query field from an expression"
-msgstr ""
+msgstr "Ð?обавиÑ?Ñ? поле запÑ?оÑ?а из вÑ?Ñ?ажениÑ?"
 
 #: ../src/query-fields-menu.c:484
 msgid "Textual expression:"
@@ -341,37 +383,87 @@ msgid ""
 "The following expression will be analysed to create\n"
 "a new field in the query"
 msgstr ""
+"Ð?лÑ? Ñ?озданиÑ? нового полÑ? запÑ?оÑ?а бÑ?деÑ?\n"
+"пÑ?оанализиÑ?овано Ñ?ледÑ?Ñ?Ñ?ее вÑ?Ñ?ажение"
 
-#: ../src/query-params-editor.c:283
+#: ../src/query-params-editor.c:284
 msgid "Name"
 msgstr "Ð?азвание"
 
-#: ../src/query-params-editor.c:297
+#: ../src/query-params-editor.c:298
 msgid "Parameter?"
 msgstr "Ð?аÑ?амеÑ?Ñ??"
 
-#: ../src/query-params-editor.c:312
+#: ../src/query-params-editor.c:313
 msgid "Value"
 msgstr "Ð?наÑ?ение"
 
-#: ../src/query-params-editor.c:326 ../src/ws-queries.c:254
+#: ../src/query-params-editor.c:327 ../src/ws-queries.c:303
 msgid "Description"
 msgstr "Ð?пиÑ?ание"
 
-#: ../src/query-params-editor.c:342
+#: ../src/query-params-editor.c:343
 msgid "Data type"
 msgstr "Тип даннÑ?Ñ?"
 
-#: ../src/query-params-editor.c:355
+#: ../src/query-params-editor.c:356
 msgid "NULL Ok?"
 msgstr "Ð?ожеÑ? имеÑ?Ñ? знаÑ?ение NULL?"
 
-#: ../src/query-params-editor.c:507
+#: ../src/query-params-editor.c:508
 #, c-format
 msgid "Error: data type '%s' does not exist"
+msgstr "Ð?Ñ?ибка: Ñ?ип даннÑ?Ñ? '%s' не Ñ?Ñ?Ñ?еÑ?Ñ?вÑ?еÑ?"
+
+#: ../src/utils.c:66
+msgid "Please fill in the following information."
+msgstr "УкажиÑ?е Ñ?ледÑ?Ñ?Ñ?Ñ?Ñ? инÑ?оÑ?маÑ?иÑ?."
+
+#: ../src/utils.c:77
+msgid "Provider selection"
+msgstr "Ð?Ñ?боÑ? Ñ?Ñ?едÑ?Ñ?ва доÑ?Ñ?Ñ?па"
+
+#: ../src/utils.c:91
+msgid "Provider:"
+msgstr "СÑ?едÑ?Ñ?во доÑ?Ñ?Ñ?па:"
+
+#: ../src/utils.c:123
+msgid ""
+"The provider associated to this connection\n"
+"does not support this operation"
 msgstr ""
+"СÑ?едÑ?Ñ?во доÑ?Ñ?Ñ?па, Ñ?вÑ?занное Ñ? Ñ?Ñ?им подклÑ?Ñ?ением,\n"
+"не поддеÑ?живаеÑ? Ñ?Ñ?Ñ? опеÑ?аÑ?иÑ?"
+
+#: ../src/utils.c:132 ../src/utils.c:276
+#, c-format
+msgid ""
+"Could not get the information required to perform that operation:\n"
+"%s"
+msgstr ""
+"Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? инÑ?оÑ?маÑ?иÑ?, Ñ?Ñ?ебÑ?емÑ?Ñ? длÑ? вÑ?полнениÑ? данной опеÑ?аÑ?ии:\n"
+"%s"
+
+#: ../src/utils.c:133 ../src/utils.c:189 ../src/utils.c:277
+#: ../src/workspace-window.c:151 ../src/workspace-window.c:161
+#: ../src/workspace-window.c:296 ../src/workspace-window.c:741
+#: ../src/ws-queries.c:766
+msgid "No detail"
+msgstr "Ð?еÑ? подÑ?обноÑ?Ñ?ей"
+
+#: ../src/utils.c:188
+msgid "Could not perform operation"
+msgstr "Ð?е Ñ?далоÑ?Ñ? вÑ?полниÑ?Ñ? опеÑ?аÑ?иÑ?"
 
-#: ../src/workspace-page.c:175
+#: ../src/utils.c:241
+msgid "Internal error: can't instantiate a provider object"
+msgstr "Ð?нÑ?Ñ?Ñ?еннÑ?Ñ? оÑ?ибка: не Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? обÑ?екÑ? Ñ?Ñ?едÑ?Ñ?ва доÑ?Ñ?Ñ?па"
+
+#: ../src/utils.c:270
+msgid "Selected provider does not support this operation"
+msgstr "Ð?Ñ?бÑ?анное Ñ?Ñ?едÑ?Ñ?во доÑ?Ñ?Ñ?па не поддеÑ?живаеÑ? даннÑ?Ñ? опеÑ?аÑ?иÑ?"
+
+#: ../src/workspace-page.c:208
 #, c-format
 msgid ""
 "This feature (%s)\n"
@@ -379,100 +471,183 @@ msgid ""
 "\n"
 "In %s, %s(), line %d"
 msgstr ""
+"ЭÑ?а возможноÑ?Ñ?Ñ? (%s)\n"
+"пока не Ñ?еализована\n"
+"\n"
+"Ð? %s, %s(), Ñ?Ñ?Ñ?ока %d"
 
-#: ../src/workspace-page.c:180
+#: ../src/workspace-page.c:213
 #, c-format
 msgid ""
 "This feature is not yet implemented\n"
 "\n"
 "In %s, %s(), line %d"
 msgstr ""
+"ЭÑ?а возможноÑ?Ñ?Ñ? пока не Ñ?еализована\n"
+"\n"
+"Ð? %s, %s(), Ñ?Ñ?Ñ?ока %d"
+
+#: ../src/workspace-window.c:122
+#, c-format
+msgid ""
+"<b>A transaction has been started on the %s connection.</b>\n"
+"\n"
+"if it is not committed, any change since the beginning of the transaction "
+"will be lost. \n"
+"\n"
+"<u>Rollback</u> the transaction to cancel any change made since the "
+"transaction was started, <u>commit</u> the transaction to save those "
+"changes, or <u>ignore</u> the transaction to let the DBMS handle the "
+"transaction (this usually leads to lose any change). What do you want to do?"
+msgstr ""
+"<b>Ð?лÑ? Ñ?оединениÑ? %s бÑ?ла наÑ?аÑ?а Ñ?Ñ?анзакÑ?иÑ?.</b>\n"
+"\n"
+"Ð?Ñ?ли она не бÑ?деÑ? заÑ?икÑ?иÑ?ована, Ñ?о лÑ?бÑ?е изменениÑ?, Ñ?деланнÑ?е оÑ? наÑ?ала "
+"Ñ?Ñ?анзакÑ?ии, бÑ?дÑ?Ñ? поÑ?еÑ?Ñ?нÑ?.\n"
+"\n"
+"<u>Ð?Ñ?каÑ?</u> Ñ?Ñ?анзакÑ?ии оÑ?менÑ?еÑ? вÑ?е Ñ?деланнÑ?е изменениÑ? оÑ? еÑ? наÑ?ала, "
+"<u>Ñ?икÑ?аÑ?иÑ?</u> Ñ?Ñ?анзакÑ?ии Ñ?оÑ?Ñ?анÑ?еÑ? Ñ?Ñ?и изменениÑ?, или <u>игноÑ?иÑ?ование</u> "
+"Ñ?Ñ?анзакÑ?ии оÑ?Ñ?авлÑ?еÑ? вÑ?боÑ? за СУÐ?Ð? (обÑ?Ñ?но пÑ?иводиÑ? к поÑ?еÑ?е вÑ?еÑ? "
+"изменений). ЧÑ?о нÑ?жно Ñ?делаÑ?Ñ??"
+
+#: ../src/workspace-window.c:134
+msgid "Rollback transaction"
+msgstr "Ð?Ñ?каÑ?иÑ?Ñ? Ñ?Ñ?анзакÑ?иÑ?"
+
+#: ../src/workspace-window.c:135
+msgid "Commit transaction"
+msgstr "Ð?аÑ?икÑ?иÑ?оваÑ?Ñ? Ñ?Ñ?анзакÑ?иÑ?"
+
+#: ../src/workspace-window.c:136
+msgid "Ignore transaction"
+msgstr "Ð?гноÑ?иÑ?оваÑ?Ñ? Ñ?Ñ?анзакÑ?иÑ?"
+
+#: ../src/workspace-window.c:148
+#, c-format
+msgid ""
+"<b>Could not rollback current transaction:</b>\n"
+"%s\n"
+"\n"
+"What do you want to do?"
+msgstr ""
+"<b>Ð?е Ñ?далоÑ?Ñ? оÑ?каÑ?иÑ?Ñ? Ñ?екÑ?Ñ?Ñ?Ñ? Ñ?Ñ?анзакÑ?иÑ?:</b>\n"
+"%s\n"
+"\n"
+"ЧÑ?о нÑ?жно Ñ?делаÑ?Ñ??"
+
+#: ../src/workspace-window.c:158
+#, c-format
+msgid ""
+"<b>Could not commit current transaction:</b>\n"
+"%s\n"
+"\n"
+"What do you want to do?"
+msgstr ""
+"<b>Ð?е Ñ?далоÑ?Ñ? заÑ?икÑ?иÑ?оваÑ?Ñ? Ñ?екÑ?Ñ?Ñ?Ñ? Ñ?Ñ?анзакÑ?иÑ?:</b>\n"
+"%s\n"
+"\n"
+"ЧÑ?о нÑ?жно Ñ?делаÑ?Ñ??"
+
+#: ../src/workspace-window.c:167
+msgid "Close anyway"
+msgstr "Ð?акÑ?Ñ?Ñ?Ñ?"
+
+#: ../src/workspace-window.c:168
+msgid "Don't close this workspace window"
+msgstr "Ð?е закÑ?Ñ?ваÑ?Ñ? окно Ñ?абоÑ?ей облаÑ?Ñ?и"
+
+#. dialog
+#: ../src/workspace-window.c:224
+msgid "Transactions management"
+msgstr "УпÑ?авление Ñ?Ñ?анзакÑ?иÑ?ми"
+
+#: ../src/workspace-window.c:255
+msgid "Database creation requires that first a database provider be selected."
+msgstr "Ð?еÑ?ед Ñ?озданием базÑ? даннÑ?Ñ? нÑ?жно вÑ?бÑ?аÑ?Ñ? Ñ?Ñ?едÑ?Ñ?во доÑ?Ñ?Ñ?па."
+
+#: ../src/workspace-window.c:256
+msgid ""
+"The 'SQLite' provider allows you to create a database stored in a single "
+"file\n"
+"and does not require a database server to be set up."
+msgstr ""
+"СÑ?едÑ?Ñ?во доÑ?Ñ?Ñ?па SQLite позволÑ?еÑ? Ñ?оздаÑ?Ñ? базÑ? даннÑ?Ñ?, Ñ?Ñ?анÑ?Ñ?Ñ?Ñ?Ñ?Ñ?\n"
+"в одном Ñ?айле и не Ñ?Ñ?ебÑ?еÑ? Ñ?Ñ?Ñ?ановки Ñ?еÑ?веÑ?а баз даннÑ?Ñ?."
+
+#: ../src/workspace-window.c:260
+msgid "Create a database"
+msgstr "СоздаÑ?Ñ? базÑ? даннÑ?Ñ?"
+
+#: ../src/workspace-window.c:272
+msgid "Delete a database"
+msgstr "УдалиÑ?Ñ? базÑ? даннÑ?Ñ?"
+
+#: ../src/workspace-window.c:273
+msgid ""
+"Database destruction requires that first a database provider be selected."
+msgstr "Ð?еÑ?ед Ñ?далением базÑ? даннÑ?Ñ? нÑ?жно вÑ?бÑ?аÑ?Ñ? Ñ?Ñ?едÑ?Ñ?во доÑ?Ñ?Ñ?па."
+
+#: ../src/workspace-window.c:295
+msgid "Could not find the 'gnome-database-properties' program"
+msgstr "Ð?е Ñ?далоÑ?Ñ? найÑ?и пÑ?огÑ?аммÑ? gnome-database-properties"
 
 #. dialog
-#: ../src/workspace-window.c:187
+#: ../src/workspace-window.c:315
 msgid "SQL console"
 msgstr "Ð?онÑ?олÑ? SQL"
 
-#: ../src/workspace-window.c:210
+#: ../src/workspace-window.c:333
 msgid "SQL Console (type \\? + ENTER for help)\n"
-msgstr ""
+msgstr "Ð?онÑ?олÑ? SQL (Ñ?Ñ?обÑ? полÑ?Ñ?иÑ?Ñ? Ñ?пÑ?авкÑ?, введиÑ?е \\? + ENTER)\n"
 
-#: ../src/workspace-window.c:289
+#: ../src/workspace-window.c:417
 msgid "Database services for the GNOME Desktop"
-msgstr ""
+msgstr "СлÑ?жбÑ? баз даннÑ?Ñ? длÑ? Ñ?абоÑ?его окÑ?Ñ?жениÑ? GNOME"
 
-#: ../src/workspace-window.c:365
+#: ../src/workspace-window.c:493
 msgid "Metadata synchronisation"
 msgstr "СинÑ?Ñ?онизаÑ?ии меÑ?аданнÑ?Ñ?"
 
-#: ../src/workspace-window.c:385
+#: ../src/workspace-window.c:499
+msgid "Reading database's meta data, please wait..."
+msgstr "Ð?Ñ?полнÑ?еÑ?Ñ?Ñ? Ñ?Ñ?ение меÑ?аданнÑ?Ñ? базÑ? даннÑ?Ñ?..."
+
+#: ../src/workspace-window.c:510
 #, c-format
 msgid ""
 "Error updating Server metadata:\n"
 "%s\n"
 msgstr ""
-
-#: ../src/workspace-window.c:401
-#, c-format
-msgid ""
-"Error updating database metadata:\n"
+"Ð?Ñ?ибка обновлениÑ? меÑ?аданнÑ?Ñ? Ñ?еÑ?веÑ?а:\n"
 "%s\n"
-msgstr ""
 
-#: ../src/workspace-window.c:652
+#: ../src/workspace-window.c:740
 #, c-format
 msgid ""
 "Error Opening connection:\n"
 "%s\n"
 msgstr ""
+"Ð?Ñ?ибка оÑ?кÑ?Ñ?Ñ?иÑ? Ñ?оединениÑ?:\n"
+"%s\n"
 
-#: ../src/workspace-window.c:653 ../src/ws-queries.c:813
-msgid "No detail"
-msgstr "Ð?еÑ? подÑ?обноÑ?Ñ?ей"
-
-#: ../src/workspace-window.c:688
+#: ../src/workspace-window.c:837
 msgid "Opening connection"
 msgstr "Ð?Ñ?кÑ?Ñ?ваеÑ?Ñ?Ñ? Ñ?оединение"
 
-#: ../src/workspace-window.c:689
+#: ../src/workspace-window.c:838
 msgid "The connection to the data source is now being opened."
-msgstr ""
-
-#: ../src/workspace-window.c:743
-#, c-format
-msgid ""
-"<b><big>Failed loading data dictionary</big></b>\n"
-"<small>The previously saved data dictionary for this connection can't be "
-"loaded because it contains errors:\n"
-"%s</small>\n"
-"\n"
-"Do you want to force a synchronization with the database dictionary now?\n"
-"\n"
-"<small><u>Warning:</u> if you answer 'Yes', all the queries, etc. defined "
-"will be lost; answering 'No' allows you try to fix the error</small>"
-msgstr ""
-
-#: ../src/workspace-window.c:850
-msgid "Loading dictionary"
-msgstr "Ð?агÑ?Ñ?жаеÑ?Ñ?Ñ? Ñ?ловаÑ?Ñ?"
-
-#: ../src/workspace-window.c:851
-msgid ""
-"The dictionary is a file where data from a previous session is stored. If "
-"this is the first session for the requested data source, then there is no "
-"dictionary."
-msgstr ""
+msgstr "Соединение Ñ? иÑ?Ñ?оÑ?ником даннÑ?Ñ? вÑ?полнено."
 
 #. dialog to choose the connection
-#: ../src/workspace-window.c:892
+#: ../src/workspace-window.c:876
 msgid "Connect"
 msgstr "Соединение"
 
 #: ../src/ws-datatypes.c:227
 msgid "Please select a data type from the list on the left"
-msgstr ""
+msgstr "Ð?Ñ?беÑ?иÑ?е Ñ?ип даннÑ?Ñ? из Ñ?пиÑ?ка Ñ?лева"
 
-#: ../src/ws-datatypes.c:236 ../src/ws-dbrels.c:244 ../src/ws-tables.c:245
+#: ../src/ws-datatypes.c:236 ../src/ws-dbrels.c:297 ../src/ws-tables.c:345
 msgid "<b>Description:</b>"
 msgstr "<b>Ð?пиÑ?ание:</b>"
 
@@ -482,25 +657,26 @@ msgstr "<b>СинонимÑ?:</b>"
 
 #: ../src/ws-datatypes.c:274
 msgid "<b>Select a filter option:</b>"
-msgstr ""
+msgstr "<b>Ð?Ñ?боÑ? паÑ?амеÑ?Ñ?а Ñ?илÑ?Ñ?Ñ?аÑ?ии:</b>"
 
 #: ../src/ws-datatypes.c:290
 msgid "Functions returning this data type"
-msgstr ""
+msgstr "ФÑ?нкÑ?ии, возвÑ?аÑ?аÑ?Ñ?ие даннÑ?й Ñ?ип даннÑ?Ñ?"
 
 #: ../src/ws-datatypes.c:298
 msgid "Functions using this data type"
-msgstr ""
+msgstr "ФÑ?нкÑ?ии, иÑ?полÑ?зÑ?Ñ?Ñ?ие даннÑ?й Ñ?ип даннÑ?Ñ?"
 
 #: ../src/ws-datatypes.c:306
 msgid "Aggregates using this data type"
-msgstr ""
+msgstr "Ð?гÑ?егиÑ?оваÑ?Ñ?, иÑ?полÑ?зÑ?Ñ? даннÑ?й Ñ?ип даннÑ?Ñ?"
 
 #: ../src/ws-datatypes.c:314
 msgid "<b>Result of filter:</b>"
-msgstr ""
+msgstr "<b>РезÑ?лÑ?Ñ?аÑ? Ñ?илÑ?Ñ?Ñ?аÑ?ии:</b>"
 
 #: ../src/ws-datatypes.c:551
+#, c-format
 msgid "Data types"
 msgstr "ТипÑ? даннÑ?Ñ?"
 
@@ -512,105 +688,108 @@ msgstr "Ð?е вÑ?бÑ?ан Ñ?ип даннÑ?Ñ?"
 msgid "Types"
 msgstr "ТипÑ?"
 
-#: ../src/ws-dbrels.c:234
+#: ../src/ws-dbrels.c:287
 msgid ""
 "Please select a graph from the list on the left,\n"
 "or create a new one using the 'Add' button below."
 msgstr ""
+"Ð?Ñ?беÑ?иÑ?е гÑ?аÑ? из Ñ?пиÑ?ка Ñ?лева,\n"
+"или Ñ?оздайÑ?е новÑ?й, нажав кнопкÑ? 'Ð?обавиÑ?Ñ?'."
 
-#: ../src/ws-dbrels.c:263
+#: ../src/ws-dbrels.c:316
 msgid "<b>Relations:</b>"
 msgstr "<b>Ð?Ñ?ноÑ?ениÑ?:</b>"
 
-#: ../src/ws-dbrels.c:413
+#: ../src/ws-dbrels.c:384
+msgid "Automatic layout"
+msgstr "Ð?вÑ?омаÑ?иÑ?еÑ?кое Ñ?азмеÑ?ение"
+
+#: ../src/ws-dbrels.c:504
 msgid "Relations view properties"
-msgstr ""
+msgstr "СвойÑ?Ñ?ва окна оÑ?ноÑ?ений"
 
-#: ../src/ws-dbrels.c:462
+#: ../src/ws-dbrels.c:553
 msgid ""
 "Enter the name and description for this database's relations representation."
-msgstr ""
+msgstr "Ð?ведиÑ?е название и опиÑ?ание пÑ?едÑ?Ñ?авлениÑ? оÑ?ноÑ?ений базÑ? даннÑ?Ñ?."
 
-#: ../src/ws-dbrels.c:491
+#: ../src/ws-dbrels.c:585
 #, c-format
 msgid "Do you want to delete the '%s' graph?"
-msgstr ""
+msgstr "УдалиÑ?Ñ? гÑ?аÑ? %s?"
+
+#: ../src/ws-dbrels.c:588
+msgid "Do you want to delete the graph <no name>?"
+msgstr "УдалиÑ?Ñ? гÑ?аÑ? <без имени>?"
 
-#: ../src/ws-dbrels.c:533
+#: ../src/ws-dbrels.c:634
+#, c-format
 msgid "Database Relations"
-msgstr ""
+msgstr "Ð?Ñ?ноÑ?ениÑ? базÑ? даннÑ?Ñ?"
 
-#: ../src/ws-dbrels.c:552
+#: ../src/ws-dbrels.c:653
 msgid "No database relation selected"
-msgstr ""
+msgstr "Ð?Ñ?ноÑ?ениÑ? базÑ? даннÑ?Ñ? не вÑ?бÑ?ано"
 
-#: ../src/ws-dbrels.c:574
+#: ../src/ws-dbrels.c:675
 msgid "Relations"
 msgstr "Ð?Ñ?ноÑ?ениÑ?"
 
-#: ../src/ws-queries.c:239
+#: ../src/ws-queries.c:288
 msgid ""
 "Please select a query from the list on the left,\n"
 "or create a new one using the 'Add' button below."
 msgstr ""
+"Ð?Ñ?беÑ?иÑ?е запÑ?оÑ? из Ñ?пиÑ?ка Ñ?лева,\n"
+"или Ñ?оздайÑ?е новÑ?й, нажав кнопкÑ? 'Ð?обавиÑ?Ñ?'."
 
-#: ../src/ws-queries.c:280
+#: ../src/ws-queries.c:329
 msgid "SQL statement"
 msgstr "Ð?Ñ?Ñ?ажение SQL"
 
-#: ../src/ws-queries.c:299 ../src/ws-queries.c:338
+#: ../src/ws-queries.c:348 ../src/ws-queries.c:387
 msgid "For information only, to edit, click on the \"Edit\" button."
-msgstr ""
+msgstr "ЧÑ?обÑ? измениÑ?Ñ? запÑ?оÑ? нажмиÑ?е кнопкÑ? \"Ð?Ñ?авка\"."
 
-#: ../src/ws-queries.c:319
+#: ../src/ws-queries.c:368
 msgid "Query parameters"
 msgstr "Ð?аÑ?амеÑ?Ñ?Ñ? запÑ?оÑ?а"
 
-#: ../src/ws-queries.c:363
-msgid "Edit"
-msgstr "Ð?Ñ?авка"
-
-#: ../src/ws-queries.c:383
-msgid "Execute"
-msgstr "Ð?Ñ?полниÑ?Ñ?"
-
-#: ../src/ws-queries.c:427
-msgid "New Query"
-msgstr "Ð?овÑ?й запÑ?оÑ?"
-
-#: ../src/ws-queries.c:442
+#: ../src/ws-queries.c:478
 #, c-format
 msgid "Edition of query '%s'"
 msgstr "РедакÑ?иÑ?ование запÑ?оÑ?а: \"%s\""
 
-#: ../src/ws-queries.c:462
+#: ../src/ws-queries.c:502
 #, c-format
 msgid "Do you want to delete the '%s' query?"
-msgstr ""
+msgstr "УдалиÑ?Ñ? запÑ?оÑ? '%s'?"
 
-#: ../src/ws-queries.c:499
+#: ../src/ws-queries.c:539
 msgid "Values to be filled"
-msgstr ""
+msgstr "Ð?Ñ?жно заполниÑ?Ñ? знаÑ?ениÑ?"
 
-#: ../src/ws-queries.c:500
+#: ../src/ws-queries.c:540
 msgid ""
 "<big><b>Required values:</b></big>\n"
 "<small>The following values are required to execute the query.</small>"
 msgstr ""
+"<big><b>ТÑ?ебÑ?емÑ?е знаÑ?ениÑ?:</b></big>\n"
+"<small>Ð?лÑ? вÑ?полнениÑ? запÑ?оÑ?а Ñ?Ñ?ебÑ?Ñ?Ñ?Ñ?Ñ? Ñ?ледÑ?Ñ?Ñ?ие знаÑ?ениÑ?.</small>"
 
-#: ../src/ws-queries.c:660
+#: ../src/ws-queries.c:621
 msgid "Execute the following insertion query?"
-msgstr ""
+msgstr "Ð?Ñ?полниÑ?Ñ? запÑ?оÑ? на вÑ?Ñ?авкÑ??"
 
-#: ../src/ws-queries.c:664
+#: ../src/ws-queries.c:625
 msgid "Execute the following update query?"
-msgstr ""
+msgstr "Ð?Ñ?полниÑ?Ñ? запÑ?оÑ? на обновление?"
 
-#: ../src/ws-queries.c:668
+#: ../src/ws-queries.c:629
 msgid "Execute the following deletion query?"
-msgstr ""
+msgstr "Ð?Ñ?полниÑ?Ñ? запÑ?оÑ? на Ñ?даление?"
 
-#: ../src/ws-queries.c:685
+#: ../src/ws-queries.c:646
 #, c-format
 msgid ""
 "<b><big>%s</big></b>\n"
@@ -619,32 +798,36 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"<b><big>%s</big></b>\n"
+"<small>СоглаÑ?но наÑ?Ñ?Ñ?ойкам, длÑ? вÑ?полнениÑ? запÑ?оÑ?а Ñ?Ñ?ебÑ?еÑ?Ñ?Ñ? подÑ?веÑ?ждение</"
+"small>\n"
+"\n"
+"%s"
 
-#: ../src/ws-queries.c:746
+#: ../src/ws-queries.c:699
 #, c-format
 msgid ""
 "The following error occurred while preparing the query:\n"
 "%s"
 msgstr ""
+"Ð?Ñ?и подгоÑ?овке запÑ?оÑ?а возникла Ñ?ледÑ?Ñ?Ñ?аÑ? оÑ?ибка:\n"
+"%s"
 
-#: ../src/ws-queries.c:751
+#: ../src/ws-queries.c:704
+#, c-format
 msgid "An unknown error occurred while preparing the query."
-msgstr ""
+msgstr "Ð?Ñ?и подгоÑ?овке запÑ?оÑ?а возникла неизвеÑ?Ñ?наÑ? оÑ?ибка."
 
-#: ../src/ws-queries.c:815
+#: ../src/ws-queries.c:768
 msgid "Can't execute query:"
 msgstr "Ð?евозможно вÑ?полниÑ?Ñ? запÑ?оÑ?:"
 
-#: ../src/ws-queries.c:848
+#: ../src/ws-queries.c:797
 #, c-format
 msgid "Execution of query '%s'"
 msgstr "Ð?Ñ?полнение запÑ?оÑ?а \"%s\""
 
-#: ../src/ws-queries.c:878
-msgid "Table to modify:"
-msgstr "ТаблиÑ?а длÑ? изменениÑ?:"
-
-#: ../src/ws-queries.c:917
+#: ../src/ws-queries.c:848
 #, c-format
 msgid ""
 "<b><big>Execute the following query ?</big></b>\n"
@@ -654,74 +837,135 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"<b><big>Ð?Ñ?полниÑ?Ñ? запÑ?оÑ??</big></b>\n"
+"<small>ЭÑ?оÑ? запÑ?оÑ? не Ñ?далоÑ?Ñ? пÑ?оанализиÑ?оваÑ?Ñ?: возможно, в нÑ?м иÑ?полÑ?зÑ?еÑ?Ñ?Ñ? "
+"Ñ?инÑ?акÑ?иÑ?, понимаемÑ?й Ñ?олÑ?ко иÑ?полÑ?зÑ?емÑ?м Ñ?ипом базÑ? даннÑ?Ñ?, или в нÑ?м еÑ?Ñ?Ñ? "
+"оÑ?ибка.</small>\n"
+"\n"
+"%s"
 
-#: ../src/ws-queries.c:962
+#: ../src/ws-queries.c:893
 msgid "Execution results"
 msgstr "РезÑ?лÑ?Ñ?аÑ?Ñ? вÑ?полнениÑ?"
 
-#: ../src/ws-queries.c:1038
+#: ../src/ws-queries.c:973
 msgid "Non reported error"
-msgstr ""
+msgstr "Ð?Ñ?ибка без дополниÑ?елÑ?ной инÑ?оÑ?маÑ?ии"
 
-#: ../src/ws-queries.c:1059 ../src/ws-queries.c:1100
+#: ../src/ws-queries.c:994 ../src/ws-queries.c:1035
+#, c-format
 msgid "Queries"
 msgstr "Ð?апÑ?оÑ?Ñ?"
 
-#: ../src/ws-queries.c:1078
+#: ../src/ws-queries.c:1013
 msgid "No query selected"
 msgstr "Ð?апÑ?оÑ? не вÑ?бÑ?ан"
 
-#: ../src/ws-tables.c:231
+#: ../src/ws-tables.c:331
 msgid ""
-"Please select a table from the list on the left,\n"
+"Please select a table or view from the list on the left,\n"
 "or create a new one using the 'Add' button below."
 msgstr ""
+"УкажиÑ?е Ñ?аблиÑ?Ñ? или вид из Ñ?пиÑ?ка Ñ?лева,\n"
+"или Ñ?оздайÑ?е новÑ?й, нажав кнопкÑ? 'Ð?обавиÑ?Ñ?'."
 
-#: ../src/ws-tables.c:257
+#: ../src/ws-tables.c:357
 msgid "<b>Fields:</b>"
 msgstr "<b>Ð?олÑ?:</b>"
 
-#: ../src/ws-tables.c:282
-msgid "<b>Integrity rules:</b>"
-msgstr ""
+#: ../src/ws-tables.c:383
+msgid "<b>Constraints and integrity rules:</b>"
+msgstr "<b>Ð?Ñ?авила огÑ?аниÑ?ений и Ñ?елоÑ?Ñ?ноÑ?Ñ?и:</b>"
 
-#: ../src/ws-tables.c:341
-msgid "Contents"
-msgstr ""
+#: ../src/ws-tables.c:424
+msgid "<b>Field's display specifications</b>"
+msgstr "<b>СпеÑ?иÑ?икаÑ?иÑ? оÑ?обÑ?ажениÑ? полей</b>"
 
-#: ../src/ws-tables.c:375
-msgid "table creation"
+#: ../src/ws-tables.c:669
+#, c-format
+msgid ""
+"Data cannot be modified for the following reason:\n"
+"%s"
 msgstr ""
+"Ð?аннÑ?е невозможно измениÑ?Ñ? по Ñ?ледÑ?Ñ?Ñ?ей пÑ?иÑ?ине:\n"
+"%s"
 
-#: ../src/ws-tables.c:381
-msgid "table removal"
-msgstr ""
+#: ../src/ws-tables.c:672
+msgid "Data cannot be modified"
+msgstr "Ð?аннÑ?е невозможно измениÑ?Ñ?"
+
+#: ../src/ws-tables.c:678
+msgid "Data cannot be modified because it is a view's data"
+msgstr "Ð?аннÑ?е невозможно измениÑ?Ñ? из-за Ñ?ого, Ñ?Ñ?о Ñ?Ñ?о вид"
 
-#: ../src/ws-tables.c:426
+#: ../src/ws-tables.c:685
 #, c-format
-msgid "Contents of '%s'"
-msgstr ""
+msgid "Contents of view '%s'"
+msgstr "СодеÑ?жимое вида '%s'"
+
+#: ../src/ws-tables.c:687
+#, c-format
+msgid "Contents of table '%s'"
+msgstr "СодеÑ?жимое Ñ?аблиÑ?Ñ? '%s'"
+
+#: ../src/ws-tables.c:762
+msgid "Column"
+msgstr "СÑ?олбеÑ?"
 
-#: ../src/ws-tables.c:523
+#: ../src/ws-tables.c:763
+msgid "Type"
+msgstr "Тип"
+
+#: ../src/ws-tables.c:764
+msgid "Can be NULL"
+msgstr "Ð?ожеÑ? бÑ?Ñ?Ñ? NULL"
+
+#: ../src/ws-tables.c:766
+msgid "Comments"
+msgstr "Ð?омменÑ?аÑ?ии"
+
+#: ../src/ws-tables.c:794
 msgid "Primary key"
-msgstr "Ð?еÑ?виÑ?нÑ?й индекÑ?"
+msgstr "Ð?еÑ?виÑ?нÑ?й клÑ?Ñ?"
 
-#: ../src/ws-tables.c:560
-msgid "Foreign key"
-msgstr ""
+#: ../src/ws-tables.c:828 ../src/ws-tables.c:830
+#, c-format
+msgid "Foreign key on '%s'"
+msgstr "Ð?неÑ?ний клÑ?Ñ? на '%s'"
 
-#: ../src/ws-tables.c:600
-msgid "UNIQUE constraint"
-msgstr ""
+#: ../src/ws-tables.c:876
+msgid "Unique constraint"
+msgstr "Ð?гÑ?аниÑ?ение Ñ?никалÑ?ноÑ?Ñ?и"
 
-#: ../src/ws-tables.c:636
+#: ../src/ws-tables.c:911
+#, c-format
 msgid "Tables and views"
-msgstr "ТаблиÑ?Ñ? и окна"
+msgstr "ТаблиÑ?Ñ? и видÑ?"
 
-#: ../src/ws-tables.c:652
+#: ../src/ws-tables.c:931
 msgid "No table selected"
 msgstr "ТаблиÑ?а не вÑ?бÑ?ана"
 
-#: ../src/ws-tables.c:674
+#: ../src/ws-tables.c:953
 msgid "Tables"
 msgstr "ТаблиÑ?Ñ?"
+
+#: ../src/ws-tables.c:1007
+msgid "Create a table"
+msgstr "СоздаÑ?Ñ? Ñ?аблиÑ?Ñ?"
+
+#: ../src/ws-tables.c:1031
+msgid "Delete a table"
+msgstr "УдалиÑ?Ñ? Ñ?аблиÑ?Ñ?"
+
+#: ../src/ws-tables.c:1091
+msgid "Rename a table"
+msgstr "Ð?еÑ?еименоваÑ?Ñ? Ñ?аблиÑ?Ñ?"
+
+#: ../src/ws-tables.c:1118
+msgid "Add a column to a table"
+msgstr "Ð?обавиÑ?Ñ? Ñ?Ñ?олбеÑ? в Ñ?аблиÑ?Ñ?"
+
+#: ../src/ws-tables.c:1151
+msgid "Delete a column from a table"
+msgstr "УдалиÑ?Ñ? Ñ?Ñ?олбеÑ? из Ñ?аблиÑ?Ñ?"