[dia] Cleanup of Russian translation, first stage. Miles and miles of mistakes and misplaced humour still

[Alexandre Prokoudine <aprokoudine src gnome org>]

commit fd30cc6f736d7311b7c098cb70401b0f759ba592
Author: Alexandre Prokoudine <alexandre prokoudine gmail com>
Date:   Wed Jun 1 08:01:26 2011 +0400

    Cleanup of Russian translation, first stage.
    Miles and miles of mistakes and misplaced humour still to through.

 po/ru.po | 4521 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 2301 insertions(+), 2220 deletions(-)
---
diff --git a/po/ru.po b/po/ru.po
index 4b230b4..8070c13 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -2,240 +2,270 @@
 # Vitaly Lipatov <lav altlinux ru>, 2002, 2003, 2004.
 # Kvyato Sergey <kvantos plotinka ru>, 2005, 2006.
 # Aleksandr Sokolov <saanchos gmail com>, 2008.
+# Ð?лекÑ?андÑ? Ð?Ñ?окÑ?дин <alexandre prokoudine gmail com>, 2011.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Dia 0.97\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-16 23:33+0400\n"
-"PO-Revision-Date: 2009-06-17 15:19+0300\n"
-"Last-Translator: Alexandre Prokoudine <alexandre prokoudine gmail com>\n"
-"Language-Team: GNOME Cyrillic <gnome-cyr lists gnome org>\n"
+"POT-Creation-Date: 2011-06-01 00:04+0400\n"
+"PO-Revision-Date: 2011-06-01 08:00+0400\n"
+"Last-Translator: Ð?лекÑ?андÑ? Ð?Ñ?окÑ?дин <alexandre prokoudine gmail com>\n"
+"Language-Team: Russian <gnome-cyr lists gnome org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\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"
+"Content-Transfer-Encoding: UTF-8\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); 10<=4 && (n%100<10 || n%"
+"100>=20) ? 1 : 2);\n"
 "X-Poedit-Language: Russian\n"
 "X-Poedit-Country: RUSSIAN FEDERATION\n"
 
 #. This is not an errror
-#: ../app/app_procs.c:214
+#: ../app/app_procs.c:208
 #, c-format
 msgid "Warning: invalid layer range %lu - %lu\n"
 msgstr "Ð?нимание: непÑ?авилÑ?нÑ?й диапазон Ñ?лоÑ? %lu - %lu\n"
 
-#: ../app/app_procs.c:226
+#: ../app/app_procs.c:220
 #, c-format
 msgid "Warning: Layer %lu (%s) selected more than once.\n"
 msgstr "Ð?нимание: Слой %lu (%s) вÑ?бÑ?ан более одного Ñ?аза.\n"
 
-#: ../app/app_procs.c:252
+#: ../app/app_procs.c:246
 #, c-format
 msgid "Warning: Layer %d (%s) selected more than once.\n"
 msgstr "Ð?нимание: Слой %d (%s) вÑ?бÑ?ан более одного Ñ?аза.\n"
 
-#: ../app/app_procs.c:261
-#, c-format
-msgid "Warning: There is no layer named %s\n"
+#: ../app/app_procs.c:255
+#, fuzzy, c-format
+msgid "Warning: There is no layer named %s.\n"
 msgstr "Ð?нимание: Слой Ñ? именем %s не Ñ?Ñ?Ñ?еÑ?Ñ?вÑ?еÑ?\n"
 
-#: ../app/app_procs.c:343
+#: ../app/app_procs.c:337
 #, c-format
 msgid "%s error: don't know how to export into %s\n"
 msgstr "%s оÑ?ибка: не извеÑ?Ñ?ен Ñ?поÑ?об Ñ?кÑ?поÑ?Ñ?а в %s\n"
 
-#: ../app/app_procs.c:352
-#, c-format
-msgid "%s error: input and output file name is identical: %s"
+#: ../app/app_procs.c:346
+#, fuzzy, c-format
+msgid "%s error: input and output filenames are identical: %s"
 msgstr "%s оÑ?ибка: название вÑ?одного и вÑ?Ñ?одного Ñ?айлов Ñ?овпадаÑ?Ñ?: %s"
 
-#: ../app/app_procs.c:360
+#: ../app/app_procs.c:354
 #, c-format
 msgid "%s error: need valid input file %s\n"
 msgstr "%s оÑ?ибка: Ñ?Ñ?ебÑ?еÑ?Ñ?Ñ? коÑ?Ñ?екÑ?нÑ?й вÑ?одной Ñ?айл %s\n"
 
 #. if (!quiet)
-#: ../app/app_procs.c:385
+#: ../app/app_procs.c:382
 #, c-format
 msgid "%s --> %s\n"
 msgstr "%s --> %s\n"
 
-#: ../app/app_procs.c:560
+#: ../app/app_procs.c:553
 #, c-format
 msgid "Can't find output format/filter %s\n"
 msgstr "Ð?е Ñ?далоÑ?Ñ? найÑ?и вÑ?Ñ?одной Ñ?оÑ?маÑ?/Ñ?илÑ?Ñ?Ñ? %s\n"
 
+#: ../app/app_procs.c:623
+#, c-format
+msgid "Input directory '%s' must exist!\n"
+msgstr ""
+
+#: ../app/app_procs.c:640
+#, c-format
+msgid "Output directory '%s' must exist!\n"
+msgstr ""
+
 #. Translators:  The argument is a list of options, not to be translated
-#: ../app/app_procs.c:638
+#: ../app/app_procs.c:690
 #, c-format
 msgid "Select the filter/format out of: %s"
 msgstr "Ð?Ñ?делиÑ?Ñ? Ñ?илÑ?Ñ?Ñ?/Ñ?оÑ?маÑ? из: %s"
 
 #. &export_file_name
-#: ../app/app_procs.c:656
+#: ../app/app_procs.c:708
 msgid "Export loaded file and exit"
 msgstr "ЭкÑ?поÑ?Ñ?иÑ?оваÑ?Ñ? загÑ?Ñ?женнÑ?й Ñ?айл и вÑ?йÑ?и"
 
-#: ../app/app_procs.c:656
+#: ../app/app_procs.c:708
 msgid "OUTPUT"
 msgstr "Ð?ЫÐ?Ð?Ð?"
 
 #. &export_file_format
 #. &export_format_string
-#: ../app/app_procs.c:658
+#: ../app/app_procs.c:710
 msgid "TYPE"
 msgstr "ТÐ?Ð?"
 
-#: ../app/app_procs.c:660
+#: ../app/app_procs.c:712
 msgid "Export graphics size"
 msgstr "РазмеÑ? Ñ?кÑ?поÑ?Ñ?иÑ?Ñ?емой гÑ?аÑ?ики"
 
-#: ../app/app_procs.c:660
+#: ../app/app_procs.c:712
 msgid "WxH"
 msgstr "ШÑ?Ð?"
 
-#: ../app/app_procs.c:662
-msgid "Show only specified layers (e.g. when exporting). Can be either the layer name or a range of layer numbers (X-Y)"
-msgstr "Ð?оказаÑ?Ñ? Ñ?олÑ?ко Ñ?е Ñ?лои, коÑ?оÑ?Ñ?е бÑ?ли вÑ?бÑ?анÑ? длÑ? Ñ?кÑ?поÑ?Ñ?иÑ?ованиÑ?. Ð?наÑ?ениеможеÑ? бÑ?Ñ?Ñ? именем Ñ?лоÑ? или инÑ?еÑ?валом номеÑ?ов (оÑ?-до)"
+#: ../app/app_procs.c:714
+msgid ""
+"Show only specified layers (e.g. when exporting). Can be either the layer "
+"name or a range of layer numbers (X-Y)"
+msgstr ""
+"Ð?оказаÑ?Ñ? Ñ?олÑ?ко Ñ?е Ñ?лои, коÑ?оÑ?Ñ?е бÑ?ли вÑ?бÑ?анÑ? длÑ? Ñ?кÑ?поÑ?Ñ?иÑ?ованиÑ?. "
+"Ð?наÑ?ениеможеÑ? бÑ?Ñ?Ñ? именем Ñ?лоÑ? или инÑ?еÑ?валом номеÑ?ов (оÑ?-до)"
 
-#: ../app/app_procs.c:663
+#: ../app/app_procs.c:715
 msgid "LAYER,LAYER,..."
 msgstr "СÐ?Ð?Ð?, СÐ?Ð?Ð?,..."
 
-#: ../app/app_procs.c:665
+#: ../app/app_procs.c:717
 msgid "Don't show the splash screen"
 msgstr "Ð?е показÑ?ваÑ?Ñ? заÑ?Ñ?авкÑ? пÑ?и запÑ?Ñ?ке"
 
-#: ../app/app_procs.c:667
-msgid "Don't create empty diagram"
+#: ../app/app_procs.c:719
+#, fuzzy
+msgid "Don't create an empty diagram"
 msgstr "Ð?е Ñ?оздаваÑ?Ñ? пÑ?Ñ?Ñ?Ñ?Ñ? диагÑ?аммÑ?"
 
-#: ../app/app_procs.c:669
+#: ../app/app_procs.c:721
 msgid "Start integrated user interface (diagrams in tabs)"
 msgstr ""
 
-#: ../app/app_procs.c:671
+#: ../app/app_procs.c:723
 msgid "Send error messages to stderr instead of showing dialogs."
-msgstr "Ð?Ñ?водиÑ?Ñ? Ñ?ообÑ?ениÑ? об оÑ?ибкаÑ? на Ñ?Ñ?андаÑ?Ñ?нÑ?й вÑ?вод оÑ?ибок вмеÑ?Ñ?о вÑ?вода диалоговÑ?Ñ? окон."
+msgstr ""
+"Ð?Ñ?водиÑ?Ñ? Ñ?ообÑ?ениÑ? об оÑ?ибкаÑ? на Ñ?Ñ?андаÑ?Ñ?нÑ?й вÑ?вод оÑ?ибок вмеÑ?Ñ?о вÑ?вода "
+"диалоговÑ?Ñ? окон."
 
-#. &input_directory
-#: ../app/app_procs.c:673
+#: ../app/app_procs.c:725
 msgid "Directory containing input files"
 msgstr ""
 
-#: ../app/app_procs.c:673
-#: ../app/app_procs.c:675
+#: ../app/app_procs.c:725 ../app/app_procs.c:727
 msgid "DIRECTORY"
 msgstr "Ð?Ð?ТÐ?Ð?Ð?Ð?"
 
-#. &output_directory
-#: ../app/app_procs.c:675
+#: ../app/app_procs.c:727
 msgid "Directory containing output files"
 msgstr ""
 
-#: ../app/app_procs.c:677
+#: ../app/app_procs.c:729
 msgid "Display credits list and exit"
 msgstr "Ð?оказаÑ?Ñ? Ñ?пиÑ?ок благодаÑ?ноÑ?Ñ?ей и вÑ?йÑ?и"
 
-#: ../app/app_procs.c:679
+#: ../app/app_procs.c:731
 msgid "Generate verbose output"
 msgstr "СоздаÑ?Ñ? деÑ?алÑ?нÑ?й вÑ?вод"
 
-#: ../app/app_procs.c:681
+#: ../app/app_procs.c:733
 msgid "Display version and exit"
 msgstr "Ð?оказаÑ?Ñ? веÑ?Ñ?иÑ? и вÑ?йÑ?и"
 
-#: ../app/app_procs.c:738
+#: ../app/app_procs.c:760
+msgid "[FILE...]"
+msgstr "[ФÐ?Ð?Ð?...]"
+
+#: ../app/app_procs.c:774
+#, fuzzy, c-format
+msgid "Invalid option?"
+msgstr "Ð Ñ?Ñ?наÑ? опеÑ?аÑ?иÑ?"
+
+#: ../app/app_procs.c:797
+#, fuzzy, c-format
+msgid "Filename conversion failed: %s\n"
+msgstr "Ð?еÑ?Ñ?иÑ? Dia %s, Ñ?компилиÑ?овано %s в %s\n"
+
+#: ../app/app_procs.c:810
+#, c-format
+msgid "Missing input: %s\n"
+msgstr ""
+
+#: ../app/app_procs.c:835
 msgid "Can't connect to session manager!\n"
 msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?Ñ?Ñ?ановиÑ?Ñ? Ñ?оединение Ñ? диÑ?пеÑ?Ñ?еÑ?ом Ñ?еанÑ?а!\n"
 
 #. TRANSLATOR: 2nd and 3rd %s are time and date respectively.
-#: ../app/app_procs.c:778
+#: ../app/app_procs.c:877
 #, c-format
 msgid "Dia version %s, compiled %s %s\n"
 msgstr "Ð?еÑ?Ñ?иÑ? Dia %s, Ñ?компилиÑ?овано %s в %s\n"
 
-#: ../app/app_procs.c:780
+#: ../app/app_procs.c:879
 #, c-format
 msgid "Dia version %s\n"
 msgstr "Ð?еÑ?Ñ?иÑ? Dia %s\n"
 
-#: ../app/app_procs.c:818
-msgid "Couldn't find standard objects when looking for object-libs; exiting...\n"
-msgstr "Ð?е Ñ?далоÑ?Ñ? найÑ?и Ñ?Ñ?андаÑ?Ñ?нÑ?е обÑ?екÑ?Ñ? пÑ?и поиÑ?ке библиоÑ?ек; завеÑ?Ñ?ение Ñ?абоÑ?Ñ?...\n"
+#: ../app/app_procs.c:921
+msgid ""
+"Couldn't find standard objects when looking for object-libs; exiting...\n"
+msgstr ""
+"Ð?е Ñ?далоÑ?Ñ? найÑ?и Ñ?Ñ?андаÑ?Ñ?нÑ?е обÑ?екÑ?Ñ? пÑ?и поиÑ?ке библиоÑ?ек; завеÑ?Ñ?ение "
+"Ñ?абоÑ?Ñ?...\n"
 
-#: ../app/app_procs.c:820
+#: ../app/app_procs.c:923
 #, c-format
-msgid "Couldn't find standard objects when looking for object-libs in '%s'; exiting...\n"
-msgstr "Ð?е Ñ?далоÑ?Ñ? найÑ?и Ñ?Ñ?андаÑ?Ñ?нÑ?е обÑ?екÑ?Ñ? пÑ?и поиÑ?ке библиоÑ?ек в «%s»; завеÑ?Ñ?ение Ñ?абоÑ?Ñ?...\n"
+msgid ""
+"Couldn't find standard objects when looking for object-libs in '%s'; "
+"exiting...\n"
+msgstr ""
+"Ð?е Ñ?далоÑ?Ñ? найÑ?и Ñ?Ñ?андаÑ?Ñ?нÑ?е обÑ?екÑ?Ñ? пÑ?и поиÑ?ке библиоÑ?ек в «%s»; завеÑ?Ñ?ение "
+"Ñ?абоÑ?Ñ?...\n"
 
-#: ../app/app_procs.c:886
+#: ../app/app_procs.c:987
 msgid "Diagram1.dia"
 msgstr "Ð?иагÑ?амма1.dia"
 
-#: ../app/app_procs.c:930
+#: ../app/app_procs.c:1022
+#, fuzzy
 msgid ""
 "This shouldn't happen.  Please file a bug report at bugzilla.gnome.org\n"
-"describing how you can cause this message to appear.\n"
+"describing how you caused this message to appear.\n"
 msgstr ""
 "Ð?озникла оÑ?ибка. Ð?ожалÑ?йÑ?Ñ?а, оÑ?пÑ?авÑ?Ñ?е оÑ?Ñ?Ñ?Ñ? об оÑ?ибке Ñ? опиÑ?анием, как \n"
 "Ñ?далоÑ?Ñ? добиÑ?Ñ?Ñ?Ñ? поÑ?влениÑ? данного Ñ?ообÑ?ениÑ?, по адÑ?еÑ?Ñ? bugzilla.gnome.org.\n"
 
-#: ../app/app_procs.c:945
+#: ../app/app_procs.c:1037
 msgid "Exiting Dia"
 msgstr "Ð?авеÑ?Ñ?ение Dia"
 
 #. no standard buttons
-#: ../app/app_procs.c:1009
+#: ../app/app_procs.c:1101
 msgid "Quitting without saving modified diagrams"
 msgstr "Ð?зменениÑ? не Ñ?оÑ?Ñ?аненÑ?"
 
-#: ../app/app_procs.c:1011
-msgid "Modified diagrams exist. Are you sure you want to quit Dia without saving them?"
-msgstr "Ð?екоÑ?оÑ?Ñ?е диагÑ?аммÑ? измененÑ?. Ð?Ñ? Ñ?веÑ?енÑ?, Ñ?Ñ?о Ñ?оÑ?иÑ?е завеÑ?Ñ?иÑ?Ñ? Ñ?абоÑ?Ñ? Ñ? пÑ?огÑ?аммой, не Ñ?оÑ?Ñ?анив иÑ??"
+#: ../app/app_procs.c:1103
+msgid ""
+"Modified diagrams exist. Are you sure you want to quit Dia without saving "
+"them?"
+msgstr ""
+"Ð?екоÑ?оÑ?Ñ?е диагÑ?аммÑ? измененÑ?. Ð?Ñ? Ñ?веÑ?енÑ?, Ñ?Ñ?о Ñ?оÑ?иÑ?е завеÑ?Ñ?иÑ?Ñ? Ñ?абоÑ?Ñ? Ñ? "
+"пÑ?огÑ?аммой, не Ñ?оÑ?Ñ?анив иÑ??"
 
-#: ../app/app_procs.c:1015
+#: ../app/app_procs.c:1107
 msgid "Quit Dia"
 msgstr "Ð?авеÑ?Ñ?ение Ñ?абоÑ?Ñ?"
 
-#: ../app/app_procs.c:1084
-#: ../app/app_procs.c:1091
-msgid "Could not create per-user Dia config directory"
+#: ../app/app_procs.c:1180 ../app/app_procs.c:1187
+#, fuzzy
+msgid "Could not create per-user Dia configuration directory"
 msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? полÑ?зоваÑ?елÑ?Ñ?кий каÑ?алог конÑ?игÑ?Ñ?аÑ?ии Dia"
 
-#: ../app/app_procs.c:1094
-msgid "Could not create per-user Dia config directory. Please make sure that the environment variable HOME points to an existing directory."
-msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? полÑ?зоваÑ?елÑ?Ñ?кий каÑ?алог наÑ?Ñ?Ñ?оек Dia. УбедиÑ?еÑ?Ñ?, Ñ?Ñ?о пеÑ?еменнаÑ? окÑ?Ñ?жениÑ? HOME Ñ?казÑ?ваеÑ? на Ñ?Ñ?Ñ?еÑ?Ñ?вÑ?Ñ?Ñ?ий каÑ?алог."
-
-#: ../app/app_procs.c:1117
-msgid "Objects and filters internal to dia"
-msgstr "Ð?бÑ?екÑ?Ñ? и Ñ?илÑ?Ñ?Ñ?Ñ? внÑ?Ñ?Ñ?и Dia"
-
-#: ../app/app_procs.c:1150
-msgid "[FILE...]"
-msgstr "[ФÐ?Ð?Ð?...]"
-
-#: ../app/app_procs.c:1170
-#, c-format
-msgid "Input-directory '%s' must exist!\n"
-msgstr ""
-
-#: ../app/app_procs.c:1175
-#, c-format
-msgid "Output-directory '%s' must exist!\n"
+#: ../app/app_procs.c:1190
+#, fuzzy
+msgid ""
+"Could not create per-user Dia configuration directory. Please make sure that "
+"the environment variable HOME points to an existing directory."
 msgstr ""
+"Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? полÑ?зоваÑ?елÑ?Ñ?кий каÑ?алог наÑ?Ñ?Ñ?оек Dia. УбедиÑ?еÑ?Ñ?, Ñ?Ñ?о "
+"пеÑ?еменнаÑ? окÑ?Ñ?жениÑ? HOME Ñ?казÑ?ваеÑ? на Ñ?Ñ?Ñ?еÑ?Ñ?вÑ?Ñ?Ñ?ий каÑ?алог."
 
-#: ../app/app_procs.c:1181
-#, c-format
-msgid "'%s' not found!\n"
-msgstr "«%s» не найдено!\n"
-
-#: ../app/app_procs.c:1189
-#, fuzzy, c-format
-msgid "'%s' not found in '%s'!\n"
-msgstr "«%s» не найдено!\n"
+#: ../app/app_procs.c:1213
+#, fuzzy
+msgid "Objects and filters internal to Dia"
+msgstr "Ð?бÑ?екÑ?Ñ? и Ñ?илÑ?Ñ?Ñ?Ñ? внÑ?Ñ?Ñ?и Dia"
 
-#: ../app/app_procs.c:1238
+#: ../app/app_procs.c:1266
 #, c-format
 msgid ""
 "The original author of Dia was:\n"
@@ -244,7 +274,7 @@ msgstr ""
 "Ð?еÑ?вÑ?м авÑ?оÑ?ом Dia бÑ?л:\n"
 "\n"
 
-#: ../app/app_procs.c:1243
+#: ../app/app_procs.c:1271
 #, c-format
 msgid ""
 "\n"
@@ -255,7 +285,7 @@ msgstr ""
 "ТекÑ?Ñ?ие Ñ?азÑ?абоÑ?Ñ?ики Dia:\n"
 "\n"
 
-#: ../app/app_procs.c:1248
+#: ../app/app_procs.c:1276
 #, c-format
 msgid ""
 "\n"
@@ -266,7 +296,7 @@ msgstr ""
 "Ð?Ñ?Ñ?гие авÑ?оÑ?Ñ?:\n"
 "\n"
 
-#: ../app/app_procs.c:1253
+#: ../app/app_procs.c:1281
 #, c-format
 msgid ""
 "\n"
@@ -289,35 +319,41 @@ msgstr ""
 "Ð?вÑ?оÑ?оÑ?Ñ?анÑ?ннÑ?е Ñ?айлÑ? Ñ?Ñ?Ñ?еÑ?Ñ?вÑ?Ñ?Ñ?.\n"
 "Ð?Ñ?беÑ?иÑ?е Ñ?е, коÑ?оÑ?Ñ?е вÑ? Ñ?оÑ?иÑ?е воÑ?Ñ?Ñ?ановиÑ?Ñ?."
 
-#: ../app/color_area.c:317
-#: ../app/color_area.c:360
+#: ../app/color_area.c:327 ../app/color_area.c:374
 msgid "Select foreground color"
 msgstr "Ð?Ñ?беÑ?иÑ?е Ñ?веÑ? пеÑ?еднего плана"
 
-#: ../app/color_area.c:318
-#: ../app/color_area.c:361
+#: ../app/color_area.c:328 ../app/color_area.c:375
 msgid "Select background color"
 msgstr "Ð?Ñ?беÑ?иÑ?е Ñ?веÑ? Ñ?она"
 
 #: ../app/commands.c:130
-msgid "No print plug-in found!"
+#, fuzzy
+msgid "No print plugin found!"
 msgstr "Ð?е найден модÑ?лÑ? длÑ? пеÑ?аÑ?и!"
 
-#: ../app/commands.c:150
+#: ../app/commands.c:149
 #, c-format
 msgid "Diagram%d.dia"
 msgstr "Ð?иагÑ?амма%d.dia"
 
-#: ../app/commands.c:343
+#: ../app/commands.c:247
+msgid "No image from Clipboard to paste."
+msgstr ""
+
+#: ../app/commands.c:297
+msgid "No selected object can take an image."
+msgstr ""
+
+#: ../app/commands.c:538
 msgid "No existing object to paste.\n"
 msgstr "Ð?е Ñ?Ñ?Ñ?еÑ?Ñ?вÑ?еÑ? обÑ?екÑ?а длÑ? вÑ?Ñ?авки.\n"
 
-#: ../app/commands.c:646
-#: ../app/commands.c:684
+#: ../app/commands.c:846 ../app/commands.c:884
 msgid "Could not find help directory"
 msgstr "Ð?е Ñ?далоÑ?Ñ? найÑ?и каÑ?алог Ñ? Ñ?айлами помоÑ?и"
 
-#: ../app/commands.c:653
+#: ../app/commands.c:853
 #, c-format
 msgid ""
 "Could not open help directory:\n"
@@ -326,7 +362,7 @@ msgstr ""
 "Ð?е Ñ?далоÑ?Ñ? оÑ?кÑ?Ñ?Ñ?Ñ? каÑ?алог Ñ?о Ñ?пÑ?авкой:\n"
 "%s"
 
-#: ../app/commands.c:720
+#: ../app/commands.c:922
 msgid "translator_credits-PLEASE_ADD_YOURSELF_HERE"
 msgstr ""
 "Valek Filippov <frob df ru>\n"
@@ -335,7 +371,7 @@ msgstr ""
 "Aleksandr Sokolov <saanchos gmail com>\n"
 "Ð?лекÑ?андÑ? Ð?Ñ?окÑ?дин <alexandre prokoudine gmail com>"
 
-#: ../app/commands.c:722
+#: ../app/commands.c:924
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -351,315 +387,291 @@ msgid ""
 "along with this program; if not, write to the Free Software\n"
 "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
 msgstr ""
-"ЭÑ?а пÑ?огÑ?амма â?? Ñ?вободное пÑ?огÑ?аммное обеÑ?пеÑ?ение. Ð?Ñ? можеÑ?е Ñ?аÑ?пÑ?оÑ?Ñ?Ñ?анÑ?Ñ?Ñ? или\n"
+"ЭÑ?а пÑ?огÑ?амма â?? Ñ?вободное пÑ?огÑ?аммное обеÑ?пеÑ?ение. Ð?Ñ? можеÑ?е Ñ?аÑ?пÑ?оÑ?Ñ?Ñ?анÑ?Ñ?Ñ? "
+"или\n"
 "изменÑ?Ñ?Ñ? его пÑ?и Ñ?Ñ?ловиÑ?Ñ? Ñ?ооÑ?веÑ?Ñ?Ñ?виÑ? GNU General Public License\n"
 "опÑ?бликованной Free Software Foundation; либо веÑ?Ñ?ии 2 лиÑ?ензии, либо (на\n"
 "ваÑ?е Ñ?Ñ?моÑ?Ñ?ение) лÑ?бой более поздней веÑ?Ñ?ии.\n"
 "\n"
-"Ð?Ñ?огÑ?амма Ñ?аÑ?пÑ?оÑ?Ñ?Ñ?анÑ?еÑ?Ñ?Ñ? в надежде на Ñ?о, Ñ?Ñ?о пÑ?иложение бÑ?деÑ? полезно, но\n"
-"Ð?Ð?Ð? Ð?СЯÐ?Ð?Ð¥ Ð?Ð?Ð Ð?Ð?ТÐ?Ð?; не гаÑ?анÑ?иÑ?Ñ?еÑ?Ñ?Ñ? даже Ð?Ð Ð?Ð?Ð?Ð?Ð?Ð?СТЬ или СÐ?Ð?ТÐ?Ð?ТСТÐ?Ð?Ð? Ð?Ð?Ð?Ð?Ð?-\n"
-"Ð?Ð?Ð?Ð? ТРÐ?Ð?Ð?Ð?Ð?Ð?Ð?ЯÐ?. Ð?лÑ? полÑ?Ñ?ениÑ? дополниÑ?елÑ?ной инÑ?оÑ?маÑ?ии ознакомÑ?Ñ?еÑ?Ñ? Ñ? GNU\n"
+"Ð?Ñ?огÑ?амма Ñ?аÑ?пÑ?оÑ?Ñ?Ñ?анÑ?еÑ?Ñ?Ñ? в надежде на Ñ?о, Ñ?Ñ?о пÑ?иложение бÑ?деÑ? полезно, "
+"но\n"
+"Ð?Ð?Ð? Ð?СЯÐ?Ð?Ð¥ Ð?Ð?Ð Ð?Ð?ТÐ?Ð?; не гаÑ?анÑ?иÑ?Ñ?еÑ?Ñ?Ñ? даже Ð?Ð Ð?Ð?Ð?Ð?Ð?Ð?СТЬ или СÐ?Ð?ТÐ?Ð?ТСТÐ?Ð?Ð? "
+"Ð?Ð?Ð?Ð?Ð?-\n"
+"Ð?Ð?Ð?Ð? ТРÐ?Ð?Ð?Ð?Ð?Ð?Ð?ЯÐ?. Ð?лÑ? полÑ?Ñ?ениÑ? дополниÑ?елÑ?ной инÑ?оÑ?маÑ?ии ознакомÑ?Ñ?еÑ?Ñ? Ñ? "
+"GNU\n"
 "General Public License.\n"
 "\n"
-"Ð?Ñ? должнÑ? полÑ?Ñ?иÑ?Ñ? копиÑ? GNU General Public License вмеÑ?Ñ?е Ñ? пÑ?огÑ?аммой. Ð?Ñ?ли\n"
+"Ð?Ñ? должнÑ? полÑ?Ñ?иÑ?Ñ? копиÑ? GNU General Public License вмеÑ?Ñ?е Ñ? пÑ?огÑ?аммой. "
+"Ð?Ñ?ли\n"
 "Ñ?Ñ?ого не пÑ?оизоÑ?ло, напиÑ?иÑ?е в Free Software Foundation, Inc., 59\n"
 "Temple Place, Suite 330, Boston, MA  02111-1307  USA\n"
 
-#: ../app/commands.c:745
+#: ../app/commands.c:951
 msgid "A program for drawing structured diagrams."
 msgstr "Ð?Ñ?иложение длÑ? Ñ?иÑ?ованиÑ? Ñ?Ñ?Ñ?Ñ?кÑ?Ñ?Ñ?иÑ?ованнÑ?Ñ? диагÑ?амм."
 
-#: ../app/confirm.c:69
+#: ../app/confirm.c:65
 #, c-format
 msgid "You are about to print a diagram with %d pages."
 msgstr ""
 
-#: ../app/confirm.c:71
+#: ../app/confirm.c:67
 #, c-format
 msgid "You are about to export a diagram with %d pages."
 msgstr ""
 
-#: ../app/confirm.c:73
+#: ../app/confirm.c:69
 #, c-format
-msgid "You are about to export a diagram which may require %s of memory.(%d pages)."
+msgid ""
+"You are about to export a diagram which may require %s of memory.(%d pages)."
 msgstr ""
 
-#: ../app/confirm.c:81
+#: ../app/confirm.c:77
 msgid ""
-"You can adjust the size of the diagram by changing the 'Scaling' in the 'Page Setup' dialog.\n"
-"Alternatively use 'Select All' and 'Best Fit' to move objects/handles into the intended bounds."
+"You can adjust the size of the diagram by changing the 'Scaling' in the "
+"'Page Setup' dialog.\n"
+"Alternatively use 'Select All' and 'Best Fit' to move objects/handles into "
+"the intended bounds."
 msgstr ""
 
-#: ../app/confirm.c:85
+#: ../app/confirm.c:81
 #, fuzzy
 msgid "Confirm Diagram Size"
 msgstr "СобÑ?Ñ?веннÑ?й Ñ?оÑ?маÑ? Dia"
 
-#: ../app/create_object.c:71
+#: ../app/create_object.c:73
 #, fuzzy, c-format
 msgid "'%s' creation failed"
 msgstr "Файл Ñ?Ñ?анзакÑ?ий"
 
-#: ../app/defaults.c:43
-#: ../app/defaults.c:150
+#: ../app/defaults.c:44 ../app/defaults.c:147
 msgid "Object defaults"
 msgstr "Ð?Ñ?Ñ?однÑ?е паÑ?амеÑ?Ñ?Ñ? обÑ?екÑ?а"
 
-#: ../app/defaults.c:61
+#: ../app/defaults.c:62
 msgid "This object has no defaults."
 msgstr "У Ñ?Ñ?ого обÑ?екÑ?а неÑ? иÑ?Ñ?однÑ?Ñ? паÑ?амеÑ?Ñ?ов."
 
-#: ../app/defaults.c:115
+#: ../app/defaults.c:111
 msgid "Defaults: "
 msgstr "УмолÑ?аниÑ?: "
 
-#: ../app/dia-props.c:85
+#: ../app/dia-props.c:86
 msgid "Diagram Properties"
 msgstr "СвойÑ?Ñ?ва диагÑ?аммÑ?"
 
-#: ../app/dia-props.c:119
+#: ../app/dia-props.c:120
 msgid "Dynamic grid"
 msgstr "Ð?инамиÑ?еÑ?каÑ? Ñ?еÑ?ка"
 
-#: ../app/dia-props.c:127
+#: ../app/dia-props.c:128
 msgid "x"
 msgstr "x"
 
-#: ../app/dia-props.c:131
+#: ../app/dia-props.c:132
 msgid "y"
 msgstr "y"
 
-#: ../app/dia-props.c:136
+#: ../app/dia-props.c:137
 msgid "Spacing"
 msgstr "Ð?нÑ?еÑ?вал"
 
-#: ../app/dia-props.c:156
+#: ../app/dia-props.c:157
 msgid "Visible spacing"
 msgstr "Ð?идимÑ?й инÑ?еÑ?вал"
 
 #. Hexes!
-#: ../app/dia-props.c:177
-#: ../app/preferences.c:242
+#: ../app/dia-props.c:178 ../app/preferences.c:243
 msgid "Hex grid"
 msgstr "ШеÑ?Ñ?иÑ?голÑ?наÑ? Ñ?еÑ?ка"
 
-#: ../app/dia-props.c:185
+#: ../app/dia-props.c:186
 msgid "Hex grid size"
 msgstr "РазмеÑ? Ñ?еÑ?Ñ?иÑ?голÑ?ной Ñ?еÑ?ки"
 
-#: ../app/dia-props.c:198
+#: ../app/dia-props.c:199
 msgid "Grid"
 msgstr "СеÑ?ка"
 
-#: ../app/dia-props.c:209
-#: ../lib/diagramdata.c:112
+#: ../app/dia-props.c:210 ../lib/diagramdata.c:117
 msgid "Background"
 msgstr "Фон"
 
-#: ../app/dia-props.c:220
-#: ../app/preferences.c:122
+#: ../app/dia-props.c:221 ../app/preferences.c:122
 msgid "Grid Lines"
 msgstr "Ð?инии Ñ?еÑ?ки"
 
-#: ../app/dia-props.c:231
+#: ../app/dia-props.c:232
 msgid "Page Breaks"
 msgstr "Ð?Ñ?аниÑ?Ñ? Ñ?Ñ?Ñ?аниÑ?"
 
-#: ../app/dia-props.c:242
+#: ../app/dia-props.c:243
 msgid "Colors"
 msgstr "ЦвеÑ?а"
 
 #. Can we be sure that the filename is the 'proper title'?
-#: ../app/dia-props.c:263
+#: ../app/dia-props.c:264
 #, c-format
 msgid "Diagram Properties: %s"
 msgstr "СвойÑ?Ñ?ва диагÑ?аммÑ?: %s"
 
-#: ../app/dia_embedd.c:348
-msgid "Could not initialize Bonobo!"
-msgstr "Ð?е Ñ?далоÑ?Ñ? иниÑ?иализиÑ?оваÑ?Ñ? Bonobo!"
-
-#: ../app/diacanvas.c:121
+#: ../app/diacanvas.c:122
 msgid "X position"
 msgstr "Ð?озиÑ?иÑ? по X"
 
-#: ../app/diacanvas.c:122
+#: ../app/diacanvas.c:123
 msgid "X position of child widget"
 msgstr "Ð?озиÑ?иÑ? X доÑ?еÑ?него виджеÑ?а"
 
-#: ../app/diacanvas.c:131
+#: ../app/diacanvas.c:132
 msgid "Y position"
 msgstr "Ð?озиÑ?иÑ? по Y"
 
-#: ../app/diacanvas.c:132
+#: ../app/diacanvas.c:133
 msgid "Y position of child widget"
 msgstr "Ð?озиÑ?иÑ? Y доÑ?еÑ?него виджеÑ?а"
 
-#: ../app/diagram.c:222
+#: ../app/diagram.c:234
 #, c-format
 msgid "Couldn't convert filename '%s' to UTF-8: %s\n"
 msgstr "Ð?е Ñ?далоÑ?Ñ? пÑ?еобÑ?азоваÑ?Ñ? имÑ? Ñ?айла «%s» в UTF-8: %s\n"
 
-#: ../app/diagram.c:225
-#: ../lib/message.c:90
-#: ../lib/message.c:293
+#: ../app/diagram.c:237 ../lib/message.c:91 ../lib/message.c:297
 msgid "Error"
 msgstr "Ð?Ñ?ибка"
 
-#: ../app/diagram.c:1209
+#: ../app/diagram.c:1207
 msgid "Trying to group with no selected objects."
 msgstr "Ð?опÑ?Ñ?ка Ñ?гÑ?Ñ?ппиÑ?оваÑ?Ñ?, не вÑ?бÑ?ано ни одного обÑ?екÑ?а."
 
-#: ../app/diagram.c:1219
-msgid "You cannot group objects that belong to different groups or have different parents"
-msgstr "Ð?елÑ?зÑ? Ñ?гÑ?Ñ?ппиÑ?оваÑ?Ñ? обÑ?екÑ?Ñ?, пÑ?инадлежаÑ?ие к Ñ?азнÑ?м гÑ?Ñ?ппам или имеÑ?Ñ?ие Ñ?азнÑ?е Ñ?одиÑ?елÑ?Ñ?кие обÑ?екÑ?Ñ?"
+#: ../app/diagram_tree_view.c:163
+msgid "Diagram"
+msgstr "Ð?иагÑ?амма"
 
-#: ../app/diagram_tree_menu.c:47
-msgid "/_Sort objects"
-msgstr "/_УпоÑ?Ñ?доÑ?иваÑ?Ñ? обÑ?екÑ?Ñ?"
+#: ../app/diagram_tree_view.c:170
+#: ../plug-ins/drs/dia-render-script-import.c:233
+msgid "Layer"
+msgstr "Слой"
 
-#: ../app/diagram_tree_menu.c:48
-msgid "/Sort objects/by _name"
-msgstr "/УпоÑ?Ñ?доÑ?иваÑ?Ñ? обÑ?екÑ?Ñ?/по _имени"
-
-#: ../app/diagram_tree_menu.c:50
-msgid "/Sort objects/by _type"
-msgstr "/УпоÑ?Ñ?доÑ?иваÑ?Ñ? обÑ?екÑ?Ñ?/по _Ñ?ипÑ?"
-
-#: ../app/diagram_tree_menu.c:52
-msgid "/Sort objects/as _inserted"
-msgstr "/УпоÑ?Ñ?доÑ?иваÑ?Ñ? обÑ?екÑ?Ñ?/как _вÑ?Ñ?авленнÑ?е"
-
-#: ../app/diagram_tree_menu.c:55
-msgid "/Sort objects/All by name"
-msgstr "/УпоÑ?Ñ?доÑ?иваÑ?Ñ? обÑ?екÑ?Ñ?/Ð?Ñ?е по имени"
-
-#: ../app/diagram_tree_menu.c:57
-msgid "/Sort objects/All by type"
-msgstr "/УпоÑ?Ñ?доÑ?иваÑ?Ñ? обÑ?екÑ?Ñ?/Ð?Ñ?е по Ñ?ипÑ?"
-
-#: ../app/diagram_tree_menu.c:59
-msgid "/Sort objects/All as inserted"
-msgstr "/УпоÑ?Ñ?доÑ?иваÑ?Ñ? обÑ?екÑ?Ñ?/Ð?Ñ?е как вÑ?Ñ?авленÑ?"
-
-#: ../app/diagram_tree_menu.c:61
-msgid "/Sort objects/_Default"
-msgstr "/УпоÑ?Ñ?доÑ?иваÑ?Ñ? обÑ?екÑ?Ñ?/Ð?о _Ñ?молÑ?аниÑ?"
-
-#: ../app/diagram_tree_menu.c:62
-msgid "/Sort objects/Default/by _name"
-msgstr "/УпоÑ?Ñ?доÑ?иваÑ?Ñ? обÑ?екÑ?Ñ?/УмолÑ?ание/по _имени"
-
-#: ../app/diagram_tree_menu.c:64
-msgid "/Sort objects/Default/by _type"
-msgstr "/УпоÑ?Ñ?доÑ?иваÑ?Ñ? обÑ?екÑ?Ñ?/УмолÑ?ание/по Ñ?ипÑ?"
-
-#: ../app/diagram_tree_menu.c:66
-msgid "/Sort objects/Default/as _inserted"
-msgstr "/УпоÑ?Ñ?доÑ?иваÑ?Ñ? обÑ?екÑ?Ñ?/УмолÑ?ание/как вÑ?Ñ?авленÑ?"
-
-#: ../app/diagram_tree_menu.c:68
-msgid "/Sort _diagrams"
-msgstr "/УпоÑ?Ñ?доÑ?иваÑ?Ñ? _диагÑ?аммÑ?"
+#: ../app/diagram_tree_view.c:176
+msgid "Layer(s)"
+msgstr "Слои"
 
-#: ../app/diagram_tree_menu.c:69
-msgid "/Sort _diagrams/by _name"
-msgstr "/УпоÑ?Ñ?доÑ?иваÑ?Ñ? _диагÑ?аммÑ?/по _имени"
+#: ../app/diagram_tree_view.c:179 ../app/diagram_tree_view.c:516
+#: ../objects/Database/table.c:141 ../objects/Istar/actor.c:146
+#: ../objects/Istar/actor.c:147 ../objects/Istar/other.c:150
+#: ../objects/Istar/other.c:151 ../objects/KAOS/other.c:153
+#: ../objects/KAOS/other.c:154 ../objects/UML/association.c:244
+#: ../objects/UML/umlattribute.c:39 ../objects/UML/umlformalparameter.c:37
+#: ../objects/UML/umloperation.c:64 ../objects/UML/umlparameter.c:45
+msgid "Type"
+msgstr "Тип"
 
-#: ../app/diagram_tree_menu.c:71
-msgid "/Sort _diagrams/as _inserted"
-msgstr "/УпоÑ?Ñ?доÑ?иваÑ?Ñ? _диагÑ?аммÑ?/как _вÑ?Ñ?авленнÑ?е"
+#. Translators: Menu item Verb/Support/Position
+#. Translators: Menu item Verb/Support/Position/Position
+#: ../app/diagram_tree_view.c:182 ../objects/FS/function.c:805
+#: ../objects/FS/function.c:807 ../objects/Istar/actor.c:70
+msgid "Position"
+msgstr "Ð?омеÑ?аÑ?Ñ?"
 
-#: ../app/diagram_tree_menu.c:73
-msgid "/Sort diagrams/_Default"
-msgstr "/УпоÑ?Ñ?доÑ?иваÑ?Ñ? _диагÑ?аммÑ?/по _Ñ?молÑ?аниÑ?"
+#: ../app/diagram_tree_view.c:185
+#, fuzzy
+msgid "Children"
+msgstr "Ð?Ñ?мениÑ?Ñ? вложение _доÑ?еÑ?ниÑ? обÑ?екÑ?ов"
 
-#: ../app/diagram_tree_menu.c:74
-msgid "/Sort diagrams/Default/by _name"
-msgstr "/УпоÑ?Ñ?доÑ?иваÑ?Ñ? диагÑ?аммÑ?/УмолÑ?ание/по _имени"
+#: ../app/diagram_tree_view.c:189
+#, fuzzy
+msgid "Object(s)"
+msgstr "_Ð?бÑ?екÑ?Ñ?"
 
-#: ../app/diagram_tree_menu.c:76
-msgid "/Sort diagrams/Default/as _inserted"
-msgstr "/УпоÑ?Ñ?доÑ?иваÑ?Ñ? диагÑ?аммÑ?/УмолÑ?ание/как вÑ?Ñ?авленнÑ?е"
+#: ../app/diagram_tree_view.c:445
+msgid "Select"
+msgstr "Ð?Ñ?бÑ?аÑ?Ñ?"
 
-#: ../app/diagram_tree_menu.c:84
-#: ../app/diagram_tree_menu.c:95
-msgid "/_Locate"
-msgstr "/_РаÑ?положение"
+#. Translators: Menu item Verb/Support/Position/Locate
+#. Translators: Menu item Verb/Signal/Sense/Locate
+#: ../app/diagram_tree_view.c:446 ../objects/FS/function.c:813
+#: ../objects/FS/function.c:1055
+msgid "Locate"
+msgstr "Ð?айÑ?и"
 
-#: ../app/diagram_tree_menu.c:85
-msgid "/_Properties"
-msgstr "/_СвойÑ?Ñ?ва"
+#: ../app/diagram_tree_view.c:447
+msgid "Properties"
+msgstr "СвойÑ?Ñ?ва"
 
-#: ../app/diagram_tree_menu.c:86
-msgid "/_Hide this type"
-msgstr "/СкÑ?Ñ?ваÑ?Ñ? даннÑ?й Ñ?ип"
+#. *** board of value **************
+#: ../app/diagram_tree_view.c:499 ../app/exit_dialog.c:123
+#: ../app/plugin-manager.c:262 ../objects/Database/table.c:139
+#: ../objects/Database/table.c:185 ../objects/SISSI/sissi_dialog.c:734
+#: ../objects/UML/association.c:238 ../objects/UML/class.c:145
+#: ../objects/UML/large_package.c:133 ../objects/UML/umlattribute.c:37
+#: ../objects/UML/umlformalparameter.c:35 ../objects/UML/umloperation.c:62
+#: ../objects/UML/umlparameter.c:43
+msgid "Name"
+msgstr "Ð?азвание"
 
-#: ../app/diagram_tree_window.c:80
-#: ../app/preferences.c:123
+#: ../app/diagram_tree_view.c:562
 msgid "Diagram Tree"
 msgstr "Ð?еÑ?ево диагÑ?аммÑ?"
 
 #. paper size
-#: ../app/diapagelayout.c:153
+#: ../app/diapagelayout.c:155
 msgid "Paper Size"
 msgstr "РазмеÑ? бÑ?маги"
 
 #. orientation
-#: ../app/diapagelayout.c:186
+#: ../app/diapagelayout.c:184
 msgid "Orientation"
 msgstr "Ð?Ñ?иенÑ?аÑ?иÑ?"
 
 #. margins
-#: ../app/diapagelayout.c:224
+#: ../app/diapagelayout.c:213
 msgid "Margins"
 msgstr "Ð?Ñ?Ñ?Ñ?Ñ?пÑ?"
 
-#: ../app/diapagelayout.c:236
+#: ../app/diapagelayout.c:225
 msgid "Top:"
 msgstr "СвеÑ?Ñ?Ñ?:"
 
-#: ../app/diapagelayout.c:249
+#: ../app/diapagelayout.c:238
 msgid "Bottom:"
 msgstr "СнизÑ?:"
 
-#: ../app/diapagelayout.c:262
+#: ../app/diapagelayout.c:251
 msgid "Left:"
 msgstr "Слева:"
 
-#: ../app/diapagelayout.c:275
+#: ../app/diapagelayout.c:264
 msgid "Right:"
 msgstr "СпÑ?ава:"
 
 #. Scaling
-#: ../app/diapagelayout.c:289
+#: ../app/diapagelayout.c:278
 msgid "Scaling"
 msgstr "Ð?аÑ?Ñ?Ñ?абиÑ?ование"
 
-#: ../app/diapagelayout.c:300
+#: ../app/diapagelayout.c:289
 msgid "Scale:"
 msgstr "Ð?аÑ?Ñ?Ñ?аб:"
 
-#: ../app/diapagelayout.c:312
+#: ../app/diapagelayout.c:301
 msgid "Fit to:"
 msgstr "Ð?аполнÑ?Ñ?Ñ? по:"
 
-#: ../app/diapagelayout.c:324
+#: ../app/diapagelayout.c:313
 msgid "by"
 msgstr " "
 
-#: ../app/diapagelayout.c:741
+#: ../app/diapagelayout.c:728
 #, c-format
 msgid "%0.3gcm x %0.3gcm"
 msgstr "%0.3gcm x %0.3gcm"
 
-#: ../app/diapagelayout.c:845
-#: ../app/pagesetup.c:76
+#: ../app/diapagelayout.c:832 ../app/pagesetup.c:77
 msgid "Page Setup"
 msgstr "Ð?аÑ?амеÑ?Ñ?Ñ? Ñ?Ñ?Ñ?аниÑ?Ñ?"
 
-#: ../app/disp_callbacks.c:95
-#: ../app/properties-dialog.c:157
+#: ../app/disp_callbacks.c:92 ../app/properties-dialog.c:156
 msgid ""
 "This object doesn't support Undo/Redo.\n"
 "Undo information erased."
@@ -667,22 +679,31 @@ msgstr ""
 "ЭÑ?оÑ? обÑ?екÑ? не поддеÑ?живаеÑ? оÑ?каÑ? или возвÑ?аÑ? оÑ?менÑ?нного дейÑ?Ñ?виÑ?.\n"
 "Ð?нÑ?оÑ?маÑ?иÑ? об оÑ?мене дейÑ?Ñ?виÑ? бÑ?ла Ñ?далена."
 
-#: ../app/disp_callbacks.c:130
-msgid "Properties..."
+#: ../app/disp_callbacks.c:127
+msgid "Propertiesâ?¦"
 msgstr "СвойÑ?Ñ?ва..."
 
-#: ../app/disp_callbacks.c:1066
+#: ../app/disp_callbacks.c:166
+msgid "Follow linkâ?¦"
+msgstr ""
+
+#: ../app/disp_callbacks.c:286
+msgid "Selection"
+msgstr "Ð?Ñ?деление"
+
+#: ../app/disp_callbacks.c:1111
 msgid ""
 "The object you dropped cannot fit into its parent. \n"
 "Either expand the parent object, or drop the object elsewhere."
 msgstr ""
 "Ð?бÑ?екÑ?, коÑ?оÑ?Ñ?й вÑ? пеÑ?еÑ?аÑ?киваеÑ?е, не можеÑ? помеÑ?Ñ?иÑ?Ñ?Ñ?Ñ? в Ñ?воего Ñ?одиÑ?елÑ?.\n"
-"Ð?ибо Ñ?велиÑ?Ñ?Ñ?е Ñ?одиÑ?елÑ?Ñ?кий обÑ?екÑ?, либо пеÑ?еÑ?аÑ?кивайÑ?е обÑ?екÑ? в дÑ?Ñ?гое меÑ?Ñ?о."
+"Ð?ибо Ñ?велиÑ?Ñ?Ñ?е Ñ?одиÑ?елÑ?Ñ?кий обÑ?екÑ?, либо пеÑ?еÑ?аÑ?кивайÑ?е обÑ?екÑ? в дÑ?Ñ?гое "
+"меÑ?Ñ?о."
 
 #. http://www.gnu.org/software/gettext/manual/html_chapter/gettext_10.html#SEC150
 #. * Althoug the single objects wont get triggered here some languages have variations on the other numbers
 #.
-#: ../app/display.c:115
+#: ../app/display.c:109
 #, c-format
 msgid "Selection of %d object"
 msgid_plural "Selection of %d objects"
@@ -690,26 +711,27 @@ msgstr[0] "Ð?Ñ?деление %d обÑ?екÑ?а"
 msgstr[1] "Ð?Ñ?деление %d обÑ?екÑ?ов"
 msgstr[2] "Ð?Ñ?деление %d обÑ?екÑ?ов"
 
-#: ../app/display.c:125
+#: ../app/display.c:119
 #, c-format
 msgid "Selected '%s'"
 msgstr "Ð?Ñ?делено «%s»"
 
 #. we really should not come here but instead disable the menu command earlier
-#: ../app/display.c:1071
-msgid "No anti-aliased renderer found"
+#: ../app/display.c:1149
+#, fuzzy
+msgid "No antialiased renderer found"
 msgstr "Ð?е найден Ñ?глаживаÑ?елÑ? оÑ?Ñ?иÑ?овки"
 
-#: ../app/display.c:1209
+#: ../app/display.c:1297
 msgid "<unnamed>"
 msgstr "<без названиÑ?>"
 
 #. no standard buttons
-#: ../app/display.c:1215
+#: ../app/display.c:1303
 msgid "Closing diagram without saving"
 msgstr "Ð?акÑ?Ñ?Ñ?ие диагÑ?аммÑ? без Ñ?оÑ?Ñ?анениÑ?"
 
-#: ../app/display.c:1217
+#: ../app/display.c:1305
 #, c-format
 msgid ""
 "The diagram '%s'\n"
@@ -718,11 +740,11 @@ msgstr ""
 "Ð?иагÑ?амма «%s»\n"
 "не бÑ?ла Ñ?оÑ?Ñ?анена. СоÑ?Ñ?аниÑ?Ñ? изменениÑ? Ñ?ейÑ?аÑ??"
 
-#: ../app/display.c:1219
+#: ../app/display.c:1307
 msgid "Close Diagram"
 msgstr "Ð?акÑ?Ñ?Ñ?Ñ? диагÑ?аммÑ?"
 
-#: ../app/display.c:1224
+#: ../app/display.c:1312
 msgid "_Discard Changes"
 msgstr "_Ð?Ñ?казаÑ?Ñ?Ñ?Ñ? оÑ? изменений"
 
@@ -746,26 +768,6 @@ msgstr "Ð?е Ñ?оÑ?Ñ?аненÑ? пеÑ?еÑ?иÑ?леннÑ?е Ñ?айлÑ?:"
 msgid "Save"
 msgstr "СоÑ?Ñ?аниÑ?Ñ?"
 
-#: ../app/exit_dialog.c:114
-msgid "active"
-msgstr "дейÑ?Ñ?вÑ?Ñ?Ñ?ий"
-
-#. *** board of value **************
-#: ../app/exit_dialog.c:123
-#: ../app/plugin-manager.c:262
-#: ../objects/Database/table.c:138
-#: ../objects/Database/table.c:181
-#: ../objects/SISSI/sissi_dialog.c:734
-#: ../objects/UML/association.c:234
-#: ../objects/UML/class.c:144
-#: ../objects/UML/large_package.c:139
-#: ../objects/UML/umlattribute.c:37
-#: ../objects/UML/umlformalparameter.c:35
-#: ../objects/UML/umloperation.c:62
-#: ../objects/UML/umlparameter.c:43
-msgid "Name"
-msgstr "Ð?азвание"
-
 #: ../app/exit_dialog.c:129
 msgid "Path"
 msgstr "Ð?Ñ?Ñ?Ñ?"
@@ -782,57 +784,50 @@ msgstr "Ð?иÑ?его не вÑ?бÑ?аÑ?Ñ?"
 msgid "Nothing selected for saving.  Would you like to try again?"
 msgstr "Ð?е вÑ?делено обÑ?екÑ?ов длÑ? Ñ?оÑ?Ñ?анениÑ?. Ð?елаеÑ?е попÑ?обоваÑ?Ñ? еÑ?е Ñ?аз?"
 
-#: ../app/filedlg.c:144
-#: ../app/filedlg.c:152
-#: ../app/filedlg.c:168
-#: ../app/filedlg.c:746
-#: ../lib/widgets.c:1488
+#: ../app/filedlg.c:143 ../app/filedlg.c:151 ../app/filedlg.c:167
+#: ../app/filedlg.c:807 ../lib/widgets.c:406
 msgid "Supported Formats"
 msgstr "Ð?оддеÑ?живаемÑ?е Ñ?оÑ?маÑ?Ñ?"
 
-#: ../app/filedlg.c:192
-#: ../app/filedlg.c:604
+#: ../app/filedlg.c:196 ../app/filedlg.c:198 ../app/filedlg.c:655
+#: ../app/filedlg.c:657
 msgid "By extension"
 msgstr "Ð?о Ñ?аÑ?Ñ?иÑ?ениÑ?"
 
-#: ../app/filedlg.c:281
+#: ../app/filedlg.c:292
 msgid "Open Diagram"
 msgstr "Ð?Ñ?кÑ?Ñ?Ñ?Ñ? диагÑ?аммÑ?"
 
-#: ../app/filedlg.c:309
+#: ../app/filedlg.c:325
 msgid "Open Options"
 msgstr "Ð?аÑ?амеÑ?Ñ?Ñ? оÑ?кÑ?Ñ?Ñ?иÑ?"
 
-#: ../app/filedlg.c:317
-#: ../app/filedlg.c:728
+#: ../app/filedlg.c:333 ../app/filedlg.c:789
 msgid "Determine file type:"
 msgstr "Ð?пÑ?еделÑ?Ñ?Ñ? Ñ?ип Ñ?айла:"
 
-#: ../app/filedlg.c:337
-#: ../app/filedlg.c:741
-#: ../lib/widgets.c:1493
+#: ../app/filedlg.c:353 ../app/filedlg.c:802 ../lib/widgets.c:414
 msgid "All Files"
 msgstr "Ð?Ñ?е Ñ?айлÑ?"
 
-#: ../app/filedlg.c:370
-#: ../plug-ins/postscript/paginate_psprint.c:408
+#: ../app/filedlg.c:386 ../plug-ins/postscript/paginate_psprint.c:416
 msgid ""
 "Some characters in the filename are neither UTF-8\n"
 "nor your local encoding.\n"
 "Some things will break."
 msgstr ""
-"Ð?екоÑ?оÑ?Ñ?е Ñ?имволÑ? в названии Ñ?айла не в UTF-8 и не в ваÑ?ей локалÑ?ной кодиÑ?овке.\n"
-"ЭÑ?о можеÑ? пÑ?ивеÑ?Ñ?и к Ñ?боÑ?, а Ñ?акже имÑ? Ñ?айла, возможно, бÑ?деÑ? оÑ?обÑ?ажаÑ?Ñ?Ñ?Ñ? некоÑ?Ñ?екÑ?но."
+"Ð?екоÑ?оÑ?Ñ?е Ñ?имволÑ? в названии Ñ?айла не в UTF-8 и не в ваÑ?ей локалÑ?ной "
+"кодиÑ?овке.\n"
+"ЭÑ?о можеÑ? пÑ?ивеÑ?Ñ?и к Ñ?боÑ?, а Ñ?акже имÑ? Ñ?айла, возможно, бÑ?деÑ? оÑ?обÑ?ажаÑ?Ñ?Ñ?Ñ? "
+"некоÑ?Ñ?екÑ?но."
 
-#: ../app/filedlg.c:380
-#: ../app/filedlg.c:651
-#: ../plug-ins/postscript/paginate_psprint.c:422
+#: ../app/filedlg.c:396 ../app/filedlg.c:709
+#: ../plug-ins/postscript/paginate_psprint.c:430
 msgid "File already exists"
 msgstr "Файл Ñ?же Ñ?Ñ?Ñ?еÑ?Ñ?вÑ?еÑ?"
 
-#: ../app/filedlg.c:382
-#: ../app/filedlg.c:653
-#: ../plug-ins/postscript/paginate_psprint.c:418
+#: ../app/filedlg.c:398 ../app/filedlg.c:711
+#: ../plug-ins/postscript/paginate_psprint.c:426
 #, c-format
 msgid ""
 "The file '%s' already exists.\n"
@@ -841,22 +836,26 @@ msgstr ""
 "Файл «%s» Ñ?же Ñ?Ñ?Ñ?еÑ?Ñ?вÑ?еÑ?.\n"
 "ХоÑ?иÑ?е пеÑ?епиÑ?аÑ?Ñ? его?"
 
-#: ../app/filedlg.c:436
+#: ../app/filedlg.c:482
 msgid "Save Diagram"
 msgstr "СоÑ?Ñ?аниÑ?Ñ? диагÑ?аммÑ?"
 
 #. Need better way to make it a reasonable size.  Isn't there some
 #. standard look for them (or is that just Gnome?)
-#: ../app/filedlg.c:447
+#: ../app/filedlg.c:496
 msgid "Compress diagram files"
 msgstr "СжимаÑ?Ñ? Ñ?оÑ?Ñ?анÑ?емÑ?е Ñ?айлÑ?"
 
-#: ../app/filedlg.c:457
-#: ../app/filedlg.c:462
-msgid "Compression reduces file size to less than 1/10th size and speeds up loading and saving.  Some text programs cannot manipulate compressed files."
-msgstr "СжаÑ?ие Ñ?менÑ?Ñ?аеÑ? Ñ?азмеÑ? Ñ?айла поÑ?Ñ?и в 10 Ñ?аз и Ñ?Ñ?коÑ?Ñ?еÑ? загÑ?Ñ?зкÑ? и Ñ?оÑ?Ñ?анение. Ð?о некоÑ?оÑ?Ñ?е пÑ?огÑ?аммÑ? длÑ? Ñ?абоÑ?Ñ? Ñ? Ñ?екÑ?Ñ?ом не Ñ?меÑ?Ñ? Ñ?абоÑ?аÑ?Ñ? Ñ? Ñ?акими Ñ?айлами."
+#: ../app/filedlg.c:505
+msgid ""
+"Compression reduces file size to less than 1/10th size and speeds up loading "
+"and saving.  Some text programs cannot manipulate compressed files."
+msgstr ""
+"СжаÑ?ие Ñ?менÑ?Ñ?аеÑ? Ñ?азмеÑ? Ñ?айла поÑ?Ñ?и в 10 Ñ?аз и Ñ?Ñ?коÑ?Ñ?еÑ? загÑ?Ñ?зкÑ? и "
+"Ñ?оÑ?Ñ?анение. Ð?о некоÑ?оÑ?Ñ?е пÑ?огÑ?аммÑ? длÑ? Ñ?абоÑ?Ñ? Ñ? Ñ?екÑ?Ñ?ом не Ñ?меÑ?Ñ? Ñ?абоÑ?аÑ?Ñ? Ñ? "
+"Ñ?акими Ñ?айлами."
 
-#: ../app/filedlg.c:677
+#: ../app/filedlg.c:735
 #, c-format
 msgid ""
 "Could not determine which export filter\n"
@@ -865,11 +864,11 @@ msgstr ""
 "Ð?е Ñ?далоÑ?Ñ? опÑ?еделиÑ?Ñ? какой Ñ?кÑ?поÑ?Ñ?нÑ?й\n"
 "Ñ?илÑ?Ñ?Ñ? иÑ?полÑ?зоваÑ?Ñ? длÑ? Ñ?оÑ?Ñ?анениÑ? «%s»"
 
-#: ../app/filedlg.c:704
+#: ../app/filedlg.c:762
 msgid "Export Diagram"
 msgstr "ЭкÑ?поÑ?Ñ? диагÑ?аммÑ?"
 
-#: ../app/filedlg.c:720
+#: ../app/filedlg.c:781
 msgid "Export Options"
 msgstr "Ð?аÑ?амеÑ?Ñ?Ñ? Ñ?кÑ?поÑ?Ñ?а"
 
@@ -893,27 +892,26 @@ msgstr "Ð?Ñ?каÑ?Ñ? Ñ?олÑ?ко _полнÑ?е Ñ?лова"
 msgid "Match _all properties (not just object name)"
 msgstr ""
 
-#: ../app/find-and-replace.c:510
+#: ../app/find-and-replace.c:508
 msgid "Find"
 msgstr "Ð?Ñ?каÑ?Ñ?"
 
-#: ../app/find-and-replace.c:542
-#: ../app/menus.c:267
+#: ../app/find-and-replace.c:538 ../app/menus.c:260
 msgid "Replace"
 msgstr "Ð?амениÑ?Ñ?"
 
-#: ../app/find-and-replace.c:545
+#: ../app/find-and-replace.c:541
 msgid "Replace _All"
 msgstr "Ð?амениÑ?Ñ? _вÑ?е"
 
 #. not adding the button in the list above to modify it's text;
 #. * the default "Find and Replace" is just too long for my taste ;)
 #.
-#: ../app/find-and-replace.c:550
+#: ../app/find-and-replace.c:546
 msgid "_Replace"
 msgstr "_Ð?амениÑ?Ñ?"
 
-#: ../app/interface.c:153
+#: ../app/interface.c:158
 msgid ""
 "Modify object(s)\n"
 "Use <Space> to toggle between this and other tools"
@@ -921,7 +919,7 @@ msgstr ""
 "Ð?зменение обÑ?екÑ?Ñ?\n"
 "Ð?Ñ?полÑ?зÑ?йÑ?е <Ð?Ñ?обел> длÑ? пеÑ?еклÑ?Ñ?ениÑ? междÑ? инÑ?Ñ?Ñ?Ñ?менÑ?ами"
 
-#: ../app/interface.c:159
+#: ../app/interface.c:164
 msgid ""
 "Text edit(s)\n"
 "Use <Esc> to leave this tool"
@@ -930,193 +928,191 @@ msgstr ""
 "Ð?Ñ?полÑ?зÑ?йÑ?е <ESC> Ñ?Ñ?обÑ? закÑ?Ñ?Ñ?Ñ? даннÑ?й инÑ?Ñ?Ñ?Ñ?менÑ?"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Magnify
-#: ../app/interface.c:165
-#: ../app/menus.c:229
-#: ../objects/FS/function.c:988
+#: ../app/interface.c:170 ../app/menus.c:226 ../objects/FS/function.c:991
 msgid "Magnify"
 msgstr "Ð?Ñ?па"
 
-#: ../app/interface.c:171
+#: ../app/interface.c:176
 msgid "Scroll around the diagram"
 msgstr "Ð?еÑ?емеÑ?аÑ?Ñ?Ñ?Ñ? по диагÑ?амме"
 
 #. how it used to be before 0.96+SVN
 #. new name matching "same name, same type"  rule
-#: ../app/interface.c:177
-#: ../app/menus.c:232
-#: ../lib/properties.c:80
-#: ../lib/properties.h:530
-#: ../objects/AADL/aadlbox.c:153
-#: ../objects/Jackson/requirement.c:144
-#: ../objects/UML/activity.c:129
-#: ../objects/UML/actor.c:126
-#: ../objects/UML/classicon.c:149
-#: ../objects/UML/component.c:130
-#: ../objects/UML/component_feature.c:161
-#: ../objects/UML/node.c:130
-#: ../objects/UML/node.c:132
-#: ../objects/UML/note.c:124
-#: ../objects/UML/object.c:151
-#: ../objects/UML/small_package.c:135
-#: ../objects/UML/state.c:154
-#: ../objects/UML/usecase.c:142
-#: ../objects/custom/custom_object.c:236
-#: ../objects/network/basestation.c:135
-#: ../objects/network/radiocell.c:127
+#: ../app/interface.c:182 ../app/menus.c:229 ../lib/properties.c:101
+#: ../lib/properties.h:551 ../objects/AADL/aadlbox.c:153
+#: ../objects/Jackson/requirement.c:144 ../objects/UML/activity.c:129
+#: ../objects/UML/actor.c:123 ../objects/UML/classicon.c:148
+#: ../objects/UML/component.c:130 ../objects/UML/component_feature.c:160
+#: ../objects/UML/node.c:130 ../objects/UML/node.c:132
+#: ../objects/UML/note.c:121 ../objects/UML/object.c:167
+#: ../objects/UML/small_package.c:132 ../objects/UML/state.c:158
+#: ../objects/UML/usecase.c:139 ../objects/custom/custom_object.c:239
+#: ../objects/network/basestation.c:135 ../objects/network/radiocell.c:127
 msgid "Text"
 msgstr "ТекÑ?Ñ?"
 
-#: ../app/interface.c:183
-#: ../app/menus.c:233
+#: ../app/interface.c:188 ../app/menus.c:230
 msgid "Box"
 msgstr "Ð?Ñ?Ñ?моÑ?голÑ?ник"
 
-#: ../app/interface.c:189
-#: ../app/menus.c:234
+#: ../app/interface.c:194 ../app/menus.c:231
 msgid "Ellipse"
 msgstr "ЭллипÑ?"
 
-#: ../app/interface.c:195
-#: ../app/menus.c:235
+#: ../app/interface.c:200 ../app/menus.c:232
 msgid "Polygon"
 msgstr "Ð?ногоÑ?голÑ?ник"
 
-#: ../app/interface.c:201
-#: ../app/menus.c:236
+#: ../app/interface.c:206 ../app/menus.c:233
 msgid "Beziergon"
 msgstr "Ð?езÑ?еÑ?голÑ?ник"
 
-#: ../app/interface.c:207
-#: ../app/menus.c:238
-#: ../objects/standard/line.c:229
+#: ../app/interface.c:212 ../app/menus.c:235 ../objects/standard/line.c:232
 msgid "Line"
 msgstr "Ð?иниÑ?"
 
-#: ../app/interface.c:213
-#: ../app/menus.c:239
+#: ../app/interface.c:218 ../app/menus.c:236
 msgid "Arc"
 msgstr "Ð?Ñ?га"
 
-#: ../app/interface.c:219
-#: ../app/menus.c:240
+#: ../app/interface.c:224 ../app/menus.c:237
 msgid "Zigzagline"
 msgstr "Ð?игзаг"
 
-#: ../app/interface.c:225
-#: ../app/menus.c:241
+#: ../app/interface.c:230 ../app/menus.c:238
 msgid "Polyline"
 msgstr "Ð?оманаÑ?"
 
-#: ../app/interface.c:231
-#: ../app/menus.c:242
+#: ../app/interface.c:236 ../app/menus.c:239
 msgid "Bezierline"
 msgstr "Ð?Ñ?иваÑ? Ð?езÑ?е"
 
-#: ../app/interface.c:237
-#: ../app/menus.c:245
+#: ../app/interface.c:242 ../app/menus.c:242
 msgid "Image"
 msgstr "Ð?зобÑ?ажение"
 
-#: ../app/interface.c:244
-#: ../app/menus.c:243
+#: ../app/interface.c:249 ../app/menus.c:240
 msgid "Outline"
 msgstr "ЭÑ?киз"
 
-#: ../app/interface.c:619
-#: ../app/interface.c:855
+#: ../app/interface.c:632 ../app/interface.c:865
 msgid "Pops up the Navigation window."
 msgstr "Ð?Ñ?кÑ?Ñ?Ñ?Ñ? окно навигаÑ?ии."
 
-#: ../app/interface.c:817
+#: ../app/interface.c:827
 msgid "Diagram menu."
 msgstr "Ð?енÑ? диагÑ?аммÑ?."
 
-#: ../app/interface.c:920
+#: ../app/interface.c:930
 msgid "Zoom"
 msgstr "Ð?аÑ?Ñ?Ñ?аб"
 
-#: ../app/interface.c:935
+#: ../app/interface.c:945
 msgid "Toggles snap-to-grid for this window."
 msgstr "Ð?еÑ?еклÑ?Ñ?аеÑ? вÑ?Ñ?авнивание по Ñ?еÑ?ке."
 
-#: ../app/interface.c:946
+#: ../app/interface.c:956
 msgid "Toggles object snapping for this window."
 msgstr "Ð?еÑ?еклÑ?Ñ?аеÑ? вÑ?Ñ?авнивание обÑ?екÑ?ов."
 
-#: ../app/interface.c:1336
+#: ../app/interface.c:1385
 #, c-format
 msgid "No sheet named %s"
 msgstr "Ð?иблиоÑ?еки Ñ?леменÑ?ов Ñ? названием %s не Ñ?Ñ?Ñ?еÑ?Ñ?вÑ?еÑ?"
 
-#: ../app/interface.c:1374
+#: ../app/interface.c:1423
 msgid "Other sheets"
 msgstr "Ð?Ñ?Ñ?гие библиоÑ?еки Ñ?леменÑ?ов"
 
-#: ../app/interface.c:1434
-#: ../sheets/Flowchart.sheet.in.h:10
+#: ../app/interface.c:1483 ../sheets/Flowchart.sheet.in.h:10
 msgid "Flowchart"
 msgstr "Ð?лок-Ñ?Ñ?ема"
 
-#: ../app/interface.c:1494
-msgid "Foreground & background colors for new objects.  The small black and white squares reset colors.  The small arrows swap colors.  Double click to change colors."
-msgstr "ЦвеÑ?а пеÑ?еднего плана и Ñ?она длÑ? новÑ?Ñ? обÑ?екÑ?ов. Ð?аленÑ?кие белÑ?й и Ñ?Ñ?Ñ?нÑ?й квадÑ?аÑ?Ñ? Ñ?бÑ?аÑ?Ñ?ваÑ?Ñ? Ñ?веÑ?а. Ð?аленÑ?каÑ? Ñ?Ñ?Ñ?елка менÑ?еÑ? иÑ? меÑ?Ñ?ами. Ð?войнÑ?м Ñ?елÑ?ком вÑ?зÑ?ваеÑ?Ñ?Ñ? диалог длÑ? Ñ?казаниÑ? иного Ñ?веÑ?а."
+#: ../app/interface.c:1543
+#, fuzzy
+msgid ""
+"Foreground & background colors for new objects.  The small black and white "
+"squares reset colors.  The small arrows swap colors.  Double-click to change "
+"colors."
+msgstr ""
+"ЦвеÑ?а пеÑ?еднего плана и Ñ?она длÑ? новÑ?Ñ? обÑ?екÑ?ов. Ð?аленÑ?кие белÑ?й и Ñ?Ñ?Ñ?нÑ?й "
+"квадÑ?аÑ?Ñ? Ñ?бÑ?аÑ?Ñ?ваÑ?Ñ? Ñ?веÑ?а. Ð?аленÑ?каÑ? Ñ?Ñ?Ñ?елка менÑ?еÑ? иÑ? меÑ?Ñ?ами. Ð?войнÑ?м "
+"Ñ?елÑ?ком вÑ?зÑ?ваеÑ?Ñ?Ñ? диалог длÑ? Ñ?казаниÑ? иного Ñ?веÑ?а."
 
-#: ../app/interface.c:1509
-msgid "Line widths.  Click on a line to set the default line width for new objects.  Double-click to set the line width more precisely."
-msgstr "ТолÑ?ина линий.  Ð?ажмиÑ?е на линиÑ?, Ñ?Ñ?обÑ? Ñ?Ñ?Ñ?ановиÑ?Ñ? Ñ?олÑ?инÑ? линии по Ñ?молÑ?аниÑ? длÑ? новÑ?Ñ? обÑ?екÑ?ов.  Ð?войнÑ?м Ñ?елÑ?ком вÑ?зÑ?ваеÑ?Ñ?Ñ? диалог Ñ?оÑ?ного ввода Ñ?олÑ?инÑ?."
+#: ../app/interface.c:1557
+msgid ""
+"Line widths.  Click on a line to set the default line width for new "
+"objects.  Double-click to set the line width more precisely."
+msgstr ""
+"ТолÑ?ина линий.  Ð?ажмиÑ?е на линиÑ?, Ñ?Ñ?обÑ? Ñ?Ñ?Ñ?ановиÑ?Ñ? Ñ?олÑ?инÑ? линии по "
+"Ñ?молÑ?аниÑ? длÑ? новÑ?Ñ? обÑ?екÑ?ов.  Ð?войнÑ?м Ñ?елÑ?ком вÑ?зÑ?ваеÑ?Ñ?Ñ? диалог Ñ?оÑ?ного "
+"ввода Ñ?олÑ?инÑ?."
 
-#: ../app/interface.c:1552
-msgid "Arrow style at the beginning of new lines.  Click to pick an arrow, or set arrow parameters with Details..."
-msgstr "СÑ?илÑ? Ñ?Ñ?Ñ?елки в наÑ?але новÑ?Ñ? линий.  Ð?ажмиÑ?е длÑ? вÑ?боÑ?а Ñ?Ñ?Ñ?елки или длÑ? Ñ?Ñ?Ñ?ановки паÑ?амеÑ?Ñ?ов Ñ?Ñ?Ñ?елки в Ñ?ооÑ?веÑ?Ñ?Ñ?вии Ñ? иÑ?Ñ?однÑ?ми паÑ?амеÑ?Ñ?ами..."
+#: ../app/interface.c:1600
+#, fuzzy
+msgid ""
+"Arrow style at the beginning of new lines.  Click to pick an arrow, or set "
+"arrow parameters with Detailsâ?¦"
+msgstr ""
+"СÑ?илÑ? Ñ?Ñ?Ñ?елки в наÑ?але новÑ?Ñ? линий.  Ð?ажмиÑ?е длÑ? вÑ?боÑ?а Ñ?Ñ?Ñ?елки или длÑ? "
+"Ñ?Ñ?Ñ?ановки паÑ?амеÑ?Ñ?ов Ñ?Ñ?Ñ?елки в Ñ?ооÑ?веÑ?Ñ?Ñ?вии Ñ? иÑ?Ñ?однÑ?ми паÑ?амеÑ?Ñ?ами..."
 
-#: ../app/interface.c:1557
-msgid "Line style for new lines.  Click to pick a line style, or set line style parameters with Details..."
-msgstr "СÑ?илÑ? линии длÑ? новÑ?Ñ? линий.  Ð?ажмиÑ?е длÑ? вÑ?боÑ?а Ñ?Ñ?илÑ? линии или длÑ? Ñ?Ñ?Ñ?ановки Ñ?войÑ?Ñ?в линий в Ñ?ооÑ?веÑ?Ñ?Ñ?вии Ñ? иÑ?Ñ?однÑ?ми паÑ?амеÑ?Ñ?ами..."
+#: ../app/interface.c:1605
+#, fuzzy
+msgid ""
+"Line style for new lines.  Click to pick a line style, or set line style "
+"parameters with Detailsâ?¦"
+msgstr ""
+"СÑ?илÑ? линии длÑ? новÑ?Ñ? линий.  Ð?ажмиÑ?е длÑ? вÑ?боÑ?а Ñ?Ñ?илÑ? линии или длÑ? "
+"Ñ?Ñ?Ñ?ановки Ñ?войÑ?Ñ?в линий в Ñ?ооÑ?веÑ?Ñ?Ñ?вии Ñ? иÑ?Ñ?однÑ?ми паÑ?амеÑ?Ñ?ами..."
 
-#: ../app/interface.c:1573
-msgid "Arrow style at the end of new lines.  Click to pick an arrow, or set arrow parameters with Details..."
-msgstr "СÑ?илÑ? Ñ?Ñ?Ñ?елки в конÑ?е новой линии. Ð?ажмиÑ?е длÑ? вÑ?боÑ?а Ñ?Ñ?Ñ?елки или длÑ? Ñ?Ñ?Ñ?ановки паÑ?амеÑ?Ñ?ов Ñ?Ñ?Ñ?елки  в Ñ?ооÑ?веÑ?Ñ?Ñ?вии Ñ? иÑ?Ñ?однÑ?ми паÑ?амеÑ?Ñ?ами..."
+#: ../app/interface.c:1621
+#, fuzzy
+msgid ""
+"Arrow style at the end of new lines.  Click to pick an arrow, or set arrow "
+"parameters with Detailsâ?¦"
+msgstr ""
+"СÑ?илÑ? Ñ?Ñ?Ñ?елки в конÑ?е новой линии. Ð?ажмиÑ?е длÑ? вÑ?боÑ?а Ñ?Ñ?Ñ?елки или длÑ? "
+"Ñ?Ñ?Ñ?ановки паÑ?амеÑ?Ñ?ов Ñ?Ñ?Ñ?елки  в Ñ?ооÑ?веÑ?Ñ?Ñ?вии Ñ? иÑ?Ñ?однÑ?ми паÑ?амеÑ?Ñ?ами..."
 
-#: ../app/interface.c:1633
-#: ../app/interface.c:1760
+#: ../app/interface.c:1680 ../app/interface.c:1804 ../dia.desktop.in.in.h:3
 msgid "Diagram Editor"
 msgstr "РедакÑ?оÑ? диагÑ?амм Dia"
 
-#: ../app/layer_dialog.c:159
+#: ../app/layer_dialog.c:163
 msgid "New Layer"
 msgstr "Ð?овÑ?й Ñ?лой"
 
-#: ../app/layer_dialog.c:160
+#: ../app/layer_dialog.c:164
 msgid "Raise Layer"
 msgstr "Ð?однÑ?Ñ?Ñ? Ñ?лой"
 
-#: ../app/layer_dialog.c:161
+#: ../app/layer_dialog.c:165
 msgid "Lower Layer"
 msgstr "Ð?пÑ?Ñ?Ñ?иÑ?Ñ? Ñ?лой"
 
-#: ../app/layer_dialog.c:162
+#: ../app/layer_dialog.c:166
 msgid "Delete Layer"
 msgstr "УдалиÑ?Ñ? Ñ?лой"
 
-#: ../app/layer_dialog.c:306
+#: ../app/layer_dialog.c:309
 msgid "Layers:"
 msgstr "Слои:"
 
-#: ../app/layer_dialog.c:386
+#: ../app/layer_dialog.c:388
 msgid "Layers"
 msgstr "Слои"
 
-#: ../app/layer_dialog.c:400
+#: ../app/layer_dialog.c:402
 msgid "Diagram:"
 msgstr "Ð?иагÑ?амма:"
 
-#: ../app/layer_dialog.c:514
-#: ../app/layer_dialog.c:1225
+#: ../app/layer_dialog.c:515 ../app/layer_dialog.c:1226
 #, c-format
 msgid "New layer %d"
 msgstr "Ð?овÑ?й Ñ?лой %d"
 
-#: ../app/layer_dialog.c:729
+#: ../app/layer_dialog.c:730
 msgid "none"
 msgstr "неÑ?"
 
@@ -1132,19 +1128,17 @@ msgstr "Ð?обавиÑ?Ñ? Ñ?лой"
 msgid "Layer name:"
 msgstr "Ð?азвание Ñ?лоÑ?:"
 
-#: ../app/linewidth_area.c:246
-#: ../lib/properties.h:491
-#: ../lib/properties.h:494
+#: ../app/linewidth_area.c:248 ../lib/properties.h:500 ../lib/properties.h:503
 #: ../objects/chronogram/chronoline.c:183
 #: ../objects/chronogram/chronoref.c:162
 msgid "Line width"
 msgstr "ТолÑ?ина линии"
 
-#: ../app/linewidth_area.c:258
+#: ../app/linewidth_area.c:260
 msgid "Line width:"
 msgstr "ТолÑ?ина линии:"
 
-#: ../app/load_save.c:295
+#: ../app/load_save.c:263
 msgid ""
 "Error loading diagram.\n"
 "Linked object not found in document."
@@ -1152,44 +1146,41 @@ msgstr ""
 "Ð?Ñ?ибка пÑ?и загÑ?Ñ?зке диагÑ?аммÑ?.\n"
 "СвÑ?заннÑ?й обÑ?екÑ? не найден в докÑ?менÑ?е."
 
-#: ../app/load_save.c:299
+#: ../app/load_save.c:267
 #, fuzzy, c-format
 msgid ""
 "Error loading diagram.\n"
-"connection handle %d does not exist on '%s'."
+"Connection handle %d does not exist on '%s'."
 msgstr ""
 "Ð?Ñ?ибка пÑ?и загÑ?Ñ?зке диагÑ?аммÑ?.\n"
 "обÑ?абоÑ?Ñ?ик Ñ?оединениÑ? не Ñ?Ñ?Ñ?еÑ?Ñ?вÑ?еÑ?."
 
-#: ../app/load_save.c:327
+#: ../app/load_save.c:285
 #, fuzzy, c-format
 msgid ""
 "Error loading diagram.\n"
-"connection point %d does not exist on '%s'."
+"Connection point %d does not exist on '%s'."
 msgstr ""
 "Ð?Ñ?ибка пÑ?и загÑ?Ñ?зке диагÑ?аммÑ?.\n"
 "Ñ?оединиÑ?елÑ?ной Ñ?оÑ?ки %s не Ñ?Ñ?Ñ?еÑ?Ñ?вÑ?Ñ?Ñ?."
 
-#: ../app/load_save.c:367
+#: ../app/load_save.c:325
 #, c-format
 msgid "Can't find parent %s of %s object\n"
 msgstr "Ð?е Ñ?далоÑ?Ñ? найÑ?и Ñ?одиÑ?елей %s обÑ?екÑ?а %s\n"
 
-#: ../app/load_save.c:416
+#: ../app/load_save.c:375
 msgid "You must specify a file, not a directory.\n"
 msgstr "Ð?Ñ? должнÑ? Ñ?казаÑ?Ñ? Ñ?айл, а не каÑ?алог.\n"
 
-#: ../app/load_save.c:423
-#: ../plug-ins/dxf/dxf-import.c:1309
-#: ../plug-ins/wpg/wpg.c:1177
-#: ../plug-ins/xfig/xfig-import.c:1270
-#: ../plug-ins/xslt/xslt.c:91
+#: ../app/load_save.c:382 ../plug-ins/dxf/dxf-import.c:1316
+#: ../plug-ins/wpg/wpg.c:1181 ../plug-ins/xfig/xfig-import.c:1275
+#: ../plug-ins/xslt/xslt.c:93
 #, c-format
 msgid "Couldn't open: '%s' for reading.\n"
 msgstr "Ð?е Ñ?далоÑ?Ñ? оÑ?кÑ?Ñ?Ñ?Ñ?: «%s» длÑ? Ñ?Ñ?ениÑ?.\n"
 
-#: ../app/load_save.c:441
-#: ../app/load_save.c:447
+#: ../app/load_save.c:400 ../app/load_save.c:406
 #, c-format
 msgid ""
 "Error loading diagram %s.\n"
@@ -1198,7 +1189,7 @@ msgstr ""
 "Ð?Ñ?ибка пÑ?и загÑ?Ñ?зке диагÑ?аммÑ? %s.\n"
 "Ð?еизвеÑ?Ñ?нÑ?й Ñ?ип Ñ?айла."
 
-#: ../app/load_save.c:455
+#: ../app/load_save.c:414
 #, c-format
 msgid ""
 "Error loading diagram %s.\n"
@@ -1218,465 +1209,494 @@ msgstr ""
 "%s.\n"
 "Ð?оÑ?Ñ?екÑ?нÑ?й Ñ?айл Dia опÑ?еделÑ?еÑ? по менÑ?Ñ?ей меÑ?е один Ñ?лой."
 
-#: ../app/load_save.c:995
+#: ../app/load_save.c:1015
 #, c-format
 msgid "Not allowed to write to output file %s\n"
 msgstr "Ð?е Ñ?далоÑ?Ñ? запиÑ?аÑ?Ñ? вÑ?Ñ?одной Ñ?айл %s\n"
 
-#: ../app/load_save.c:1027
+#: ../app/load_save.c:1047
 #, c-format
 msgid "Not allowed to write temporary files in %s\n"
 msgstr "Ð?е Ñ?далоÑ?Ñ? запиÑ?аÑ?Ñ? вÑ?еменнÑ?й Ñ?айл в %s\n"
 
-#: ../app/load_save.c:1049
-#: ../plug-ins/cairo/diacairo.c:121
-#: ../plug-ins/cgm/cgm.c:1154
-#: ../plug-ins/drs/dia-render-script.c:121
-#: ../plug-ins/dxf/dxf-export.c:547
-#: ../plug-ins/hpgl/hpgl.c:710
-#: ../plug-ins/libart/export_png.c:157
-#: ../plug-ins/metapost/render_metapost.c:1177
-#: ../plug-ins/pgf/render_pgf.c:1208
-#: ../plug-ins/postscript/render_eps.c:105
-#: ../plug-ins/pstricks/render_pstricks.c:916
-#: ../plug-ins/shape/shape-export.c:137
-#: ../plug-ins/svg/render_svg.c:199
-#: ../plug-ins/vdx/vdx-export.c:1849
-#: ../plug-ins/wpg/wpg.c:1072
-#: ../plug-ins/xfig/xfig-export.c:1151
-#: ../plug-ins/xslt/xslt.c:99
+#: ../app/load_save.c:1069 ../plug-ins/cairo/diacairo.c:125
+#: ../plug-ins/cgm/cgm.c:1170 ../plug-ins/drs/dia-render-script.c:124
+#: ../plug-ins/dxf/dxf-export.c:547 ../plug-ins/hpgl/hpgl.c:710
+#: ../plug-ins/libart/export_png.c:159
+#: ../plug-ins/metapost/render_metapost.c:1180
+#: ../plug-ins/pgf/render_pgf.c:1202 ../plug-ins/postscript/render_eps.c:105
+#: ../plug-ins/pstricks/render_pstricks.c:919
+#: ../plug-ins/shape/shape-export.c:138 ../plug-ins/svg/render_svg.c:198
+#: ../plug-ins/vdx/vdx-export.c:1849 ../plug-ins/wpg/wpg.c:1076
+#: ../plug-ins/xfig/xfig-export.c:1157 ../plug-ins/xslt/xslt.c:101
 #, c-format
 msgid "Can't open output file %s: %s\n"
 msgstr "Ð?е Ñ?далоÑ?Ñ? оÑ?кÑ?Ñ?Ñ?Ñ? вÑ?Ñ?одной Ñ?айл %s: %s\n"
 
 #. Save failed; we clean our stuff up, without touching the file named
 #. "filename" if it existed.
-#: ../app/load_save.c:1060
+#: ../app/load_save.c:1080
 #, c-format
 msgid "Internal error %d writing file %s\n"
 msgstr "Ð?нÑ?Ñ?Ñ?еннÑ?Ñ? оÑ?ибка: %d пÑ?и запиÑ?и Ñ?айла %s\n"
 
-#: ../app/load_save.c:1071
+#: ../app/load_save.c:1091
 #, c-format
 msgid "Can't rename %s to final output file %s: %s\n"
 msgstr "Ð?е Ñ?далоÑ?Ñ? пеÑ?еименоваÑ?Ñ? %s вÑ?Ñ?одной Ñ?айл из %s в %s\n"
 
-#: ../app/load_save.c:1162
-#: ../app/load_save.c:1167
+#: ../app/load_save.c:1234 ../app/load_save.c:1239
 msgid "Dia Diagram File"
 msgstr "СобÑ?Ñ?веннÑ?й Ñ?оÑ?маÑ? Dia"
 
-#: ../app/menus.c:63
+#: ../app/menus.c:61
 msgid "Fit"
 msgstr "Ð?одогнаÑ?Ñ?"
 
-#: ../app/menus.c:81
+#: ../app/menus.c:78
 msgid "_File"
 msgstr "_Файл"
 
-#: ../app/menus.c:85
+#: ../app/menus.c:79
+msgid "Create a new diagram"
+msgstr "СоздаÑ?Ñ? новÑ?Ñ? диагÑ?аммÑ?"
+
+#: ../app/menus.c:80
+msgid "Open a diagram file"
+msgstr "Ð?Ñ?кÑ?Ñ?Ñ?Ñ? Ñ?айл диагÑ?аммÑ?"
+
+#: ../app/menus.c:82
 msgid "_Help"
 msgstr "_СпÑ?авка"
 
-#: ../app/menus.c:93
-msgid "Sheets and Objects..."
+#: ../app/menus.c:92
+msgid "Sheets and Objectsâ?¦"
 msgstr "Ð?аÑ?егоÑ?ии и обÑ?екÑ?Ñ?..."
 
-#: ../app/menus.c:95
-msgid "Plugins..."
+#: ../app/menus.c:94
+msgid "Pluginsâ?¦"
 msgstr "Ð?одÑ?ли..."
 
-#: ../app/menus.c:101
-msgid "_Diagram tree..."
+#: ../app/menus.c:95
+msgid "_Diagram Treeâ?¦"
 msgstr "_Ð?еÑ?ево диагÑ?аммÑ?..."
 
-#: ../app/menus.c:107
+#: ../app/menus.c:101
 msgid "Show Toolbar"
 msgstr "Ð?оказÑ?ваÑ?Ñ? Ð?анелÑ? инÑ?Ñ?Ñ?Ñ?менÑ?ов"
 
-#: ../app/menus.c:108
+#: ../app/menus.c:102
 msgid "Show Statusbar"
 msgstr "Ð?оказаÑ?Ñ? СÑ?Ñ?окÑ? Ñ?оÑ?Ñ?оÑ?ниÑ?"
 
-#: ../app/menus.c:109
+#: ../app/menus.c:103
 msgid "Show Layers"
 msgstr "Ð?оказаÑ?Ñ? Ñ?лои"
 
-#: ../app/menus.c:117
-msgid "_Export ..."
-msgstr "_ЭкÑ?поÑ?Ñ?..."
+#: ../app/menus.c:109
+msgid "Save the diagram"
+msgstr "СоÑ?Ñ?аниÑ?Ñ? диагÑ?аммÑ?"
+
+#: ../app/menus.c:110
+msgid "Save the diagram with a new name"
+msgstr "СоÑ?Ñ?аниÑ?Ñ? диагÑ?аммÑ? в Ñ?айл Ñ? дÑ?Ñ?гим именем"
 
-#: ../app/menus.c:118
+#: ../app/menus.c:111
+msgid "_Exportâ?¦"
+msgstr "_ЭкÑ?поÑ?Ñ?иÑ?оваÑ?Ñ?..."
+
+#: ../app/menus.c:111
+msgid "Export the diagram"
+msgstr "ЭкÑ?поÑ?Ñ?иÑ?оваÑ?Ñ? диагÑ?аммÑ?"
+
+#: ../app/menus.c:112
 msgid "_Diagram Properties"
 msgstr "С_войÑ?Ñ?ва диагÑ?аммÑ?"
 
-#: ../app/menus.c:119
-msgid "Page Set_up..."
+#: ../app/menus.c:113
+msgid "Page Set_upâ?¦"
 msgstr "Ð?аÑ?а_меÑ?Ñ?Ñ? Ñ?Ñ?Ñ?аниÑ?Ñ?..."
 
-#: ../app/menus.c:123
-#: ../app/sheets_dialog.c:236
+#: ../app/menus.c:114
+msgid "Print the diagram"
+msgstr "Ð?апеÑ?аÑ?аÑ?Ñ? диагÑ?аммÑ?"
+
+#: ../app/menus.c:117
 msgid "_Edit"
 msgstr "_Ð?Ñ?авка"
 
-#: ../app/menus.c:130
+#: ../app/menus.c:121
+msgid "Copy selection"
+msgstr "СкопиÑ?оваÑ?Ñ? вÑ?деление"
+
+#: ../app/menus.c:122
+msgid "Cut selection"
+msgstr "Ð?Ñ?Ñ?езаÑ?Ñ? вÑ?деление"
+
+#: ../app/menus.c:123
+msgid "Paste selection"
+msgstr "Ð?Ñ?Ñ?авиÑ?Ñ? вÑ?деление"
+
+#: ../app/menus.c:124
 msgid "_Duplicate"
 msgstr "Сд_елаÑ?Ñ? копиÑ?"
 
 #. the following used to bind to <control><shift>C which collides with Unicode input.
-#. * <control>>alt> doesn't work either
-#: ../app/menus.c:138
+#. * <control><alt> doesn't work either
+#: ../app/menus.c:132
 msgid "Copy Text"
 msgstr "Ð?опиÑ?оваÑ?Ñ? Ñ?екÑ?Ñ?"
 
-#: ../app/menus.c:139
+#: ../app/menus.c:133
 msgid "Cut Text"
 msgstr "Ð?Ñ?Ñ?езаÑ?Ñ? Ñ?екÑ?Ñ?"
 
-#: ../app/menus.c:140
+#: ../app/menus.c:134
 msgid "Paste _Text"
 msgstr "Ð?_Ñ?Ñ?авиÑ?Ñ? Ñ?екÑ?Ñ?"
 
-#: ../app/menus.c:142
+#: ../app/menus.c:136
+msgid "Paste _Image"
+msgstr "Ð?Ñ?Ñ?авиÑ?Ñ? _изобÑ?ажение"
+
+#: ../app/menus.c:138
 msgid "_Layers"
 msgstr "С_лои"
 
-#: ../app/menus.c:143
-msgid "Add Layer..."
-msgstr "Ð?обавиÑ?Ñ?..."
+#: ../app/menus.c:139
+msgid "Add Layerâ?¦"
+msgstr "Ð?обавиÑ?Ñ? Ñ?лой..."
 
-#: ../app/menus.c:144
-msgid "Rename Layer..."
-msgstr "Ð?еÑ?еименоваÑ?Ñ?..."
+#: ../app/menus.c:140
+msgid "Rename Layerâ?¦"
+msgstr "Ð?еÑ?еименоваÑ?Ñ? Ñ?лой..."
 
-#: ../app/menus.c:145
-msgid "Move selection to layer above"
+#: ../app/menus.c:141
+msgid "Move Selection to Layer above"
 msgstr "Ð?еÑ?енеÑ?Ñ?и вÑ?деление в Ñ?лой вÑ?Ñ?е"
 
-#: ../app/menus.c:146
-msgid "Move selection to layer below"
+#: ../app/menus.c:142
+msgid "Move Selection to Layer below"
 msgstr "Ð?еÑ?енеÑ?Ñ?и вÑ?деление в Ñ?лой ниже"
 
-#: ../app/menus.c:147
-msgid "_Layers..."
-msgstr "_Слои..."
+#: ../app/menus.c:143
+msgid "_Layersâ?¦"
+msgstr "С_лои..."
 
-#: ../app/menus.c:149
+#: ../app/menus.c:145
 msgid "_View"
 msgstr "_Ð?ид"
 
-#: ../app/menus.c:152
+#: ../app/menus.c:146
+msgid "Zoom in"
+msgstr "Ð?Ñ?иблизиÑ?Ñ?"
+
+#: ../app/menus.c:147
+msgid "Zoom out"
+msgstr "Ð?Ñ?далиÑ?Ñ?"
+
+#: ../app/menus.c:148
 msgid "_Zoom"
 msgstr "_Ð?аÑ?Ñ?Ñ?аб"
 
-#: ../app/menus.c:153
+#: ../app/menus.c:149
 msgid "1600%"
 msgstr "1600%"
 
-#: ../app/menus.c:154
-#: ../app/menus.c:573
+#: ../app/menus.c:150 ../app/menus.c:575 ../app/menus.c:587
 msgid "800%"
 msgstr "800%"
 
-#: ../app/menus.c:155
-#: ../app/menus.c:574
+#: ../app/menus.c:151 ../app/menus.c:576 ../app/menus.c:588
 msgid "400%"
 msgstr "400%"
 
-#: ../app/menus.c:156
+#: ../app/menus.c:152
 msgid "283"
 msgstr "283"
 
-#: ../app/menus.c:157
+#: ../app/menus.c:153
 msgid "200"
 msgstr "200"
 
-#: ../app/menus.c:158
+#: ../app/menus.c:154
 msgid "141"
 msgstr "41"
 
-#: ../app/menus.c:160
+#: ../app/menus.c:156
 msgid "85"
 msgstr "85"
 
-#: ../app/menus.c:161
+#: ../app/menus.c:157
 msgid "70.7"
 msgstr "70.7"
 
-#: ../app/menus.c:162
+#: ../app/menus.c:158
 msgid "50"
 msgstr "50"
 
-#: ../app/menus.c:163
+#: ../app/menus.c:159
 msgid "35.4"
 msgstr "35.4"
 
-#: ../app/menus.c:164
+#: ../app/menus.c:160
 msgid "25"
 msgstr "25"
 
+#. Show All, Best Fit.  Same as the Gimp, Ctrl+E
+#: ../app/menus.c:162
+msgid "Zoom fit"
+msgstr ""
+
 #. "display_toggle_entries" items go here
-#: ../app/menus.c:170
+#: ../app/menus.c:166
 msgid "New _View"
 msgstr "СоздаÑ?Ñ? _окно"
 
-#: ../app/menus.c:171
+#: ../app/menus.c:167
 msgid "C_lone View"
 msgstr "_Ð?лониÑ?оваÑ?Ñ? окно"
 
-#: ../app/menus.c:174
+#: ../app/menus.c:170
 msgid "_Objects"
 msgstr "_Ð?бÑ?екÑ?Ñ?"
 
-#: ../app/menus.c:175
+#: ../app/menus.c:171
 msgid "Send to _Back"
 msgstr "Ð?еÑ?емеÑ?Ñ?иÑ?Ñ? на _задний план"
 
-#: ../app/menus.c:176
+#: ../app/menus.c:172
 msgid "Bring to _Front"
 msgstr "Ð?еÑ?емеÑ?Ñ?иÑ?Ñ? на _пеÑ?едний план"
 
-#: ../app/menus.c:177
+#: ../app/menus.c:173
 msgid "Send Backwards"
-msgstr "Ð?еÑ?емеÑ?Ñ?иÑ?Ñ? далÑ?Ñ?е"
+msgstr "Ð?еÑ?емеÑ?Ñ?иÑ?Ñ? ниже"
 
-#: ../app/menus.c:178
+#: ../app/menus.c:174
 msgid "Bring Forwards"
-msgstr "Ð?еÑ?емеÑ?Ñ?иÑ?Ñ? ближе"
+msgstr "Ð?еÑ?емеÑ?Ñ?иÑ?Ñ? вÑ?Ñ?е"
 
-#: ../app/menus.c:180
+#: ../app/menus.c:176
 msgid "_Group"
 msgstr "_СгÑ?Ñ?ппиÑ?оваÑ?Ñ?"
 
 #. deliberately not using Ctrl+U for Ungroup
-#: ../app/menus.c:182
+#: ../app/menus.c:178
 msgid "_Ungroup"
 msgstr "_РазгÑ?Ñ?ппиÑ?оваÑ?Ñ?"
 
-#: ../app/menus.c:184
+#: ../app/menus.c:180
 msgid "_Parent"
 msgstr "_Ð?ложиÑ?Ñ?"
 
-#: ../app/menus.c:185
+#: ../app/menus.c:181
 msgid "_Unparent"
 msgstr "_Ð?Ñ?мениÑ?Ñ? вложение"
 
-#: ../app/menus.c:186
+#: ../app/menus.c:182
 msgid "_Unparent Children"
 msgstr "Ð?Ñ?мениÑ?Ñ? вложение _доÑ?еÑ?ниÑ? обÑ?екÑ?ов"
 
 #. Translators: Menu item Verb/Support/Position/Align
-#: ../app/menus.c:188
-#: ../objects/FS/function.c:808
+#: ../app/menus.c:184 ../objects/FS/function.c:811
 msgid "Align"
 msgstr "Ð?Ñ?Ñ?авниваÑ?Ñ?"
 
-#: ../app/menus.c:193
-#: ../objects/standard/textobj.c:137
+#: ../app/menus.c:189 ../objects/standard/textobj.c:137
 msgid "Top"
 msgstr "Ð?еÑ?Ñ?"
 
-#: ../app/menus.c:194
+#: ../app/menus.c:190
 msgid "Middle"
 msgstr "СеÑ?едина"
 
-#: ../app/menus.c:195
-#: ../objects/standard/textobj.c:136
+#: ../app/menus.c:191 ../objects/standard/textobj.c:136
 msgid "Bottom"
 msgstr "Ð?из"
 
-#: ../app/menus.c:197
+#: ../app/menus.c:193
 msgid "Spread Out Horizontally"
 msgstr "РаÑ?пÑ?еделиÑ?Ñ? гоÑ?изонÑ?алÑ?но"
 
-#: ../app/menus.c:198
+#: ../app/menus.c:194
 msgid "Spread Out Vertically"
 msgstr "РаÑ?пÑ?еделиÑ?Ñ? веÑ?Ñ?икалÑ?но"
 
-#: ../app/menus.c:199
+#: ../app/menus.c:195
 msgid "Adjacent"
 msgstr "СмежнÑ?е"
 
-#: ../app/menus.c:200
+#: ../app/menus.c:196
 msgid "Stacked"
 msgstr "Ð?ложеннÑ?е"
 
-#: ../app/menus.c:204
+#: ../app/menus.c:197 ../app/menus.c:207
+msgid "Connected"
+msgstr "СвÑ?заннÑ?е"
+
+#: ../app/menus.c:201
 msgid "_Select"
 msgstr "_Ð?Ñ?деление"
 
-#: ../app/menus.c:205
+#: ../app/menus.c:202
 msgid "All"
 msgstr "Ð?Ñ?Ñ?"
 
-#: ../app/menus.c:206
-#: ../lib/arrows.c:1882
-#: ../objects/Jackson/domain.c:96
-#: ../objects/UML/association.c:221
-#: ../objects/UML/association.c:227
+#: ../app/menus.c:203 ../lib/arrows.c:1890 ../objects/Jackson/domain.c:96
+#: ../objects/UML/association.c:222 ../objects/UML/association.c:228
 msgid "None"
 msgstr "СнÑ?Ñ?Ñ? вÑ?деление"
 
-#: ../app/menus.c:207
+#: ../app/menus.c:204
 msgid "Invert"
 msgstr "Ð?нвеÑ?Ñ?иÑ?оваÑ?Ñ?"
 
-#: ../app/menus.c:209
+#: ../app/menus.c:206
 msgid "Transitive"
 msgstr "Ð?ложеннÑ?е"
 
-#: ../app/menus.c:210
-msgid "Connected"
-msgstr "СвÑ?заннÑ?е"
-
-#: ../app/menus.c:211
+#: ../app/menus.c:208
 msgid "Same Type"
 msgstr "Того же Ñ?ипа"
 
 #. display_select_radio_entries go here
-#: ../app/menus.c:215
+#: ../app/menus.c:212
 msgid "Select By"
 msgstr "Ð?Ñ?делиÑ?Ñ? по"
 
-#: ../app/menus.c:217
+#: ../app/menus.c:214
 msgid "_Input Methods"
 msgstr "Ð?во_д"
 
-#: ../app/menus.c:219
+#: ../app/menus.c:216
 msgid "D_ialogs"
 msgstr "_Ð?иалоги"
 
-#: ../app/menus.c:221
+#: ../app/menus.c:218
 msgid "D_ebug"
 msgstr "_Ð?Ñ?ладка"
 
-#: ../app/menus.c:227
+#: ../app/menus.c:224
 msgid "_Tools"
 msgstr "_Ð?нÑ?Ñ?Ñ?Ñ?менÑ?Ñ?"
 
-#: ../app/menus.c:228
+#: ../app/menus.c:225
 msgid "Modify"
 msgstr "Ð?змениÑ?Ñ?"
 
-#: ../app/menus.c:230
-msgid "Edit text"
+#: ../app/menus.c:227
+msgid "Edit Text"
 msgstr "Ð?Ñ?авка Ñ?екÑ?Ñ?а"
 
-#: ../app/menus.c:231
+#: ../app/menus.c:228
 msgid "Scroll"
 msgstr "Ð?еÑ?емеÑ?ение"
 
-#: ../app/menus.c:254
-msgid "Fullscr_een"
-msgstr "_Ð?о веÑ?Ñ? Ñ?кÑ?ан"
-
-#: ../app/menus.c:256
-msgid "_AntiAliased"
+#: ../app/menus.c:249
+msgid "_Antialiased"
 msgstr "_СглаженнÑ?й"
 
-#: ../app/menus.c:257
+#: ../app/menus.c:250
 msgid "Show _Grid"
 msgstr "Ð?оказÑ?ваÑ?Ñ? _Ñ?еÑ?кÑ?"
 
-#: ../app/menus.c:258
-msgid "_Snap To Grid"
-msgstr "_Ð?Ñ?Ñ?авниваÑ?Ñ? по Ñ?еÑ?ке"
+#: ../app/menus.c:251
+msgid "_Snap to Grid"
+msgstr "_Ð?Ñ?илипаÑ?Ñ? к Ñ?еÑ?ке"
 
-#: ../app/menus.c:259
-msgid "Snap To _Objects"
-msgstr "_Ð?Ñ?Ñ?авниваÑ?Ñ? по обÑ?екÑ?Ñ?"
+#: ../app/menus.c:252
+msgid "Snap to _Objects"
+msgstr "Ð?Ñ?_илипаÑ?Ñ? к обÑ?екÑ?ам"
 
-#: ../app/menus.c:260
+#: ../app/menus.c:253
 msgid "Show _Rulers"
 msgstr "Ð?оказÑ?ваÑ?Ñ? _линейки"
 
-#: ../app/menus.c:261
+#: ../app/menus.c:254
 msgid "Show _Connection Points"
 msgstr "Ð?оказÑ?ваÑ?Ñ? _Ñ?оединиÑ?елÑ?нÑ?е Ñ?оÑ?ки"
 
-#: ../app/menus.c:268
+#: ../app/menus.c:261
 msgid "Union"
 msgstr "Ð?бÑ?единиÑ?Ñ?"
 
-#: ../app/menus.c:269
+#: ../app/menus.c:262
 msgid "Intersection"
 msgstr "Ð?еÑ?еÑ?еÑ?Ñ?"
 
 #. Translators: Menu item Verb/Channel/Export/Remove
 #. Translators: Menu item Verb/Branch/Separate/Remove
 #. Translators: Menu item Verb/Branch/Separate/Remove/Remove
-#: ../app/menus.c:270
-#: ../app/sheets_dialog.c:785
-#: ../objects/FS/function.c:708
-#: ../objects/FS/function.c:860
-#: ../objects/FS/function.c:862
+#: ../app/menus.c:263 ../objects/FS/function.c:711
+#: ../objects/FS/function.c:863 ../objects/FS/function.c:865
 msgid "Remove"
 msgstr "УдалиÑ?Ñ?"
 
 #. Cannot also be called Invert, duplicate names caused keybinding problems
-#: ../app/menus.c:272
+#: ../app/menus.c:265
 msgid "Inverse"
 msgstr "Ð?бÑ?аÑ?иÑ?Ñ?"
 
-#: ../app/menus.c:336
+#: ../app/menus.c:328
 msgid "NULL tooldata in tool_menu_select"
 msgstr "NULL даннÑ?е инÑ?Ñ?Ñ?Ñ?менÑ?а в tool_menu_select"
 
-#: ../app/menus.c:575
+#: ../app/menus.c:577 ../app/menus.c:589
 msgid "300%"
 msgstr "300%"
 
-#: ../app/menus.c:576
+#: ../app/menus.c:578 ../app/menus.c:590
 msgid "200%"
 msgstr "200%"
 
-#: ../app/menus.c:577
+#: ../app/menus.c:579 ../app/menus.c:591
 msgid "150%"
 msgstr "150%"
 
-#: ../app/menus.c:578
+#: ../app/menus.c:580 ../app/menus.c:592
 msgid "100%"
 msgstr "100%"
 
-#: ../app/menus.c:579
+#: ../app/menus.c:581 ../app/menus.c:593
 msgid "75%"
 msgstr "75%"
 
-#: ../app/menus.c:580
+#: ../app/menus.c:582 ../app/menus.c:594
 msgid "50%"
 msgstr "50%"
 
-#: ../app/menus.c:581
+#: ../app/menus.c:583 ../app/menus.c:595
 msgid "25%"
 msgstr "25%"
 
-#: ../app/menus.c:582
+#: ../app/menus.c:584 ../app/menus.c:596
 msgid "10%"
 msgstr "10%"
 
-#: ../app/menus.c:608
+#: ../app/menus.c:622
 msgid "Toggles snap-to-grid."
 msgstr "Ð?еÑ?еклÑ?Ñ?аеÑ? вÑ?Ñ?авнивание по Ñ?еÑ?ке длÑ? Ñ?Ñ?ого окна."
 
-#: ../app/menus.c:620
+#: ../app/menus.c:633
 msgid "Toggles object snapping."
 msgstr "Ð?еÑ?еклÑ?Ñ?аеÑ? вÑ?Ñ?авнивание обÑ?екÑ?ов длÑ? Ñ?Ñ?ого окна."
 
-#: ../app/modify_tool.c:392
-msgid "Couldn't get GTK settings"
+#: ../app/modify_tool.c:367
+#, fuzzy
+msgid "Couldn't get GTK+ settings"
 msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? наÑ?Ñ?Ñ?ойки GTK"
 
 #: ../app/plugin-manager.c:200
-msgid "Plug-ins"
+msgid "Plugins"
 msgstr "Ð?одÑ?ли"
 
 #: ../app/plugin-manager.c:255
 msgid "Loaded"
 msgstr "Ð?агÑ?Ñ?жен"
 
-#: ../app/plugin-manager.c:268
-#: ../objects/SISSI/sissi_dialog.c:730
-#: ../objects/SISSI/sissi_dialog.c:882
+#: ../app/plugin-manager.c:268 ../objects/SISSI/sissi_dialog.c:730
+#: ../objects/SISSI/sissi_dialog.c:880
 msgid "Description"
 msgstr "Ð?пиÑ?ание"
 
@@ -1685,13 +1705,12 @@ msgid "Load at Startup"
 msgstr "Ð?агÑ?Ñ?жаÑ?Ñ? пÑ?и запÑ?Ñ?ке"
 
 #: ../app/plugin-manager.c:284
-msgid "File Name"
-msgstr "Ð?азвание Ñ?айла"
+msgid "Filename"
+msgstr "Ð?мÑ? Ñ?айла"
 
-#: ../app/preferences.c:99
-#: ../app/preferences.c:144
+#: ../app/preferences.c:100 ../app/preferences.c:143
 msgid "any"
-msgstr "Ð?Ñ?бой Ñ?поÑ?об"
+msgstr "лÑ?бой"
 
 #: ../app/preferences.c:118
 msgid "User Interface"
@@ -1709,15 +1728,15 @@ msgstr "Ð?ид по Ñ?молÑ?аниÑ?"
 msgid "Favorites"
 msgstr "Ð?Ñ?едпоÑ?Ñ?ениÑ?"
 
-#: ../app/preferences.c:165
+#: ../app/preferences.c:164
 msgid "Reset tools after create"
 msgstr "СбÑ?аÑ?Ñ?ваÑ?Ñ? инÑ?Ñ?Ñ?Ñ?менÑ?Ñ? поÑ?ле Ñ?озданиÑ?"
 
-#: ../app/preferences.c:168
+#: ../app/preferences.c:167
 msgid "Number of undo levels:"
 msgstr "ЧиÑ?ло Ñ?Ñ?овней оÑ?каÑ?а:"
 
-#: ../app/preferences.c:171
+#: ../app/preferences.c:170
 msgid ""
 "Reverse dragging selects\n"
 "intersecting objects"
@@ -1725,201 +1744,190 @@ msgstr ""
 "Ð?бÑ?аÑ?ное пеÑ?еÑ?Ñ?гивание вÑ?делÑ?еÑ?\n"
 "пеÑ?еÑ?екаÑ?Ñ?иеÑ?Ñ? обÑ?екÑ?Ñ?"
 
-#: ../app/preferences.c:174
+#: ../app/preferences.c:173
 msgid "Recent documents list size:"
 msgstr "РазмеÑ? Ñ?пиÑ?ка поÑ?ледниÑ? докÑ?менÑ?ов:"
 
-#: ../app/preferences.c:177
+#: ../app/preferences.c:176
 msgid "Use menu bar"
 msgstr "Ð?Ñ?полÑ?зоваÑ?Ñ? Ñ?Ñ?Ñ?окÑ? менÑ?"
 
-#: ../app/preferences.c:180
+#: ../app/preferences.c:179
 msgid "Keep tool box on top of diagram windows"
 msgstr "СоÑ?Ñ?анÑ?Ñ?Ñ? панелÑ? инÑ?Ñ?Ñ?Ñ?менÑ?ов Ñ?веÑ?Ñ?Ñ? окна диагÑ?аммÑ?"
 
-#: ../app/preferences.c:183
+#: ../app/preferences.c:182
 msgid "Length unit:"
 msgstr "Ð?диниÑ?а измеÑ?ениÑ? длинÑ?"
 
-#: ../app/preferences.c:186
-msgid "Font-size unit:"
-msgstr "Ð?диниÑ?а измеÑ?ениÑ? Ñ?азмеÑ?а Ñ?Ñ?иÑ?Ñ?а:"
+#: ../app/preferences.c:185
+msgid "Font size unit:"
+msgstr "Ð?диниÑ?а измеÑ?ениÑ? Ñ?Ñ?иÑ?Ñ?ов:"
 
-#: ../app/preferences.c:189
+#: ../app/preferences.c:188
 msgid "New diagram:"
 msgstr "Ð?оваÑ? диагÑ?амма:"
 
-#: ../app/preferences.c:190
+#: ../app/preferences.c:189
 msgid "Portrait"
 msgstr "Ð?оÑ?Ñ?Ñ?еÑ?"
 
-#: ../app/preferences.c:192
+#: ../app/preferences.c:191
 msgid "Paper type:"
 msgstr "Тип лиÑ?Ñ?а:"
 
-#: ../app/preferences.c:194
-#: ../objects/Database/table_dialog.c:1078
+#: ../app/preferences.c:193 ../objects/Database/table_dialog.c:1087
 msgid "Background Color:"
 msgstr "ЦвеÑ? Ñ?она:"
 
-#: ../app/preferences.c:196
+#: ../app/preferences.c:195
 msgid "Compress saved files"
 msgstr "СжимаÑ?Ñ? Ñ?оÑ?Ñ?анÑ?емÑ?е Ñ?айлÑ?"
 
-#: ../app/preferences.c:199
+#: ../app/preferences.c:198
 msgid "Connection Points:"
 msgstr "СоединиÑ?елÑ?нÑ?е Ñ?оÑ?ки:"
 
 #. { NULL, PREF_NONE, 0, NULL, 3, N_("Grid:") },
-#: ../app/preferences.c:200
-#: ../app/preferences.c:211
-#: ../app/preferences.c:235
+#: ../app/preferences.c:199 ../app/preferences.c:210 ../app/preferences.c:234
 msgid "Visible"
-msgstr "Ð?идимÑ?й"
+msgstr "Ð?идимÑ? по Ñ?молÑ?аниÑ?"
 
-#: ../app/preferences.c:201
+#: ../app/preferences.c:200
 msgid "Snap to object"
 msgstr "Ð?Ñ?илипаÑ?Ñ? к обÑ?екÑ?ам"
 
-#: ../app/preferences.c:204
+#: ../app/preferences.c:203
 msgid "New window:"
 msgstr "Ð?овое окно:"
 
-#: ../app/preferences.c:205
+#: ../app/preferences.c:204
 msgid "Width:"
 msgstr "ШиÑ?ина:"
 
-#: ../app/preferences.c:206
+#: ../app/preferences.c:205
 msgid "Height:"
 msgstr "Ð?Ñ?Ñ?оÑ?а:"
 
-#: ../app/preferences.c:207
+#: ../app/preferences.c:206
 msgid "Magnify:"
 msgstr "УвелиÑ?ение:"
 
-#: ../app/preferences.c:210
+#: ../app/preferences.c:209
 msgid "Page breaks:"
 msgstr "Ð?Ñ?аниÑ?Ñ? Ñ?Ñ?Ñ?аниÑ?:"
 
-#: ../app/preferences.c:212
-#: ../app/preferences.c:240
+#: ../app/preferences.c:211 ../app/preferences.c:241
 msgid "Color:"
 msgstr "ЦвеÑ?:"
 
-#: ../app/preferences.c:213
+#: ../app/preferences.c:212
 msgid "Solid lines"
 msgstr "СплоÑ?нÑ?е линии"
 
-#: ../app/preferences.c:216
+#: ../app/preferences.c:215
 msgid "Antialias:"
 msgstr "_СглаженнÑ?й:"
 
-#: ../app/preferences.c:217
+#: ../app/preferences.c:216
 msgid "view antialised"
 msgstr "Сглаженное пÑ?едÑ?Ñ?авление"
 
 #. Favored Filter
 #. Translators: Menu item Verb/Channel/Export
 #. Translators: Menu item Verb/Channel/Export/Export
-#: ../app/preferences.c:221
-#: ../objects/FS/function.c:698
-#: ../objects/FS/function.c:700
-#: ../plug-ins/libart/export_png.c:323
+#: ../app/preferences.c:220 ../objects/FS/function.c:701
+#: ../objects/FS/function.c:703 ../plug-ins/libart/export_png.c:328
 msgid "Export"
 msgstr "ЭкÑ?поÑ?Ñ?"
 
-#: ../app/preferences.c:223
+#: ../app/preferences.c:222
 msgid "Portable Network Graphics"
 msgstr "Portable Network Graphics"
 
-#: ../app/preferences.c:225
-#: ../plug-ins/svg/render_svg.c:515
-#: ../plug-ins/svg/svg-import.c:884
+#: ../app/preferences.c:224 ../plug-ins/svg/render_svg.c:497
+#: ../plug-ins/svg/svg-import.c:1008
 msgid "Scalable Vector Graphics"
-msgstr "Ð?аÑ?Ñ?Ñ?абиÑ?Ñ?емаÑ? векÑ?оÑ?наÑ? гÑ?аÑ?ика (SVG)"
+msgstr "Scalable Vector Graphics"
 
-#: ../app/preferences.c:227
+#: ../app/preferences.c:226
 msgid "PostScript"
 msgstr "PostScript"
 
-#: ../app/preferences.c:229
-msgid "Windows MetaFile"
+#: ../app/preferences.c:228 ../plug-ins/wmf/wmf.cpp:1458
+msgid "Windows Metafile"
 msgstr "Windows MetaFile"
 
-#: ../app/preferences.c:231
-msgid "Enhanced MetaFile"
+#: ../app/preferences.c:230 ../plug-ins/wmf/wmf.cpp:1467
+msgid "Enhanced Metafile"
 msgstr "Enhanced MetaFile"
 
-#: ../app/preferences.c:236
+#: ../app/preferences.c:235
 msgid "Snap to"
-msgstr "Ð?Ñ?Ñ?авниваÑ?Ñ? по"
+msgstr "Ð?Ñ?илипаÑ?Ñ? к Ñ?еÑ?ке"
 
-#: ../app/preferences.c:237
+#: ../app/preferences.c:236
 msgid "Dynamic grid resizing"
 msgstr "Ð?инамиÑ?еÑ?кое изменение Ñ?ага Ñ?еÑ?ки"
 
-#: ../app/preferences.c:238
+#: ../app/preferences.c:237
 msgid "X Size:"
 msgstr "РазмеÑ? X:"
 
-#: ../app/preferences.c:239
+#: ../app/preferences.c:238
 msgid "Y Size:"
 msgstr "РазмеÑ? Y:"
 
-#: ../app/preferences.c:241
+#: ../app/preferences.c:239
+#, fuzzy
+msgid "Visual Spacing X:"
+msgstr "Ð?идимÑ?й инÑ?еÑ?вал"
+
+#: ../app/preferences.c:240
+#, fuzzy
+msgid "Visual Spacing Y:"
+msgstr "Ð?идимÑ?й инÑ?еÑ?вал"
+
+#: ../app/preferences.c:242
 msgid "Lines per major line"
 msgstr "Ð?иний на главнÑ?е линии"
 
-#: ../app/preferences.c:243
+#: ../app/preferences.c:244
 msgid "Hex Size:"
 msgstr "РазмеÑ? Ñ?еÑ?Ñ?игÑ?анной Ñ?еÑ?ки:"
 
-#. There's really no reason to not pretty format it, and allowing non-pretty
-#. can lead to problems with long lines, CVS etc.
-#. { "pretty_formated_xml", PREF_BOOLEAN,PREF_OFFSET(pretty_formated_xml),
-#. &default_true,0,"pretty formated xml",NULL, TRUE},
-#.
-#: ../app/preferences.c:255
-msgid "Diagram tree window:"
-msgstr "Ð?кно деÑ?ева диагÑ?аммÑ?"
-
-#: ../app/preferences.c:257
-msgid "Save hidden object types"
-msgstr "СоÑ?Ñ?анÑ?Ñ?Ñ? Ñ?ипÑ? Ñ?пÑ?Ñ?Ñ?аннÑ?Ñ? обÑ?екÑ?ов"
-
-#: ../app/preferences.c:485
-#: ../lib/prop_inttypes.c:158
+#: ../app/preferences.c:478 ../lib/prop_inttypes.c:159
+#: ../lib/prop_pixbuf.c:215
 msgid "Yes"
 msgstr "Ð?а"
 
-#: ../app/preferences.c:485
-#: ../app/preferences.c:496
-#: ../lib/prop_inttypes.c:160
-#: ../lib/prop_inttypes.c:186
+#: ../app/preferences.c:478 ../app/preferences.c:489
+#: ../lib/prop_inttypes.c:161 ../lib/prop_inttypes.c:187
+#: ../lib/prop_pixbuf.c:217 ../lib/prop_pixbuf.c:223
 msgid "No"
 msgstr "Ð?еÑ?"
 
-#: ../app/preferences.c:591
+#: ../app/preferences.c:592
 msgid "Preferences"
 msgstr "Ð?аÑ?амеÑ?Ñ?Ñ?"
 
-#: ../app/properties-dialog.c:56
+#: ../app/properties-dialog.c:60
 msgid "Object properties"
 msgstr "СвойÑ?Ñ?ва обÑ?екÑ?а"
 
-#: ../app/properties-dialog.c:81
+#: ../app/properties-dialog.c:85
 msgid "This object has no properties."
 msgstr "У Ñ?Ñ?ого обÑ?екÑ?а неÑ? Ñ?войÑ?Ñ?в."
 
-#: ../app/properties-dialog.c:245
+#: ../app/properties-dialog.c:248
 msgid "Properties: "
 msgstr "СвойÑ?Ñ?ва:"
 
-#: ../app/properties-dialog.c:249
+#: ../app/properties-dialog.c:252
 msgid "Object properties:"
 msgstr "СвойÑ?Ñ?ва обÑ?екÑ?а:"
 
-#: ../app/sheets.c:162
+#: ../app/sheets.c:156
 #, c-format
 msgid ""
 "%s\n"
@@ -1928,7 +1936,7 @@ msgstr ""
 "%s\n"
 "СиÑ?Ñ?емнаÑ? каÑ?егоÑ?иÑ?"
 
-#: ../app/sheets.c:164
+#: ../app/sheets.c:158
 #, c-format
 msgid ""
 "%s\n"
@@ -1937,7 +1945,7 @@ msgstr ""
 "%s\n"
 "Ð?олÑ?зоваÑ?елÑ?Ñ?каÑ? каÑ?егоÑ?иÑ?"
 
-#: ../app/sheets.c:279
+#: ../app/sheets.c:276
 msgid ""
 "Can't get symbol 'custom_type' from any module.\n"
 "Editing shapes is disabled."
@@ -1945,172 +1953,60 @@ msgstr ""
 "Ð?и в одном из модÑ?лей не найден Ñ?имвол 'custom_type'.\n"
 "РедакÑ?иÑ?ование Ñ?оÑ?м вÑ?клÑ?Ñ?ено."
 
-#: ../app/sheets.c:399
+#: ../app/sheets.c:411
 #, c-format
 msgid "Widget not found: %s"
 msgstr "Ð?иджеÑ? не найден: %s"
 
-#: ../app/sheets.c:474
+#: ../app/sheets.c:441
 msgid "SVG Shape"
 msgstr "ФоÑ?мÑ? SVG"
 
-#: ../app/sheets.c:476
+#: ../app/sheets.c:443
 msgid "Programmed DiaObject"
 msgstr "Ð?апÑ?огÑ?аммиÑ?ованнÑ?й обÑ?екÑ? Dia"
 
-#: ../app/sheets_dialog.c:84
-msgid "Sheets and Objects"
-msgstr "Ð?аÑ?егоÑ?ии и обÑ?екÑ?Ñ?"
-
-#: ../app/sheets_dialog.c:110
-#: ../app/sheets_dialog_callbacks.c:180
-msgid "<- Copy"
-msgstr "<- Ð?опиÑ?оваÑ?Ñ?"
-
-#: ../app/sheets_dialog.c:120
-#: ../app/sheets_dialog_callbacks.c:182
-msgid "<- Copy All"
-msgstr "< - Ð?опиÑ?оваÑ?Ñ? вÑ?Ñ?"
-
-#: ../app/sheets_dialog.c:127
-#: ../app/sheets_dialog_callbacks.c:184
-msgid "<- Move"
-msgstr "<- Ð?еÑ?емеÑ?Ñ?иÑ?Ñ?"
+#: ../app/sheets_dialog.c:255
+msgid "Select SVG Shape File"
+msgstr "Ð?Ñ?беÑ?иÑ?е Ñ?айл Ñ? Ñ?оÑ?мой SVG"
 
-#: ../app/sheets_dialog.c:137
-#: ../app/sheets_dialog_callbacks.c:186
-msgid "<- Move All"
-msgstr "<- Ð?еÑ?емеÑ?Ñ?иÑ?Ñ? вÑ?Ñ?"
+#: ../app/sheets_dialog_callbacks.c:164
+msgid "Copy â??"
+msgstr "СкопиÑ?оваÑ?Ñ? â??"
 
-#: ../app/sheets_dialog.c:234
-msgid "Edit"
-msgstr "РедакÑ?иÑ?оваÑ?Ñ?"
+#: ../app/sheets_dialog_callbacks.c:166
+msgid "Copy All â??"
+msgstr "СкопиÑ?оваÑ?Ñ? вÑ?е â??"
 
-#: ../app/sheets_dialog.c:267
-msgid "Revert"
-msgstr "Ð?бÑ?аÑ?иÑ?Ñ?"
+#: ../app/sheets_dialog_callbacks.c:168
+msgid "Move â??"
+msgstr "Ð?еÑ?емеÑ?Ñ?иÑ?Ñ? â??"
 
-#: ../app/sheets_dialog.c:355
-msgid "New"
-msgstr "Ð?овÑ?й"
-
-#: ../app/sheets_dialog.c:363
-#: ../app/sheets_dialog.c:795
-#: ../objects/Database/table.c:140
-#: ../objects/Istar/actor.c:146
-#: ../objects/Istar/actor.c:147
-#: ../objects/Istar/other.c:150
-#: ../objects/Istar/other.c:151
-#: ../objects/KAOS/other.c:153
-#: ../objects/KAOS/other.c:154
-#: ../objects/UML/association.c:240
-#: ../objects/UML/umlattribute.c:39
-#: ../objects/UML/umlformalparameter.c:37
-#: ../objects/UML/umloperation.c:64
-#: ../objects/UML/umlparameter.c:45
-msgid "Type"
-msgstr "Тип"
+#: ../app/sheets_dialog_callbacks.c:170
+msgid "Move All â??"
+msgstr "Ð?еÑ?емеÑ?Ñ?иÑ?Ñ? вÑ?е â??"
 
-#: ../app/sheets_dialog.c:378
-msgid "Browse..."
-msgstr "Ð?Ñ?бÑ?аÑ?Ñ?..."
+#: ../app/sheets_dialog_callbacks.c:177
+msgid "â?? Copy"
+msgstr "â?? СкопиÑ?оваÑ?Ñ?"
 
-#: ../app/sheets_dialog.c:387
-msgid "SVG Shape:"
-msgstr "ФоÑ?мÑ? SVG:"
+#: ../app/sheets_dialog_callbacks.c:179
+msgid "â?? Copy All"
+msgstr "â?? СкопиÑ?оваÑ?Ñ? вÑ?е"
 
-#: ../app/sheets_dialog.c:414
-#: ../app/sheets_dialog.c:477
-msgid "description:"
-msgstr "опиÑ?ание:"
+#: ../app/sheets_dialog_callbacks.c:181
+msgid "â?? Move"
+msgstr "â?? Ð?еÑ?емеÑ?Ñ?иÑ?Ñ?"
 
-#: ../app/sheets_dialog.c:426
-msgid "Sheet name:"
-msgstr "Ð?азвание каÑ?егоÑ?ии:"
+#: ../app/sheets_dialog_callbacks.c:183
+msgid "â?? Move All"
+msgstr "â?? Ð?еÑ?емеÑ?Ñ?иÑ?Ñ? вÑ?е"
 
-#: ../app/sheets_dialog.c:447
-#: ../app/sheets_dialog_callbacks.c:292
-#: ../app/sheets_dialog_callbacks.c:1109
+#: ../app/sheets_dialog_callbacks.c:289 ../app/sheets_dialog_callbacks.c:1072
 msgid "Line Break"
 msgstr "РазÑ?Ñ?в Ñ?Ñ?Ñ?оки"
 
-#: ../app/sheets_dialog.c:569
-msgid "Edit Attributes"
-msgstr "Ð?Ñ?авка аÑ?Ñ?ибÑ?Ñ?ов"
-
-#: ../app/sheets_dialog.c:584
-msgid "DiaObject"
-msgstr "Ð?бÑ?екÑ? Dia"
-
-#: ../app/sheets_dialog.c:600
-#: ../app/sheets_dialog.c:693
-msgid "Description:"
-msgstr "Ð?пиÑ?ание:"
-
-#: ../app/sheets_dialog.c:619
-#: ../objects/Database/table_dialog.c:695
-#: ../objects/FS/flow-ortho.c:169
-#: ../objects/FS/flow.c:146
-#: ../objects/Istar/link.c:162
-#: ../objects/Jackson/phenomenon.c:146
-#: ../objects/KAOS/metaandorrel.c:166
-#: ../objects/KAOS/metabinrel.c:173
-#: ../objects/UML/class_dialog.c:1159
-#: ../objects/UML/class_dialog.c:2025
-#: ../objects/UML/class_dialog.c:2261
-#: ../objects/UML/class_dialog.c:2864
-msgid "Type:"
-msgstr "Тип:"
-
-#: ../app/sheets_dialog.c:657
-msgid "Sheet"
-msgstr "Ð?аÑ?егоÑ?иÑ?"
-
-#: ../app/sheets_dialog.c:673
-#: ../objects/Database/table_dialog.c:683
-#: ../objects/Database/table_dialog.c:1046
-#: ../objects/ER/attribute.c:155
-#: ../objects/ER/entity.c:137
-#: ../objects/ER/relationship.c:142
-#: ../objects/UML/class_dialog.c:1148
-#: ../objects/UML/class_dialog.c:2014
-#: ../objects/UML/class_dialog.c:2250
-#: ../objects/UML/class_dialog.c:2853
-#: ../objects/UML/dependency.c:137
-#: ../objects/UML/generalization.c:133
-#: ../objects/UML/realizes.c:134
-msgid "Name:"
-msgstr "Ð?азвание:"
-
-#: ../app/sheets_dialog.c:810
-msgid "DiaObject:"
-msgstr "Ð?бÑ?екÑ? Dia:"
-
-#: ../app/sheets_dialog.c:837
-msgid "Sheet:"
-msgstr "Ð?аÑ?егоÑ?иÑ?:"
-
-#: ../app/sheets_dialog.c:921
-msgid "Select SVG Shape File"
-msgstr "Ð?Ñ?беÑ?иÑ?е Ñ?айл Ñ? Ñ?оÑ?мой SVG"
-
-#: ../app/sheets_dialog_callbacks.c:167
-msgid "Copy ->"
-msgstr "Ð?опиÑ?оваÑ?Ñ? ->"
-
-#: ../app/sheets_dialog_callbacks.c:169
-msgid "Copy All ->"
-msgstr "Ð?опиÑ?оваÑ?Ñ? вÑ?Ñ? ->"
-
-#: ../app/sheets_dialog_callbacks.c:171
-msgid "Move ->"
-msgstr "Ð?еÑ?емеÑ?Ñ?иÑ?Ñ? ->"
-
-#: ../app/sheets_dialog_callbacks.c:173
-msgid "Move All ->"
-msgstr "Ð?еÑ?емеÑ?Ñ?иÑ?Ñ? вÑ?Ñ? ->"
-
-#: ../app/sheets_dialog_callbacks.c:306
+#: ../app/sheets_dialog_callbacks.c:303
 #, c-format
 msgid ""
 "%s\n"
@@ -2119,7 +2015,7 @@ msgstr ""
 "ЭлеменÑ?\n"
 "%s"
 
-#: ../app/sheets_dialog_callbacks.c:309
+#: ../app/sheets_dialog_callbacks.c:306
 #, c-format
 msgid ""
 "%s\n"
@@ -2128,7 +2024,7 @@ msgstr ""
 "%s\n"
 "Ð?бÑ?екÑ?"
 
-#: ../app/sheets_dialog_callbacks.c:312
+#: ../app/sheets_dialog_callbacks.c:309
 #, c-format
 msgid ""
 "%s\n"
@@ -2137,254 +2033,250 @@ msgstr ""
 "%s\n"
 "Ð?еназнаÑ?еннÑ?й Ñ?ип"
 
-#: ../app/sheets_dialog_callbacks.c:803
+#: ../app/sheets_dialog_callbacks.c:771
+msgid "Please select a .shape file"
+msgstr "Ð?Ñ?беÑ?иÑ?е Ñ?айл .shape"
+
+#: ../app/sheets_dialog_callbacks.c:778
 #, c-format
 msgid "Filename must end with '%s': '%s'"
 msgstr "Ð?азвание Ñ?айла должно оканÑ?иваÑ?Ñ?Ñ?Ñ? Ñ?имволами «%s»: «%s»"
 
-#: ../app/sheets_dialog_callbacks.c:811
+#: ../app/sheets_dialog_callbacks.c:786
 #, c-format
 msgid "Error examining %s: %s"
 msgstr "Ð?Ñ?ибка пÑ?и пÑ?овеÑ?ке %s: %s"
 
-#: ../app/sheets_dialog_callbacks.c:842
+#: ../app/sheets_dialog_callbacks.c:817
 msgid "Please export the diagram as a shape."
 msgstr "ЭкÑ?поÑ?Ñ?иÑ?Ñ?йÑ?е диагÑ?аммÑ? как Ñ?оÑ?мÑ?(Ñ?аблон)."
 
-#: ../app/sheets_dialog_callbacks.c:845
+#: ../app/sheets_dialog_callbacks.c:820
 #, c-format
 msgid "Could not interpret shape file: '%s'"
 msgstr "Ð?е Ñ?далоÑ?Ñ? обÑ?абоÑ?аÑ?Ñ? Ñ?айл Ñ?оÑ?мÑ?: «%s»"
 
-#: ../app/sheets_dialog_callbacks.c:916
+#: ../app/sheets_dialog_callbacks.c:888
 msgid "Sheet must have a Name"
 msgstr "Ð?аÑ?егоÑ?иÑ? должна имеÑ?Ñ? название"
 
-#: ../app/sheets_dialog_callbacks.c:1621
-#: ../app/sheets_dialog_callbacks.c:1628
+#: ../app/sheets_dialog_callbacks.c:1582 ../app/sheets_dialog_callbacks.c:1589
 #, c-format
 msgid "Couldn't open '%s': %s"
 msgstr "Ð?е Ñ?далоÑ?Ñ? оÑ?кÑ?Ñ?Ñ?Ñ? «%s»: %s"
 
-#: ../app/sheets_dialog_callbacks.c:1680
+#: ../app/sheets_dialog_callbacks.c:1643
 #, c-format
 msgid "Couldn't open: '%s' for writing"
 msgstr "Ð?е Ñ?далоÑ?Ñ? оÑ?кÑ?Ñ?Ñ?Ñ?: «%s» длÑ? запиÑ?и"
 
-#: ../app/sheets_dialog_callbacks.c:1690
+#: ../app/sheets_dialog_callbacks.c:1653
 msgid "a user"
 msgstr "полÑ?зоваÑ?елÑ?"
 
-#: ../app/sheets_dialog_callbacks.c:1703
+#: ../app/sheets_dialog_callbacks.c:1666
 #, c-format
 msgid "File: %s"
 msgstr "Файл: %s"
 
-#: ../app/sheets_dialog_callbacks.c:1706
+#: ../app/sheets_dialog_callbacks.c:1669
 #, c-format
 msgid "Date: %s"
 msgstr "Ð?аÑ?а: %s"
 
-#: ../app/sheets_dialog_callbacks.c:1710
+#: ../app/sheets_dialog_callbacks.c:1673
 #, c-format
 msgid "For: %s"
 msgstr "Ð?лÑ?: %s"
 
-#: ../app/sheets_dialog_callbacks.c:1727
+#: ../app/sheets_dialog_callbacks.c:1690
 msgid "add shapes here"
 msgstr "добавиÑ?Ñ? Ñ?оÑ?мÑ? здеÑ?Ñ?"
 
-#: ../app/splash.c:57
-msgid "Loading ..."
-msgstr "Ð?агÑ?Ñ?зка..."
+#: ../app/splash.c:50
+msgid "Loadingâ?¦"
+msgstr "Ð?Ñ?огÑ?амма загÑ?Ñ?жаеÑ?Ñ?Ñ?..."
 
-#: ../app/splash.c:75
+#: ../app/splash.c:68
 #, c-format
 msgid "Dia v %s"
 msgstr "Dia веÑ?Ñ?ии %s"
 
 #: ../dia.desktop.in.in.h:1
-msgid "Dia Diagram Editor"
-msgstr "Dia â?? РедакÑ?оÑ? диагÑ?амм"
+msgid "Dia"
+msgstr "Dia"
 
 #: ../dia.desktop.in.in.h:2
+msgid "Dia Diagram Editor"
+msgstr "РедакÑ?оÑ? диагÑ?амм Dia"
+
+#: ../dia.desktop.in.in.h:4
 msgid "Edit your Diagrams"
-msgstr "РедакÑ?иÑ?оваÑ?Ñ? ваÑ?и диагÑ?аммÑ?"
+msgstr "Создание и Ñ?едакÑ?иÑ?ование диагÑ?амм"
 
-#: ../lib/arrows.c:1883
+#: ../lib/arrows.c:1891
 msgid "Lines"
 msgstr "Ð?инии"
 
-#: ../lib/arrows.c:1884
+#: ../lib/arrows.c:1892
 msgid "Hollow Triangle"
 msgstr "Ð?олÑ?й Ñ?Ñ?еÑ?голÑ?ник"
 
-#: ../lib/arrows.c:1885
+#: ../lib/arrows.c:1893
 msgid "Filled Triangle"
 msgstr "Ð?аполненнÑ?й Ñ?Ñ?еÑ?голÑ?ник"
 
-#: ../lib/arrows.c:1886
+#: ../lib/arrows.c:1894
 msgid "Unfilled Triangle"
 msgstr "Ð?езаполненнÑ?й Ñ?Ñ?еÑ?голÑ?ник"
 
-#: ../lib/arrows.c:1887
+#: ../lib/arrows.c:1895
 msgid "Hollow Diamond"
 msgstr "Ð?Ñ?Ñ?Ñ?оÑ?елÑ?й Ñ?омб"
 
-#: ../lib/arrows.c:1888
+#: ../lib/arrows.c:1896
 msgid "Filled Diamond"
 msgstr "Ð?аполненнÑ?й Ñ?омб"
 
-#: ../lib/arrows.c:1889
+#: ../lib/arrows.c:1897
 msgid "Half Diamond"
 msgstr "Ð?олÑ?Ñ?омб"
 
-#: ../lib/arrows.c:1890
+#: ../lib/arrows.c:1898
 msgid "Half Head"
 msgstr "Ð?олÑ?кÑ?Ñ?г"
 
-#: ../lib/arrows.c:1891
+#: ../lib/arrows.c:1899
 msgid "Slashed Cross"
 msgstr "Ð?оÑ?ой кÑ?еÑ?Ñ?"
 
-#: ../lib/arrows.c:1892
+#: ../lib/arrows.c:1900
 msgid "Filled Ellipse"
 msgstr "Ð?аполненнÑ?й Ñ?ллипÑ?"
 
-#: ../lib/arrows.c:1893
+#: ../lib/arrows.c:1901
 msgid "Hollow Ellipse"
 msgstr "Ð?олÑ?й Ñ?ллипÑ?"
 
-#: ../lib/arrows.c:1894
+#: ../lib/arrows.c:1902
 msgid "Filled Dot"
 msgstr "Ð?аполненнÑ?й кÑ?Ñ?г"
 
-#: ../lib/arrows.c:1895
+#: ../lib/arrows.c:1903
 msgid "Dimension Origin"
 msgstr "Ð?еÑ?вонаÑ?алÑ?нÑ?е Ñ?азмеÑ?Ñ?"
 
-#: ../lib/arrows.c:1896
+#: ../lib/arrows.c:1904
 msgid "Blanked Dot"
 msgstr "Ð?Ñ?Ñ?Ñ?ой кÑ?Ñ?г"
 
-#: ../lib/arrows.c:1897
+#: ../lib/arrows.c:1905
 msgid "Double Hollow Triangle"
 msgstr "Ð?войной полÑ?й Ñ?Ñ?еÑ?голÑ?ник"
 
-#: ../lib/arrows.c:1898
+#: ../lib/arrows.c:1906
 msgid "Double Filled Triangle"
 msgstr "Ð?войной заполненнÑ?й Ñ?Ñ?еÑ?голÑ?ник"
 
-#: ../lib/arrows.c:1899
+#: ../lib/arrows.c:1907
 msgid "Filled Dot and Triangle"
 msgstr "Ð?аполнено Ñ?оÑ?ками и Ñ?Ñ?еÑ?голÑ?никами"
 
-#: ../lib/arrows.c:1900
+#: ../lib/arrows.c:1908
 msgid "Filled Box"
 msgstr "Ð?аполненнÑ?й квадÑ?аÑ?"
 
-#: ../lib/arrows.c:1901
+#: ../lib/arrows.c:1909
 msgid "Blanked Box"
 msgstr "Ð?Ñ?Ñ?Ñ?ой квадÑ?аÑ?"
 
-#: ../lib/arrows.c:1902
+#: ../lib/arrows.c:1910
 msgid "Slashed"
 msgstr "Ð?аÑ?Ñ?Ñ?иÑ?ованнÑ?й"
 
-#: ../lib/arrows.c:1903
+#: ../lib/arrows.c:1911
 msgid "Integral Symbol"
 msgstr "Символ инÑ?егÑ?ала"
 
-#: ../lib/arrows.c:1904
+#: ../lib/arrows.c:1912
 msgid "Crow Foot"
 msgstr "Ð?Ñ?Ñ?инаÑ? лапка"
 
-#: ../lib/arrows.c:1905
+#: ../lib/arrows.c:1913
 msgid "Cross"
 msgstr "Ð?еÑ?еÑ?еÑ?ение"
 
-#: ../lib/arrows.c:1906
+#: ../lib/arrows.c:1914
 msgid "1-or-many"
 msgstr "1-или-много"
 
-#: ../lib/arrows.c:1907
+#: ../lib/arrows.c:1915
 msgid "0-or-many"
 msgstr "0-или-много"
 
-#: ../lib/arrows.c:1908
+#: ../lib/arrows.c:1916
 msgid "1-or-0"
 msgstr "1-или-0"
 
-#: ../lib/arrows.c:1909
+#: ../lib/arrows.c:1917
 msgid "1 exactly"
 msgstr "Ñ?овно 1"
 
-#: ../lib/arrows.c:1910
+#: ../lib/arrows.c:1918
 msgid "Filled Concave"
 msgstr "Ð?аполненнÑ?Ñ? впадинÑ?"
 
-#: ../lib/arrows.c:1911
+#: ../lib/arrows.c:1919
 msgid "Blanked Concave"
 msgstr "Ð?Ñ?Ñ?Ñ?Ñ?Ñ? впадинÑ?"
 
-#: ../lib/arrows.c:1912
+#: ../lib/arrows.c:1920 ../lib/properties.c:81 ../lib/properties.c:87
+#: ../lib/properties.h:478 ../lib/properties.h:484
 msgid "Round"
 msgstr "Ð?олÑ?кÑ?Ñ?г"
 
-#: ../lib/arrows.c:1913
+#: ../lib/arrows.c:1921
 msgid "Open Round"
 msgstr "РаÑ?кÑ?Ñ?Ñ?Ñ?й полÑ?кÑ?Ñ?г"
 
-#: ../lib/arrows.c:1914
+#: ../lib/arrows.c:1922
 msgid "Backslash"
 msgstr "Ð?бÑ?аÑ?нÑ?й Ñ?леÑ?"
 
-#: ../lib/arrows.c:1915
+#: ../lib/arrows.c:1923
 msgid "Infinite Line"
 msgstr "Ð?еÑ?конеÑ?наÑ? линиÑ?"
 
-#: ../lib/arrows.c:2043
+#: ../lib/arrows.c:2051
 msgid "Arrow head of unknown type"
 msgstr "Ð?онÑ?ик Ñ?Ñ?Ñ?елки неизвеÑ?Ñ?ного Ñ?ипа"
 
-#: ../lib/arrows.c:2051
-#, c-format
-msgid "Arrow head of type %s has too small dimensions, removing.\n"
+#: ../lib/arrows.c:2059
+#, fuzzy, c-format
+msgid "Arrow head of type %s has too small dimensions; removing.\n"
 msgstr "РазмеÑ?Ñ? оконÑ?аниÑ? Ñ?Ñ?Ñ?елки Ñ?лиÑ?ком малÑ?, Ñ?даление %s.\n"
 
-#: ../lib/arrows.c:2184
+#: ../lib/arrows.c:2192
 msgid "unknown arrow"
 msgstr "неопÑ?еделÑ?ннаÑ? Ñ?Ñ?Ñ?елка"
 
-#: ../lib/bezier_conn.c:636
+#: ../lib/bezier_conn.c:638
 msgid "Internal error: Setting corner type of endpoint of bezier"
 msgstr "Ð?нÑ?Ñ?Ñ?еннÑ?Ñ? оÑ?ибка: Ñ?Ñ?Ñ?ановка Ñ?ипа Ñ?гла длÑ? конеÑ?ной Ñ?оÑ?ки кÑ?ивой Ð?езÑ?е"
 
-#: ../lib/create.c:50
-#: ../lib/create.c:100
-#: ../lib/create.c:127
-#: ../lib/create.c:161
-#: ../lib/create.c:197
-#: ../lib/create.c:224
-#: ../lib/create.c:260
-#: ../lib/create.c:295
-#: ../lib/create.c:338
-#: ../plug-ins/svg/svg-import.c:267
-#: ../plug-ins/vdx/vdx-import.c:144
+#: ../lib/create.c:50 ../lib/create.c:100 ../lib/create.c:127
+#: ../lib/create.c:161 ../lib/create.c:197 ../lib/create.c:224
+#: ../lib/create.c:260 ../lib/create.c:295 ../lib/create.c:338
+#: ../plug-ins/svg/svg-import.c:268 ../plug-ins/vdx/vdx-import.c:145
 msgid "Can't find standard object"
 msgstr "СÑ?андаÑ?Ñ?нÑ?й обÑ?екÑ? не найден"
 
-#: ../lib/dia_dirs.c:242
-#, c-format
-msgid "%s<illegal characters>..."
-msgstr "%s<некоÑ?Ñ?екÑ?нÑ?й Ñ?имвол>..."
-
-#: ../lib/dia_dirs.c:273
-#, c-format
-msgid "Too many ..'s in filename %s\n"
+#: ../lib/dia_dirs.c:328
+#, fuzzy, c-format
+msgid "Too many \"..\"s in filename %s\n"
 msgstr "СлиÑ?ком много ... в имени Ñ?айла %s\n"
 
-#: ../lib/dia_xml.c:192
+#: ../lib/dia_xml.c:197
 #, c-format
 msgid ""
 "The file %s has no encoding specification;\n"
@@ -2393,60 +2285,114 @@ msgstr ""
 "Файл %s не Ñ?одеÑ?жиÑ? Ñ?казаниÑ? на кодиÑ?овкÑ?;\n"
 "полагаем, Ñ?Ñ?о Ñ?Ñ?о %s"
 
-#: ../lib/dia_xml.c:597
+#: ../lib/dia_xml.c:616
 msgid "Taking point value of non-point node."
 msgstr "Ð?зÑ?Ñ?Ñ? знаÑ?ение Ñ?оÑ?ки безÑ?оÑ?еÑ?ного Ñ?зла"
 
-#: ../lib/dia_xml.c:608
+#: ../lib/dia_xml.c:627
 #, c-format
 msgid "Incorrect x Point value \"%s\" %f; discarding it."
 msgstr "Ð?епÑ?авилÑ?ное знаÑ?ение Ñ?оÑ?ки x «%s» %f; оÑ?бÑ?аÑ?Ñ?ваем его."
 
-#: ../lib/dia_xml.c:615
+#: ../lib/dia_xml.c:634
 msgid "Error parsing point."
 msgstr "Ð?Ñ?ибка пÑ?и обÑ?абоÑ?ке Ñ?оÑ?ки."
 
 #. don't bother with useless warnings (see above)
-#: ../lib/dia_xml.c:623
+#: ../lib/dia_xml.c:642
 #, c-format
 msgid "Incorrect y Point value \"%s\" %f; discarding it."
 msgstr "Ð?епÑ?авилÑ?ное знаÑ?ение Ñ?оÑ?ки y «%s» %f; оÑ?бÑ?аÑ?Ñ?ваем его."
 
-#: ../lib/dia_xml.c:640
+#: ../lib/dia_xml.c:659
 #, fuzzy
 msgid "Taking bezpoint value of non-point node."
 msgstr "Ð?зÑ?Ñ?Ñ? знаÑ?ение Ñ?оÑ?ки безÑ?оÑ?еÑ?ного Ñ?зла"
 
-#: ../lib/dia_xml.c:658
+#: ../lib/dia_xml.c:677
 msgid "Error parsing bezpoint p1."
 msgstr "Ð?Ñ?ибка пÑ?и Ñ?азбоÑ?е bezpoint p1."
 
-#: ../lib/dia_xml.c:672
+#: ../lib/dia_xml.c:691
 msgid "Error parsing bezpoint p2."
 msgstr "Ð?Ñ?ибка пÑ?и Ñ?азбоÑ?е bezpoint p2."
 
-#: ../lib/dia_xml.c:686
+#: ../lib/dia_xml.c:705
 msgid "Error parsing bezpoint p3."
 msgstr "Ð?Ñ?ибка пÑ?и Ñ?азбоÑ?е bezpoint p3."
 
-#: ../lib/diaarrowchooser.c:352
+#: ../lib/diaarrowchooser.c:381
 msgid "Arrow Properties"
 msgstr "СвойÑ?Ñ?ва Ñ?Ñ?Ñ?елки"
 
-#: ../lib/dialinechooser.c:297
+#: ../lib/diaarrowselector.c:121
+msgid "More arrows"
+msgstr "Ð?Ñ?Ñ?гие Ñ?Ñ?Ñ?елки"
+
+#: ../lib/diaarrowselector.c:138
+msgid "Size: "
+msgstr "РазмеÑ?: "
+
+#: ../lib/diacolorselector.c:205
+msgid "Select color"
+msgstr "Ð?Ñ?боÑ? Ñ?веÑ?а"
+
+#: ../lib/diacolorselector.c:287
+msgid "More colors"
+msgstr "Ð?ополниÑ?елÑ?нÑ?е Ñ?веÑ?а"
+
+#: ../lib/diadynamicmenu.c:392
+msgid "Reset menu"
+msgstr "СбÑ?оÑ?иÑ?Ñ? изменениÑ? в менÑ?"
+
+#: ../lib/diafontselector.c:159
+msgid "Other fonts"
+msgstr "Ð?Ñ?Ñ?гие Ñ?Ñ?иÑ?Ñ?Ñ?"
+
+#: ../lib/diafontselector.c:231
+#, c-format
+msgid "Couldn't find font family for %s\n"
+msgstr "Ð?е Ñ?далоÑ?Ñ? найÑ?и Ñ?емейÑ?Ñ?во Ñ?Ñ?иÑ?Ñ?а длÑ? %s\n"
+
+#: ../lib/dialinechooser.c:309
 msgid "Line Style Properties"
 msgstr "СвойÑ?Ñ?ва Ñ?Ñ?илÑ? линии"
 
-#: ../lib/dialinechooser.c:339
-msgid "Details..."
-msgstr "Ð?еÑ?али..."
+#: ../lib/dialinechooser.c:344
+msgid "Detailsâ?¦"
+msgstr "Ð?одÑ?обноÑ?Ñ?и..."
+
+#. Translators: Menu item Noun/Material/Solid
+#: ../lib/dialinestyleselector.c:124 ../objects/FS/function.c:1079
+msgid "Solid"
+msgstr "СплоÑ?наÑ?"
+
+#: ../lib/dialinestyleselector.c:130
+msgid "Dashed"
+msgstr "ШÑ?Ñ?иÑ?оваÑ?"
 
-#: ../lib/dialogs.c:51
-msgid "Ok"
-msgstr "Ok"
+#: ../lib/dialinestyleselector.c:136
+msgid "Dash-Dot"
+msgstr "ШÑ?Ñ?иÑ?-Ñ?оÑ?ка"
 
-#: ../lib/dialogs.c:52
-#: ../plug-ins/postscript/paginate_psprint.c:322
+#: ../lib/dialinestyleselector.c:142
+msgid "Dash-Dot-Dot"
+msgstr "ШÑ?Ñ?иÑ?-Ñ?оÑ?ка-Ñ?оÑ?ка"
+
+#: ../lib/dialinestyleselector.c:148
+msgid "Dotted"
+msgstr "ТоÑ?еÑ?наÑ?"
+
+#. fs->sizebox = GTK_HBOX(box);
+#: ../lib/dialinestyleselector.c:166
+msgid "Dash length: "
+msgstr "Ð?лина Ñ?Ñ?Ñ?иÑ?а: "
+
+#: ../lib/dialogs.c:51 ../plug-ins/postscript/paginate_psprint.c:314
+msgid "OK"
+msgstr "Ð?Ð?"
+
+#: ../lib/dialogs.c:52 ../plug-ins/postscript/paginate_psprint.c:326
 msgid "Cancel"
 msgstr "Ð?Ñ?мениÑ?Ñ?"
 
@@ -2455,41 +2401,40 @@ msgstr "Ð?Ñ?мениÑ?Ñ?"
 msgid "Multiple export filters with unique name %s"
 msgstr "Ð?ножеÑ?Ñ?во Ñ?илÑ?Ñ?Ñ?ов Ñ?кÑ?поÑ?Ñ?а Ñ? Ñ?никалÑ?нÑ?м названием %s"
 
-#: ../lib/font.c:84
+#: ../lib/font.c:85
 #, c-format
 msgid "Can't load font %s.\n"
 msgstr "Ð?е Ñ?далоÑ?Ñ? загÑ?Ñ?зиÑ?Ñ? Ñ?Ñ?иÑ?Ñ? %s.\n"
 
-#: ../lib/message.c:92
-#: ../lib/message.c:278
+#: ../lib/group.c:618
+msgid "Transformation"
+msgstr "Ð?Ñ?еобÑ?азование"
+
+#: ../lib/message.c:93 ../lib/message.c:282
 msgid "Warning"
 msgstr "Ð?нимание"
 
-#: ../lib/message.c:119
+#: ../lib/message.c:120
 msgid "There is one similar message."
 msgstr "Уже Ñ?Ñ?Ñ?еÑ?Ñ?вÑ?еÑ? одно подобное Ñ?ообÑ?ение."
 
-#: ../lib/message.c:124
+#: ../lib/message.c:125
 msgid "Show repeated messages"
 msgstr "Ð?оказÑ?ваÑ?Ñ? повÑ?оÑ?Ñ?Ñ?Ñ?иеÑ?Ñ? Ñ?ообÑ?ениÑ?"
 
-#: ../lib/message.c:145
+#: ../lib/message.c:146
 msgid "Don't show this message again"
 msgstr "Ð?е показÑ?ваÑ?Ñ? данное Ñ?ообÑ?ение вновÑ?"
 
-#: ../lib/message.c:203
+#: ../lib/message.c:204
 #, c-format
 msgid "There are %d similar messages."
 msgstr "Ð?оÑ?вилоÑ?Ñ? %d поÑ?ожиÑ? Ñ?ообÑ?ений."
 
-#: ../lib/message.c:262
+#: ../lib/message.c:266
 msgid "Notice"
 msgstr "Ð?амеÑ?ка"
 
-#: ../lib/newgroup.c:124
-msgid "Open group"
-msgstr "Ð?Ñ?кÑ?Ñ?Ñ?Ñ? гÑ?Ñ?ппÑ?"
-
 #: ../lib/object_defaults.c:128
 #, c-format
 msgid ""
@@ -2499,6 +2444,16 @@ msgstr ""
 "Ð?Ñ?ибка пÑ?и загÑ?Ñ?зке Ñ?молÑ?аний «%s».\n"
 "ЭÑ?о не Ñ?айл Ñ? диагÑ?аммой Dia."
 
+#. base property stuff...
+#: ../lib/orth_conn.h:92
+#, fuzzy
+msgid "Autoroute"
+msgstr "Ð?вÑ?оÑ?"
+
+#: ../lib/orth_conn.h:103
+msgid "Autorouting"
+msgstr ""
+
 #: ../lib/plug-ins.c:111
 msgid "???"
 msgstr "???"
@@ -2512,8 +2467,7 @@ msgstr "Ð?Ñ?опÑ?Ñ?еннÑ?е завиÑ?имоÑ?Ñ?и длÑ? «%s»?"
 msgid "Missing symbol 'dia_plugin_init'"
 msgstr "Ð?Ñ?Ñ?Ñ?Ñ?Ñ?Ñ?вÑ?еÑ? Ñ?имвол 'dia_plugin_init'"
 
-#: ../lib/plug-ins.c:205
-#: ../lib/plug-ins.c:213
+#: ../lib/plug-ins.c:205 ../lib/plug-ins.c:213
 msgid "dia_plugin_init() call failed"
 msgstr "вÑ?зов dia_plugin_init() завеÑ?Ñ?илÑ?Ñ? неÑ?даÑ?но"
 
@@ -2547,127 +2501,175 @@ msgstr "Ð?аÑ?а Ñ?озданиÑ?"
 msgid "Modification date"
 msgstr "Ð?аÑ?а изменениÑ?"
 
-#: ../lib/prop_dict.c:47
-#: ../objects/SISSI/sissi_dialog.c:880
+#: ../lib/prop_dict.c:47 ../objects/SISSI/sissi_dialog.c:878
 msgid "URL"
 msgstr "Ð?дÑ?еÑ? URL"
 
-#: ../lib/prop_inttypes.c:558
-msgid "Property cast from int to enum out of range"
-msgstr "Ð?Ñ?еобÑ?азование Ñ?ипа Ñ?войÑ?Ñ?ва Ñ? int на enum дало оÑ?ибкÑ? «вне диапазона»"
+#: ../lib/prop_dict.c:235 ../sheets/ciscomisc.sheet.in.h:18
+msgid "Key"
+msgstr "Ð?лÑ?Ñ?"
+
+#: ../lib/prop_dict.c:242 ../objects/UML/umlattribute.c:41
+#: ../objects/UML/umlparameter.c:47
+msgid "Value"
+msgstr "Ð?наÑ?ение"
+
+#: ../lib/prop_inttypes.c:567
+msgid "Property cast from int to enum out of range"
+msgstr "Ð?Ñ?еобÑ?азование Ñ?ипа Ñ?войÑ?Ñ?ва Ñ? int на enum дало оÑ?ибкÑ? «вне диапазона»"
+
+#: ../lib/prop_pixbuf.c:103
+#, c-format
+msgid ""
+"Failed to load image form diagram:\n"
+"%s"
+msgstr ""
+
+#: ../lib/prop_pixbuf.c:157
+#, c-format
+msgid ""
+"Saving inline pixbuf failed:\n"
+"%s"
+msgstr ""
+
+#: ../lib/prop_pixbuf.c:241
+msgid "Cant create image data from scratch!"
+msgstr ""
 
-#: ../lib/prop_text.c:469
+#: ../lib/prop_text.c:473
 #, c-format
 msgid "Group with %d objects"
 msgstr "СгÑ?Ñ?ппиÑ?оваÑ?Ñ? Ñ? %d обÑ?екÑ?ами"
 
-#: ../lib/properties.c:65
-#: ../lib/properties.h:477
-#: ../lib/widgets.c:724
+#: ../lib/propdialogs.c:324 ../objects/UML/association.c:236
+#: ../objects/UML/object.c:147
+msgid "General"
+msgstr "Ð?бÑ?ие"
+
+#: ../lib/propdialogs.c:325
+msgid "Meta"
+msgstr "Ð?еÑ?аданнÑ?е"
+
+#: ../lib/properties.c:67 ../lib/properties.h:465 ../lib/widgets.c:273
 msgid "Left"
 msgstr "Ð?лево"
 
-#: ../lib/properties.c:66
-#: ../lib/properties.h:478
-#: ../lib/widgets.c:730
+#: ../lib/properties.c:68 ../lib/properties.h:466 ../lib/widgets.c:274
 #: ../objects/standard/textobj.c:138
 msgid "Center"
 msgstr "Ð?о Ñ?еÑ?едине"
 
-#: ../lib/properties.c:67
-#: ../lib/properties.h:479
-#: ../lib/widgets.c:736
+#: ../lib/properties.c:69 ../lib/properties.h:467 ../lib/widgets.c:275
 msgid "Right"
 msgstr "Ð?пÑ?аво"
 
-#: ../lib/properties.c:74
-#: ../lib/properties.h:497
-#: ../lib/properties.h:500
+#: ../lib/properties.c:74 ../lib/properties.h:471
+msgid "Never"
+msgstr "Ð?икогда"
+
+#: ../lib/properties.c:75 ../lib/properties.h:472
+msgid "When Needed"
+msgstr "Ð?Ñ?и необÑ?одимоÑ?Ñ?и"
+
+#: ../lib/properties.c:76 ../lib/properties.h:473
+msgid "Always"
+msgstr "Ð?Ñ?егда"
+
+#: ../lib/properties.c:80 ../lib/properties.h:477
+msgid "Miter"
+msgstr "Ð?Ñ?Ñ?Ñ?ое"
+
+#: ../lib/properties.c:82 ../lib/properties.h:479
+msgid "Bevel"
+msgstr "ФаÑ?ка"
+
+#: ../lib/properties.c:86 ../lib/properties.h:483
+msgid "Butt"
+msgstr "Ð?лоÑ?кие"
+
+#: ../lib/properties.c:88 ../lib/properties.h:485
+#, fuzzy
+msgid "Projecting"
+msgstr "Ð?аÑ?иÑ?аÑ?Ñ?"
+
+#: ../lib/properties.c:95 ../lib/properties.h:506 ../lib/properties.h:509
 #: ../objects/chronogram/chronoline.c:181
 #: ../objects/chronogram/chronoref.c:160
 msgid "Line color"
 msgstr "ЦвеÑ? линии"
 
-#: ../lib/properties.c:75
-#: ../lib/properties.h:503
-#: ../lib/properties.h:506
+#: ../lib/properties.c:96 ../lib/properties.h:512 ../lib/properties.h:515
 msgid "Line style"
 msgstr "СÑ?илÑ? линии"
 
-#: ../lib/properties.c:76
-#: ../lib/properties.h:510
-#: ../lib/properties.h:513
+#: ../lib/properties.c:97 ../lib/properties.h:531 ../lib/properties.h:534
 msgid "Fill color"
 msgstr "ЦвеÑ? заполнениÑ?"
 
-#: ../lib/properties.c:77
-#: ../lib/properties.h:516
-#: ../lib/properties.h:519
+#: ../lib/properties.c:98 ../lib/properties.h:537 ../lib/properties.h:540
 msgid "Draw background"
 msgstr "Ð?аÑ?иÑ?оваÑ?Ñ? Ñ?он"
 
-#: ../lib/properties.c:78
-#: ../lib/properties.h:523
+#: ../lib/properties.c:99 ../lib/properties.h:544
 msgid "Start arrow"
 msgstr "Ð?аÑ?алÑ?наÑ? Ñ?Ñ?Ñ?елка"
 
-#: ../lib/properties.c:79
-#: ../lib/properties.h:526
+#: ../lib/properties.c:100 ../lib/properties.h:547
 msgid "End arrow"
 msgstr "Ð?онеÑ?наÑ? Ñ?Ñ?Ñ?елка"
 
-#: ../lib/properties.c:81
-#: ../lib/properties.h:536
+#: ../lib/properties.c:102 ../lib/properties.h:557
 msgid "Text alignment"
 msgstr "Ð?Ñ?Ñ?авнивание Ñ?екÑ?Ñ?а"
 
 #. all this just to make the defaults selectable ...
-#: ../lib/properties.c:82
-#: ../lib/properties.h:541
-#: ../objects/Database/table_dialog.c:1036
-#: ../objects/Database/reference.c:117
-#: ../objects/GRAFCET/condition.c:134
-#: ../objects/GRAFCET/step.c:167
-#: ../objects/GRAFCET/transition.c:144
-#: ../objects/UML/class.c:174
-#: ../objects/UML/class_dialog.c:564
-#: ../objects/chronogram/chronoline.c:185
+#: ../lib/properties.c:103 ../lib/properties.h:562
+#: ../objects/Database/table_dialog.c:1045 ../objects/Database/reference.c:118
+#: ../objects/GRAFCET/condition.c:134 ../objects/GRAFCET/step.c:167
+#: ../objects/GRAFCET/transition.c:144 ../objects/UML/class.c:177
+#: ../objects/UML/class_dialog.c:542 ../objects/chronogram/chronoline.c:185
 #: ../objects/chronogram/chronoref.c:166
 msgid "Font"
 msgstr "ШÑ?иÑ?Ñ?"
 
-#: ../lib/properties.c:83
-#: ../lib/properties.h:549
-#: ../objects/GRAFCET/condition.c:136
-#: ../objects/GRAFCET/step.c:169
-#: ../objects/GRAFCET/transition.c:146
-#: ../objects/chronogram/chronoline.c:187
+#: ../lib/properties.c:104 ../lib/properties.h:570
+#: ../objects/GRAFCET/condition.c:136 ../objects/GRAFCET/step.c:169
+#: ../objects/GRAFCET/transition.c:146 ../objects/chronogram/chronoline.c:187
 #: ../objects/chronogram/chronoref.c:168
 msgid "Font size"
 msgstr "РазмеÑ? Ñ?Ñ?иÑ?Ñ?а"
 
-#: ../lib/properties.c:84
-#: ../lib/properties.h:555
-#: ../objects/GRAFCET/step.c:171
-#: ../objects/chronogram/chronoline.c:189
+#: ../lib/properties.c:105 ../lib/properties.h:576
+#: ../objects/GRAFCET/step.c:171 ../objects/chronogram/chronoline.c:189
 #: ../objects/chronogram/chronoref.c:170
 msgid "Text color"
 msgstr "ЦвеÑ? Ñ?екÑ?Ñ?а"
 
+#: ../lib/properties.h:518 ../lib/properties.h:521
+msgid "Line join"
+msgstr "Соединение линий"
+
+#: ../lib/properties.h:524 ../lib/properties.h:527
+msgid "Line caps"
+msgstr "Ð?онÑ?Ñ? линии"
+
+#: ../lib/properties.h:585
+msgid "Text fitting"
+msgstr "РазмеÑ? по Ñ?екÑ?Ñ?Ñ?"
+
 #: ../lib/proplist.c:163
-#, c-format
-msgid "No attribute '%s' (%p) or no data(%p) in this attribute"
+#, fuzzy, c-format
+msgid "No attribute '%s' (%p) or no data (%p) in this attribute"
 msgstr "СвойÑ?Ñ?во «%s» (%p) оÑ?Ñ?Ñ?Ñ?Ñ?Ñ?вÑ?еÑ? или не Ñ?одеÑ?жиÑ? (%p) даннÑ?Ñ?"
 
-#: ../lib/sheet.c:69
-#: ../lib/sheet.c:84
+#: ../lib/sheet.c:70 ../lib/sheet.c:85
 #, c-format
 msgid ""
 "DiaObject '%s' needed in sheet '%s' was not found.\n"
 "It will not be available for use."
 msgstr ""
 
-#: ../lib/sheet.c:314
+#: ../lib/sheet.c:315
 #, c-format
 msgid ""
 "The system sheet '%s' appears to be more recent than your custom\n"
@@ -2677,163 +2679,127 @@ msgid ""
 "or remove '%s', using the 'Sheets and Objects' dialog."
 msgstr ""
 
-#: ../lib/sheet.c:371
+#: ../lib/sheet.c:372
 #, c-format
 msgid "%s: you should use object tags rather than shape tags now"
 msgstr ""
 
-#: ../lib/widgets.c:441
-msgid "Other fonts"
-msgstr "Ð?Ñ?Ñ?гие Ñ?Ñ?иÑ?Ñ?Ñ?"
-
-#: ../lib/widgets.c:513
-#, c-format
-msgid "Couldn't find font family for %s\n"
-msgstr "Ð?е Ñ?далоÑ?Ñ? найÑ?и Ñ?емейÑ?Ñ?во Ñ?Ñ?иÑ?Ñ?а длÑ? %s\n"
-
-#. Translators: Menu item Noun/Material/Solid
-#: ../lib/widgets.c:896
-#: ../objects/FS/function.c:1076
-msgid "Solid"
-msgstr "СплоÑ?наÑ?"
-
-#: ../lib/widgets.c:902
-msgid "Dashed"
-msgstr "ШÑ?Ñ?иÑ?оваÑ?"
-
-#: ../lib/widgets.c:908
-msgid "Dash-Dot"
-msgstr "ШÑ?Ñ?иÑ?-Ñ?оÑ?ка"
-
-#: ../lib/widgets.c:914
-msgid "Dash-Dot-Dot"
-msgstr "ШÑ?Ñ?иÑ?-Ñ?оÑ?ка-Ñ?оÑ?ка"
-
-#: ../lib/widgets.c:920
-msgid "Dotted"
-msgstr "ТоÑ?еÑ?наÑ?"
-
-#. fs->sizebox = GTK_HBOX(box);
-#: ../lib/widgets.c:938
-msgid "Dash length: "
-msgstr "Ð?лина Ñ?Ñ?Ñ?иÑ?а: "
-
-#: ../lib/widgets.c:1066
-msgid "Select color"
-msgstr "Ð?Ñ?боÑ? Ñ?веÑ?а"
-
-#: ../lib/widgets.c:1132
-msgid "More colors..."
-msgstr "Ð?Ñ?Ñ?гие Ñ?веÑ?а..."
-
-#: ../lib/widgets.c:1280
-msgid "More arrows"
-msgstr "Ð?Ñ?Ñ?гие Ñ?Ñ?Ñ?елки"
-
-#: ../lib/widgets.c:1297
-msgid "Size: "
-msgstr "РазмеÑ?: "
-
-#: ../lib/widgets.c:1475
+#: ../lib/widgets.c:394
 msgid "Select image file"
 msgstr "Ð?Ñ?бÑ?аÑ?Ñ? Ñ?айл изобÑ?ажениÑ?"
 
-#: ../lib/widgets.c:1523
+#: ../lib/widgets.c:445
 msgid "Browse"
 msgstr "Ð?Ñ?бÑ?аÑ?Ñ?..."
 
-#: ../lib/widgets.c:2076
-msgid "Reset menu"
-msgstr "Ð?Ñ?оÑ?иÑ?аÑ?Ñ? по новой менÑ?"
-
 #. Installer message if no GTK+ was found
-#: ../installer/win32/gennsh.c:38
-msgid "GTK+ is not installed. Please use the full installer. It is available from http://dia-installer.de.";
-msgstr "GTK+ не Ñ?Ñ?Ñ?ановлен. Ð?оÑ?полÑ?зÑ?йÑ?еÑ?Ñ? полной веÑ?Ñ?ией пакеÑ?а Ñ?Ñ?Ñ?ановки: http://dia-installer.de.";
+#: ../installer/win32/gennsh.c:39
+msgid ""
+"GTK+ is not installed. Please use the full installer. It is available from "
+"http://dia-installer.de.";
+msgstr ""
+"GTK+ не Ñ?Ñ?Ñ?ановлен. Ð?оÑ?полÑ?зÑ?йÑ?еÑ?Ñ? полной веÑ?Ñ?ией пакеÑ?а Ñ?Ñ?Ñ?ановки: http://";
+"dia-installer.de."
 
 #. Installer message: Don't install over pre 0.95 versions
-#: ../installer/win32/gennsh.c:41
-msgid "Please remove old Dia installations completely or install Dia to a different location."
+#: ../installer/win32/gennsh.c:42
+msgid ""
+"Please remove old Dia installations completely or install Dia to a different "
+"location."
 msgstr ""
 
 #. Installer message:  License Page
-#: ../installer/win32/gennsh.c:44
+#: ../installer/win32/gennsh.c:45
 msgid "Next >"
 msgstr "Ð?алÑ?Ñ?е >"
 
 #. Installer message, keep the $(^Name) and $_CLICK, these will be replaced
-#: ../installer/win32/gennsh.c:47
-msgid "$(^Name) is released under the GPL license. The license is provided here for information purposes only. $_CLICK"
+#: ../installer/win32/gennsh.c:48
+msgid ""
+"$(^Name) is released under the GPL license. The license is provided here for "
+"information purposes only. $_CLICK"
 msgstr ""
 
 #. Installer message: Components page
-#: ../installer/win32/gennsh.c:50
+#: ../installer/win32/gennsh.c:51
 msgid "Dia Diagram Editor (required)"
 msgstr "РедакÑ?оÑ? диагÑ?амм Dia"
 
 #. Installer message: Components page
-#: ../installer/win32/gennsh.c:53
+#: ../installer/win32/gennsh.c:54
 msgid "Translations"
 msgstr "Ð?окализаÑ?иÑ?"
 
 #. Installer message: Component description
-#: ../installer/win32/gennsh.c:56
+#: ../installer/win32/gennsh.c:57
 msgid "Optional translations of the Dia user interface"
 msgstr "ФайлÑ? локализаÑ?ии инÑ?еÑ?Ñ?ейÑ?а Dia"
 
 #. Installer message: Component description
-#: ../installer/win32/gennsh.c:59
+#: ../installer/win32/gennsh.c:60
 msgid "Core Dia files and dlls"
 msgstr "Ð?Ñ?новнÑ?е Ñ?айлÑ? и библиоÑ?еки Dia"
 
 #. Installer message: Component name
-#: ../installer/win32/gennsh.c:62
+#: ../installer/win32/gennsh.c:63
 msgid "Python plug-in"
 msgstr "РаÑ?Ñ?иÑ?ениÑ? на Python"
 
 #. Installer message: Component description
-#: ../installer/win32/gennsh.c:65
-msgid "Support for the Python Scripting Language 2.3. Do not select this if Python is not installed."
-msgstr "Ð?оддеÑ?жка Ñ?Ñ?енаÑ?ного Ñ?зÑ?ка пÑ?огÑ?аммиÑ?ованиÑ? Python 2.3. Ð?Ñ?ли Python не Ñ?Ñ?Ñ?ановлен, Ñ?нимиÑ?е Ñ?лажок."
+#: ../installer/win32/gennsh.c:66
+msgid ""
+"Support for the Python Scripting Language 2.3. Do not select this if Python "
+"is not installed."
+msgstr ""
+"Ð?оддеÑ?жка Ñ?Ñ?енаÑ?ного Ñ?зÑ?ка пÑ?огÑ?аммиÑ?ованиÑ? Python 2.3. Ð?Ñ?ли Python не "
+"Ñ?Ñ?Ñ?ановлен, Ñ?нимиÑ?е Ñ?лажок."
 
 #. Installer message: hyperlink text on finish page
-#: ../installer/win32/gennsh.c:68
+#: ../installer/win32/gennsh.c:69
 msgid "Visit the Dia for Windows Web Page"
 msgstr "СайÑ? Dia"
 
 #. Installer message: Dia uninstaller entry in Control Panel
-#: ../installer/win32/gennsh.c:71
+#: ../installer/win32/gennsh.c:72
 msgid "Dia (remove only)"
 msgstr "Dia (Ñ?олÑ?ко Ñ?даление)"
 
 #. Installer message: confirmation question. Keep $\r
-#: ../installer/win32/gennsh.c:74
-msgid "Your old Dia directory is about to be deleted. Would you like to continue?$\r$\rNote: Any non-standard plugins that you may have installed will be deleted.$\rDia user settings will not be affected."
+#: ../installer/win32/gennsh.c:75
+msgid ""
+"Your old Dia directory is about to be deleted. Would you like to continue?$\r"
+"$\rNote: Any non-standard plugins that you may have installed will be "
+"deleted.$\rDia user settings will not be affected."
 msgstr ""
 
 #. Installer message: confirmatin question. Keep $\r
-#: ../installer/win32/gennsh.c:77
-msgid "The installation directory you specified already exists. Any contents$\rwill be deleted. Would you like to continue?"
+#: ../installer/win32/gennsh.c:78
+msgid ""
+"The installation directory you specified already exists. Any contents$\rwill "
+"be deleted. Would you like to continue?"
 msgstr ""
 
 #. Installer message: Uninstall Section Prompts. Keep $\r
-#: ../installer/win32/gennsh.c:80
-msgid "The uninstaller could not find registry entries for Dia.$\rIt is likely that another user installed this application."
+#: ../installer/win32/gennsh.c:81
+msgid ""
+"The uninstaller could not find registry entries for Dia.$\rIt is likely that "
+"another user installed this application."
 msgstr ""
 
 #. Installer message: Uninstall error message
-#: ../installer/win32/gennsh.c:83
+#: ../installer/win32/gennsh.c:84
 msgid "You do not have permission to uninstall this application."
 msgstr ""
 
 #. Installer message: Uninstallation warning. Keep $INSTDIR
-#: ../installer/win32/gennsh.c:86
+#: ../installer/win32/gennsh.c:87
 msgid "This will completely delete $INSTDIR and all subdirectories. Continue?"
 msgstr ""
 
 #. Installer message: Uninstallation warning. Keep $\PROFILE\.dia
-#: ../installer/win32/gennsh.c:89
-msgid "This will completely delete $PROFILE\\.dia and all subdirectories. Continue?"
+#: ../installer/win32/gennsh.c:90
+msgid ""
+"This will completely delete $PROFILE\\.dia and all subdirectories. Continue?"
 msgstr ""
 
 #: ../objects/AADL/aadl.c:52
@@ -2913,19 +2879,23 @@ msgid "Number of arms"
 msgstr "Ð?олиÑ?еÑ?Ñ?во плеÑ?ей:"
 
 #: ../objects/Database/compound.c:221
-msgid "Flip arms verticaly"
+#, fuzzy
+msgid "Flip arms vertically"
 msgstr "Ð?Ñ?Ñ?азиÑ?Ñ? плеÑ?и веÑ?Ñ?икалÑ?но"
 
 #: ../objects/Database/compound.c:223
-msgid "Flip arms horizontaly"
+#, fuzzy
+msgid "Flip arms horizontally"
 msgstr "Ð?Ñ?Ñ?азиÑ?Ñ? плеÑ?и гоÑ?изонÑ?алÑ?но"
 
 #: ../objects/Database/compound.c:225
-msgid "Center mount point verticaly"
+#, fuzzy
+msgid "Center mount point vertically"
 msgstr "ТоÑ?ка пÑ?ивÑ?зки в Ñ?енÑ?Ñ?е по веÑ?Ñ?икали"
 
 #: ../objects/Database/compound.c:227
-msgid "Center mount point horizontaly"
+#, fuzzy
+msgid "Center mount point horizontally"
 msgstr "ТоÑ?ка пÑ?ивÑ?зки в Ñ?енÑ?Ñ?е по гоÑ?изонÑ?али"
 
 #: ../objects/Database/compound.c:229
@@ -2940,268 +2910,254 @@ msgstr "СÑ?Ñ?Ñ?кÑ?Ñ?Ñ?а"
 msgid "Entity/Relationship table diagram objects"
 msgstr "Ð?бÑ?екÑ?Ñ? диагÑ?аммÑ? СÑ?Ñ?ноÑ?Ñ?ей/Ð?Ñ?ноÑ?ений"
 
-#: ../objects/Database/table.c:142
-#: ../objects/Database/table.c:183
-#: ../objects/Database/table.c:200
-#: ../objects/UML/class.c:148
-#: ../objects/UML/class.c:189
-#: ../objects/UML/class_dialog.c:595
-#: ../objects/UML/umlattribute.c:43
-#: ../objects/UML/umloperation.c:66
-#: ../objects/UML/umlparameter.c:49
-#: ../sheets/SDL.sheet.in.h:3
+#: ../objects/Database/table.c:143 ../objects/Database/table.c:187
+#: ../objects/Database/table.c:204 ../objects/UML/class.c:149
+#: ../objects/UML/class.c:192 ../objects/UML/class_dialog.c:573
+#: ../objects/UML/umlattribute.c:43 ../objects/UML/umloperation.c:66
+#: ../objects/UML/umlparameter.c:49 ../sheets/SDL.sheet.in.h:3
 msgid "Comment"
 msgstr "Ð?омменÑ?аÑ?ий"
 
-#: ../objects/Database/table.c:144
+#: ../objects/Database/table.c:145
 msgid "Primary key"
 msgstr "Ð?еÑ?виÑ?нÑ?й клÑ?Ñ?"
 
-#: ../objects/Database/table.c:146
+#: ../objects/Database/table.c:147
 msgid "Nullable"
 msgstr "Ð?опÑ?Ñ?Ñ?им null"
 
-#: ../objects/Database/table.c:148
+#: ../objects/Database/table.c:149
 msgid "Unique"
 msgstr "УникалÑ?ноÑ?Ñ?Ñ?"
 
-#: ../objects/Database/table.c:185
+#: ../objects/Database/table.c:151
+#, fuzzy
+msgid "Default value"
+msgstr "Ð?наÑ?ение по Ñ?молÑ?аниÑ?:"
+
+#: ../objects/Database/table.c:189
 msgid "Visible comments"
 msgstr "Ð?идимÑ?е Ð?омменÑ?аÑ?ии"
 
-#: ../objects/Database/table.c:187
-#: ../objects/UML/class.c:171
+#: ../objects/Database/table.c:191 ../objects/UML/class.c:172
 msgid "Comment tagging"
 msgstr "Ð?омеÑ?ки комменÑ?аÑ?иев"
 
-#: ../objects/Database/table.c:189
-#: ../objects/Database/table_dialog.c:976
+#: ../objects/Database/table.c:193 ../objects/Database/table_dialog.c:985
 msgid "Underline primary keys"
 msgstr "Ð?одÑ?Ñ?Ñ?киваÑ?Ñ? пеÑ?виÑ?нÑ?е клÑ?Ñ?и"
 
-#: ../objects/Database/table.c:191
-#: ../objects/Database/table_dialog.c:981
+#: ../objects/Database/table.c:195 ../objects/Database/table_dialog.c:990
 msgid "Use bold font for primary keys"
 msgstr "Ð?Ñ?полÑ?зоваÑ?Ñ? полÑ?жиÑ?нÑ?й Ñ?Ñ?иÑ?Ñ? длÑ? пеÑ?виÑ?нÑ?Ñ? клÑ?Ñ?ей"
 
 #. property rows
-#: ../objects/Database/table.c:196
-#: ../objects/SADT/arrow.c:136
-#: ../objects/UML/class.c:179
-#: ../objects/UML/class_dialog.c:570
+#: ../objects/Database/table.c:200 ../objects/SADT/arrow.c:137
+#: ../objects/UML/class.c:182 ../objects/UML/class_dialog.c:548
 msgid "Normal"
 msgstr "Ð?оÑ?малÑ?нÑ?й"
 
-#: ../objects/Database/table.c:198
-msgid "Tablename"
-msgstr "Ð?мÑ? Ñ?аблиÑ?Ñ?"
-
-#: ../objects/Database/table.c:203
-#: ../objects/Database/table.c:205
-#: ../objects/Database/table.c:207
-#: ../objects/Database/reference.c:120
-#: ../objects/UML/association.c:245
-#: ../objects/UML/association.c:256
-#: ../objects/UML/association.c:258
-#: ../objects/UML/association.c:260
-#: ../objects/UML/association.c:262
-#: ../objects/UML/association.c:264
-#: ../objects/UML/class.c:193
-#: ../objects/UML/class.c:195
-#: ../objects/UML/class.c:197
-#: ../objects/UML/class.c:199
-#: ../objects/UML/class.c:201
-#: ../objects/UML/class.c:203
+#: ../objects/Database/table.c:202
+#, fuzzy
+msgid "Table name"
+msgstr "Ð?мÑ? Ñ?аблиÑ?Ñ?:"
+
+#: ../objects/Database/table.c:207 ../objects/Database/table.c:209
+#: ../objects/Database/table.c:211 ../objects/Database/reference.c:121
+#: ../objects/UML/association.c:249 ../objects/UML/association.c:260
+#: ../objects/UML/association.c:262 ../objects/UML/association.c:264
+#: ../objects/UML/association.c:266 ../objects/UML/association.c:268
+#: ../objects/UML/class.c:196 ../objects/UML/class.c:198
+#: ../objects/UML/class.c:200 ../objects/UML/class.c:202
+#: ../objects/UML/class.c:204 ../objects/UML/class.c:206
 msgid " "
 msgstr " "
 
-#: ../objects/Database/table.c:211
-#: ../objects/UML/class.c:209
-#: ../objects/UML/object.c:157
+#: ../objects/Database/table.c:215 ../objects/UML/class.c:212
+#: ../objects/UML/object.c:153
 msgid "Attributes"
 msgstr "Ð?Ñ?Ñ?ибÑ?Ñ?Ñ?"
 
-#: ../objects/Database/table.c:248
+#: ../objects/Database/table.c:252 ../objects/UML/class.c:324
 msgid "Show comments"
 msgstr "Ð?оказаÑ?Ñ? комменÑ?аÑ?ии"
 
 #. init data
-#: ../objects/Database/table.c:253
-#: ../objects/Database/table.c:356
+#: ../objects/Database/table.c:257 ../objects/Database/table.c:364
 #: ../sheets/Database.sheet.in.h:5
 msgid "Table"
 msgstr "ТаблиÑ?а"
 
 #. Attributes page:
-#: ../objects/Database/table_dialog.c:611
-#: ../objects/UML/class_dialog.c:1081
+#: ../objects/Database/table_dialog.c:609 ../objects/UML/class_dialog.c:1050
 msgid "_Attributes"
 msgstr "_Ð?Ñ?Ñ?ибÑ?Ñ?Ñ?"
 
 #. the "new" button
-#: ../objects/Database/table_dialog.c:639
-#: ../objects/SISSI/sissi_dialog.c:739
-#: ../objects/SISSI/sissi_dialog.c:871
+#: ../objects/Database/table_dialog.c:636 ../objects/SISSI/sissi_dialog.c:739
+#: ../objects/SISSI/sissi_dialog.c:870
 msgid "_New"
 msgstr "_СоздаÑ?Ñ?"
 
 #. the "delete" button
-#: ../objects/Database/table_dialog.c:647
+#: ../objects/Database/table_dialog.c:643
 msgid "_Delete"
 msgstr "_УдалиÑ?Ñ?"
 
 #. the "Move up" button
-#: ../objects/Database/table_dialog.c:655
+#: ../objects/Database/table_dialog.c:650
 msgid "Move up"
 msgstr "Ð?еÑ?енеÑ?Ñ?и ввеÑ?Ñ?"
 
 #. the "Move down" button
-#: ../objects/Database/table_dialog.c:663
+#: ../objects/Database/table_dialog.c:657
 msgid "Move down"
 msgstr "Ð?еÑ?емеÑ?Ñ?иÑ?Ñ? вниз"
 
-#: ../objects/Database/table_dialog.c:673
-#: ../objects/UML/class_dialog.c:1138
+#: ../objects/Database/table_dialog.c:666 ../objects/UML/class_dialog.c:1102
 msgid "Attribute data"
 msgstr "Ð?аннÑ?е аÑ?Ñ?ибÑ?Ñ?а"
 
-#: ../objects/Database/table_dialog.c:707
-#: ../objects/Database/table_dialog.c:946
-#: ../objects/Database/table_dialog.c:1051
-#: ../objects/UML/class_dialog.c:452
-#: ../objects/UML/class_dialog.c:1181
-#: ../objects/UML/class_dialog.c:2111
-#: ../objects/UML/class_dialog.c:2283
+#: ../objects/Database/table_dialog.c:676
+#: ../objects/Database/table_dialog.c:1055 ../objects/ER/attribute.c:155
+#: ../objects/ER/entity.c:137 ../objects/ER/relationship.c:142
+#: ../objects/UML/class_dialog.c:1112 ../objects/UML/class_dialog.c:1950
+#: ../objects/UML/class_dialog.c:2150 ../objects/UML/class_dialog.c:2726
+#: ../objects/UML/dependency.c:134 ../objects/UML/generalization.c:131
+#: ../objects/UML/realizes.c:131
+msgid "Name:"
+msgstr "Ð?азвание:"
+
+#: ../objects/Database/table_dialog.c:688 ../objects/FS/flow-ortho.c:169
+#: ../objects/FS/flow.c:146 ../objects/Istar/link.c:162
+#: ../objects/Jackson/phenomenon.c:146 ../objects/KAOS/metaandorrel.c:166
+#: ../objects/KAOS/metabinrel.c:173 ../objects/UML/class_dialog.c:1123
+#: ../objects/UML/class_dialog.c:1961 ../objects/UML/class_dialog.c:2161
+#: ../objects/UML/class_dialog.c:2737
+msgid "Type:"
+msgstr "Тип:"
+
+#: ../objects/Database/table_dialog.c:699
+#, fuzzy
+msgid "Default:"
+msgstr "УмолÑ?аниÑ?: "
+
+#: ../objects/Database/table_dialog.c:711
+#: ../objects/Database/table_dialog.c:955
+#: ../objects/Database/table_dialog.c:1060 ../objects/UML/class_dialog.c:430
+#: ../objects/UML/class_dialog.c:1145 ../objects/UML/class_dialog.c:2021
+#: ../objects/UML/class_dialog.c:2183
 msgid "Comment:"
 msgstr "Ð?омменÑ?аÑ?ий:"
 
-#: ../objects/Database/table_dialog.c:726
+#: ../objects/Database/table_dialog.c:730
 msgid "_Primary key"
 msgstr "_Ð?еÑ?виÑ?нÑ?й клÑ?Ñ?"
 
-#: ../objects/Database/table_dialog.c:733
+#: ../objects/Database/table_dialog.c:737
 msgid "N_ullable"
 msgstr "_Ð?опÑ?Ñ?Ñ?им null"
 
-#: ../objects/Database/table_dialog.c:740
+#: ../objects/Database/table_dialog.c:744
 msgid "Uni_que"
 msgstr "_УникалÑ?ноÑ?Ñ?Ñ?"
 
-#: ../objects/Database/table_dialog.c:928
+#: ../objects/Database/table_dialog.c:937
 msgid "_Table"
 msgstr "_ТаблиÑ?а"
 
-#: ../objects/Database/table_dialog.c:936
+#: ../objects/Database/table_dialog.c:945
 msgid "Table name:"
 msgstr "Ð?мÑ? Ñ?аблиÑ?Ñ?:"
 
 #. XXX create a handler and disable the 'show documentation tag' checkbox
 #. if 'comment visible' is not active.
-#: ../objects/Database/table_dialog.c:966
+#: ../objects/Database/table_dialog.c:975
 msgid "Comment visible"
 msgstr "Ð?идимÑ?е комменÑ?аÑ?ии"
 
-#: ../objects/Database/table_dialog.c:971
-#: ../objects/UML/class_dialog.c:522
+#: ../objects/Database/table_dialog.c:980 ../objects/UML/class_dialog.c:500
 #, fuzzy
 msgid "Show documentation tag"
 msgstr "Ð?оказÑ?ваÑ?Ñ? меÑ?кÑ? докÑ?менÑ?аÑ?ии"
 
 #. * Fonts and Colors selection *
-#: ../objects/Database/table_dialog.c:1010
-#: ../objects/UML/class_dialog.c:551
+#: ../objects/Database/table_dialog.c:1019 ../objects/UML/class_dialog.c:529
 msgid "_Style"
 msgstr "_СÑ?илÑ?"
 
-#: ../objects/Database/table_dialog.c:1021
+#: ../objects/Database/table_dialog.c:1030
 msgid "Border width:"
 msgstr "ШиÑ?ина Ñ?амки:"
 
 #. head line
-#: ../objects/Database/table_dialog.c:1034
-#: ../objects/UML/class_dialog.c:561
+#: ../objects/Database/table_dialog.c:1043 ../objects/UML/class_dialog.c:539
 #: ../objects/UML/umlparameter.c:51
 msgid "Kind"
 msgstr "СоÑ?Ñ?"
 
-#: ../objects/Database/table_dialog.c:1038
-#: ../objects/UML/class_dialog.c:566
+#: ../objects/Database/table_dialog.c:1047 ../objects/UML/class_dialog.c:544
 msgid "Size"
 msgstr "РазмеÑ?"
 
-#: ../objects/Database/table_dialog.c:1041
+#: ../objects/Database/table_dialog.c:1050
 msgid "Normal:"
 msgstr "Ð?оÑ?малÑ?нÑ?й:"
 
-#: ../objects/Database/table_dialog.c:1062
+#: ../objects/Database/table_dialog.c:1071
 msgid "Text Color:"
 msgstr "ЦвеÑ? Ñ?екÑ?Ñ?а:"
 
-#: ../objects/Database/table_dialog.c:1070
+#: ../objects/Database/table_dialog.c:1079
 msgid "Foreground Color:"
 msgstr "ЦвеÑ? пеÑ?еднего плана:"
 
 #. two chars at the beginning
-#: ../objects/Database/table_dialog.c:1383
+#: ../objects/Database/table_dialog.c:1391
 msgid "not null"
 msgstr "not null"
 
-#: ../objects/Database/table_dialog.c:1384
+#: ../objects/Database/table_dialog.c:1392
 msgid "null"
 msgstr "null"
 
-#: ../objects/Database/table_dialog.c:1385
+#: ../objects/Database/table_dialog.c:1393
 msgid "unique"
 msgstr "Ñ?никалÑ?ноÑ?Ñ?Ñ?"
 
-#: ../objects/Database/reference.c:108
-#: ../objects/flowchart/box.c:152
-#: ../objects/standard/box.c:152
-#: ../objects/standard/polyline.c:136
-#: ../objects/standard/zigzagline.c:132
+#: ../objects/Database/reference.c:109 ../objects/flowchart/box.c:154
+#: ../objects/standard/box.c:152 ../objects/standard/polyline.c:140
+#: ../objects/standard/zigzagline.c:136
 msgid "Corner radius"
 msgstr "РадиÑ?Ñ? Ñ?гла"
 
-#: ../objects/Database/reference.c:111
+#: ../objects/Database/reference.c:112
 msgid "Start description"
 msgstr "Ð?еÑ?виÑ?ное опиÑ?ание"
 
-#: ../objects/Database/reference.c:113
+#: ../objects/Database/reference.c:114
 msgid "End description"
 msgstr "Ð?онеÑ?ное опиÑ?ание"
 
-#: ../objects/Database/reference.c:144
-#: ../objects/ER/participation.c:408
-#: ../objects/FS/flow-ortho.c:626
-#: ../objects/GRAFCET/vector.c:314
-#: ../objects/SADT/arrow.c:459
-#: ../objects/UML/association.c:854
-#: ../objects/UML/component_feature.c:190
-#: ../objects/UML/dependency.c:376
-#: ../objects/UML/generalization.c:372
-#: ../objects/UML/realizes.c:363
-#: ../objects/UML/transition.c:172
-#: ../objects/standard/zigzagline.c:380
+#: ../objects/Database/reference.c:145 ../objects/ER/participation.c:406
+#: ../objects/FS/flow-ortho.c:632 ../objects/GRAFCET/vector.c:314
+#: ../objects/SADT/arrow.c:464 ../objects/UML/association.c:868
+#: ../objects/UML/component_feature.c:191 ../objects/UML/dependency.c:382
+#: ../objects/UML/generalization.c:379 ../objects/UML/realizes.c:369
+#: ../objects/UML/transition.c:173 ../objects/standard/zigzagline.c:385
 msgid "Add segment"
 msgstr "Ð?обавиÑ?Ñ? Ñ?егменÑ?"
 
-#: ../objects/Database/reference.c:145
-#: ../objects/ER/participation.c:409
-#: ../objects/FS/flow-ortho.c:627
-#: ../objects/GRAFCET/vector.c:315
-#: ../objects/SADT/arrow.c:460
-#: ../objects/UML/association.c:855
-#: ../objects/UML/component_feature.c:191
-#: ../objects/UML/dependency.c:377
-#: ../objects/UML/generalization.c:373
-#: ../objects/UML/realizes.c:364
-#: ../objects/UML/transition.c:173
-#: ../objects/standard/zigzagline.c:381
+#: ../objects/Database/reference.c:146 ../objects/ER/participation.c:407
+#: ../objects/FS/flow-ortho.c:633 ../objects/GRAFCET/vector.c:315
+#: ../objects/SADT/arrow.c:465 ../objects/UML/association.c:869
+#: ../objects/UML/component_feature.c:192 ../objects/UML/dependency.c:383
+#: ../objects/UML/generalization.c:380 ../objects/UML/realizes.c:370
+#: ../objects/UML/transition.c:174 ../objects/standard/zigzagline.c:386
 msgid "Delete segment"
 msgstr "УдалиÑ?Ñ? Ñ?егменÑ?"
 
-#: ../objects/Database/reference.c:151
-#: ../sheets/Database.sheet.in.h:4
+#: ../objects/Database/reference.c:152 ../sheets/Database.sheet.in.h:4
 msgid "Reference"
 msgstr "СÑ?Ñ?лка"
 
@@ -3221,8 +3177,7 @@ msgstr "Ð?Ñ?оизводное:"
 msgid "Multivalue:"
 msgstr "Ð?ногознаÑ?ноÑ?Ñ?Ñ?:"
 
-#: ../objects/ER/attribute.c:436
-#: ../sheets/ER.sheet.in.h:1
+#: ../objects/ER/attribute.c:436 ../sheets/ER.sheet.in.h:1
 msgid "Attribute"
 msgstr "Ð?Ñ?Ñ?ибÑ?Ñ?"
 
@@ -3234,8 +3189,7 @@ msgstr "СлабÑ?й:"
 msgid "Associative:"
 msgstr "СвÑ?заннÑ?й:"
 
-#: ../objects/ER/entity.c:415
-#: ../objects/UML/classicon.c:131
+#: ../objects/ER/entity.c:415 ../objects/UML/classicon.c:132
 #: ../sheets/ER.sheet.in.h:4
 msgid "Entity"
 msgstr "СÑ?Ñ?ноÑ?Ñ?Ñ?"
@@ -3264,26 +3218,21 @@ msgstr "Ð?Ñ?аÑ?аÑ?Ñ?:"
 msgid "Identifying:"
 msgstr "Ð?денÑ?иÑ?икаÑ?иÑ?:"
 
-#: ../objects/ER/relationship.c:459
-#: ../sheets/ER.sheet.in.h:6
+#: ../objects/ER/relationship.c:459 ../sheets/ER.sheet.in.h:6
 msgid "Relationship"
 msgstr "Ð?Ñ?ноÑ?ение"
 
 #. Translators: Menu item Noun/Energy
-#: ../objects/FS/flow-ortho.c:160
-#: ../objects/FS/flow-ortho.c:623
-#: ../objects/FS/flow.c:137
-#: ../objects/FS/flow.c:625
-#: ../objects/FS/function.c:1098
+#: ../objects/FS/flow-ortho.c:160 ../objects/FS/flow-ortho.c:629
+#: ../objects/FS/flow.c:137 ../objects/FS/flow.c:631
+#: ../objects/FS/function.c:1101
 msgid "Energy"
 msgstr "ЭнеÑ?гиÑ?"
 
 #. Translators: Menu item Noun/Material
-#: ../objects/FS/flow-ortho.c:161
-#: ../objects/FS/flow-ortho.c:624
-#: ../objects/FS/flow.c:138
-#: ../objects/FS/flow.c:626
-#: ../objects/FS/function.c:1074
+#: ../objects/FS/flow-ortho.c:161 ../objects/FS/flow-ortho.c:630
+#: ../objects/FS/flow.c:138 ../objects/FS/flow.c:632
+#: ../objects/FS/function.c:1077
 msgid "Material"
 msgstr "Ð?аÑ?еÑ?иал"
 
@@ -3291,14 +3240,10 @@ msgstr "Ð?аÑ?еÑ?иал"
 #. Translators: Menu item Verb/Signal/Signal
 #. Translators: Menu item Noun/Signal
 #. Translators: Menu item Noun/Signal/Signal
-#: ../objects/FS/flow-ortho.c:162
-#: ../objects/FS/flow-ortho.c:625
-#: ../objects/FS/flow.c:139
-#: ../objects/FS/flow.c:627
-#: ../objects/FS/function.c:1036
-#: ../objects/FS/function.c:1038
-#: ../objects/FS/function.c:1174
-#: ../objects/FS/function.c:1176
+#: ../objects/FS/flow-ortho.c:162 ../objects/FS/flow-ortho.c:631
+#: ../objects/FS/flow.c:139 ../objects/FS/flow.c:633
+#: ../objects/FS/function.c:1039 ../objects/FS/function.c:1041
+#: ../objects/FS/function.c:1177 ../objects/FS/function.c:1179
 msgid "Signal"
 msgstr "Сигнал"
 
@@ -3315,346 +3260,309 @@ msgid "User function"
 msgstr "Ð?олÑ?зоваÑ?елÑ?Ñ?каÑ? Ñ?Ñ?нкÑ?иÑ?"
 
 #. Translators: Menu item Verb
-#: ../objects/FS/function.c:678
+#: ../objects/FS/function.c:681
 msgid "Verb"
 msgstr "Ð?лагол"
 
 #. Translators: Menu item Verb/Channel
 #. Translators: Menu item Verb/Channel/Channel
 #. Translators: Menu item Verb/Channel/Transfer/Transport/Channel
-#: ../objects/FS/function.c:680
-#: ../objects/FS/function.c:682
-#: ../objects/FS/function.c:722
+#: ../objects/FS/function.c:683 ../objects/FS/function.c:685
+#: ../objects/FS/function.c:725
 msgid "Channel"
 msgstr "Ð?анал"
 
 #. Translators: Menu item Verb/Channel/Import
 #. Translators: Menu item Verb/Channel/Import/Import
-#: ../objects/FS/function.c:684
-#: ../objects/FS/function.c:686
+#: ../objects/FS/function.c:687 ../objects/FS/function.c:689
 msgid "Import"
 msgstr "Ð?мпоÑ?Ñ?"
 
 #. Translators: Menu item Verb/Channel/Import/Input
-#: ../objects/FS/function.c:688
-#: ../objects/KAOS/metabinrel.c:165
+#: ../objects/FS/function.c:691 ../objects/KAOS/metabinrel.c:165
 msgid "Input"
 msgstr "Ð?водиÑ?Ñ?"
 
 #. Translators: Menu item Verb/Channel/Import/Receive
-#: ../objects/FS/function.c:690
+#: ../objects/FS/function.c:693
 msgid "Receive"
 msgstr "Ð?Ñ?инимаÑ?Ñ?"
 
 #. Translators: Menu item Verb/Channel/Import/Allow
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Allow
-#: ../objects/FS/function.c:692
-#: ../objects/FS/function.c:964
+#: ../objects/FS/function.c:695 ../objects/FS/function.c:967
 msgid "Allow"
 msgstr "РазÑ?еÑ?аÑ?Ñ?"
 
 #. Translators: Menu item Verb/Channel/Import/Form Entrance
-#: ../objects/FS/function.c:694
+#: ../objects/FS/function.c:697
 msgid "Form Entrance"
 msgstr "СоÑ?Ñ?авлÑ?Ñ?Ñ? вÑ?од"
 
 #. Translators: Menu item Verb/Channel/Import/Capture
 #. Translators: Menu item Verb/Provision/Store/Capture
-#: ../objects/FS/function.c:696
-#: ../objects/FS/function.c:930
+#: ../objects/FS/function.c:699 ../objects/FS/function.c:933
 msgid "Capture"
 msgstr "Ð?аÑ?ваÑ?Ñ?ваÑ?Ñ?"
 
 #. Translators: Menu item Verb/Channel/Export/Discharge
-#: ../objects/FS/function.c:702
+#: ../objects/FS/function.c:705
 msgid "Discharge"
 msgstr "РазÑ?Ñ?жаÑ?Ñ?"
 
 #. Translators: Menu item Verb/Channel/Export/Eject
-#: ../objects/FS/function.c:704
+#: ../objects/FS/function.c:707
 msgid "Eject"
 msgstr "Ð?Ñ?кидÑ?ваÑ?Ñ?"
 
 #. Translators: Menu item Verb/Channel/Export/Dispose
-#: ../objects/FS/function.c:706
+#: ../objects/FS/function.c:709
 msgid "Dispose"
 msgstr "РаÑ?полагаÑ?Ñ?"
 
 #. Translators: Menu item Verb/Channel/Transfer
 #. Translators: Menu item Verb/Channel/Transfer/Transfer
 #. Translators: Menu item Verb/Channel/Transfer/Transmit/Transfer
-#: ../objects/FS/function.c:710
-#: ../objects/FS/function.c:712
-#: ../objects/FS/function.c:730
+#: ../objects/FS/function.c:713 ../objects/FS/function.c:715
+#: ../objects/FS/function.c:733
 msgid "Transfer"
 msgstr "Ð?еÑ?еноÑ?иÑ?Ñ?"
 
 #. Translators: Menu item Verb/Channel/Transfer/Transport
 #. Translators: Menu item Verb/Channel/Transfer/Transport/Transport
-#: ../objects/FS/function.c:714
-#: ../objects/FS/function.c:716
+#: ../objects/FS/function.c:717 ../objects/FS/function.c:719
 msgid "Transport"
 msgstr "Ð?еÑ?евозиÑ?Ñ?"
 
 #. Translators: Menu item Verb/Channel/Transfer/Transport/Lift
-#: ../objects/FS/function.c:718
+#: ../objects/FS/function.c:721
 msgid "Lift"
 msgstr "Ð?однимаÑ?Ñ?"
 
 #. Translators: Menu item Verb/Channel/Transfer/Transport/Move
-#: ../objects/FS/function.c:720
+#: ../objects/FS/function.c:723
 msgid "Move"
 msgstr "Ð?еÑ?емеÑ?аÑ?Ñ?"
 
 #. Translators: Menu item Verb/Channel/Transfer/Transmit
 #. Translators: Menu item Verb/Channel/Transfer/Transmit/Transmit
-#: ../objects/FS/function.c:724
-#: ../objects/FS/function.c:726
+#: ../objects/FS/function.c:727 ../objects/FS/function.c:729
 msgid "Transmit"
 msgstr "Ð?еÑ?едаваÑ?Ñ?"
 
 #. Translators: Menu item Verb/Channel/Transfer/Transmit/Conduct
-#: ../objects/FS/function.c:728
+#: ../objects/FS/function.c:731
 msgid "Conduct"
 msgstr "СопÑ?овождаÑ?Ñ?"
 
 #. Translators: Menu item Verb/Channel/Transfer/Transmit/Convey
-#: ../objects/FS/function.c:732
+#: ../objects/FS/function.c:735
 msgid "Convey"
 msgstr "Ð?Ñ?еобÑ?азоваÑ?Ñ?"
 
 #. Translators: Menu item Verb/Channel/Guide
 #. Translators: Menu item Verb/Channel/Guide/Guide
 #. Translators: Menu item Verb/Channel/Guide/Guide/Guide
-#: ../objects/FS/function.c:734
-#: ../objects/FS/function.c:736
-#: ../objects/FS/function.c:738
+#: ../objects/FS/function.c:737 ../objects/FS/function.c:739
+#: ../objects/FS/function.c:741
 msgid "Guide"
 msgstr "Ð Ñ?ководиÑ?Ñ?"
 
 #. Translators: Menu item Verb/Channel/Guide/Guide/Direct
-#: ../objects/FS/function.c:740
+#: ../objects/FS/function.c:743
 msgid "Direct"
 msgstr "Ð?апÑ?авлÑ?Ñ?Ñ?"
 
 #. Translators: Menu item Verb/Channel/Guide/Guide/Straighten
-#: ../objects/FS/function.c:742
+#: ../objects/FS/function.c:745
 msgid "Straighten"
 msgstr "Ð?Ñ?пÑ?авлÑ?Ñ?Ñ?"
 
 #. Translators: Menu item Verb/Channel/Guide/Guide/Steer
-#: ../objects/FS/function.c:744
+#: ../objects/FS/function.c:747
 msgid "Steer"
 msgstr "УпÑ?авлÑ?Ñ?Ñ?"
 
 #. Translators: Menu item Verb/Channel/Guide/Translate
-#: ../objects/FS/function.c:746
+#: ../objects/FS/function.c:749
 msgid "Translate"
 msgstr "Ð?еÑ?еводиÑ?Ñ?"
 
 #. Translators: Menu item Verb/Channel/Guide/Rotate
 #. Translators: Menu item Verb/Channel/Guide/Rotate/Rotate
-#: ../objects/FS/function.c:748
-#: ../objects/FS/function.c:750
+#: ../objects/FS/function.c:751 ../objects/FS/function.c:753
 msgid "Rotate"
 msgstr "Ð?Ñ?аÑ?аÑ?Ñ?"
 
 #. Translators: Menu item Verb/Channel/Guide/Rotate/Turn
-#: ../objects/FS/function.c:752
+#: ../objects/FS/function.c:755
 msgid "Turn"
 msgstr "Ð?овоÑ?аÑ?иваÑ?Ñ?"
 
 #. Translators: Menu item Verb/Channel/Guide/Rotate/Spin
-#: ../objects/FS/function.c:754
+#: ../objects/FS/function.c:757
 msgid "Spin"
 msgstr "Ð?Ñ?Ñ?Ñ?иÑ?Ñ?"
 
 #. Translators: Menu item Verb/Channel/Guide/Allow DOF
 #. Translators: Menu item Verb/Channel/Guide/Allow DOF/Allow DOF
-#: ../objects/FS/function.c:756
-#: ../objects/FS/function.c:758
+#: ../objects/FS/function.c:759 ../objects/FS/function.c:761
 msgid "Allow DOF"
 msgstr "Ð?озволÑ?Ñ?Ñ? DOF"
 
 #. Translators: Menu item Verb/Channel/Guide/Allow DOF/Constrain
-#: ../objects/FS/function.c:760
+#: ../objects/FS/function.c:763
 msgid "Constrain"
 msgstr "СдеÑ?живаÑ?Ñ?"
 
 #. Translators: Menu item Verb/Channel/Guide/Allow DOF/Unlock
-#: ../objects/FS/function.c:762
+#: ../objects/FS/function.c:765
 msgid "Unlock"
 msgstr "РазблокиÑ?оваÑ?Ñ?"
 
 #. Translators: Menu item Verb/Support
 #. Translators: Menu item Verb/Support/Support
-#: ../objects/FS/function.c:764
-#: ../objects/FS/function.c:766
+#: ../objects/FS/function.c:767 ../objects/FS/function.c:769
 msgid "Support"
 msgstr "Ð?оддеÑ?живаÑ?Ñ?"
 
 #. Translators: Menu item Verb/Support/Stop
 #. Translators: Menu item Verb/Support/Stop/Stop
-#: ../objects/FS/function.c:768
-#: ../objects/FS/function.c:770
+#: ../objects/FS/function.c:771 ../objects/FS/function.c:773
 #: ../sheets/SDL.sheet.in.h:19
 msgid "Stop"
 msgstr "СÑ?оп"
 
 #. Translators: Menu item Verb/Support/Stop/Insulate
-#: ../objects/FS/function.c:772
+#: ../objects/FS/function.c:775
 msgid "Insulate"
 msgstr "Ð?золиÑ?оваÑ?Ñ?"
 
 #. Translators: Menu item Verb/Support/Stop/Protect
-#: ../objects/FS/function.c:774
+#: ../objects/FS/function.c:777
 msgid "Protect"
 msgstr "Ð?аÑ?иÑ?аÑ?Ñ?"
 
 #. Translators: Menu item Verb/Support/Stop/Prevent
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Prevent
-#: ../objects/FS/function.c:776
-#: ../objects/FS/function.c:966
+#: ../objects/FS/function.c:779 ../objects/FS/function.c:969
 msgid "Prevent"
 msgstr "Ð?Ñ?едоÑ?вÑ?аÑ?аÑ?Ñ?"
 
 #. Translators: Menu item Verb/Support/Stop/Shield
-#: ../objects/FS/function.c:778
+#: ../objects/FS/function.c:781
 msgid "Shield"
 msgstr "ЭкÑ?аниÑ?оваÑ?Ñ?"
 
 #. Translators: Menu item Verb/Support/Stop/Inhibit
-#: ../objects/FS/function.c:780
+#: ../objects/FS/function.c:783
 msgid "Inhibit"
 msgstr "Ð?Ñ?епÑ?Ñ?Ñ?Ñ?воваÑ?Ñ?"
 
 #. Translators: Menu item Verb/Support/Stabilize
 #. Translators: Menu item Verb/Support/Stabilize/Stabilize
-#: ../objects/FS/function.c:782
-#: ../objects/FS/function.c:784
+#: ../objects/FS/function.c:785 ../objects/FS/function.c:787
 msgid "Stabilize"
 msgstr "СÑ?абилизиÑ?оваÑ?Ñ?"
 
 #. Translators: Menu item Verb/Support/Stabilize/Steady
-#: ../objects/FS/function.c:786
+#: ../objects/FS/function.c:789
 msgid "Steady"
 msgstr "Ð?Ñ?Ñ?епенÑ?Ñ?Ñ?"
 
 #. Translators: Menu item Verb/Support/Secure
 #. Translators: Menu item Verb/Support/Secure/Secure
-#: ../objects/FS/function.c:788
-#: ../objects/FS/function.c:790
+#: ../objects/FS/function.c:791 ../objects/FS/function.c:793
 msgid "Secure"
 msgstr "Ð?аÑ?иÑ?аÑ?Ñ?"
 
 #. Translators: Menu item Verb/Support/Secure/Attach
 #. Translators: Menu item Verb/Connect/Couple/Attach
-#: ../objects/FS/function.c:792
-#: ../objects/FS/function.c:824
+#: ../objects/FS/function.c:795 ../objects/FS/function.c:827
 msgid "Attach"
 msgstr "Ð?Ñ?иÑ?оединÑ?Ñ?Ñ?"
 
 #. Translators: Menu item Verb/Support/Secure/Mount
-#: ../objects/FS/function.c:794
+#: ../objects/FS/function.c:797
 msgid "Mount"
 msgstr "Ð?одклÑ?Ñ?аÑ?Ñ?"
 
 #. Translators: Menu item Verb/Support/Secure/Lock
-#: ../objects/FS/function.c:796
-#: ../sheets/ciscomisc.sheet.in.h:19
+#: ../objects/FS/function.c:799 ../sheets/ciscomisc.sheet.in.h:19
 msgid "Lock"
 msgstr "Ð?локиÑ?оваÑ?Ñ?"
 
 #. Translators: Menu item Verb/Support/Secure/Fasten
-#: ../objects/FS/function.c:798
+#: ../objects/FS/function.c:801
 msgid "Fasten"
 msgstr "СкÑ?еплÑ?Ñ?Ñ?"
 
 #. Translators: Menu item Verb/Support/Secure/Hold
-#: ../objects/FS/function.c:800
+#: ../objects/FS/function.c:803
 msgid "Hold"
 msgstr "СоÑ?Ñ?анÑ?Ñ?Ñ?"
 
-#. Translators: Menu item Verb/Support/Position
-#. Translators: Menu item Verb/Support/Position/Position
-#: ../objects/FS/function.c:802
-#: ../objects/FS/function.c:804
-#: ../objects/Istar/actor.c:70
-msgid "Position"
-msgstr "Ð?омеÑ?аÑ?Ñ?"
-
 #. Translators: Menu item Verb/Support/Position/Orient
-#: ../objects/FS/function.c:806
+#: ../objects/FS/function.c:809
 msgid "Orient"
 msgstr "Ð?Ñ?иенÑ?иÑ?оваÑ?Ñ?"
 
-#. Translators: Menu item Verb/Support/Position/Locate
-#. Translators: Menu item Verb/Signal/Sense/Locate
-#: ../objects/FS/function.c:810
-#: ../objects/FS/function.c:1052
-msgid "Locate"
-msgstr "РаÑ?полагаÑ?Ñ?"
-
 #. Translators: Menu item Verb/Connect
 #. Translators: Menu item Verb/Connect/Connect
-#: ../objects/FS/function.c:812
-#: ../objects/FS/function.c:814
+#: ../objects/FS/function.c:815 ../objects/FS/function.c:817
 msgid "Connect"
 msgstr "СвÑ?зÑ?ваÑ?Ñ?"
 
 #. Translators: Menu item Verb/Connect/Couple
 #. Translators: Menu item Verb/Connect/Couple/Couple
-#: ../objects/FS/function.c:816
-#: ../objects/FS/function.c:818
+#: ../objects/FS/function.c:819 ../objects/FS/function.c:821
 msgid "Couple"
 msgstr "СоединÑ?Ñ?Ñ?"
 
 #. Translators: Menu item Verb/Connect/Couple/Join
-#: ../objects/FS/function.c:820
+#: ../objects/FS/function.c:823
 msgid "Join"
 msgstr "Ð?одклÑ?Ñ?аÑ?Ñ?"
 
 #. Translators: Menu item Verb/Connect/Couple/Assemble
-#: ../objects/FS/function.c:822
+#: ../objects/FS/function.c:825
 msgid "Assemble"
 msgstr "СобиÑ?аÑ?Ñ?"
 
 #. Translators: Menu item Verb/Connect/Mix
 #. Translators: Menu item Verb/Connect/Mix/Mix
-#: ../objects/FS/function.c:826
-#: ../objects/FS/function.c:828
+#: ../objects/FS/function.c:829 ../objects/FS/function.c:831
 msgid "Mix"
 msgstr "Ð?еÑ?емеÑ?иваÑ?Ñ?"
 
 #. Translators: Menu item Verb/Connect/Mix/Combine
-#: ../objects/FS/function.c:830
+#: ../objects/FS/function.c:833
 msgid "Combine"
 msgstr "Ð?бÑ?единÑ?Ñ?Ñ?"
 
 #. Translators: Menu item Verb/Connect/Mix/Blend
-#: ../objects/FS/function.c:832
+#: ../objects/FS/function.c:835
 msgid "Blend"
 msgstr "СмеÑ?иваÑ?Ñ?"
 
 #. Translators: Menu item Verb/Connect/Mix/Add
-#: ../objects/FS/function.c:834
+#: ../objects/FS/function.c:837
 msgid "Add"
 msgstr "Ð?обавлÑ?Ñ?Ñ?"
 
 #. Translators: Menu item Verb/Connect/Mix/Pack
-#: ../objects/FS/function.c:836
+#: ../objects/FS/function.c:839
 msgid "Pack"
 msgstr "УпаковÑ?ваÑ?Ñ?"
 
 #. Translators: Menu item Verb/Connect/Mix/Coalesce
-#: ../objects/FS/function.c:838
+#: ../objects/FS/function.c:841
 msgid "Coalesce"
 msgstr "СÑ?аÑ?иваÑ?Ñ?"
 
 #. Translators: Menu item Verb/Branch
 #. Translators: Menu item Verb/Branch/Branch
-#: ../objects/FS/function.c:840
-#: ../objects/FS/function.c:842
+#: ../objects/FS/function.c:843 ../objects/FS/function.c:845
 #: ../sheets/UML.sheet.in.h:5
 msgid "Branch"
 msgstr "РазвеÑ?влÑ?Ñ?Ñ?"
@@ -3662,730 +3570,704 @@ msgstr "РазвеÑ?влÑ?Ñ?Ñ?"
 #. Translators: Menu item Verb/Branch/Separate
 #. Translators: Menu item Verb/Branch/Separate/Separate
 #. Translators: Menu item Verb/Branch/Separate/Separate/Separate
-#: ../objects/FS/function.c:844
-#: ../objects/FS/function.c:846
-#: ../objects/FS/function.c:848
+#: ../objects/FS/function.c:847 ../objects/FS/function.c:849
+#: ../objects/FS/function.c:851
 msgid "Separate"
 msgstr "Ð?Ñ?делÑ?Ñ?Ñ?"
 
 #. Translators: Menu item Verb/Branch/Separate/Separate/Switch
-#: ../objects/FS/function.c:850
+#: ../objects/FS/function.c:853
 msgid "Switch"
 msgstr "Ð?еÑ?еклÑ?Ñ?аÑ?Ñ?"
 
 #. Translators: Menu item Verb/Branch/Separate/Separate/Divide
-#: ../objects/FS/function.c:852
+#: ../objects/FS/function.c:855
 msgid "Divide"
 msgstr "РазделÑ?Ñ?Ñ?"
 
 #. Translators: Menu item Verb/Branch/Separate/Separate/Release
-#: ../objects/FS/function.c:854
+#: ../objects/FS/function.c:857
 msgid "Release"
 msgstr "Ð?Ñ?пÑ?Ñ?каÑ?Ñ?"
 
 #. Translators: Menu item Verb/Branch/Separate/Separate/Detach
-#: ../objects/FS/function.c:856
+#: ../objects/FS/function.c:859
 msgid "Detach"
 msgstr "Ð?Ñ?Ñ?оединÑ?Ñ?Ñ?"
 
 #. Translators: Menu item Verb/Branch/Separate/Separate/Disconnect
-#: ../objects/FS/function.c:858
+#: ../objects/FS/function.c:861
 msgid "Disconnect"
 msgstr "Ð?Ñ?клÑ?Ñ?аÑ?Ñ?"
 
 #. Translators: Menu item Verb/Branch/Separate/Remove/Cut
-#: ../objects/FS/function.c:864
+#: ../objects/FS/function.c:867
 msgid "Cut"
 msgstr "Ð?Ñ?Ñ?езаÑ?Ñ?"
 
 #. Translators: Menu item Verb/Branch/Separate/Remove/Polish
-#: ../objects/FS/function.c:866
+#: ../objects/FS/function.c:869
 msgid "Polish"
 msgstr "Ð?олиÑ?оваÑ?Ñ?"
 
 #. Translators: Menu item Verb/Branch/Separate/Remove/Sand
-#: ../objects/FS/function.c:868
+#: ../objects/FS/function.c:871
 msgid "Sand"
 msgstr "ЧиÑ?Ñ?иÑ?Ñ? пеÑ?ком"
 
 #. Translators: Menu item Verb/Branch/Separate/Remove/Drill
-#: ../objects/FS/function.c:870
+#: ../objects/FS/function.c:873
 msgid "Drill"
 msgstr "СвеÑ?лиÑ?Ñ?"
 
 #. Translators: Menu item Verb/Branch/Separate/Remove/Lathe
-#: ../objects/FS/function.c:872
+#: ../objects/FS/function.c:875
 msgid "Lathe"
 msgstr "Ð?Ñ?Ñ?аÑ?иваÑ?Ñ?"
 
 #. Translators: Menu item Verb/Branch/Refine
 #. Translators: Menu item Verb/Branch/Refine/Refine
-#: ../objects/FS/function.c:874
-#: ../objects/FS/function.c:876
+#: ../objects/FS/function.c:877 ../objects/FS/function.c:879
 msgid "Refine"
 msgstr "Ð?благоÑ?аживаÑ?Ñ?"
 
 #. Translators: Menu item Verb/Branch/Refine/Purify
-#: ../objects/FS/function.c:878
+#: ../objects/FS/function.c:881
 msgid "Purify"
 msgstr "Ð?Ñ?иÑ?аÑ?Ñ?"
 
 #. Translators: Menu item Verb/Branch/Refine/Strain
-#: ../objects/FS/function.c:880
+#: ../objects/FS/function.c:883
 msgid "Strain"
 msgstr "Ð?аÑ?Ñ?гиваÑ?Ñ?"
 
 #. Translators: Menu item Verb/Branch/Refine/Filter
-#: ../objects/FS/function.c:882
+#: ../objects/FS/function.c:885
 msgid "Filter"
 msgstr "ФилÑ?Ñ?Ñ?оваÑ?Ñ?"
 
 #. Translators: Menu item Verb/Branch/Refine/Percolate
-#: ../objects/FS/function.c:884
+#: ../objects/FS/function.c:887
 msgid "Percolate"
 msgstr "Ð?Ñ?оÑ?еживаÑ?Ñ?"
 
 #. Translators: Menu item Verb/Branch/Refine/Clear
-#: ../objects/FS/function.c:886
+#: ../objects/FS/function.c:889
 msgid "Clear"
 msgstr "Ð?Ñ?иÑ?аÑ?Ñ?"
 
 #. Translators: Menu item Verb/Branch/Distribute
 #. Translators: Menu item Verb/Branch/Distribute/Distribute
-#: ../objects/FS/function.c:888
-#: ../objects/FS/function.c:890
+#: ../objects/FS/function.c:891 ../objects/FS/function.c:893
 msgid "Distribute"
 msgstr "РаÑ?пÑ?еделÑ?Ñ?Ñ?"
 
 #. Translators: Menu item Verb/Branch/Distribute/Diverge
-#: ../objects/FS/function.c:892
+#: ../objects/FS/function.c:895
 msgid "Diverge"
 msgstr "Ð?Ñ?клонÑ?Ñ?Ñ?"
 
 #. Translators: Menu item Verb/Branch/Distribute/Scatter
-#: ../objects/FS/function.c:894
+#: ../objects/FS/function.c:897
 msgid "Scatter"
 msgstr "РазбÑ?аÑ?Ñ?ваÑ?Ñ?"
 
 #. Translators: Menu item Verb/Branch/Distribute/Disperse
-#: ../objects/FS/function.c:896
+#: ../objects/FS/function.c:899
 msgid "Disperse"
 msgstr "РаÑ?Ñ?еиваÑ?Ñ?"
 
 #. Translators: Menu item Verb/Branch/Distribute/Diffuse
 #. Translators: Menu item Verb/Branch/Dissipate/Diffuse
-#: ../objects/FS/function.c:898
-#: ../objects/FS/function.c:912
+#: ../objects/FS/function.c:901 ../objects/FS/function.c:915
 msgid "Diffuse"
 msgstr "РаÑ?пÑ?лÑ?Ñ?Ñ?"
 
 #. Translators: Menu item Verb/Branch/Distribute/Empty
-#: ../objects/FS/function.c:900
+#: ../objects/FS/function.c:903
 msgid "Empty"
 msgstr "Ð?Ñ?Ñ?Ñ?о"
 
 #. Translators: Menu item Verb/Branch/Dissipate
 #. Translators: Menu item Verb/Branch/Dissipate/Dissipate
-#: ../objects/FS/function.c:902
-#: ../objects/FS/function.c:904
+#: ../objects/FS/function.c:905 ../objects/FS/function.c:907
 msgid "Dissipate"
 msgstr "РаÑ?Ñ?оÑ?аÑ?Ñ?"
 
 #. Translators: Menu item Verb/Branch/Dissipate/Absorb
-#: ../objects/FS/function.c:906
+#: ../objects/FS/function.c:909
 msgid "Absorb"
 msgstr "Ð?оглоÑ?аÑ?Ñ?"
 
 #. Translators: Menu item Verb/Branch/Dissipate/Dampen
-#: ../objects/FS/function.c:908
+#: ../objects/FS/function.c:911
 msgid "Dampen"
 msgstr "Ð?Ñ?Ñ?Ñ?Ñ?еваÑ?Ñ?"
 
 #. Translators: Menu item Verb/Branch/Dissipate/Dispel
-#: ../objects/FS/function.c:910
+#: ../objects/FS/function.c:913
 msgid "Dispel"
 msgstr "РазгонÑ?Ñ?Ñ?"
 
 #. Translators: Menu item Verb/Branch/Dissipate/Resist
-#: ../objects/FS/function.c:914
+#: ../objects/FS/function.c:917
 msgid "Resist"
 msgstr "СопÑ?оÑ?ивлÑ?Ñ?Ñ?Ñ?Ñ?"
 
 #. Translators: Menu item Verb/Provision
 #. Translators: Menu item Verb/Provision/Provision
-#: ../objects/FS/function.c:916
-#: ../objects/FS/function.c:918
+#: ../objects/FS/function.c:919 ../objects/FS/function.c:921
 msgid "Provision"
 msgstr "Ð?беÑ?пеÑ?иваÑ?Ñ?"
 
 #. Translators: Menu item Verb/Provision/Store
 #. Translators: Menu item Verb/Provision/Store/Store
-#: ../objects/FS/function.c:920
-#: ../objects/FS/function.c:922
+#: ../objects/FS/function.c:923 ../objects/FS/function.c:925
 msgid "Store"
 msgstr "Ð¥Ñ?аниÑ?Ñ?"
 
 #. Translators: Menu item Verb/Provision/Store/Contain
-#: ../objects/FS/function.c:924
+#: ../objects/FS/function.c:927
 msgid "Contain"
 msgstr "СодеÑ?жаÑ?Ñ?"
 
 #. Translators: Menu item Verb/Provision/Store/Collect
-#: ../objects/FS/function.c:926
+#: ../objects/FS/function.c:929
 msgid "Collect"
 msgstr "СобиÑ?аÑ?Ñ?"
 
 #. Translators: Menu item Verb/Provision/Store/Reserve
-#: ../objects/FS/function.c:928
+#: ../objects/FS/function.c:931
 msgid "Reserve"
 msgstr "Ð?апаÑ?аÑ?Ñ?"
 
 #. Translators: Menu item Verb/Provision/Supply
 #. Translators: Menu item Verb/Provision/Supply/Supply
-#: ../objects/FS/function.c:932
-#: ../objects/FS/function.c:934
+#: ../objects/FS/function.c:935 ../objects/FS/function.c:937
 msgid "Supply"
 msgstr "Ð?оÑ?Ñ?авлÑ?Ñ?Ñ?"
 
 #. Translators: Menu item Verb/Provision/Supply/Fill
-#: ../objects/FS/function.c:936
+#: ../objects/FS/function.c:939
 msgid "Fill"
 msgstr "Ð?аполнÑ?Ñ?Ñ?"
 
 #. Translators: Menu item Verb/Provision/Supply/Provide
-#: ../objects/FS/function.c:938
+#: ../objects/FS/function.c:941
 msgid "Provide"
 msgstr "Ð?Ñ?едоÑ?Ñ?авлÑ?Ñ?Ñ?"
 
 #. Translators: Menu item Verb/Provision/Supply/Replenish
-#: ../objects/FS/function.c:940
+#: ../objects/FS/function.c:943
 msgid "Replenish"
 msgstr "Ð?ополнÑ?Ñ?Ñ?"
 
 #. Translators: Menu item Verb/Provision/Supply/Expose
-#: ../objects/FS/function.c:942
+#: ../objects/FS/function.c:945
 msgid "Expose"
 msgstr "Ð?Ñ?Ñ?Ñ?авлÑ?Ñ?Ñ?"
 
 #. Translators: Menu item Verb/Provision/Extract
-#: ../objects/FS/function.c:944
-#: ../sheets/Flowchart.sheet.in.h:9
+#: ../objects/FS/function.c:947 ../sheets/Flowchart.sheet.in.h:9
 msgid "Extract"
 msgstr "Ð?звлекаÑ?Ñ?"
 
 #. Translators: Menu item Verb/Control Magnitude
 #. Translators: Menu item Verb/Control Magnitude/Control Magnitude
-#: ../objects/FS/function.c:946
-#: ../objects/FS/function.c:948
+#: ../objects/FS/function.c:949 ../objects/FS/function.c:951
 msgid "Control Magnitude"
 msgstr "Ð?онÑ?Ñ?олÑ?ное знаÑ?ение"
 
 #. Translators: Menu item Verb/Control Magnitude/Actuate
 #. Translators: Menu item Verb/Control Magnitude/Actuate/Actuate
-#: ../objects/FS/function.c:950
-#: ../objects/FS/function.c:952
+#: ../objects/FS/function.c:953 ../objects/FS/function.c:955
 msgid "Actuate"
 msgstr "Ð?Ñ?ивеÑ?Ñ?и в дейÑ?Ñ?вие"
 
 #. Translators: Menu item Verb/Control Magnitude/Actuate/Start
-#: ../objects/FS/function.c:954
+#: ../objects/FS/function.c:957
 msgid "Start"
 msgstr "Ð?аÑ?аÑ?Ñ?"
 
 #. Translators: Menu item Verb/Control Magnitude/Actuate/Initiate
-#: ../objects/FS/function.c:956
+#: ../objects/FS/function.c:959
 msgid "Initiate"
 msgstr "Ð?ниÑ?ииÑ?оваÑ?Ñ?"
 
 #. Translators: Menu item Verb/Control Magnitude/Regulate
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Regulate
-#: ../objects/FS/function.c:958
-#: ../objects/FS/function.c:960
+#: ../objects/FS/function.c:961 ../objects/FS/function.c:963
 msgid "Regulate"
 msgstr "РегÑ?лиÑ?оваÑ?Ñ?"
 
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Control
 #. Translators: Menu item Noun/Signal/Control
-#: ../objects/FS/function.c:962
-#: ../objects/FS/function.c:1180
-#: ../objects/UML/classicon.c:129
+#: ../objects/FS/function.c:965 ../objects/FS/function.c:1183
+#: ../objects/UML/classicon.c:130
 msgid "Control"
 msgstr "Ð?онÑ?Ñ?олиÑ?оваÑ?Ñ?"
 
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Enable
-#: ../objects/FS/function.c:968
+#: ../objects/FS/function.c:971
 msgid "Enable"
 msgstr "Ð?клÑ?Ñ?аÑ?Ñ?"
 
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Disable
-#: ../objects/FS/function.c:970
+#: ../objects/FS/function.c:973
 msgid "Disable"
 msgstr "Ð?Ñ?клÑ?Ñ?аÑ?Ñ?"
 
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Limit
-#: ../objects/FS/function.c:972
+#: ../objects/FS/function.c:975
 msgid "Limit"
 msgstr "Ð?гÑ?аниÑ?иваÑ?Ñ?"
 
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Interrupt
-#: ../objects/FS/function.c:974
+#: ../objects/FS/function.c:977
 msgid "Interrupt"
 msgstr "Ð?Ñ?еÑ?Ñ?ваÑ?Ñ?"
 
 #. Translators: Menu item Verb/Control Magnitude/Change
 #. Translators: Menu item Verb/Control Magnitude/Change/Change
-#: ../objects/FS/function.c:976
-#: ../objects/FS/function.c:978
+#: ../objects/FS/function.c:979 ../objects/FS/function.c:981
 msgid "Change"
 msgstr "Ð?зменÑ?Ñ?Ñ?"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Increase
-#: ../objects/FS/function.c:980
+#: ../objects/FS/function.c:983
 msgid "Increase"
 msgstr "УвелиÑ?иваÑ?Ñ?"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Decrease
-#: ../objects/FS/function.c:982
+#: ../objects/FS/function.c:985
 msgid "Decrease"
 msgstr "УменÑ?Ñ?аÑ?Ñ?"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Amplify
-#: ../objects/FS/function.c:984
+#: ../objects/FS/function.c:987
 msgid "Amplify"
 msgstr "УÑ?иливаÑ?Ñ?"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Reduce
-#: ../objects/FS/function.c:986
+#: ../objects/FS/function.c:989
 msgid "Reduce"
 msgstr "Ð?Ñ?лаблÑ?Ñ?Ñ?"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Normalize
-#: ../objects/FS/function.c:990
+#: ../objects/FS/function.c:993
 msgid "Normalize"
 msgstr "Ð?оÑ?мализоваÑ?Ñ?"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Multiply
-#: ../objects/FS/function.c:992
+#: ../objects/FS/function.c:995
 msgid "Multiply"
 msgstr "УмножаÑ?Ñ?"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Scale
 #. FIXME: mark read-only
-#: ../objects/FS/function.c:994
-#: ../objects/Misc/measure.c:186
+#: ../objects/FS/function.c:997 ../objects/Misc/measure.c:186
 msgid "Scale"
 msgstr "Ð?аÑ?Ñ?Ñ?абиÑ?оваÑ?Ñ?"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Rectify
-#: ../objects/FS/function.c:996
+#: ../objects/FS/function.c:999
 msgid "Rectify"
 msgstr "Ð?Ñ?пÑ?авлÑ?Ñ?Ñ?"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Adjust
-#: ../objects/FS/function.c:998
+#: ../objects/FS/function.c:1001
 msgid "Adjust"
 msgstr "Ð?одбиÑ?аÑ?Ñ?"
 
 #. Translators: Menu item Verb/Control Magnitude/Form
 #. Translators: Menu item Verb/Control Magnitude/Form/Form
-#: ../objects/FS/function.c:1000
-#: ../objects/FS/function.c:1002
+#: ../objects/FS/function.c:1003 ../objects/FS/function.c:1005
 msgid "Form"
 msgstr "ФоÑ?миÑ?оваÑ?Ñ?"
 
 #. Translators: Menu item Verb/Control Magnitude/Form/Compact
-#: ../objects/FS/function.c:1004
+#: ../objects/FS/function.c:1007
 msgid "Compact"
 msgstr "УпаковÑ?ваÑ?Ñ?"
 
 #. Translators: Menu item Verb/Control Magnitude/Form/Crush
-#: ../objects/FS/function.c:1006
+#: ../objects/FS/function.c:1009
 msgid "Crush"
 msgstr "РаздавливаÑ?Ñ?"
 
 #. Translators: Menu item Verb/Control Magnitude/Form/Shape
-#: ../objects/FS/function.c:1008
+#: ../objects/FS/function.c:1011
 msgid "Shape"
 msgstr "Ð?Ñ?идаваÑ?Ñ? Ñ?оÑ?мÑ?"
 
 #. Translators: Menu item Verb/Control Magnitude/Form/Compress
-#: ../objects/FS/function.c:1010
+#: ../objects/FS/function.c:1013
 msgid "Compress"
 msgstr "СжимаÑ?Ñ?"
 
 #. Translators: Menu item Verb/Control Magnitude/Form/Pierce
-#: ../objects/FS/function.c:1012
+#: ../objects/FS/function.c:1015
 msgid "Pierce"
 msgstr "Ð?Ñ?онзаÑ?Ñ?"
 
 #. Translators: Menu item Verb/Convert
 #. Translators: Menu item Verb/Convert/Convert
-#: ../objects/FS/function.c:1014
-#: ../objects/FS/function.c:1016
+#: ../objects/FS/function.c:1017 ../objects/FS/function.c:1019
 msgid "Convert"
 msgstr "Ð?Ñ?еобÑ?азоваÑ?Ñ?"
 
 #. Translators: Menu item Verb/Convert/Transform
-#: ../objects/FS/function.c:1018
+#: ../objects/FS/function.c:1021
 msgid "Transform"
 msgstr "ТÑ?анÑ?Ñ?оÑ?миÑ?оваÑ?Ñ?"
 
 #. Translators: Menu item Verb/Convert/Liquefy
-#: ../objects/FS/function.c:1020
+#: ../objects/FS/function.c:1023
 msgid "Liquefy"
 msgstr "СжижаÑ?Ñ?"
 
 #. Translators: Menu item Verb/Convert/Solidify
-#: ../objects/FS/function.c:1022
+#: ../objects/FS/function.c:1025
 msgid "Solidify"
 msgstr "Ð?Ñ?веÑ?деваÑ?Ñ?"
 
 #. Translators: Menu item Verb/Convert/Evaporate
-#: ../objects/FS/function.c:1024
+#: ../objects/FS/function.c:1027
 msgid "Evaporate"
 msgstr "Ð?Ñ?паÑ?иваÑ?Ñ?"
 
 #. Translators: Menu item Verb/Convert/Sublimate
-#: ../objects/FS/function.c:1026
+#: ../objects/FS/function.c:1029
 msgid "Sublimate"
 msgstr "Ð?Ñ?аждаÑ?Ñ?"
 
 #. Translators: Menu item Verb/Convert/Condense
-#: ../objects/FS/function.c:1028
+#: ../objects/FS/function.c:1031
 msgid "Condense"
 msgstr "Ð?онденÑ?иÑ?оваÑ?Ñ?"
 
 #. Translators: Menu item Verb/Convert/Integrate
-#: ../objects/FS/function.c:1030
+#: ../objects/FS/function.c:1033
 msgid "Integrate"
 msgstr "УкÑ?Ñ?пнÑ?Ñ?Ñ?"
 
 #. Translators: Menu item Verb/Convert/Differentiate
-#: ../objects/FS/function.c:1032
+#: ../objects/FS/function.c:1035
 msgid "Differentiate"
 msgstr "РазлиÑ?аÑ?Ñ?"
 
 #. Translators: Menu item Verb/Convert/Process
-#: ../objects/FS/function.c:1034
-#: ../sheets/AADL.sheet.in.h:8
+#: ../objects/FS/function.c:1037 ../sheets/AADL.sheet.in.h:8
 #: ../sheets/Gane_and_Sarson.sheet.in.h:7
 msgid "Process"
 msgstr "Ð?бÑ?абаÑ?Ñ?ваÑ?Ñ?"
 
 #. Translators: Menu item Verb/Signal/Sense
 #. Translators: Menu item Verb/Signal/Sense/Sense
-#: ../objects/FS/function.c:1040
-#: ../objects/FS/function.c:1042
+#: ../objects/FS/function.c:1043 ../objects/FS/function.c:1045
 msgid "Sense"
 msgstr "Ð?Ñ?Ñ?Ñ?аÑ?Ñ?"
 
 #. Translators: Menu item Verb/Signal/Sense/Perceive
-#: ../objects/FS/function.c:1044
+#: ../objects/FS/function.c:1047
 msgid "Perceive"
 msgstr "Ð?оÑ?пÑ?инимаÑ?Ñ?"
 
 #. Translators: Menu item Verb/Signal/Sense/Recognize
-#: ../objects/FS/function.c:1046
+#: ../objects/FS/function.c:1049
 msgid "Recognize"
 msgstr "РаÑ?познаваÑ?Ñ?"
 
 #. Translators: Menu item Verb/Signal/Sense/Discern
-#: ../objects/FS/function.c:1048
+#: ../objects/FS/function.c:1051
 msgid "Discern"
 msgstr "РазлиÑ?аÑ?Ñ?"
 
 #. Translators: Menu item Verb/Signal/Sense/Check
-#: ../objects/FS/function.c:1050
+#: ../objects/FS/function.c:1053
 msgid "Check"
 msgstr "Ð?онÑ?Ñ?олиÑ?оваÑ?Ñ?"
 
 #. Translators: Menu item Verb/Signal/Sense/Verify
-#: ../objects/FS/function.c:1054
+#: ../objects/FS/function.c:1057
 msgid "Verify"
 msgstr "Ð?Ñ?овеÑ?Ñ?Ñ?Ñ?"
 
 #. Translators: Menu item Verb/Signal/Indicate
 #. Translators: Menu item Verb/Signal/Indicate/Indicate
-#: ../objects/FS/function.c:1056
-#: ../objects/FS/function.c:1058
+#: ../objects/FS/function.c:1059 ../objects/FS/function.c:1061
 msgid "Indicate"
 msgstr "УказÑ?ваÑ?Ñ?"
 
 #. Translators: Menu item Verb/Signal/Indicate/Mark
-#: ../objects/FS/function.c:1060
+#: ../objects/FS/function.c:1063
 msgid "Mark"
 msgstr "Ð?омеÑ?аÑ?Ñ?"
 
 #. Translators: Menu item Verb/Signal/Display
-#: ../objects/FS/function.c:1062
-#: ../sheets/Flowchart.sheet.in.h:7
+#: ../objects/FS/function.c:1065 ../sheets/Flowchart.sheet.in.h:7
 msgid "Display"
 msgstr "Ð?оказÑ?ваÑ?Ñ?"
 
 #. Translators: Menu item Verb/Signal/Measure
 #. Translators: Menu item Verb/Signal/Measure/Measure
-#: ../objects/FS/function.c:1064
-#: ../objects/FS/function.c:1066
+#: ../objects/FS/function.c:1067 ../objects/FS/function.c:1069
 msgid "Measure"
 msgstr "Ð?змеÑ?Ñ?Ñ?Ñ?"
 
 #. Translators: Menu item Verb/Signal/Measure/Calculate
-#: ../objects/FS/function.c:1068
+#: ../objects/FS/function.c:1071
 msgid "Calculate"
 msgstr "Ð?Ñ?Ñ?иÑ?лÑ?Ñ?Ñ?"
 
 #. Translators: Menu item Verb/Signal/Represent
-#: ../objects/FS/function.c:1070
+#: ../objects/FS/function.c:1073
 msgid "Represent"
 msgstr "Ð?Ñ?едоÑ?Ñ?авлÑ?Ñ?Ñ?"
 
 #. Translators: Menu item Noun
-#: ../objects/FS/function.c:1072
+#: ../objects/FS/function.c:1075
 msgid "Noun"
 msgstr "СÑ?Ñ?еÑ?Ñ?виÑ?елÑ?ное"
 
 #. Translators: Menu item Noun/Material/Liquid
-#: ../objects/FS/function.c:1078
+#: ../objects/FS/function.c:1081
 msgid "Liquid"
 msgstr "Ð?идкоÑ?Ñ?Ñ?"
 
 #. Translators: Menu item Noun/Material/Gas
-#: ../objects/FS/function.c:1080
+#: ../objects/FS/function.c:1083
 msgid "Gas"
 msgstr "Ð?аз"
 
 #. Translators: Menu item Noun/Material/Human
 #. Translators: Menu item Noun/Material/Human/Human
 #. Translators: Menu item Noun/Energy/Human
-#: ../objects/FS/function.c:1082
-#: ../objects/FS/function.c:1084
-#: ../objects/FS/function.c:1168
+#: ../objects/FS/function.c:1085 ../objects/FS/function.c:1087
+#: ../objects/FS/function.c:1171
 msgid "Human"
 msgstr "Человек"
 
 #. Translators: Menu item Noun/Material/Human/Hand
-#: ../objects/FS/function.c:1086
+#: ../objects/FS/function.c:1089
 msgid "Hand"
 msgstr "Ð Ñ?ка"
 
 #. Translators: Menu item Noun/Material/Human/Foot
-#: ../objects/FS/function.c:1088
+#: ../objects/FS/function.c:1091
 msgid "Foot"
 msgstr "Ð?ога"
 
 #. Translators: Menu item Noun/Material/Human/Head
-#: ../objects/FS/function.c:1090
+#: ../objects/FS/function.c:1093
 msgid "Head"
 msgstr "Ð?олова"
 
 #. Translators: Menu item Noun/Material/Human/Finger
-#: ../objects/FS/function.c:1092
+#: ../objects/FS/function.c:1095
 msgid "Finger"
 msgstr "Ð?алеÑ?"
 
 #. Translators: Menu item Noun/Material/Human/Toe
-#: ../objects/FS/function.c:1094
+#: ../objects/FS/function.c:1097
 msgid "Toe"
 msgstr "Ð?оÑ?ок"
 
 #. Translators: Menu item Noun/Material/Biological
-#: ../objects/FS/function.c:1096
+#: ../objects/FS/function.c:1099
 msgid "Biological"
 msgstr "Ð?иологиÑ?еÑ?кий"
 
 #. Translators: Menu item Noun/Energy/Mechanical
-#: ../objects/FS/function.c:1100
+#: ../objects/FS/function.c:1103
 msgid "Mechanical"
 msgstr "Ð?еÑ?аниÑ?еÑ?каÑ?"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Mech. Energy
-#: ../objects/FS/function.c:1102
+#: ../objects/FS/function.c:1105
 msgid "Mech. Energy"
 msgstr "Ð?еÑ?аниÑ?еÑ?каÑ? Ñ?неÑ?гиÑ?"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Translation
-#: ../objects/FS/function.c:1104
+#: ../objects/FS/function.c:1107
 msgid "Translation"
 msgstr "Ð?оÑ?Ñ?Ñ?паÑ?елÑ?ное движение"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Force
-#: ../objects/FS/function.c:1106
+#: ../objects/FS/function.c:1109
 msgid "Force"
 msgstr "Сила"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Rotation
-#: ../objects/FS/function.c:1108
-#: ../objects/standard/outline.c:206
+#: ../objects/FS/function.c:1111 ../objects/standard/outline.c:206
 msgid "Rotation"
 msgstr "Ð?Ñ?аÑ?ение"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Torque
-#: ../objects/FS/function.c:1110
+#: ../objects/FS/function.c:1113
 msgid "Torque"
 msgstr "Ð?Ñ?аÑ?аÑ?Ñ?ий моменÑ?"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Random Motion
-#: ../objects/FS/function.c:1112
+#: ../objects/FS/function.c:1115
 msgid "Random Motion"
 msgstr "СлÑ?Ñ?айное движение"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Vibration
-#: ../objects/FS/function.c:1114
+#: ../objects/FS/function.c:1117
 msgid "Vibration"
 msgstr "Ð?ибÑ?аÑ?иÑ?"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Rotational Energy
-#: ../objects/FS/function.c:1116
+#: ../objects/FS/function.c:1119
 msgid "Rotational Energy"
 msgstr "ЭнеÑ?гиÑ? вÑ?аÑ?ениÑ?"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Translational Energy
-#: ../objects/FS/function.c:1118
+#: ../objects/FS/function.c:1121
 msgid "Translational Energy"
 msgstr "ЭнеÑ?гиÑ? движениÑ?"
 
 #. Translators: Menu item Noun/Energy/Electricity
-#: ../objects/FS/function.c:1120
+#: ../objects/FS/function.c:1123
 msgid "Electrical"
 msgstr "ЭлекÑ?Ñ?иÑ?еÑ?каÑ?"
 
 #. Translators: Menu item Noun/Energy/Electricity/Electricity
-#: ../objects/FS/function.c:1122
+#: ../objects/FS/function.c:1125
 msgid "Electricity"
 msgstr "ЭлекÑ?Ñ?иÑ?еÑ?Ñ?во"
 
 #. Translators: Menu item Noun/Energy/Electricity/Voltage
-#: ../objects/FS/function.c:1124
+#: ../objects/FS/function.c:1127
 msgid "Voltage"
 msgstr "Ð?апÑ?Ñ?жение"
 
 #. Translators: Menu item Noun/Energy/Electricity/Current
-#: ../objects/FS/function.c:1126
+#: ../objects/FS/function.c:1129
 msgid "Current"
 msgstr "Ток"
 
 #. Translators: Menu item Noun/Energy/Hydraulic
-#: ../objects/FS/function.c:1128
+#: ../objects/FS/function.c:1131
 msgid "Hydraulic"
 msgstr "Ð?идÑ?авлиÑ?еÑ?каÑ?"
 
 #. Translators: Menu item Noun/Energy/Hydraulic/Pressure
-#: ../objects/FS/function.c:1130
+#: ../objects/FS/function.c:1133
 msgid "Pressure"
 msgstr "Ð?авление"
 
 #. Translators: Menu item Noun/Energy/Hydraulic/Volumetric Flow
-#: ../objects/FS/function.c:1132
+#: ../objects/FS/function.c:1135
 msgid "Volumetric Flow"
 msgstr "Ð?бÑ?Ñ?мнÑ?й поÑ?ок"
 
 #. Translators: Menu item Noun/Energy/Thermal
-#: ../objects/FS/function.c:1134
+#: ../objects/FS/function.c:1137
 msgid "Thermal"
 msgstr "ТепловаÑ?"
 
 #. Translators: Menu item Noun/Energy/Thermal/Heat
-#: ../objects/FS/function.c:1136
+#: ../objects/FS/function.c:1139
 msgid "Heat"
 msgstr "Ð?агÑ?ев"
 
 #. Translators: Menu item Noun/Energy/Thermal/Conduction
-#: ../objects/FS/function.c:1138
+#: ../objects/FS/function.c:1141
 msgid "Conduction"
 msgstr "Ð?Ñ?оводимоÑ?Ñ?Ñ?"
 
 #. Translators: Menu item Noun/Energy/Thermal/Convection
-#: ../objects/FS/function.c:1140
+#: ../objects/FS/function.c:1143
 msgid "Convection"
 msgstr "Ð?онвекÑ?иÑ?"
 
 #. Translators: Menu item Noun/Energy/Thermal/Radiation
 #. Translators: Menu item Noun/Energy/Radioactive/Radiation
-#: ../objects/FS/function.c:1142
-#: ../objects/FS/function.c:1150
+#: ../objects/FS/function.c:1145 ../objects/FS/function.c:1153
 msgid "Radiation"
 msgstr "Ð?злÑ?Ñ?ение"
 
 #. Translators: Menu item Noun/Energy/Pneumatic
-#: ../objects/FS/function.c:1144
+#: ../objects/FS/function.c:1147
 msgid "Pneumatic"
 msgstr "Ð?невмаÑ?иÑ?еÑ?каÑ?"
 
 #. Translators: Menu item Noun/Energy/Chemical
-#: ../objects/FS/function.c:1146
+#: ../objects/FS/function.c:1149
 msgid "Chemical"
 msgstr "ХимиÑ?"
 
 #. Translators: Menu item Noun/Energy/Radioactive
-#: ../objects/FS/function.c:1148
+#: ../objects/FS/function.c:1151
 msgid "Radioactive"
 msgstr "РадиоакÑ?ивнаÑ?"
 
 #. Translators: Menu item Noun/Energy/Radioactive/Microwaves
-#: ../objects/FS/function.c:1152
+#: ../objects/FS/function.c:1155
 msgid "Microwaves"
 msgstr "Ð?икÑ?оволноваÑ?"
 
 #. Translators: Menu item Noun/Energy/Radioactive/Radio waves
-#: ../objects/FS/function.c:1154
+#: ../objects/FS/function.c:1157
 msgid "Radio waves"
 msgstr "РадиоволноваÑ?"
 
 #. Translators: Menu item Noun/Energy/Radioactive/X-Rays
-#: ../objects/FS/function.c:1156
+#: ../objects/FS/function.c:1159
 msgid "X-Rays"
 msgstr "РенÑ?геновÑ?каÑ?"
 
 #. Translators: Menu item Noun/Energy/Radioactive/Gamma Rays
-#: ../objects/FS/function.c:1158
+#: ../objects/FS/function.c:1161
 msgid "Gamma Rays"
 msgstr "Ð?амма-излÑ?Ñ?ение"
 
 #. Translators: Menu item Noun/Energy/Acoustic Energy
-#: ../objects/FS/function.c:1160
+#: ../objects/FS/function.c:1163
 msgid "Acoustic Energy"
 msgstr "Ð?кÑ?Ñ?Ñ?иÑ?еÑ?каÑ? Ñ?неÑ?гиÑ?"
 
 #. Translators: Menu item Noun/Energy/Optical Energy
-#: ../objects/FS/function.c:1162
+#: ../objects/FS/function.c:1165
 msgid "Optical Energy"
 msgstr "Ð?пÑ?иÑ?еÑ?каÑ? Ñ?неÑ?гиÑ?"
 
 #. Translators: Menu item Noun/Energy/Solar Energy
-#: ../objects/FS/function.c:1164
+#: ../objects/FS/function.c:1167
 msgid "Solar Energy"
 msgstr "СолнеÑ?наÑ? Ñ?неÑ?гиÑ?"
 
 #. Translators: Menu item Noun/Energy/Magnetic Energy
-#: ../objects/FS/function.c:1166
+#: ../objects/FS/function.c:1169
 msgid "Magnetic Energy"
 msgstr "Ð?агниÑ?наÑ? Ñ?неÑ?гиÑ?"
 
 #. Translators: Menu item Noun/Energy/Human/Human Motion
-#: ../objects/FS/function.c:1170
+#: ../objects/FS/function.c:1173
 msgid "Human Motion"
 msgstr "ЧеловеÑ?еÑ?кое пеÑ?емеÑ?ение"
 
 #. Translators: Menu item Noun/Energy/Human/Human Force
-#: ../objects/FS/function.c:1172
+#: ../objects/FS/function.c:1175
 msgid "Human Force"
 msgstr "ЧеловеÑ?еÑ?каÑ? Ñ?ила"
 
 #. Translators: Menu item Noun/Signal/Status
-#: ../objects/FS/function.c:1178
+#: ../objects/FS/function.c:1181
 msgid "Status"
 msgstr "СоÑ?Ñ?оÑ?ние"
 
-#: ../objects/FS/function.c:1182
+#: ../objects/FS/function.c:1185
 msgid "User/Device Fn"
 msgstr "ФÑ?нкÑ?иÑ? полÑ?зоваÑ?елÑ?/Ñ?Ñ?Ñ?Ñ?ойÑ?Ñ?ва"
 
-#: ../objects/FS/function.c:1183
+#: ../objects/FS/function.c:1186
 msgid "Wish Fn"
 msgstr "Ð?елаемаÑ? Ñ?Ñ?нкÑ?иÑ?"
 
-#: ../objects/GRAFCET/action.c:137
-#: ../sheets/SDL.sheet.in.h:9
+#: ../objects/GRAFCET/action.c:137 ../sheets/SDL.sheet.in.h:9
 msgid "Macro call"
 msgstr "Ð?Ñ?зов макÑ?оÑ?а"
 
@@ -4409,8 +4291,7 @@ msgstr "ШÑ?иÑ?Ñ? Ñ?Ñ?ловиÑ?"
 msgid "The condition's font size"
 msgstr "РазмеÑ? Ñ?Ñ?иÑ?Ñ?а Ñ?Ñ?ловиÑ?"
 
-#: ../objects/GRAFCET/condition.c:139
-#: ../objects/GRAFCET/transition.c:149
+#: ../objects/GRAFCET/condition.c:139 ../objects/GRAFCET/transition.c:149
 msgid "Color"
 msgstr "ЦвеÑ?"
 
@@ -4422,28 +4303,23 @@ msgstr "ЦвеÑ? Ñ?Ñ?ловиÑ?"
 msgid "GRAFCET diagram objects"
 msgstr "Ð?бÑ?екÑ?Ñ? диагÑ?аммÑ? GRAFCET"
 
-#: ../objects/GRAFCET/step.c:148
-#: ../sheets/GRAFCET.sheet.in.h:13
+#: ../objects/GRAFCET/step.c:148 ../sheets/GRAFCET.sheet.in.h:13
 msgid "Regular step"
 msgstr "Ð?бÑ?Ñ?нÑ?й Ñ?аг"
 
-#: ../objects/GRAFCET/step.c:149
-#: ../sheets/GRAFCET.sheet.in.h:6
+#: ../objects/GRAFCET/step.c:149 ../sheets/GRAFCET.sheet.in.h:6
 msgid "Initial step"
 msgstr "Ð?аÑ?алÑ?нÑ?й Ñ?аг"
 
-#: ../objects/GRAFCET/step.c:150
-#: ../sheets/GRAFCET.sheet.in.h:8
+#: ../objects/GRAFCET/step.c:150 ../sheets/GRAFCET.sheet.in.h:8
 msgid "Macro entry step"
 msgstr "Шаг вÑ?ода в макÑ?оÑ?"
 
-#: ../objects/GRAFCET/step.c:151
-#: ../sheets/GRAFCET.sheet.in.h:9
+#: ../objects/GRAFCET/step.c:151 ../sheets/GRAFCET.sheet.in.h:9
 msgid "Macro exit step"
 msgstr "Шаг вÑ?Ñ?ода из макÑ?оÑ?а"
 
-#: ../objects/GRAFCET/step.c:152
-#: ../sheets/GRAFCET.sheet.in.h:7
+#: ../objects/GRAFCET/step.c:152 ../sheets/GRAFCET.sheet.in.h:7
 msgid "Macro call step"
 msgstr "Шаг вÑ?зова макÑ?оÑ?а"
 
@@ -4519,23 +4395,17 @@ msgstr "Ð?"
 msgid "Vergent type:"
 msgstr "Тип Ñ?Ñ?ебÑ?а:"
 
-#: ../objects/GRAFCET/vergent.c:407
-#: ../objects/Istar/other.c:471
-#: ../objects/Jackson/domain.c:533
-#: ../objects/KAOS/goal.c:574
-#: ../objects/KAOS/other.c:527
-#: ../objects/SADT/box.c:449
-#: ../objects/standard/line.c:223
+#: ../objects/GRAFCET/vergent.c:407 ../objects/Istar/other.c:471
+#: ../objects/Jackson/domain.c:533 ../objects/KAOS/goal.c:574
+#: ../objects/KAOS/other.c:525 ../objects/SADT/box.c:454
+#: ../objects/standard/line.c:226
 msgid "Add connection point"
 msgstr "Ð?обавиÑ?Ñ? Ñ?оединиÑ?елÑ?нÑ?Ñ? Ñ?оÑ?кÑ?"
 
-#: ../objects/GRAFCET/vergent.c:408
-#: ../objects/Istar/other.c:472
-#: ../objects/Jackson/domain.c:534
-#: ../objects/KAOS/goal.c:575
-#: ../objects/KAOS/other.c:528
-#: ../objects/SADT/box.c:450
-#: ../objects/standard/line.c:224
+#: ../objects/GRAFCET/vergent.c:408 ../objects/Istar/other.c:472
+#: ../objects/Jackson/domain.c:534 ../objects/KAOS/goal.c:575
+#: ../objects/KAOS/other.c:526 ../objects/SADT/box.c:455
+#: ../objects/standard/line.c:227
 msgid "Delete connection point"
 msgstr "УдалиÑ?Ñ? Ñ?оединиÑ?елÑ?нÑ?Ñ? Ñ?оÑ?кÑ?"
 
@@ -4543,35 +4413,28 @@ msgstr "УдалиÑ?Ñ? Ñ?оединиÑ?елÑ?нÑ?Ñ? Ñ?оÑ?кÑ?"
 msgid "GRAFCET OR/AND vergent"
 msgstr "GRAFCET Ð?/Ð?Ð?Ð? Ñ?Ñ?ебеÑ?"
 
-#: ../objects/Istar/actor.c:68
-#: ../objects/Istar/link.c:150
+#: ../objects/Istar/actor.c:68 ../objects/Istar/link.c:150
 msgid "Unspecified"
 msgstr "Ð?еопÑ?еделÑ?ннÑ?й"
 
-#: ../objects/Istar/actor.c:69
-#: ../objects/KAOS/other.c:75
+#: ../objects/Istar/actor.c:69 ../objects/KAOS/other.c:75
 msgid "Agent"
 msgstr "Ð?генÑ?"
 
-#: ../objects/Istar/actor.c:71
-#: ../objects/UML/association.c:247
+#: ../objects/Istar/actor.c:71 ../objects/UML/association.c:251
 msgid "Role"
 msgstr "РолÑ?"
 
-#: ../objects/Istar/goal.c:76
-#: ../objects/KAOS/goal.c:79
+#: ../objects/Istar/goal.c:76 ../objects/KAOS/goal.c:79
 msgid "Softgoal"
 msgstr "Ð?Ñ?иблизиÑ?елÑ?наÑ? Ñ?елÑ?"
 
-#: ../objects/Istar/goal.c:77
-#: ../objects/KAOS/goal.c:80
+#: ../objects/Istar/goal.c:77 ../objects/KAOS/goal.c:80
 msgid "Goal"
 msgstr "ЦелÑ?"
 
-#: ../objects/Istar/goal.c:156
-#: ../objects/Istar/goal.c:157
-#: ../objects/KAOS/goal.c:159
-#: ../objects/KAOS/goal.c:160
+#: ../objects/Istar/goal.c:156 ../objects/Istar/goal.c:157
+#: ../objects/KAOS/goal.c:159 ../objects/KAOS/goal.c:160
 msgid "Goal Type"
 msgstr "Тип Ñ?ели"
 
@@ -4588,8 +4451,7 @@ msgstr "Ð?оложиÑ?елÑ?нÑ?й вклад"
 msgid "Negative contrib"
 msgstr "Ð?Ñ?Ñ?иÑ?аÑ?елÑ?нÑ?й вклад"
 
-#: ../objects/Istar/link.c:153
-#: ../sheets/UML.sheet.in.h:10
+#: ../objects/Istar/link.c:153 ../sheets/UML.sheet.in.h:10
 msgid "Dependency"
 msgstr "Ð?авиÑ?имоÑ?Ñ?Ñ?"
 
@@ -4605,8 +4467,7 @@ msgstr "СмÑ?Ñ?л-конеÑ?"
 msgid "Resource"
 msgstr "РеÑ?Ñ?Ñ?Ñ?"
 
-#: ../objects/Istar/other.c:74
-#: ../sheets/BPMN.sheet.in.h:43
+#: ../objects/Istar/other.c:74 ../sheets/BPMN.sheet.in.h:43
 msgid "Task"
 msgstr "Ð?адаÑ?а"
 
@@ -4638,8 +4499,7 @@ msgstr "Ð?оÑ?лÑ?Ñ?нÑ?й"
 msgid "Lexical"
 msgstr "Ð?екÑ?иÑ?еÑ?кий"
 
-#: ../objects/Jackson/domain.c:178
-#: ../objects/Jackson/domain.c:179
+#: ../objects/Jackson/domain.c:178 ../objects/Jackson/domain.c:179
 msgid "Domain Type"
 msgstr "Тип домена"
 
@@ -4648,7 +4508,8 @@ msgid "Domain Kind"
 msgstr "Род домена"
 
 #: ../objects/Jackson/domain.c:184
-msgid "Optional kind which appears in the lower right corner of the Domain"
+#, fuzzy
+msgid "Optional kind which appears in the lower-right corner of the Domain"
 msgstr "Ð?ополниÑ?елÑ?нÑ?й Ñ?од коÑ?оÑ?Ñ?й Ñ?аÑ?полагаеÑ?Ñ?Ñ? в нижнем пÑ?авом Ñ?глÑ? домена"
 
 #: ../objects/Jackson/domain.c:539
@@ -4663,16 +4524,14 @@ msgstr "Ð?иагÑ?амма Ð?жекÑ?она"
 msgid "Shared"
 msgstr "РазделÑ?емÑ?й"
 
-#: ../objects/Jackson/phenomenon.c:137
-#: ../objects/KAOS/goal.c:81
+#: ../objects/Jackson/phenomenon.c:137 ../objects/KAOS/goal.c:81
 msgid "Requirement"
 msgstr "ТÑ?ебование"
 
 #. how it used to be before 0.96+SVN
 #. new name matching "same name, same type"  rule
-#: ../objects/Jackson/phenomenon.c:144
-#: ../objects/UML/message.c:153
-#: ../objects/UML/message.c:155
+#: ../objects/Jackson/phenomenon.c:144 ../objects/UML/message.c:150
+#: ../objects/UML/message.c:152
 msgid "Message:"
 msgstr "СообÑ?ение:"
 
@@ -4748,7 +4607,7 @@ msgstr "Ð?Ñ?оизводиÑ?"
 msgid "Output"
 msgstr "Ð?Ñ?вод"
 
-#: ../objects/KAOS/other.c:533
+#: ../objects/KAOS/other.c:531
 msgid "KAOS other"
 msgstr "KAOS иное"
 
@@ -4772,6 +4631,11 @@ msgstr "ШиÑ?ина линии Ñ?екÑ?ндной Ñ?Ñ?Ñ?елки"
 msgid "Show hours"
 msgstr "Ð?оказÑ?ваÑ?Ñ? Ñ?аÑ?Ñ?"
 
+#: ../objects/Misc/diagram_as_object.c:112
+#, fuzzy
+msgid "Diagram file"
+msgstr "СобÑ?Ñ?веннÑ?й Ñ?оÑ?маÑ? Dia"
+
 #: ../objects/Misc/grid_object.c:140
 #, fuzzy
 msgid "Rows"
@@ -4783,14 +4647,16 @@ msgid "Columns"
 msgstr "Ð?окÑ?менÑ?Ñ?"
 
 #: ../objects/Misc/grid_object.c:144
-msgid "Gridline color"
+#, fuzzy
+msgid "Grid line color"
 msgstr "ЦвеÑ? линии Ñ?еÑ?ки"
 
 #: ../objects/Misc/grid_object.c:146
-msgid "Gridline width"
+#, fuzzy
+msgid "Grid line width"
 msgstr "ТолÑ?ина линии Ñ?еÑ?ки"
 
-#: ../objects/Misc/libmisc.c:41
+#: ../objects/Misc/libmisc.c:42
 msgid "Miscellaneous objects"
 msgstr "Ð?Ñ?оÑ?ие обÑ?екÑ?Ñ?"
 
@@ -4827,79 +4693,78 @@ msgid "pi"
 msgstr "пикÑ?"
 
 #. PROP_FLAG_VISIBLE|
-#: ../objects/Misc/measure.c:185
-#: ../sheets/ChemEng.sheet.in.h:28
+#: ../objects/Misc/measure.c:185 ../sheets/ChemEng.sheet.in.h:28
 msgid "Measurement"
 msgstr "Ð?змеÑ?ение"
 
 #: ../objects/Misc/measure.c:187
 msgid "Unit"
-msgstr "Ð?бÑ?единение"
+msgstr "Ð?диниÑ?а измеÑ?ениÑ?"
 
 #: ../objects/Misc/measure.c:188
 msgid "Precision"
 msgstr "ТоÑ?ноÑ?Ñ?Ñ?"
 
-#: ../objects/Misc/tree.c:605
-#: ../objects/network/bus.c:613
+#: ../objects/Misc/tree.c:606 ../objects/network/bus.c:614
 msgid "Add Handle"
 msgstr "Ð?обавиÑ?Ñ? обÑ?абоÑ?Ñ?ик"
 
-#: ../objects/Misc/tree.c:606
-#: ../objects/network/bus.c:614
+#: ../objects/Misc/tree.c:607 ../objects/network/bus.c:615
 msgid "Delete Handle"
 msgstr "УдалиÑ?Ñ? обÑ?абоÑ?Ñ?ик"
 
-#: ../objects/SADT/arrow.c:137
+#: ../objects/SADT/arrow.c:138
 msgid "Import resource (not shown upstairs)"
 msgstr "Ð?мпоÑ?Ñ? Ñ?еÑ?Ñ?Ñ?Ñ?а (не показÑ?ваÑ?Ñ? звÑ?здоÑ?ки)"
 
-#: ../objects/SADT/arrow.c:138
+#: ../objects/SADT/arrow.c:139
 msgid "Imply resource (not shown downstairs)"
 msgstr "Ð?одÑ?азÑ?меваÑ?Ñ? Ñ?еÑ?Ñ?Ñ?Ñ? (не показÑ?ваÑ?Ñ? звÑ?здоÑ?ки)"
 
-#: ../objects/SADT/arrow.c:139
+#: ../objects/SADT/arrow.c:140
 msgid "Dotted arrow"
 msgstr "ТоÑ?еÑ?наÑ? Ñ?Ñ?Ñ?елка"
 
-#: ../objects/SADT/arrow.c:140
+#: ../objects/SADT/arrow.c:141
 msgid "disable arrow heads"
 msgstr "оÑ?клÑ?Ñ?иÑ?Ñ? наконеÑ?ник Ñ?Ñ?Ñ?елки"
 
-#: ../objects/SADT/arrow.c:146
+#: ../objects/SADT/arrow.c:148
 msgid "Flow style:"
 msgstr "СÑ?илÑ? поÑ?ока:"
 
-#: ../objects/SADT/arrow.c:148
+#: ../objects/SADT/arrow.c:150
 msgid "Automatically gray vertical flows:"
 msgstr "Ð?вÑ?омаÑ?иÑ?еÑ?ки вÑ?делÑ?Ñ?Ñ? веÑ?Ñ?икалÑ?нÑ?е поÑ?оки:"
 
-#: ../objects/SADT/arrow.c:149
-msgid "To improve the ease of reading, flows which begin and end vertically can be rendered gray"
-msgstr "ЧÑ?обÑ? Ñ?пÑ?оÑ?Ñ?иÑ?Ñ? Ñ?Ñ?ение, поÑ?оки, коÑ?оÑ?Ñ?е наÑ?инаÑ?Ñ?Ñ?Ñ? и заканÑ?иваÑ?Ñ?Ñ?Ñ? веÑ?Ñ?икалÑ?но, могÑ?Ñ? бÑ?Ñ?Ñ? оÑ?обÑ?аженÑ? Ñ?еÑ?Ñ?м."
+#: ../objects/SADT/arrow.c:151
+msgid ""
+"To improve the ease of reading, flows which begin and end vertically can be "
+"rendered gray"
+msgstr ""
+"ЧÑ?обÑ? Ñ?пÑ?оÑ?Ñ?иÑ?Ñ? Ñ?Ñ?ение, поÑ?оки, коÑ?оÑ?Ñ?е наÑ?инаÑ?Ñ?Ñ?Ñ? и заканÑ?иваÑ?Ñ?Ñ?Ñ? "
+"веÑ?Ñ?икалÑ?но, могÑ?Ñ? бÑ?Ñ?Ñ? оÑ?обÑ?аженÑ? Ñ?еÑ?Ñ?м."
 
-#: ../objects/SADT/arrow.c:465
+#: ../objects/SADT/arrow.c:470
 msgid "SADT Arrow"
 msgstr "SADT Ñ?Ñ?Ñ?елка"
 
-#: ../objects/SADT/box.c:139
-#: ../objects/custom/custom_object.c:226
-#: ../objects/flowchart/box.c:154
-#: ../objects/flowchart/diamond.c:152
-#: ../objects/flowchart/ellipse.c:151
-#: ../objects/flowchart/parallelogram.c:156
+#: ../objects/SADT/box.c:140 ../objects/custom/custom_object.c:229
+#: ../objects/flowchart/box.c:156 ../objects/flowchart/diamond.c:154
+#: ../objects/flowchart/ellipse.c:153 ../objects/flowchart/parallelogram.c:158
 msgid "Text padding"
 msgstr "Ð?аполнение Ñ?екÑ?Ñ?а"
 
-#: ../objects/SADT/box.c:146
+#: ../objects/SADT/box.c:149
 msgid "Activity/Data identifier"
 msgstr "Ð?денÑ?иÑ?икаÑ?оÑ? деÑ?Ñ?елÑ?ноÑ?Ñ?и/даннÑ?Ñ?"
 
-#: ../objects/SADT/box.c:147
-msgid "The identifier which appears in the lower right corner of the Box"
+#: ../objects/SADT/box.c:150
+#, fuzzy
+msgid "The identifier which appears in the lower-right corner of the Box"
 msgstr "Ð?денÑ?иÑ?икаÑ?оÑ?, коÑ?оÑ?Ñ?й Ñ?аÑ?полагаеÑ?Ñ?Ñ? в нижнем пÑ?авом Ñ?глÑ? обÑ?екÑ?а"
 
-#: ../objects/SADT/box.c:455
+#: ../objects/SADT/box.c:460
 msgid "SADT box"
 msgstr "ЯÑ?ейка SADT"
 
@@ -4907,18 +4772,15 @@ msgstr "ЯÑ?ейка SADT"
 msgid "SADT diagram objects"
 msgstr "Ð?бÑ?екÑ?Ñ? диагÑ?аммÑ? SADT"
 
-#: ../objects/SISSI/classification.h:38
-#: ../objects/SISSI/sissi_dialog.c:42
+#: ../objects/SISSI/classification.h:38 ../objects/SISSI/sissi_dialog.c:42
 msgid "No Protection"
 msgstr "Ð?ез заÑ?иÑ?Ñ?"
 
-#: ../objects/SISSI/classification.h:39
-#: ../objects/SISSI/sissi_dialog.c:43
+#: ../objects/SISSI/classification.h:39 ../objects/SISSI/sissi_dialog.c:43
 msgid "Restricted Diffusion"
 msgstr "Ð?гÑ?аниÑ?енное Ñ?аÑ?пÑ?оÑ?Ñ?Ñ?анение"
 
-#: ../objects/SISSI/classification.h:40
-#: ../objects/SISSI/sissi_dialog.c:44
+#: ../objects/SISSI/classification.h:40 ../objects/SISSI/sissi_dialog.c:44
 msgid "Special Country Confidential"
 msgstr "СекÑ?еÑ?нÑ?й (Ñ?казаннаÑ? Ñ?Ñ?Ñ?ана)"
 
@@ -4926,31 +4788,28 @@ msgstr "СекÑ?еÑ?нÑ?й (Ñ?казаннаÑ? Ñ?Ñ?Ñ?ана)"
 msgid "Confidential"
 msgstr "СекÑ?еÑ?нÑ?й"
 
-#: ../objects/SISSI/classification.h:42
-#: ../objects/SISSI/sissi_dialog.c:45
+#: ../objects/SISSI/classification.h:42 ../objects/SISSI/sissi_dialog.c:45
 msgid "NATO Confidential"
 msgstr "СекÑ?еÑ?нÑ?й (Ð?Ð?ТÐ?)"
 
-#: ../objects/SISSI/classification.h:43
-#: ../objects/SISSI/sissi_dialog.c:46
+#: ../objects/SISSI/classification.h:43 ../objects/SISSI/sissi_dialog.c:46
 msgid "Personal Confidential"
 msgstr "СекÑ?еÑ?нÑ?й (Ñ?аÑ?Ñ?наÑ? инÑ?оÑ?маÑ?иÑ?)"
 
-#: ../objects/SISSI/classification.h:44
-#: ../objects/SISSI/sissi_dialog.c:47
+#: ../objects/SISSI/classification.h:44 ../objects/SISSI/sissi_dialog.c:47
 msgid "Medical Confidential"
 msgstr "СекÑ?еÑ?нÑ?й (медиÑ?инÑ?каÑ? инÑ?оÑ?маÑ?иÑ?)"
 
 #: ../objects/SISSI/classification.h:45
-msgid "Industrie Confidential"
+#, fuzzy
+msgid "Industry Confidential"
 msgstr "СекÑ?еÑ?нÑ?й (пÑ?омÑ?Ñ?ленноÑ?Ñ?Ñ?)"
 
 #: ../objects/SISSI/classification.h:46
 msgid "Defense Confidential"
 msgstr "СекÑ?еÑ?нÑ?й (обоÑ?она)"
 
-#: ../objects/SISSI/classification.h:47
-#: ../objects/SISSI/sissi_dialog.c:49
+#: ../objects/SISSI/classification.h:47 ../objects/SISSI/sissi_dialog.c:49
 msgid "Secret"
 msgstr "Тайна"
 
@@ -4958,23 +4817,19 @@ msgstr "Тайна"
 msgid "Defense Secret"
 msgstr "Тайна (обоÑ?она)"
 
-#: ../objects/SISSI/classification.h:49
-#: ../objects/SISSI/sissi_dialog.c:50
+#: ../objects/SISSI/classification.h:49 ../objects/SISSI/sissi_dialog.c:50
 msgid "Secret special country"
 msgstr "Тайна (Ñ?казаннаÑ? Ñ?Ñ?Ñ?ана)"
 
-#: ../objects/SISSI/classification.h:50
-#: ../objects/SISSI/sissi_dialog.c:51
+#: ../objects/SISSI/classification.h:50 ../objects/SISSI/sissi_dialog.c:51
 msgid "NATO Secret"
 msgstr "Тайна (Ð?Ð?ТÐ?)"
 
-#: ../objects/SISSI/classification.h:51
-#: ../objects/SISSI/sissi_dialog.c:52
+#: ../objects/SISSI/classification.h:51 ../objects/SISSI/sissi_dialog.c:52
 msgid "Very Secret"
 msgstr "СÑ?Ñ?ого Ñ?екÑ?еÑ?но"
 
-#: ../objects/SISSI/classification.h:52
-#: ../objects/SISSI/sissi_dialog.c:53
+#: ../objects/SISSI/classification.h:52 ../objects/SISSI/sissi_dialog.c:53
 msgid "NATO Very Secret"
 msgstr "СÑ?Ñ?ого Ñ?екÑ?еÑ?но (Ð?Ð?ТÐ?)"
 
@@ -4991,8 +4846,7 @@ msgstr ""
 "Ð?Ñ?ибка пÑ?и загÑ?Ñ?зке диагÑ?аммÑ? %s.\n"
 "ЭÑ?о не Ñ?айл Dia."
 
-#: ../objects/SISSI/sissi.c:928
-#: ../objects/SISSI/sissi.c:932
+#: ../objects/SISSI/sissi.c:928 ../objects/SISSI/sissi.c:932
 #, fuzzy, c-format
 msgid ""
 "Error loading object.\n"
@@ -5103,7 +4957,8 @@ msgid "Project or system organisation"
 msgstr "Ð?Ñ?оекÑ?наÑ? или Ñ?иÑ?Ñ?емнаÑ? оÑ?ганизаÑ?иÑ?"
 
 #: ../objects/SISSI/sissi_dialog.c:92
-msgid "Subcontractors / Suppliers / Manufacturers"
+#, fuzzy
+msgid "Subcontractors/Suppliers/Manufacturers"
 msgstr "СÑ?бподÑ?Ñ?дÑ?ики / Ð?оÑ?Ñ?авÑ?ики / Ð?Ñ?оизводиÑ?ели"
 
 #: ../objects/SISSI/sissi_dialog.c:97
@@ -5139,7 +4994,8 @@ msgid "Power"
 msgstr "Ð?оÑ?ноÑ?Ñ?Ñ?, Сила"
 
 #: ../objects/SISSI/sissi_dialog.c:105
-msgid "Cooling / Pollution"
+#, fuzzy
+msgid "Cooling/Pollution"
 msgstr "Ð?Ñ?лаждение / Ð?агÑ?Ñ?знение"
 
 #: ../objects/SISSI/sissi_dialog.c:109
@@ -5223,11 +5079,11 @@ msgid "Developer"
 msgstr "РазÑ?абоÑ?Ñ?ик"
 
 #: ../objects/SISSI/sissi_dialog.c:166
-msgid "Operator / Maintenance"
+#, fuzzy
+msgid "Operator/Maintenance"
 msgstr "Ð?пеÑ?аÑ?оÑ? / СопÑ?овождение"
 
-#: ../objects/SISSI/sissi_dialog.c:171
-#: ../sheets/network.sheet.in.h:20
+#: ../objects/SISSI/sissi_dialog.c:171 ../sheets/network.sheet.in.h:20
 msgid "Network"
 msgstr "Ð?омпÑ?Ñ?Ñ?еÑ?наÑ? Ñ?еÑ?Ñ?"
 
@@ -5243,8 +5099,7 @@ msgstr "Ð?аÑ?Ñ?ивнаÑ? или акÑ?ивнаÑ? Ñ?мена"
 msgid "Communication interface"
 msgstr "Ð?оммÑ?никаÑ?ионнÑ?й инÑ?еÑ?Ñ?ейÑ?"
 
-#: ../objects/SISSI/sissi_dialog.c:179
-#: ../sheets/SISSI.sheet.in.h:54
+#: ../objects/SISSI/sissi_dialog.c:179 ../sheets/SISSI.sheet.in.h:54
 msgid "Software"
 msgstr "Ð?Ñ?огÑ?аммное обеÑ?пеÑ?ение"
 
@@ -5253,7 +5108,8 @@ msgid "Operating System"
 msgstr "Ð?пеÑ?аÑ?ионнаÑ? Ñ?иÑ?Ñ?ема"
 
 #: ../objects/SISSI/sissi_dialog.c:181
-msgid "Service - maintenance or administration software"
+#, fuzzy
+msgid "Service â?? maintenance or administration software"
 msgstr "СеÑ?виÑ? - поддеÑ?жка или Ð?Ð? длÑ? админиÑ?Ñ?Ñ?иÑ?ованиÑ?"
 
 #: ../objects/SISSI/sissi_dialog.c:182
@@ -5277,7 +5133,8 @@ msgid "HARDWARE"
 msgstr "Ð?Ð?Ð?Ð?Ð Ð?ТÐ?Ð?Ð? Ð?Ð?Ð?СÐ?Ð?ЧÐ?Ð?Ð?Ð?"
 
 #: ../objects/SISSI/sissi_dialog.c:191
-msgid "Data-processing equipment (active)"
+#, fuzzy
+msgid "Data processing equipment (active)"
 msgstr "Ð?боÑ?Ñ?дование длÑ? обÑ?абоÑ?ки даннÑ?Ñ? (акÑ?ивное)"
 
 #: ../objects/SISSI/sissi_dialog.c:192
@@ -5310,23 +5167,19 @@ msgid "_Menace"
 msgstr "_УгÑ?оза"
 
 #. ********* label of board *********
-#: ../objects/SISSI/sissi_dialog.c:317
-#: ../objects/SISSI/sissi_dialog.c:326
+#: ../objects/SISSI/sissi_dialog.c:317 ../objects/SISSI/sissi_dialog.c:326
 msgid "Menace"
 msgstr "УгÑ?оза"
 
-#: ../objects/SISSI/sissi_dialog.c:319
-#: ../objects/SISSI/sissi_dialog.c:328
+#: ../objects/SISSI/sissi_dialog.c:319 ../objects/SISSI/sissi_dialog.c:328
 msgid "P Action"
 msgstr "Ð?ейÑ?Ñ?вие P"
 
-#: ../objects/SISSI/sissi_dialog.c:321
-#: ../objects/SISSI/sissi_dialog.c:330
+#: ../objects/SISSI/sissi_dialog.c:321 ../objects/SISSI/sissi_dialog.c:330
 msgid "P Detection"
 msgstr "Ð?пÑ?еделение P"
 
-#: ../objects/SISSI/sissi_dialog.c:323
-#: ../objects/SISSI/sissi_dialog.c:332
+#: ../objects/SISSI/sissi_dialog.c:323 ../objects/SISSI/sissi_dialog.c:332
 msgid "Vulnerability"
 msgstr "УÑ?звимоÑ?Ñ?Ñ?"
 
@@ -5346,371 +5199,340 @@ msgid "value"
 msgstr "знаÑ?ение"
 
 #. Other properties of page
-#: ../objects/SISSI/sissi_dialog.c:862
+#: ../objects/SISSI/sissi_dialog.c:861
 msgid "Documents"
 msgstr "Ð?окÑ?менÑ?Ñ?"
 
-#: ../objects/SISSI/sissi_dialog.c:878
+#: ../objects/SISSI/sissi_dialog.c:876
 msgid "Document title"
 msgstr "Ð?аголовок докÑ?менÑ?а"
 
-#: ../objects/UML/actor.c:357
-#: ../objects/UML/actor.c:359
+#: ../objects/UML/actor.c:356 ../objects/UML/actor.c:358
 #: ../sheets/UML.sheet.in.h:2
 msgid "Actor"
 msgstr "Ð?кÑ?оÑ?"
 
-#: ../objects/UML/association.c:222
+#: ../objects/UML/association.c:223
 msgid "From A to B"
 msgstr "Ð?Ñ? Ð? до Ð?"
 
-#: ../objects/UML/association.c:223
+#: ../objects/UML/association.c:224
 msgid "From B to A"
 msgstr "Ð?Ñ? Ð? до Ð?"
 
-#: ../objects/UML/association.c:228
+#: ../objects/UML/association.c:229
 msgid "Aggregation"
 msgstr "Ð?гÑ?егаÑ?иÑ?"
 
-#: ../objects/UML/association.c:229
+#: ../objects/UML/association.c:230
 msgid "Composition"
 msgstr "Ð?омпозиÑ?иÑ?"
 
-#: ../objects/UML/association.c:236
+#: ../objects/UML/association.c:240
 msgid "Direction"
 msgstr "Ð?апÑ?авление"
 
-#: ../objects/UML/association.c:238
+#: ../objects/UML/association.c:242
 msgid "Show direction"
 msgstr "Ð?оказаÑ?Ñ? напÑ?авление"
 
-#: ../objects/UML/association.c:238
+#: ../objects/UML/association.c:242
 msgid "Show the small arrow denoting the reading direction"
 msgstr "Ð?оказаÑ?Ñ? Ñ?Ñ?Ñ?елкой напÑ?авление Ñ?Ñ?ениÑ?"
 
-#: ../objects/UML/association.c:245
+#: ../objects/UML/association.c:249
 msgid "Side A"
 msgstr "СÑ?оÑ?она A"
 
-#: ../objects/UML/association.c:249
+#: ../objects/UML/association.c:253
 msgid "Multiplicity"
 msgstr "СложноÑ?Ñ?Ñ?,Ð?ножеÑ?Ñ?венноÑ?Ñ?Ñ?"
 
-#: ../objects/UML/association.c:251
-#: ../objects/UML/umlattribute.c:45
+#: ../objects/UML/association.c:255 ../objects/UML/umlattribute.c:45
 #: ../objects/UML/umloperation.c:71
 msgid "Visibility"
 msgstr "Ð?идимоÑ?Ñ?Ñ?"
 
-#: ../objects/UML/association.c:253
+#: ../objects/UML/association.c:257
 msgid "Show arrow"
 msgstr "Ð?оказаÑ?Ñ? Ñ?Ñ?Ñ?елкÑ?"
 
-#: ../objects/UML/association.c:256
+#: ../objects/UML/association.c:260
 msgid "Side B"
 msgstr "СÑ?оÑ?она B"
 
-#: ../objects/UML/class.c:142
-#: ../objects/UML/class.c:325
-#: ../objects/UML/class.c:1773
-#: ../sheets/UML.sheet.in.h:6
+#: ../objects/UML/association.c:271 ../objects/UML/object.c:162
+#, fuzzy
+msgid "Style"
+msgstr "_СÑ?илÑ?"
+
+#: ../objects/UML/class.c:143 ../objects/UML/class.c:331
+#: ../objects/UML/class.c:1827 ../sheets/UML.sheet.in.h:6
 msgid "Class"
 msgstr "Ð?лаÑ?Ñ?"
 
 #. how it used to be before 0.96+SVN
 #. one name, one type: but breaks forward-compatibiliy so kind of reverted
-#: ../objects/UML/class.c:146
-#: ../objects/UML/classicon.c:140
-#: ../objects/UML/classicon.c:142
-#: ../objects/UML/component.c:126
-#: ../objects/UML/large_package.c:137
-#: ../objects/UML/object.c:153
-#: ../objects/UML/small_package.c:131
-#: ../objects/UML/umloperation.c:68
+#: ../objects/UML/class.c:147 ../objects/UML/classicon.c:139
+#: ../objects/UML/classicon.c:141 ../objects/UML/component.c:126
+#: ../objects/UML/large_package.c:135 ../objects/UML/object.c:149
+#: ../objects/UML/small_package.c:128 ../objects/UML/umloperation.c:68
 msgid "Stereotype"
 msgstr "СÑ?еÑ?еоÑ?ип"
 
-#: ../objects/UML/class.c:150
-#: ../objects/UML/class.c:183
-#: ../objects/UML/class_dialog.c:468
-#: ../objects/UML/class_dialog.c:580
-#: ../objects/UML/class_dialog.c:2087
-#: ../objects/UML/uml.c:110
+#: ../objects/UML/class.c:151 ../objects/UML/class.c:186
+#: ../objects/UML/class_dialog.c:446 ../objects/UML/class_dialog.c:558
+#: ../objects/UML/class_dialog.c:2005 ../objects/UML/uml.c:111
 msgid "Abstract"
 msgstr "Ð?бÑ?Ñ?Ñ?акÑ?иÑ?"
 
-#: ../objects/UML/class.c:152
-#: ../objects/UML/class.c:1770
+#: ../objects/UML/class.c:153 ../objects/UML/class.c:1824
 msgid "Template"
 msgstr "Шаблон"
 
-#: ../objects/UML/class.c:155
-#: ../objects/UML/class_dialog.c:477
+#: ../objects/UML/class.c:156 ../objects/UML/class_dialog.c:455
 msgid "Suppress Attributes"
 msgstr "СкÑ?Ñ?Ñ?Ñ?е аÑ?Ñ?ибÑ?Ñ?Ñ?"
 
-#: ../objects/UML/class.c:157
+#: ../objects/UML/class.c:158
 msgid "Suppress Operations"
 msgstr "СкÑ?Ñ?Ñ?Ñ?е опеÑ?аÑ?ии"
 
-#: ../objects/UML/class.c:159
+#: ../objects/UML/class.c:160
 msgid "Visible Attributes"
 msgstr "Ð?идимÑ?е аÑ?Ñ?ибÑ?Ñ?Ñ?"
 
-#: ../objects/UML/class.c:161
+#: ../objects/UML/class.c:162
 msgid "Visible Operations"
 msgstr "Ð?идимÑ?е опеÑ?аÑ?ии"
 
-#: ../objects/UML/class.c:163
+#: ../objects/UML/class.c:164
 msgid "Visible Comments"
 msgstr "Ð?идимÑ?е комменÑ?аÑ?ии"
 
-#: ../objects/UML/class.c:165
-#: ../objects/UML/class_dialog.c:493
+#: ../objects/UML/class.c:166 ../objects/UML/class_dialog.c:471
 msgid "Wrap Operations"
 msgstr "Ð?пеÑ?аÑ?ии Ñ?окÑ?Ñ?Ñ?иÑ?"
 
-#: ../objects/UML/class.c:167
+#: ../objects/UML/class.c:168
 msgid "Wrap after char"
 msgstr "СкÑ?Ñ?Ñ?Ñ? поÑ?ле Ñ?имвола"
 
-#: ../objects/UML/class.c:169
+#: ../objects/UML/class.c:170
 msgid "Comment line length"
 msgstr "Ð?лина Ñ?Ñ?Ñ?оки комменÑ?аÑ?иÑ?"
 
-#: ../objects/UML/class.c:181
-#: ../objects/UML/class_dialog.c:575
+#: ../objects/UML/class.c:174 ../objects/UML/class.c:326
+#, fuzzy
+msgid "Allow resizing"
+msgstr "Ð?олÑ?й Ñ?Ñ?еÑ?голÑ?ник"
+
+#: ../objects/UML/class.c:184 ../objects/UML/class_dialog.c:553
 msgid "Polymorphic"
 msgstr "Ð?олимоÑ?Ñ?нÑ?й"
 
-#: ../objects/UML/class.c:185
-msgid "Classname"
+#: ../objects/UML/class.c:188 ../objects/UML/class_dialog.c:563
+msgid "Class Name"
 msgstr "Ð?азвание клаÑ?Ñ?а"
 
-#: ../objects/UML/class.c:187
-msgid "Abstract Classname"
+#: ../objects/UML/class.c:190
+#, fuzzy
+msgid "Abstract Class Name"
 msgstr "Ð?азвание абÑ?Ñ?Ñ?акÑ?ного клаÑ?Ñ?а"
 
-#: ../objects/UML/class.c:211
+#: ../objects/UML/class.c:214
 msgid "Operations"
 msgstr "Ð?пеÑ?аÑ?ии"
 
-#: ../objects/UML/class.c:214
+#: ../objects/UML/class.c:217
 msgid "Template Parameters"
 msgstr "Ð?аÑ?амеÑ?Ñ?Ñ? Ñ?аблона"
 
-#: ../objects/UML/class.c:320
-msgid "Show Comments"
-msgstr "Ð?оказаÑ?Ñ? комменÑ?аÑ?ии"
-
 #. Class page:
-#: ../objects/UML/class_dialog.c:429
+#: ../objects/UML/class_dialog.c:407
 msgid "_Class"
 msgstr "_Ð?лаÑ?Ñ?"
 
-#: ../objects/UML/class_dialog.c:437
+#: ../objects/UML/class_dialog.c:415
 msgid "Class name:"
 msgstr "Ð?азвание клаÑ?Ñ?а:"
 
-#: ../objects/UML/class_dialog.c:445
-#: ../objects/UML/class_dialog.c:2036
-#: ../objects/UML/dependency.c:139
-#: ../objects/UML/generalization.c:135
-#: ../objects/UML/realizes.c:136
+#: ../objects/UML/class_dialog.c:423 ../objects/UML/class_dialog.c:1972
+#: ../objects/UML/dependency.c:136 ../objects/UML/generalization.c:133
+#: ../objects/UML/realizes.c:133
 msgid "Stereotype:"
 msgstr "СÑ?еÑ?еоÑ?ип:"
 
-#: ../objects/UML/class_dialog.c:474
+#: ../objects/UML/class_dialog.c:452
 msgid "Attributes visible"
 msgstr "Ð?идимÑ?е аÑ?Ñ?ибÑ?Ñ?Ñ?"
 
-#: ../objects/UML/class_dialog.c:483
+#: ../objects/UML/class_dialog.c:461
 msgid "Operations visible"
 msgstr "Ð?идимÑ?е опеÑ?аÑ?ии"
 
-#: ../objects/UML/class_dialog.c:486
+#: ../objects/UML/class_dialog.c:464
 msgid "Suppress operations"
 msgstr "СкÑ?Ñ?Ñ?Ñ?е опеÑ?аÑ?ии"
 
-#: ../objects/UML/class_dialog.c:500
+#: ../objects/UML/class_dialog.c:478
 msgid "Wrap after this length: "
 msgstr "Ð?еÑ?еноÑ?иÑ?Ñ? поÑ?ле Ñ?Ñ?ой длинÑ?: "
 
-#: ../objects/UML/class_dialog.c:508
+#: ../objects/UML/class_dialog.c:486
 msgid "Comments visible"
 msgstr "Ð?идимÑ?е комменÑ?аÑ?ии"
 
-#: ../objects/UML/class_dialog.c:515
+#: ../objects/UML/class_dialog.c:493
 msgid "Wrap comment after this length: "
 msgstr "Ð?еÑ?еноÑ?иÑ?Ñ? комменÑ?аÑ?ий по Ñ?Ñ?ой длине: "
 
-#: ../objects/UML/class_dialog.c:585
-msgid "Class Name"
-msgstr "Ð?азвание клаÑ?Ñ?а"
-
-#: ../objects/UML/class_dialog.c:590
+#: ../objects/UML/class_dialog.c:568
 msgid "Abstract Class"
 msgstr "Ð?бÑ?Ñ?Ñ?акÑ?нÑ?й клаÑ?Ñ?"
 
 #. should probably be refactored too.
-#: ../objects/UML/class_dialog.c:607
+#: ../objects/UML/class_dialog.c:585
 msgid "Line Width"
 msgstr "ТолÑ?ина линии"
 
-#: ../objects/UML/class_dialog.c:616
+#: ../objects/UML/class_dialog.c:594
 msgid "Text Color"
 msgstr "ЦвеÑ? Ñ?екÑ?Ñ?а"
 
-#: ../objects/UML/class_dialog.c:624
+#: ../objects/UML/class_dialog.c:602
 msgid "Foreground Color"
 msgstr "ЦвеÑ? пеÑ?еднего плана"
 
-#: ../objects/UML/class_dialog.c:632
+#: ../objects/UML/class_dialog.c:610
 msgid "Background Color"
 msgstr "ЦвеÑ? Ñ?она"
 
-#: ../objects/UML/class_dialog.c:1170
+#: ../objects/UML/class_dialog.c:1134
 msgid "Value:"
 msgstr "Ð?наÑ?ение:"
 
-#: ../objects/UML/class_dialog.c:1203
-#: ../objects/UML/class_dialog.c:2048
+#: ../objects/UML/class_dialog.c:1167 ../objects/UML/class_dialog.c:1984
 msgid "Visibility:"
 msgstr "Ð?идимоÑ?Ñ?Ñ?:"
 
-#: ../objects/UML/class_dialog.c:1212
-#: ../objects/UML/class_dialog.c:2057
-#: ../objects/UML/uml.c:102
+#: ../objects/UML/class_dialog.c:1172 ../objects/UML/class_dialog.c:1989
+#: ../objects/UML/uml.c:103
 msgid "Public"
 msgstr "Ð?Ñ?блиÑ?нÑ?й"
 
-#: ../objects/UML/class_dialog.c:1215
-#: ../objects/UML/class_dialog.c:2060
-#: ../objects/UML/uml.c:103
+#: ../objects/UML/class_dialog.c:1173 ../objects/UML/class_dialog.c:1990
+#: ../objects/UML/uml.c:104
 msgid "Private"
 msgstr "ЧаÑ?Ñ?нÑ?й"
 
-#: ../objects/UML/class_dialog.c:1218
-#: ../objects/UML/class_dialog.c:2063
-#: ../objects/UML/uml.c:104
+#: ../objects/UML/class_dialog.c:1174 ../objects/UML/class_dialog.c:1991
+#: ../objects/UML/uml.c:105
 msgid "Protected"
 msgstr "Ð?аÑ?иÑ?Ñ?ннÑ?й"
 
-#: ../objects/UML/class_dialog.c:1221
-#: ../objects/UML/class_dialog.c:2066
-#: ../objects/UML/uml.c:105
+#: ../objects/UML/class_dialog.c:1175 ../objects/UML/class_dialog.c:1992
+#: ../objects/UML/uml.c:106
 msgid "Implementation"
 msgstr "РеализаÑ?иÑ?"
 
 #. end: Inheritance type
-#: ../objects/UML/class_dialog.c:1237
-#: ../objects/UML/class_dialog.c:2103
+#: ../objects/UML/class_dialog.c:1187 ../objects/UML/class_dialog.c:2013
 msgid "Class scope"
 msgstr "Ð?блаÑ?Ñ?Ñ? видимоÑ?Ñ?и клаÑ?Ñ?а"
 
 #. end: Visibility
-#: ../objects/UML/class_dialog.c:2078
+#: ../objects/UML/class_dialog.c:2000
 msgid "Inheritance type:"
 msgstr "Тип наÑ?ледованиÑ?"
 
-#: ../objects/UML/class_dialog.c:2090
-#: ../objects/UML/uml.c:111
+#: ../objects/UML/class_dialog.c:2006 ../objects/UML/uml.c:112
 msgid "Polymorphic (virtual)"
 msgstr "Ð?олимоÑ?Ñ?нÑ?й (виÑ?Ñ?Ñ?алÑ?нÑ?й)"
 
-#: ../objects/UML/class_dialog.c:2093
-#: ../objects/UML/uml.c:112
+#: ../objects/UML/class_dialog.c:2007 ../objects/UML/uml.c:113
 msgid "Leaf (final)"
 msgstr "Ð?иÑ?Ñ? (оконÑ?ание)"
 
-#: ../objects/UML/class_dialog.c:2107
+#: ../objects/UML/class_dialog.c:2017
 msgid "Query"
 msgstr "Ð?апÑ?оÑ?"
 
-#: ../objects/UML/class_dialog.c:2154
+#: ../objects/UML/class_dialog.c:2061
 msgid "Parameters:"
 msgstr "Ð?аÑ?амеÑ?Ñ?Ñ?:"
 
-#: ../objects/UML/class_dialog.c:2239
+#: ../objects/UML/class_dialog.c:2139
 msgid "Parameter data"
 msgstr "Ð?аннÑ?е паÑ?амеÑ?Ñ?а"
 
-#: ../objects/UML/class_dialog.c:2272
+#: ../objects/UML/class_dialog.c:2172
 msgid "Def. value:"
 msgstr "Ð?наÑ?ение по Ñ?молÑ?аниÑ?:"
 
-#: ../objects/UML/class_dialog.c:2306
+#: ../objects/UML/class_dialog.c:2203
 msgid "Direction:"
 msgstr "Ð?апÑ?авление:"
 
-#: ../objects/UML/class_dialog.c:2315
-#: ../objects/UML/umlparameter.c:34
+#: ../objects/UML/class_dialog.c:2208 ../objects/UML/umlparameter.c:34
 msgid "Undefined"
 msgstr "Ð?еопÑ?еделÑ?ннÑ?й"
 
-#: ../objects/UML/class_dialog.c:2318
-#: ../objects/UML/umlparameter.c:35
+#: ../objects/UML/class_dialog.c:2209 ../objects/UML/umlparameter.c:35
 msgid "In"
 msgstr "Ð?вод"
 
-#: ../objects/UML/class_dialog.c:2321
-#: ../objects/UML/umlparameter.c:36
+#: ../objects/UML/class_dialog.c:2210 ../objects/UML/umlparameter.c:36
 msgid "Out"
 msgstr "Ð?Ñ?вод"
 
-#: ../objects/UML/class_dialog.c:2324
-#: ../objects/UML/umlparameter.c:37
+#: ../objects/UML/class_dialog.c:2211 ../objects/UML/umlparameter.c:37
 msgid "In & Out"
 msgstr "Ð?вод и Ð?Ñ?вод"
 
 #. Operations page:
-#: ../objects/UML/class_dialog.c:2359
+#: ../objects/UML/class_dialog.c:2242
 msgid "_Operations"
 msgstr "_Ð?пеÑ?аÑ?ии"
 
-#: ../objects/UML/class_dialog.c:2417
+#: ../objects/UML/class_dialog.c:2297
 msgid "Operation data"
 msgstr "Ð?аннÑ?е опеÑ?аÑ?ии"
 
 #. Templates page:
-#: ../objects/UML/class_dialog.c:2780
+#: ../objects/UML/class_dialog.c:2658
 msgid "_Templates"
 msgstr "_ШаблонÑ?"
 
-#: ../objects/UML/class_dialog.c:2786
-#: ../sheets/UML.sheet.in.h:29
+#: ../objects/UML/class_dialog.c:2664 ../sheets/UML.sheet.in.h:29
 msgid "Template class"
 msgstr "Ð?лаÑ?Ñ?-Ñ?аблон"
 
-#: ../objects/UML/class_dialog.c:2843
+#: ../objects/UML/class_dialog.c:2716
 msgid "Formal parameter data"
 msgstr "Ð?аннÑ?е Ñ?оÑ?малÑ?ного паÑ?амеÑ?Ñ?а"
 
-#: ../objects/UML/classicon.c:130
+#: ../objects/UML/classicon.c:131
 msgid "Boundary"
 msgstr "Ð?Ñ?аниÑ?а"
 
-#: ../objects/UML/classicon.c:145
+#: ../objects/UML/classicon.c:144
 msgid "Is object"
 msgstr "ЯвлÑ?еÑ?Ñ?Ñ? обÑ?екÑ?ом"
 
-#: ../objects/UML/component_feature.c:150
-#: ../sheets/UML.sheet.in.h:14
+#: ../objects/UML/component_feature.c:150 ../sheets/UML.sheet.in.h:14
 msgid "Facet"
 msgstr "Ð?Ñ?анÑ?"
 
-#: ../objects/UML/component_feature.c:151
-#: ../sheets/UML.sheet.in.h:26
+#: ../objects/UML/component_feature.c:151 ../sheets/UML.sheet.in.h:26
 msgid "Receptacle"
 msgstr "Ð?онÑ?ейнеÑ?"
 
-#: ../objects/UML/component_feature.c:152
-#: ../sheets/UML.sheet.in.h:13
+#: ../objects/UML/component_feature.c:152 ../sheets/UML.sheet.in.h:13
 msgid "Event Source"
 msgstr "Ð?Ñ?Ñ?оÑ?ник Ñ?обÑ?Ñ?ий"
 
-#: ../objects/UML/component_feature.c:153
-#: ../sheets/UML.sheet.in.h:12
+#: ../objects/UML/component_feature.c:153 ../sheets/UML.sheet.in.h:12
 msgid "Event Sink"
 msgstr "Ð?Ñ?иÑ?мник Ñ?обÑ?Ñ?иÑ?"
 
@@ -5718,14 +5540,13 @@ msgstr "Ð?Ñ?иÑ?мник Ñ?обÑ?Ñ?иÑ?"
 msgid "Constraint:"
 msgstr "Ð?гÑ?аниÑ?ение:"
 
-#: ../objects/UML/dependency.c:141
+#: ../objects/UML/dependency.c:138
 msgid "Show arrow:"
 msgstr "Ð?оказаÑ?Ñ? Ñ?Ñ?Ñ?елкÑ?:"
 
 #. how it used to be before 0.96+SVN
 #. new name matching "same name, same type"  rule - reverted, forward compatibility seems more important
-#: ../objects/UML/implements.c:131
-#: ../objects/UML/implements.c:133
+#: ../objects/UML/implements.c:128 ../objects/UML/implements.c:130
 msgid "Interface:"
 msgstr "Ð?нÑ?еÑ?Ñ?ейÑ?:"
 
@@ -5737,27 +5558,27 @@ msgstr "Ð?Ñ?обÑ?азиÑ?Ñ? Ñ?окÑ?Ñ? Ñ?пÑ?авлениÑ?:"
 msgid "Draw destruction mark:"
 msgstr "Ð?Ñ?обÑ?азиÑ?Ñ? меÑ?кÑ? Ñ?ниÑ?Ñ?ожениÑ?:"
 
-#: ../objects/UML/lifeline.c:505
+#: ../objects/UML/lifeline.c:499
 msgid "Add connection points"
 msgstr "Ð?обавиÑ?Ñ? Ñ?оединиÑ?елÑ?нÑ?е Ñ?оÑ?ки"
 
-#: ../objects/UML/lifeline.c:506
+#: ../objects/UML/lifeline.c:500
 msgid "Remove connection points"
 msgstr "УдалиÑ?Ñ? Ñ?оединиÑ?елÑ?нÑ?е Ñ?оÑ?ки"
 
-#: ../objects/UML/lifeline.c:507
+#: ../objects/UML/lifeline.c:501
 msgid "Increase connection points distance"
 msgstr "УвелиÑ?иÑ?Ñ? Ñ?аÑ?Ñ?Ñ?оÑ?ние до Ñ?оединиÑ?елÑ?нÑ?Ñ? Ñ?оÑ?ек"
 
-#: ../objects/UML/lifeline.c:508
+#: ../objects/UML/lifeline.c:502
 msgid "Decrease connection points distance"
 msgstr "УменÑ?Ñ?иÑ?Ñ? Ñ?аÑ?Ñ?Ñ?оÑ?ние до Ñ?оединиÑ?елÑ?нÑ?Ñ? Ñ?оÑ?ек"
 
-#: ../objects/UML/lifeline.c:509
+#: ../objects/UML/lifeline.c:503
 msgid "Set default connection points distance"
 msgstr "УÑ?Ñ?ановиÑ?Ñ? Ñ?аÑ?Ñ?Ñ?оÑ?ние до Ñ?оединиÑ?елÑ?нÑ?Ñ? Ñ?оÑ?ек по Ñ?молÑ?аниÑ?"
 
-#: ../objects/UML/lifeline.c:513
+#: ../objects/UML/lifeline.c:507
 msgid "UML Lifeline"
 msgstr "Ð?иниÑ? жизни UML"
 
@@ -5789,45 +5610,46 @@ msgstr "Ð?оÑ?лаÑ?Ñ?"
 msgid "Recursive"
 msgstr "РекÑ?Ñ?Ñ?ивнÑ?й"
 
-#: ../objects/UML/message.c:158
+#: ../objects/UML/message.c:154
 msgid "Message type:"
 msgstr "Тип Ñ?ообÑ?ениÑ?:"
 
-#: ../objects/UML/object.c:155
+#: ../objects/UML/object.c:151
 msgid "Explicit state"
 msgstr "Ð?конÑ?аÑ?елÑ?ное Ñ?оÑ?Ñ?оÑ?ние"
 
-#: ../objects/UML/object.c:160
+#: ../objects/UML/object.c:156
 msgid "Active object"
 msgstr "Ð?ейÑ?Ñ?вÑ?Ñ?Ñ?ий обÑ?екÑ?"
 
-#: ../objects/UML/object.c:162
+#: ../objects/UML/object.c:158
 msgid "Show attributes"
 msgstr "Ð?оказаÑ?Ñ? аÑ?Ñ?ибÑ?Ñ?Ñ?"
 
-#: ../objects/UML/object.c:164
+#: ../objects/UML/object.c:160
 msgid "Multiple instance"
 msgstr "Ð?ножеÑ?Ñ?веннÑ?е Ñ?кземплÑ?Ñ?Ñ?"
 
-#: ../objects/UML/state.c:155
+#: ../objects/UML/state.c:151
 msgid "Entry action"
 msgstr "Ð?аÑ?аÑ?Ñ? дейÑ?Ñ?вие"
 
-#: ../objects/UML/state.c:156
+#: ../objects/UML/state.c:152
 msgid "Do action"
 msgstr "Ð?Ñ?полниÑ?Ñ? дейÑ?Ñ?вие"
 
-#: ../objects/UML/state.c:157
+#: ../objects/UML/state.c:153
 msgid "Exit action"
 msgstr "Ð?аконÑ?иÑ?Ñ? дейÑ?Ñ?вие"
 
 #. Would like to create a state_term instead, but making the connections
 #. * is a pain
-#: ../objects/UML/state.c:479
+#: ../objects/UML/state.c:493
+#, fuzzy
 msgid ""
 "This diagram uses the State object for initial/final states.\n"
-"That option will go away in future versions.\n"
-"Please use the Initial/Final State object instead\n"
+"This option will go away in future versions.\n"
+"Please use the Initial/Final State object instead.\n"
 msgstr ""
 "ЭÑ?а диагÑ?амма иÑ?полÑ?зÑ?еÑ? обÑ?екÑ? State длÑ? наÑ?алÑ?нÑ?Ñ?/конеÑ?нÑ?Ñ? Ñ?оÑ?Ñ?оÑ?ний.\n"
 "ЭÑ?оÑ? паÑ?амеÑ?Ñ? бÑ?деÑ? оÑ?менÑ?н в бÑ?дÑ?Ñ?иÑ? веÑ?Ñ?иÑ?Ñ?.\n"
@@ -5837,46 +5659,39 @@ msgstr ""
 msgid "Is final"
 msgstr "Ð?конÑ?ен"
 
-#: ../objects/UML/transition.c:141
+#: ../objects/UML/transition.c:142
 msgid "Trigger"
 msgstr "ТÑ?иггеÑ?"
 
-#: ../objects/UML/transition.c:142
+#: ../objects/UML/transition.c:143
 msgid "The event that causes this transition to be taken"
 msgstr "СобÑ?Ñ?ие коÑ?оÑ?ое вÑ?зÑ?ваеÑ? пеÑ?еÑ?од"
 
-#: ../objects/UML/transition.c:143
+#: ../objects/UML/transition.c:144
 msgid "Action"
 msgstr "Ð?ейÑ?Ñ?вие"
 
-#: ../objects/UML/transition.c:144
+#: ../objects/UML/transition.c:145
 msgid "Action to perform when this transition is taken"
 msgstr "Ð?ейÑ?Ñ?вие во вÑ?емÑ? пеÑ?еÑ?ода"
 
-#: ../objects/UML/transition.c:145
-#: ../sheets/cisconetwork.sheet.in.h:43
+#: ../objects/UML/transition.c:146 ../sheets/cisconetwork.sheet.in.h:43
 msgid "Guard"
 msgstr "Ð¥Ñ?аниÑ?елÑ?"
 
-#: ../objects/UML/transition.c:146
+#: ../objects/UML/transition.c:147
 msgid "Condition for taking this transition when the event is fired"
 msgstr "УÑ?ловие пеÑ?еÑ?ода пÑ?и возникновении Ñ?обÑ?Ñ?иÑ?"
 
-#: ../objects/UML/uml.c:66
+#: ../objects/UML/uml.c:67
 msgid "Unified Modelling Language diagram objects UML 1.3"
 msgstr "Ð?бÑ?екÑ?Ñ? диагÑ?амм УниÑ?иÑ?иÑ?ованного Ñ?зÑ?ка моделиÑ?ованиÑ? UML веÑ?Ñ?ии 1.3"
 
-#: ../objects/UML/umlattribute.c:41
-#: ../objects/UML/umlparameter.c:47
-msgid "Value"
-msgstr "Ð?наÑ?ение"
-
 #: ../objects/UML/umlattribute.c:47
 msgid "Abstract (?)"
 msgstr "Ð?бÑ?Ñ?Ñ?акÑ?иÑ? (?)"
 
-#: ../objects/UML/umlattribute.c:49
-#: ../objects/UML/umloperation.c:77
+#: ../objects/UML/umlattribute.c:49 ../objects/UML/umloperation.c:77
 msgid "Class scope (static)"
 msgstr "Ð?идимоÑ?Ñ?Ñ? клаÑ?Ñ?а (static)"
 
@@ -5888,25 +5703,23 @@ msgstr "Тип наÑ?ледованиÑ?"
 msgid "Query (const)"
 msgstr "Ð?апÑ?оÑ? (const)"
 
-#: ../objects/UML/umloperation.c:79
-#: ../objects/chronogram/chronoline.c:164
+#: ../objects/UML/umloperation.c:79 ../objects/chronogram/chronoline.c:164
 msgid "Parameters"
 msgstr "Ð?аÑ?амеÑ?Ñ?Ñ?"
 
-#: ../objects/UML/usecase.c:136
-msgid "Text outside"
-msgstr "ТекÑ?Ñ? Ñ?наÑ?Ñ?жи"
-
-#: ../objects/UML/usecase.c:138
+#: ../objects/UML/usecase.c:133
 msgid "Collaboration"
 msgstr "Ð?оопеÑ?аÑ?иÑ?"
 
+#: ../objects/UML/usecase.c:135
+msgid "Text outside"
+msgstr "ТекÑ?Ñ? Ñ?наÑ?Ñ?жи"
+
 #: ../objects/chronogram/chronogram.c:40
 msgid "Chronogram diagram objects"
 msgstr "Ð?бÑ?екÑ?Ñ? диагÑ?аммÑ? Ñ?Ñ?оногÑ?аммÑ?"
 
-#: ../objects/chronogram/chronoline.c:150
-#: ../sheets/AADL.sheet.in.h:4
+#: ../objects/chronogram/chronoline.c:150 ../sheets/AADL.sheet.in.h:4
 msgid "Data"
 msgstr "Ð?аннÑ?е"
 
@@ -5923,17 +5736,19 @@ msgid "Event specification"
 msgstr "СпеÑ?иÑ?икаÑ?иÑ? Ñ?обÑ?Ñ?иÑ?"
 
 #: ../objects/chronogram/chronoline.c:158
+#, fuzzy
 msgid ""
-"@ time    set the pointer at an absolute time.\n"
-"( duration  sets the signal up, then wait 'duration'.\n"
-") duration  sets the signal down, then wait 'duration'.\n"
-"u duration  sets the signal to \"unknown\" state, then wait 'duration'.\n"
-"example : @ 1.0 (2.0)1.0(2.0)\n"
+"@ time    set the pointer to an absolute time.\n"
+"( duration  set the signal up, then wait 'duration'.\n"
+") duration  set the signal down, then wait 'duration'.\n"
+"u duration  set the signal to \"unknown\" state, then wait 'duration'.\n"
+"Example: @ 1.0 (2.0)1.0(2.0)\n"
 msgstr ""
 "@ вÑ?емÑ?   Ñ?Ñ?Ñ?анавливаеÑ? Ñ?казаÑ?елÑ? на абÑ?олÑ?Ñ?ное вÑ?емÑ?.\n"
 "( длиÑ?елÑ?ноÑ?Ñ?Ñ?  вклÑ?Ñ?аеÑ? Ñ?игнал и ждÑ?Ñ? Ñ?казанное вÑ?емÑ?.\n"
 ") длиÑ?елÑ?ноÑ?Ñ?Ñ?  вÑ?клÑ?Ñ?аеÑ? Ñ?игнал и ждÑ?Ñ? Ñ?казанное вÑ?емÑ?.\n"
-"u длиÑ?елÑ?ноÑ?Ñ?Ñ?  Ñ?Ñ?Ñ?анавливаеÑ? Ñ?игнал в неопÑ?еделÑ?нное Ñ?оÑ?Ñ?оÑ?ние и ждÑ?Ñ? Ñ?казанное вÑ?емÑ?.\n"
+"u длиÑ?елÑ?ноÑ?Ñ?Ñ?  Ñ?Ñ?Ñ?анавливаеÑ? Ñ?игнал в неопÑ?еделÑ?нное Ñ?оÑ?Ñ?оÑ?ние и ждÑ?Ñ? "
+"Ñ?казанное вÑ?емÑ?.\n"
 "Ð?Ñ?имеÑ?: @ 1.0 (2.0)1.0(2.0)\n"
 
 #: ../objects/chronogram/chronoline.c:166
@@ -5995,31 +5810,28 @@ msgstr "Ð?Ñ?Ñ?гаÑ?"
 msgid "Custom XML shapes loader"
 msgstr "Ð?агÑ?Ñ?зÑ?ик полÑ?зоваÑ?елÑ?Ñ?киÑ? XML-Ñ?оÑ?м"
 
-#: ../objects/custom/custom_object.c:207
-#: ../objects/custom/custom_object.c:239
+#: ../objects/custom/custom_object.c:210 ../objects/custom/custom_object.c:243
 msgid "Flip horizontal"
 msgstr "Ð?оÑ?изонÑ?алÑ?ное оÑ?Ñ?ажение"
 
-#: ../objects/custom/custom_object.c:209
-#: ../objects/custom/custom_object.c:241
+#: ../objects/custom/custom_object.c:212 ../objects/custom/custom_object.c:245
 msgid "Flip vertical"
 msgstr "Ð?еÑ?Ñ?икалÑ?ное оÑ?Ñ?ажение"
 
-#: ../objects/custom/custom_object.c:212
-#: ../objects/custom/custom_object.c:244
+#: ../objects/custom/custom_object.c:215 ../objects/custom/custom_object.c:248
 msgid "Scale of the subshapes"
 msgstr "Ð?аÑ?Ñ?аб подÑ?оÑ?м"
 
-#: ../objects/custom/custom_object.c:1780
+#: ../objects/custom/custom_object.c:1764
 msgid "Flip Horizontal"
 msgstr "Ð?оÑ?изонÑ?алÑ?ное оÑ?Ñ?ажение"
 
-#: ../objects/custom/custom_object.c:1781
+#: ../objects/custom/custom_object.c:1765
 msgid "Flip Vertical"
 msgstr "Ð?еÑ?Ñ?икалÑ?ное оÑ?Ñ?ажение"
 
-#: ../objects/custom/custom_object.c:1818
-#: ../objects/custom_lines/custom_linetypes.c:263
+#: ../objects/custom/custom_object.c:1802
+#: ../objects/custom_lines/custom_linetypes.c:264
 #, c-format
 msgid "Cannot open icon file %s for object type '%s'."
 msgstr "Ð?е Ñ?далоÑ?Ñ? оÑ?кÑ?Ñ?Ñ?Ñ? Ñ?айл пикÑ?огÑ?аммÑ? %s длÑ? обÑ?екÑ?а Ñ?ипа «%s»."
@@ -6032,16 +5844,16 @@ msgstr "Ð?бÑ?екÑ? CustomLines"
 msgid "Custom XML lines loader"
 msgstr "Ð?агÑ?Ñ?зÑ?ик полÑ?зоваÑ?елÑ?Ñ?киÑ? XML-Ñ?оÑ?м"
 
-#: ../objects/custom_lines/custom_linetypes.c:226
+#: ../objects/custom_lines/custom_linetypes.c:227
 msgid "INTERNAL: CustomLines: Illegal line type in LineInfo object."
 msgstr "Ð?Ð?УТРÐ?Ð?Ð?Ð?Ð?: CustomLines: Ð?екоÑ?Ñ?екÑ?нÑ?й Ñ?ип линии в обÑ?екÑ?е LineInfo."
 
-#: ../objects/custom_lines/custom_linetypes.c:251
+#: ../objects/custom_lines/custom_linetypes.c:252
 #, c-format
 msgid "INTERNAL: CustomLines: Illegal line type in LineInfo object %s."
 msgstr "Ð?Ð?УТРÐ?Ð?Ð?Ð?Ð?: CustomLines: Ð?екоÑ?Ñ?екÑ?нÑ?й Ñ?ип линии в обÑ?екÑ?е LineInfo %s."
 
-#: ../objects/custom/shape_info.c:162
+#: ../objects/custom/shape_info.c:163
 #, c-format
 msgid ""
 "The file '%s' has invalid path data.\n"
@@ -6054,7 +5866,7 @@ msgstr ""
 msgid "Flowchart objects"
 msgstr "Ð?бÑ?екÑ?Ñ? блок-Ñ?Ñ?емÑ?"
 
-#: ../objects/flowchart/parallelogram.c:154
+#: ../objects/flowchart/parallelogram.c:156
 msgid "Shear angle"
 msgstr "Угол Ñ?меÑ?ениÑ?"
 
@@ -6062,8 +5874,7 @@ msgstr "Угол Ñ?меÑ?ениÑ?"
 msgid "Sectors"
 msgstr "СекÑ?оÑ?Ñ?"
 
-#: ../objects/network/basestation.c:401
-#: ../objects/network/basestation.c:403
+#: ../objects/network/basestation.c:401 ../objects/network/basestation.c:403
 msgid "Base Station"
 msgstr "Ð?азоваÑ? Ñ?Ñ?анÑ?иÑ?"
 
@@ -6075,132 +5886,137 @@ msgstr "Ð?бÑ?екÑ?Ñ? диагÑ?аммÑ? Ñ?еÑ?и"
 msgid "Radius"
 msgstr "РадиÑ?Ñ?"
 
-#: ../objects/network/wanlink.c:119
+#: ../objects/network/wanlink.c:120
 msgid "Width"
 msgstr "ШиÑ?ина"
 
-#: ../objects/standard/arc.c:142
+#: ../objects/standard/arc.c:143
 msgid "Curve distance"
 msgstr "Ð?лина кÑ?ивой"
 
-#: ../objects/standard/bezier.c:139
-#: ../objects/standard/line.c:143
-#: ../objects/standard/polyline.c:137
+#: ../objects/standard/bezier.c:143 ../objects/standard/line.c:145
+#: ../objects/standard/polyline.c:141
 msgid "Line gaps"
 msgstr "Ð?Ñ?обелÑ? линии"
 
-#: ../objects/standard/bezier.c:141
-#: ../objects/standard/line.c:145
-#: ../objects/standard/polyline.c:139
+#: ../objects/standard/bezier.c:145 ../objects/standard/line.c:147
+#: ../objects/standard/polyline.c:143
 msgid "Absolute start gap"
 msgstr "Ð?Ñ?обел абÑ?олÑ?Ñ?ного наÑ?ала"
 
-#: ../objects/standard/bezier.c:143
-#: ../objects/standard/line.c:147
-#: ../objects/standard/polyline.c:141
+#: ../objects/standard/bezier.c:147 ../objects/standard/line.c:149
+#: ../objects/standard/polyline.c:145
 msgid "Absolute end gap"
 msgstr "Ð?Ñ?обел абÑ?олÑ?Ñ?ного конÑ?а"
 
-#: ../objects/standard/bezier.c:731
-#: ../objects/standard/beziergon.c:495
+#: ../objects/standard/bezier.c:755 ../objects/standard/beziergon.c:507
 msgid "Add Segment"
 msgstr "Ð?обавиÑ?Ñ? Ñ?егменÑ?"
 
-#: ../objects/standard/bezier.c:732
-#: ../objects/standard/beziergon.c:496
+#: ../objects/standard/bezier.c:756 ../objects/standard/beziergon.c:508
 msgid "Delete Segment"
 msgstr "УдалиÑ?Ñ? Ñ?егменÑ?"
 
-#: ../objects/standard/bezier.c:734
-#: ../objects/standard/beziergon.c:498
+#: ../objects/standard/bezier.c:758 ../objects/standard/beziergon.c:510
 msgid "Symmetric control"
 msgstr "СиммеÑ?Ñ?иÑ?наÑ? Ñ?оÑ?ка"
 
-#: ../objects/standard/bezier.c:736
-#: ../objects/standard/beziergon.c:500
+#: ../objects/standard/bezier.c:760 ../objects/standard/beziergon.c:512
 msgid "Smooth control"
 msgstr "Ð?ладкаÑ? Ñ?оÑ?ка"
 
-#: ../objects/standard/bezier.c:738
-#: ../objects/standard/beziergon.c:502
+#: ../objects/standard/bezier.c:762 ../objects/standard/beziergon.c:514
 msgid "Cusp control"
 msgstr "Ð?Ñ?Ñ?Ñ?аÑ? Ñ?оÑ?ка"
 
-#: ../objects/standard/box.c:139
-#: ../objects/standard/ellipse.c:133
+#: ../objects/standard/box.c:139 ../objects/standard/ellipse.c:133
 msgid "Free"
 msgstr "Ð?Ñ?оизволÑ?ное"
 
-#: ../objects/standard/box.c:140
-#: ../objects/standard/ellipse.c:134
+#: ../objects/standard/box.c:140 ../objects/standard/ellipse.c:134
 msgid "Fixed"
 msgstr "ФикÑ?иÑ?ованное"
 
-#: ../objects/standard/box.c:141
-#: ../objects/standard/box.c:699
+#: ../objects/standard/box.c:141 ../objects/standard/box.c:699
 msgid "Square"
 msgstr "Ð?вадÑ?аÑ?"
 
-#: ../objects/standard/box.c:154
-#: ../objects/standard/ellipse.c:146
+#: ../objects/standard/box.c:154 ../objects/standard/ellipse.c:146
 msgid "Aspect ratio"
 msgstr "Ð?Ñ?ноÑ?ение Ñ?Ñ?оÑ?он"
 
-#: ../objects/standard/box.c:695
-#: ../objects/standard/ellipse.c:670
+#: ../objects/standard/box.c:695 ../objects/standard/ellipse.c:673
 msgid "Free aspect"
 msgstr "Ð?Ñ?оизволÑ?нÑ?е пÑ?опоÑ?Ñ?ии"
 
-#: ../objects/standard/box.c:697
-#: ../objects/standard/ellipse.c:672
+#: ../objects/standard/box.c:697 ../objects/standard/ellipse.c:675
 msgid "Fixed aspect"
 msgstr "ФикÑ?иÑ?ованнÑ?е пÑ?опоÑ?Ñ?ии"
 
-#: ../objects/standard/ellipse.c:135
-#: ../objects/standard/ellipse.c:674
+#: ../objects/standard/ellipse.c:135 ../objects/standard/ellipse.c:677
 msgid "Circle"
 msgstr "Ð?Ñ?Ñ?г"
 
-#: ../objects/standard/image.c:139
+#: ../objects/standard/image.c:144
 msgid "Image file"
 msgstr "Файл изобÑ?ажениÑ?"
 
-#: ../objects/standard/image.c:141
+#: ../objects/standard/image.c:146
+#, fuzzy
+msgid "Inline data"
+msgstr "Ð?аннÑ?е вÑ?емени"
+
+#: ../objects/standard/image.c:146
+msgid "Store image data in diagram"
+msgstr ""
+
+#: ../objects/standard/image.c:148
+msgid "Pixbuf"
+msgstr ""
+
+#: ../objects/standard/image.c:148
+#, fuzzy
+msgid "The Pixbuf reference"
+msgstr "Ð?аÑ?амеÑ?Ñ?Ñ?"
+
+#: ../objects/standard/image.c:150
 msgid "Draw border"
 msgstr "Ð?аÑ?иÑ?оваÑ?Ñ? Ñ?амкÑ?"
 
-#: ../objects/standard/image.c:143
+#: ../objects/standard/image.c:152
 msgid "Keep aspect ratio"
 msgstr "СоÑ?Ñ?анÑ?Ñ?Ñ? пÑ?опоÑ?Ñ?ии"
 
+#: ../objects/standard/image.c:671
+msgid "Inconsistent pixbuf during image save."
+msgstr ""
+
 #. Found file in same dir as diagram.
 #. Found file in current dir.
-#: ../objects/standard/image.c:697
-#: ../objects/standard/image.c:708
-#, c-format
+#: ../objects/standard/image.c:768 ../objects/standard/image.c:779
+#, fuzzy, c-format
 msgid ""
-"The image file '%s' was not found in that directory.\n"
-"Using the file '%s' instead\n"
+"The image file '%s' was not found in the specified directory.\n"
+"Using the file '%s' instead.\n"
 msgstr ""
 "Файл изобÑ?ажениÑ? «%s» не бÑ?л найден в Ñ?Ñ?ом каÑ?алоге.\n"
 "Ð?меÑ?Ñ?о него иÑ?полÑ?зÑ?еÑ?Ñ?Ñ? Ñ?айл «%s»\n"
 
 #. Didn't find file in current dir.
-#: ../objects/standard/image.c:714
-#: ../objects/standard/image.c:736
+#: ../objects/standard/image.c:785 ../objects/standard/image.c:807
 #, c-format
 msgid "The image file '%s' was not found.\n"
 msgstr "Файл изобÑ?ажениÑ? «%s» не бÑ?л найден.\n"
 
-#: ../objects/standard/line.c:134
+#: ../objects/standard/line.c:136
 msgid "Arrows"
 msgstr "СÑ?Ñ?елки"
 
-#: ../objects/standard/line.c:139
+#: ../objects/standard/line.c:141
 msgid "Start point"
 msgstr "Ð?аÑ?алÑ?наÑ? Ñ?оÑ?ка:"
 
-#: ../objects/standard/line.c:141
+#: ../objects/standard/line.c:143
 msgid "End point"
 msgstr "Ð?онеÑ?наÑ? Ñ?оÑ?ка"
 
@@ -6212,13 +6028,11 @@ msgstr "СодеÑ?жимое Ñ?екÑ?Ñ?а"
 msgid "Angle to rotate the outline"
 msgstr "Угол вÑ?аÑ?ениÑ? конÑ?Ñ?Ñ?а"
 
-#: ../objects/standard/polygon.c:462
-#: ../objects/standard/polyline.c:616
+#: ../objects/standard/polygon.c:473 ../objects/standard/polyline.c:638
 msgid "Add Corner"
 msgstr "Ð?обавиÑ?Ñ? Ñ?голок"
 
-#: ../objects/standard/polygon.c:463
-#: ../objects/standard/polyline.c:617
+#: ../objects/standard/polygon.c:474 ../objects/standard/polyline.c:639
 msgid "Delete Corner"
 msgstr "УдалиÑ?Ñ? Ñ?голок"
 
@@ -6234,86 +6048,85 @@ msgstr "Ð?еÑ?ваÑ? линиÑ?"
 msgid "Vertical text alignment"
 msgstr "Ð?еÑ?Ñ?икалÑ?ное вÑ?Ñ?авнивание Ñ?екÑ?Ñ?а"
 
-#: ../plug-ins/cairo/diacairo-interactive.c:263
-#: ../plug-ins/cairo/diacairo-interactive.c:264
+#: ../plug-ins/cairo/diacairo-interactive.c:377
+#: ../plug-ins/cairo/diacairo-interactive.c:378
 msgid "Zoom pointer"
 msgstr "Ð?аÑ?Ñ?Ñ?абиÑ?Ñ?емÑ?й пÑ?инÑ?еÑ?"
 
-#: ../plug-ins/cairo/diacairo-interactive.c:270
-#: ../plug-ins/cairo/diacairo-interactive.c:271
+#: ../plug-ins/cairo/diacairo-interactive.c:384
+#: ../plug-ins/cairo/diacairo-interactive.c:385
 msgid "Visible rect pointer"
 msgstr "Ð?идимÑ?й Ñ?казаÑ?елÑ? пÑ?Ñ?моÑ?голÑ?ника"
 
-#: ../plug-ins/cairo/diacairo.c:129
-#, c-format
+#: ../plug-ins/cairo/diacairo.c:133
+#, fuzzy, c-format
 msgid ""
 "Can't convert output filename '%s' to locale encoding.\n"
-"Please choose a different name to save with cairo.\n"
+"Please choose a different name to save with Cairo.\n"
 msgstr ""
 "Ð?е Ñ?далоÑ?Ñ? Ñ?оÑ?Ñ?аниÑ?Ñ? вÑ?Ñ?одной Ñ?айл '%s' в локалÑ?ной кодиÑ?овке.\n"
 "Ð?опÑ?обÑ?йÑ?е вÑ?бÑ?аÑ?Ñ? дÑ?Ñ?гое имÑ? длÑ? Ñ?оÑ?Ñ?анениÑ?.\n"
 
-#: ../plug-ins/cairo/diacairo.c:256
-#: ../plug-ins/cairo/diacairo.c:272
+#: ../plug-ins/cairo/diacairo.c:277 ../plug-ins/cairo/diacairo.c:293
 #, c-format
 msgid "Can't write %d bytes to %s"
 msgstr "Ð?е Ñ?далоÑ?Ñ? запиÑ?аÑ?Ñ? %d байÑ?ов в %s"
 
-#: ../plug-ins/cairo/diacairo.c:285
+#: ../plug-ins/cairo/diacairo.c:306
 msgid "Clipboard copy failed"
 msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?копиÑ?оваÑ?Ñ? в бÑ?Ñ?еÑ? обмена"
 
-#: ../plug-ins/cairo/diacairo.c:311
-#: ../plug-ins/postscript/postscript.c:39
-#: ../plug-ins/wmf/wmf.cpp:1388
+#: ../plug-ins/cairo/diacairo.c:331 ../plug-ins/postscript/postscript.c:39
+#: ../plug-ins/wmf/wmf.cpp:1482
 msgid "Nothing to print"
 msgstr "Ð?еÑ? докÑ?менÑ?ов длÑ? пеÑ?аÑ?и"
 
-#: ../plug-ins/cairo/diacairo.c:322
-msgid "Printing with Gtk+(cairo) requires at least version 2.10."
-msgstr "Ð?еÑ?аÑ?Ñ? Ñ?Ñ?ебÑ?еÑ? Gtk+(cairo) веÑ?Ñ?ии 2.10 и вÑ?Ñ?е."
-
-#: ../plug-ins/cairo/diacairo.c:329
+#: ../plug-ins/cairo/diacairo.c:346
 msgid "Cairo PostScript"
 msgstr "Cairo PostScript"
 
-#: ../plug-ins/cairo/diacairo.c:340
+#: ../plug-ins/cairo/diacairo.c:357
 msgid "Cairo Portable Document Format"
 msgstr "Cairo Portable Document Format (PDF)"
 
-#: ../plug-ins/cairo/diacairo.c:355
+#: ../plug-ins/cairo/diacairo.c:368
 msgid "Cairo Scalable Vector Graphics"
-msgstr "Cairo маÑ?Ñ?Ñ?абиÑ?Ñ?емаÑ? векÑ?оÑ?наÑ? гÑ?аÑ?ика (SVG)"
+msgstr "Cairo SVG"
+
+#: ../plug-ins/cairo/diacairo.c:380
+msgid "CairoScript"
+msgstr "CairoScript"
 
-#: ../plug-ins/cairo/diacairo.c:366
+#: ../plug-ins/cairo/diacairo.c:391
 msgid "Cairo PNG"
 msgstr "Cairo PNG"
 
-#: ../plug-ins/cairo/diacairo.c:374
+#: ../plug-ins/cairo/diacairo.c:399
 msgid "Cairo PNG (with alpha)"
 msgstr "Cairo PNG (Ñ? пÑ?озÑ?аÑ?ноÑ?Ñ?Ñ?Ñ?)"
 
-#: ../plug-ins/cairo/diacairo.c:384
+#: ../plug-ins/cairo/diacairo.c:409
 msgid "Cairo EMF"
 msgstr "Файл Cairo WMF"
 
-#: ../plug-ins/cairo/diacairo.c:394
+#: ../plug-ins/cairo/diacairo.c:419
 msgid "Cairo WMF"
 msgstr "Cairo WMF"
 
-#: ../plug-ins/cairo/diacairo.c:416
+#: ../plug-ins/cairo/diacairo.c:441
 msgid "Copy _Diagram"
 msgstr "СкопиÑ?оваÑ?Ñ? _диагÑ?аммÑ?"
 
-#: ../plug-ins/cairo/diacairo.c:426
-msgid "Print (GTK) ..."
+#: ../plug-ins/cairo/diacairo.c:450
+#, fuzzy
+msgid "Print (GTK+)â?¦"
 msgstr "Ð?еÑ?аÑ?Ñ? (GTK)..."
 
-#: ../plug-ins/cairo/diacairo.c:471
-msgid "Cairo based Rendering"
+#: ../plug-ins/cairo/diacairo.c:497
+msgid "Cairo-based Rendering"
 msgstr "Ð?Ñ?Ñ?иÑ?овка Ñ? иÑ?полÑ?зованием Cairo"
 
-#: ../plug-ins/cgm/cgm.c:1106
+#: ../plug-ins/cgm/cgm.c:1118
 msgid ""
 "Image row length larger than maximum cell array.\n"
 "Image not exported to CGM."
@@ -6321,33 +6134,44 @@ msgstr ""
 "Ð?лина Ñ?Ñ?Ñ?оки изобÑ?ажениÑ? болÑ?Ñ?е Ñ?ем макÑ?ималÑ?нÑ?й маÑ?Ñ?ив Ñ?Ñ?еек.\n"
 "Ð?зобÑ?ажение не Ñ?кÑ?поÑ?Ñ?иÑ?овано в CGM."
 
-#: ../plug-ins/cgm/cgm.c:1361
+#: ../plug-ins/cgm/cgm.c:1125 ../plug-ins/libart/dialibartrenderer.c:1324
+#: ../plug-ins/metapost/render_metapost.c:1110
+#: ../plug-ins/postscript/diapsrenderer.c:719
+#: ../plug-ins/pstricks/render_pstricks.c:826 ../plug-ins/wpg/wpg.c:891
+msgid "Not enough memory for image drawing."
+msgstr ""
+
+#: ../plug-ins/cgm/cgm.c:1378
 msgid "Computer Graphics Metafile"
 msgstr "Computer Graphics Metafile"
 
-#: ../plug-ins/cgm/cgm.c:1386
+#: ../plug-ins/cgm/cgm.c:1403
 msgid "Computer Graphics Metafile export filter"
 msgstr "ФилÑ?Ñ?Ñ? Ñ?кÑ?поÑ?Ñ?а Ñ?айлов Computer Graphics Metafile"
 
-#: ../plug-ins/drs/dia-render-script.c:153
+#: ../plug-ins/drs/dia-render-script-import.c:225
+msgid "Broken file?"
+msgstr ""
+
+#: ../plug-ins/drs/dia-render-script.c:156
+#: ../plug-ins/drs/dia-render-script.c:161
 msgid "DiaRenderScript"
 msgstr ""
 
-#: ../plug-ins/drs/dia-render-script.c:164
+#: ../plug-ins/drs/dia-render-script.c:185
 msgid "DiaRenderScript filter"
 msgstr ""
 
-#: ../plug-ins/dxf/dxf-export.c:598
-#: ../plug-ins/dxf/dxf-import.c:1402
+#: ../plug-ins/dxf/dxf-export.c:598 ../plug-ins/dxf/dxf-import.c:1409
 msgid "Drawing Interchange File"
 msgstr "DIF (векÑ?оÑ?нÑ?й Ñ?оÑ?маÑ? обмена изобÑ?ажениÑ?ми)"
 
-#: ../plug-ins/dxf/dxf-import.c:1319
+#: ../plug-ins/dxf/dxf-import.c:1326
 #, c-format
 msgid "read_dxf_codes failed on '%s'\n"
 msgstr "read_dxf_codes не Ñ?далоÑ?Ñ? вÑ?полниÑ?Ñ? «%s»\n"
 
-#: ../plug-ins/dxf/dxf-import.c:1326
+#: ../plug-ins/dxf/dxf-import.c:1333
 #, c-format
 msgid "Binary DXF from '%s' not supported\n"
 msgstr "Ð?инаÑ?нÑ?й DXF оÑ? «%s» не поддеÑ?живаеÑ?Ñ?Ñ?\n"
@@ -6365,47 +6189,49 @@ msgid "HP Graphics Language export filter"
 msgstr "ФилÑ?Ñ?Ñ? Ñ?кÑ?поÑ?Ñ?а Ñ?айлов HPGL"
 
 #: ../plug-ins/libart/dialibart.c:59
-msgid "Libart based rendering"
+#, fuzzy
+msgid "Libart-based rendering"
 msgstr "Ð?Ñ?Ñ?иÑ?овка Ñ? иÑ?полÑ?зованием Libart"
 
-#: ../plug-ins/libart/export_png.c:165
+#: ../plug-ins/libart/export_png.c:167
 msgid "Could not create PNG write structure"
 msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? Ñ?Ñ?Ñ?Ñ?кÑ?Ñ?Ñ?Ñ? запиÑ?и PNG"
 
-#: ../plug-ins/libart/export_png.c:174
+#: ../plug-ins/libart/export_png.c:176
 msgid "Could not create PNG header info structure"
 msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? Ñ?Ñ?Ñ?Ñ?кÑ?Ñ?Ñ?Ñ? инÑ?оÑ?маÑ?ионного заголовка PNG"
 
-#: ../plug-ins/libart/export_png.c:182
+#: ../plug-ins/libart/export_png.c:184
 msgid "Error occurred while writing PNG"
 msgstr "Ð?Ñ?и запиÑ?и PNG обнаÑ?Ñ?жена оÑ?ибка"
 
 #. Create a dialog
-#: ../plug-ins/libart/export_png.c:322
+#: ../plug-ins/libart/export_png.c:327
 msgid "PNG Export Options"
 msgstr "Ð?аÑ?амеÑ?Ñ?Ñ? Ñ?кÑ?поÑ?Ñ?а PNG"
 
-#: ../plug-ins/libart/export_png.c:328
+#: ../plug-ins/libart/export_png.c:333
 msgid "Image width:"
 msgstr "ШиÑ?ина изобÑ?ажениÑ?:"
 
-#: ../plug-ins/libart/export_png.c:331
+#: ../plug-ins/libart/export_png.c:336
 msgid "Image height:"
 msgstr "Ð?Ñ?Ñ?оÑ?а изобÑ?ажениÑ?:"
 
-#: ../plug-ins/libart/export_png.c:377
-msgid "PNG (anti-aliased)"
+#: ../plug-ins/libart/export_png.c:382
+#, fuzzy
+msgid "PNG (antialiased)"
 msgstr "PNG (_СглаженнÑ?й)"
 
-#: ../plug-ins/libart/dialibartrenderer.c:295
+#: ../plug-ins/libart/dialibartrenderer.c:304
 msgid "gdk_renderer: Unsupported fill mode specified!\n"
 msgstr "gdk_renderer: Указан не поддеÑ?живаемÑ?й Ñ?ежим заполнениÑ?!\n"
 
-#: ../plug-ins/libart/dialibartrenderer.c:1476
+#: ../plug-ins/libart/dialibartrenderer.c:1475
 msgid "Renderer transformation"
 msgstr "Ð?омпенÑ?аÑ?ионное пÑ?еобÑ?азование"
 
-#: ../plug-ins/libart/dialibartrenderer.c:1477
+#: ../plug-ins/libart/dialibartrenderer.c:1476
 msgid "Transform pointer"
 msgstr "ТоÑ?ка Ñ?Ñ?анÑ?Ñ?оÑ?маÑ?ии"
 
@@ -6413,7 +6239,7 @@ msgstr "ТоÑ?ка Ñ?Ñ?анÑ?Ñ?оÑ?маÑ?ии"
 msgid "TeX Metapost export filter"
 msgstr "ФилÑ?Ñ?Ñ? Ñ?кÑ?поÑ?Ñ?а Ñ?айлов TeX Metapost"
 
-#: ../plug-ins/metapost/render_metapost.c:1262
+#: ../plug-ins/metapost/render_metapost.c:1265
 msgid "TeX Metapost macros"
 msgstr "Ð?акÑ?оÑ? TeX Metapost"
 
@@ -6423,10 +6249,11 @@ msgstr "ФилÑ?Ñ?Ñ? Ñ?кÑ?поÑ?Ñ?а в Ñ?оÑ?маÑ? LaTeX PGF"
 
 #: ../plug-ins/pgf/render_pgf.c:1112
 #: ../plug-ins/pstricks/render_pstricks.c:733
-msgid "Not valid UTF8"
+#, fuzzy
+msgid "Not valid UTF-8"
 msgstr "Ð?екоÑ?Ñ?екÑ?нÑ?й UTF8"
 
-#: ../plug-ins/pgf/render_pgf.c:1277
+#: ../plug-ins/pgf/render_pgf.c:1262
 msgid "LaTeX PGF macros"
 msgstr "Ð?акÑ?оÑ? LaTeX PGF"
 
@@ -6442,7 +6269,8 @@ msgstr ""
 "%s"
 
 #: ../plug-ins/pixbuf/pixbuf.c:199
-msgid "gdk-pixbuf based bitmap export/import"
+#, fuzzy
+msgid "gdk-pixbuf-based bitmap export/import"
 msgstr "ЭкÑ?поÑ?Ñ?/импоÑ?Ñ? Ñ?аÑ?Ñ?Ñ?овÑ?Ñ? изобÑ?ажений gdk-pixbuf"
 
 #: ../plug-ins/postscript/paginate_psprint.c:273
@@ -6454,37 +6282,33 @@ msgstr "Ð?Ñ?бÑ?аÑ?Ñ? пÑ?инÑ?еÑ?"
 msgid "Printer"
 msgstr "Ð?Ñ?инÑ?еÑ?"
 
-#: ../plug-ins/postscript/paginate_psprint.c:299
-#: ../sheets/Misc.sheet.in.h:1
+#: ../plug-ins/postscript/paginate_psprint.c:299 ../sheets/Misc.sheet.in.h:1
 msgid "File"
 msgstr "Файл"
 
-#: ../plug-ins/postscript/paginate_psprint.c:314
-msgid "OK"
-msgstr "Ð?Ð?"
-
-#: ../plug-ins/postscript/paginate_psprint.c:456
+#: ../plug-ins/postscript/paginate_psprint.c:464
 #, c-format
 msgid "Could not run command '%s': %s"
 msgstr "Ð?е Ñ?далоÑ?Ñ? вÑ?полниÑ?Ñ? командÑ? «%s»: %s"
 
-#: ../plug-ins/postscript/paginate_psprint.c:459
+#: ../plug-ins/postscript/paginate_psprint.c:467
 #, c-format
 msgid "Could not open '%s' for writing: %s"
 msgstr "Ð?е Ñ?далоÑ?Ñ? оÑ?кÑ?Ñ?Ñ?Ñ? «%s» длÑ? запиÑ?и: %s"
 
-#: ../plug-ins/postscript/paginate_psprint.c:481
+#: ../plug-ins/postscript/paginate_psprint.c:489
 #, c-format
 msgid "Printing error: command '%s' returned %d\n"
 msgstr "Ð?Ñ?ибка пеÑ?аÑ?и: команда «%s» возвÑ?аÑ?ила %d\n"
 
-#: ../plug-ins/postscript/paginate_psprint.c:492
+#: ../plug-ins/postscript/paginate_psprint.c:500
 #, c-format
 msgid "Printing error: command '%s' caused sigpipe."
 msgstr "Ð?Ñ?ибка пеÑ?аÑ?и: команда «%s» вÑ?звала Ñ?игнал sigpipe."
 
 #: ../plug-ins/postscript/render_eps.c:150
-msgid "Encapsulated Postscript (using Pango fonts)"
+#, fuzzy
+msgid "Encapsulated PostScript (using Pango fonts)"
 msgstr "Encapsulated PostScript (иÑ?полÑ?зÑ?Ñ? Ñ?Ñ?иÑ?Ñ?Ñ? Pango)"
 
 #: ../plug-ins/postscript/render_eps.c:159
@@ -6492,7 +6316,8 @@ msgid "Encapsulated Postscript with preview (using Pango fonts)"
 msgstr "Encapsulated Postscript Ñ? пÑ?едпÑ?оÑ?моÑ?Ñ?ом (иÑ?полÑ?зÑ?Ñ? Ñ?Ñ?иÑ?Ñ?Ñ? Pango)"
 
 #: ../plug-ins/postscript/render_eps.c:169
-msgid "Encapsulated Postscript (using PostScript Latin-1 fonts)"
+#, fuzzy
+msgid "Encapsulated PostScript (using PostScript Latin-1 fonts)"
 msgstr "Encapsulated PostScript (иÑ?полÑ?зÑ?Ñ? PostScript-Ñ?Ñ?иÑ?Ñ?Ñ? Latin-1)"
 
 #: ../plug-ins/postscript/postscript.c:46
@@ -6500,18 +6325,20 @@ msgid "Print (PS)"
 msgstr "Ð?еÑ?аÑ?Ñ? (PS)"
 
 #: ../plug-ins/postscript/postscript.c:70
-msgid "Postscript Rendering"
+#, fuzzy
+msgid "PostScript Rendering"
 msgstr "Ð?Ñ?Ñ?иÑ?овка Postscript"
 
 #: ../plug-ins/pstricks/pstricks.c:26
-msgid "TeX Pstricks export filter"
+#, fuzzy
+msgid "TeX PSTricks export filter"
 msgstr "ФилÑ?Ñ?Ñ? Ñ?кÑ?поÑ?Ñ?а Ñ?айлов TeX Pstricks"
 
-#: ../plug-ins/pstricks/render_pstricks.c:987
+#: ../plug-ins/pstricks/render_pstricks.c:990
 msgid "TeX PSTricks macros"
 msgstr "Ð?акÑ?оÑ? TeX PSTricks"
 
-#: ../plug-ins/python/pydia-render.c:779
+#: ../plug-ins/python/pydia-render.c:933
 #, c-format
 msgid "Couldn't open '%s' for writing.\n"
 msgstr "Ð?е Ñ?далоÑ?Ñ? оÑ?кÑ?Ñ?Ñ?Ñ? «%s» длÑ? запиÑ?и.\n"
@@ -6520,23 +6347,27 @@ msgstr "Ð?е Ñ?далоÑ?Ñ? оÑ?кÑ?Ñ?Ñ?Ñ? «%s» длÑ? запиÑ?и.\n"
 msgid "Python scripting support"
 msgstr "Ð?оддеÑ?жка Ñ?кÑ?ипÑ?ов Python"
 
-#: ../plug-ins/shape/shape-export.c:474
+#: ../plug-ins/shape/shape-export.c:479
 msgid "Shape files must end in .shape, or they cannot be loaded by Dia"
-msgstr "ФайлÑ? Ñ?оÑ?м должнÑ? имеÑ?Ñ? Ñ?аÑ?Ñ?иÑ?ениÑ? .shape. Ð? пÑ?оÑ?ивном Ñ?лÑ?Ñ?ае они не могÑ?Ñ? бÑ?Ñ?Ñ? загÑ?Ñ?женÑ? Dia"
+msgstr ""
+"ФайлÑ? Ñ?оÑ?м должнÑ? имеÑ?Ñ? Ñ?аÑ?Ñ?иÑ?ениÑ? .shape. Ð? пÑ?оÑ?ивном Ñ?лÑ?Ñ?ае они не могÑ?Ñ? "
+"бÑ?Ñ?Ñ? загÑ?Ñ?женÑ? Dia"
 
-#: ../plug-ins/shape/shape-export.c:485
-msgid "Can't export png without libart!"
+#: ../plug-ins/shape/shape-export.c:493
+#, fuzzy
+msgid "Can't export PNG icon without export plugin!"
 msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?кÑ?поÑ?Ñ?иÑ?оваÑ?Ñ? png без libart!"
 
-#: ../plug-ins/shape/shape-export.c:510
+#: ../plug-ins/shape/shape-export.c:517
 msgid "Dia Shape File"
 msgstr "Файл ФоÑ?м Dia"
 
 #: ../plug-ins/shape/shape.c:36
-msgid "dia shape export filter"
+#, fuzzy
+msgid "Dia shape export filter"
 msgstr "ФилÑ?Ñ?Ñ? Ñ?кÑ?поÑ?Ñ?а Ñ?оÑ?м dia"
 
-#: ../plug-ins/svg/svg-import.c:258
+#: ../plug-ins/svg/svg-import.c:259
 msgid ""
 "Invalid path data.\n"
 "svg:path data must start with moveto."
@@ -6544,74 +6375,71 @@ msgstr ""
 "Ð?екоÑ?Ñ?екÑ?нÑ?е даннÑ?е пÑ?Ñ?и.\n"
 "svg:path должно наÑ?инаÑ?Ñ?Ñ?Ñ? Ñ? командÑ? moveto."
 
-#: ../plug-ins/svg/svg-import.c:806
+#: ../plug-ins/svg/svg-import.c:923
 msgid "Expected SVG Namespace not found in file"
 msgstr "Ð? Ñ?айле не найдено ожидаемое пÑ?оÑ?Ñ?Ñ?анÑ?Ñ?во имен SVG"
 
-#: ../plug-ins/svg/svg-import.c:826
-#, c-format
-msgid "root element was '%s' -- expecting 'svg'."
+#: ../plug-ins/svg/svg-import.c:943
+#, fuzzy, c-format
+msgid "root element was '%s' â?? expecting 'svg'."
 msgstr "коÑ?невой Ñ?леменÑ? бÑ?л «%s», а ожидаеÑ?Ñ?Ñ? 'svg'."
 
 #: ../plug-ins/svg/svg.c:50
 msgid "Scalable Vector Graphics import and export filters"
 msgstr "ФилÑ?Ñ?Ñ?Ñ? импоÑ?Ñ?а и Ñ?кÑ?поÑ?Ñ?а маÑ?Ñ?Ñ?абиÑ?Ñ?емой векÑ?оÑ?ной гÑ?аÑ?ики(SVG)"
 
-#: ../plug-ins/vdx/vdx-export.c:1376
-#: ../plug-ins/vdx/vdx-export.c:1385
+#: ../plug-ins/vdx/vdx-export.c:1375 ../plug-ins/vdx/vdx-export.c:1384
 #, c-format
 msgid "Couldn't read file %s"
 msgstr "Ð?е Ñ?далоÑ?Ñ? пÑ?оÑ?еÑ?Ñ?Ñ? Ñ?айл %s"
 
-#: ../plug-ins/vdx/vdx-export.c:1905
+#: ../plug-ins/vdx/vdx-export.c:1911
 msgid "Visio XML format"
 msgstr "Visio XML Ñ?оÑ?маÑ?"
 
-#: ../plug-ins/vdx/vdx-import.c:226
-#: ../plug-ins/xfig/xfig-import.c:1046
+#: ../plug-ins/vdx/vdx-import.c:230 ../plug-ins/xfig/xfig-import.c:1049
 #, c-format
 msgid "Couldn't read color: %s\n"
 msgstr "Ð?е Ñ?далоÑ?Ñ? пÑ?оÑ?еÑ?Ñ?Ñ? Ñ?веÑ?: %s\n"
 
-#: ../plug-ins/vdx/vdx-import.c:540
+#: ../plug-ins/vdx/vdx-import.c:543
 #, c-format
 msgid "Couldn't find shape %d\n"
 msgstr "Ð?е Ñ?далоÑ?Ñ? найÑ?и Ñ?оÑ?мÑ? %d\n"
 
-#: ../plug-ins/vdx/vdx-import.c:1046
+#: ../plug-ins/vdx/vdx-import.c:1053
 #, c-format
 msgid "Unexpected Ellipse object: %s\n"
 msgstr "Ð?еожиданнÑ?й обÑ?екÑ? овал: %s\n"
 
-#: ../plug-ins/vdx/vdx-import.c:1060
+#: ../plug-ins/vdx/vdx-import.c:1067
 msgid "Can't rotate ellipse\n"
 msgstr "Ð?е Ñ?далоÑ?Ñ? повеÑ?нÑ?Ñ?Ñ? Ñ?ллипÑ?: %s\n"
 
-#: ../plug-ins/vdx/vdx-import.c:1391
+#: ../plug-ins/vdx/vdx-import.c:1398
 msgid "MoveTo not at start of Bezier\n"
 msgstr "MoveTo не на Ñ?Ñ?аÑ?Ñ?е Ñ? Ð?езÑ?е\n"
 
-#: ../plug-ins/vdx/vdx-import.c:1739
+#: ../plug-ins/vdx/vdx-import.c:1748
 msgid "Invalid NURBS formula"
 msgstr "Ð?екоÑ?Ñ?екÑ?наÑ? Ñ?оÑ?мÑ?ла NURBS"
 
-#: ../plug-ins/vdx/vdx-import.c:1983
+#: ../plug-ins/vdx/vdx-import.c:1995 ../plug-ins/vdx/vdx-import.c:2007
 #, c-format
 msgid "Couldn't write file %s"
 msgstr "Ð?е Ñ?далоÑ?Ñ? запиÑ?аÑ?Ñ? Ñ?айл %s"
 
-#: ../plug-ins/vdx/vdx-import.c:2068
-#: ../plug-ins/vdx/vdx-import.c:2081
+#: ../plug-ins/vdx/vdx-import.c:2060 ../plug-ins/vdx/vdx-import.c:2073
 #, c-format
 msgid "Couldn't handle foreign object type %s"
 msgstr "Ð?е Ñ?далоÑ?Ñ?  обÑ?абоÑ?аÑ?Ñ? Ñ?Ñ?оÑ?онний Ñ?ип обÑ?екÑ?а %s"
 
-#: ../plug-ins/vdx/vdx-import.c:2109
-#, c-format
-msgid "Couldn't make object dir %s"
+#: ../plug-ins/vdx/vdx-import.c:2101
+#, fuzzy, c-format
+msgid "Couldn't make object directory %s"
 msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? каÑ?алог обÑ?екÑ?ов %s"
 
-#: ../plug-ins/vdx/vdx-import.c:3090
+#: ../plug-ins/vdx/vdx-import.c:3091
 msgid "Visio XML File Format"
 msgstr "Файл Visio XML"
 
@@ -6629,313 +6457,314 @@ msgstr "Ð?е Ñ?далоÑ?Ñ? запиÑ?аÑ?Ñ? обÑ?екÑ? %u"
 msgid "Visio XML Format import and export filter"
 msgstr "ФилÑ?Ñ?Ñ? импоÑ?Ñ?а/Ñ?кÑ?поÑ?Ñ?а Ñ?оÑ?маÑ?а Visio XML Format"
 
-#: ../plug-ins/wmf/wmf.cpp:506
-#, c-format
+#: ../plug-ins/wmf/wmf.cpp:552
+#, fuzzy, c-format
 msgid ""
-"Can not render unknown font:\n"
+"Cannot render unknown font:\n"
 "%s"
 msgstr ""
 "Ð?е Ñ?далоÑ?Ñ? оÑ?обÑ?азиÑ?Ñ? неизвеÑ?Ñ?нÑ?й Ñ?Ñ?иÑ?Ñ?:\n"
 "%s"
 
-#: ../plug-ins/wmf/wmf.cpp:1265
+#: ../plug-ins/wmf/wmf.cpp:1359
 #, c-format
 msgid "Couldn't open: '%s' for writing.\n"
 msgstr "Ð?е Ñ?далоÑ?Ñ? оÑ?кÑ?Ñ?Ñ?Ñ?: «%s» длÑ? запиÑ?и.\n"
 
-#: ../plug-ins/wmf/wmf.cpp:1364
-msgid "Windows Meta File"
-msgstr "Windows Meta File"
-
-#: ../plug-ins/wmf/wmf.cpp:1373
-msgid "Enhanced Meta File"
-msgstr "УлÑ?Ñ?Ñ?еннÑ?й Meta File"
-
-#: ../plug-ins/wmf/wmf.cpp:1395
-msgid "Print (GDI) ..."
+#: ../plug-ins/wmf/wmf.cpp:1489
+#, fuzzy
+msgid "Print (GDI)â?¦"
 msgstr "Ð?еÑ?аÑ?Ñ? (GDI)..."
 
-#: ../plug-ins/wmf/wmf.cpp:1410
+#: ../plug-ins/wmf/wmf.cpp:1504
 msgid "WMF export filter"
 msgstr "Ñ?илÑ?Ñ?Ñ? Ñ?кÑ?поÑ?Ñ?а в WMF"
 
-#: ../plug-ins/wpg/wpg.c:1190
+#: ../plug-ins/wpg/wpg.c:1194
 #, c-format
 msgid "File: %s type/version unsupported.\n"
 msgstr "Файл: %s Ñ?ип или веÑ?Ñ?иÑ? не поддеÑ?живаеÑ?Ñ?Ñ?.\n"
 
-#: ../plug-ins/wpg/wpg.c:1321
-#: ../plug-ins/wpg/wpg.c:1328
+#: ../plug-ins/wpg/wpg.c:1325 ../plug-ins/wpg/wpg.c:1332
 msgid "WPG"
 msgstr "WPG"
 
-#: ../plug-ins/wpg/wpg.c:1356
+#: ../plug-ins/wpg/wpg.c:1360
 msgid "WordPerfect Graphics export filter"
 msgstr "ФилÑ?Ñ?Ñ? Ñ?кÑ?поÑ?Ñ?а Ñ?айлов WordPerfect Graphics"
 
-#: ../plug-ins/xfig/xfig-export.c:461
-#, c-format
-msgid "FIG format has no equivalent of arrow style %s, using simple arrow.\n"
-msgstr "ФоÑ?маÑ? FIG не имееÑ? аналога длÑ? Ñ?Ñ?илÑ? Ñ?Ñ?Ñ?елок %s, иÑ?полÑ?зÑ?ем пÑ?оÑ?Ñ?Ñ?Ñ? Ñ?Ñ?Ñ?елкÑ?.\n"
+#: ../plug-ins/xfig/xfig-export.c:464
+#, fuzzy, c-format
+msgid "Fig format has no equivalent of arrow style %s; using simple arrow.\n"
+msgstr ""
+"ФоÑ?маÑ? FIG не имееÑ? аналога длÑ? Ñ?Ñ?илÑ? Ñ?Ñ?Ñ?елок %s, иÑ?полÑ?зÑ?ем пÑ?оÑ?Ñ?Ñ?Ñ? "
+"Ñ?Ñ?Ñ?елкÑ?.\n"
 
-#: ../plug-ins/xfig/xfig-export.c:484
-msgid "No more user-definable colors - using black"
+#: ../plug-ins/xfig/xfig-export.c:487
+#, fuzzy
+msgid "No more user-definable colors â?? using black"
 msgstr "Ð?едоÑ?Ñ?аÑ?оÑ?но Ñ?веÑ?ов, опÑ?еделÑ?емÑ?Ñ? полÑ?зоваÑ?елем - иÑ?полÑ?зÑ?ем Ñ?Ñ?Ñ?нÑ?й"
 
-#: ../plug-ins/xfig/xfig-export.c:1205
-msgid "XFig format"
+#: ../plug-ins/xfig/xfig-export.c:1211
+#, fuzzy
+msgid "Xfig format"
 msgstr "Файл в Ñ?оÑ?маÑ?е XFig"
 
 #: ../plug-ins/xfig/xfig-import.c:111
-#, c-format
-msgid "Color index %d too high, only 512 colors allowed. Using black instead."
-msgstr "Ð?ндекÑ? Ñ?веÑ?а %d Ñ?лиÑ?ком болÑ?Ñ?ой. РазÑ?еÑ?аеÑ?Ñ?Ñ? иÑ?полÑ?зоваÑ?Ñ? Ñ?олÑ?ко 512 Ñ?веÑ?ов. Ð?аменÑ?еÑ?Ñ?Ñ? на Ñ?Ñ?Ñ?нÑ?й."
+#, fuzzy, c-format
+msgid "Color index %d too high; only 512 colors allowed. Using black instead."
+msgstr ""
+"Ð?ндекÑ? Ñ?веÑ?а %d Ñ?лиÑ?ком болÑ?Ñ?ой. РазÑ?еÑ?аеÑ?Ñ?Ñ? иÑ?полÑ?зоваÑ?Ñ? Ñ?олÑ?ко 512 Ñ?веÑ?ов. "
+"Ð?аменÑ?еÑ?Ñ?Ñ? на Ñ?Ñ?Ñ?нÑ?й."
 
-#: ../plug-ins/xfig/xfig-import.c:138
+#: ../plug-ins/xfig/xfig-import.c:141
 msgid "Patterns are not supported by Dia"
 msgstr "ШаблонÑ? не поддеÑ?живаÑ?Ñ?Ñ?Ñ? Dia"
 
-#: ../plug-ins/xfig/xfig-import.c:166
-msgid "Triple-dotted lines are not supported by Dia, using double-dotted"
+#: ../plug-ins/xfig/xfig-import.c:169
+#, fuzzy
+msgid "Triple-dotted lines are not supported by Dia; using double-dotted"
 msgstr "ТÑ?Ñ?Ñ?Ñ?оÑ?еÑ?нÑ?е линии не поддеÑ?живаÑ?Ñ?Ñ?Ñ? Dia, иÑ?полÑ?зÑ?Ñ?Ñ?Ñ?Ñ? двÑ?Ñ?Ñ?оÑ?еÑ?нÑ?е"
 
-#: ../plug-ins/xfig/xfig-import.c:170
+#: ../plug-ins/xfig/xfig-import.c:173
 #, c-format
 msgid "Line style %d should not appear\n"
 msgstr "СÑ?илÑ? линии %d не должен поÑ?влÑ?Ñ?Ñ?Ñ?Ñ?\n"
 
-#: ../plug-ins/xfig/xfig-import.c:238
+#: ../plug-ins/xfig/xfig-import.c:241
 #, c-format
 msgid "Error while reading %dth of %d points: %s\n"
 msgstr "Ð?Ñ?ибка пÑ?и Ñ?Ñ?ении %d-ой из %d Ñ?оÑ?ек: %s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:266
+#: ../plug-ins/xfig/xfig-import.c:269
 msgid "Error while reading arrowhead\n"
 msgstr "Ð?Ñ?ибка пÑ?и Ñ?Ñ?ении Ñ?айла Ñ?Ñ?Ñ?елки\n"
 
-#: ../plug-ins/xfig/xfig-import.c:288
+#: ../plug-ins/xfig/xfig-import.c:291
 #, c-format
 msgid "Unknown arrow type %d\n"
 msgstr "Ð?еизвеÑ?Ñ?нÑ?й Ñ?ип Ñ?Ñ?Ñ?елки %d\n"
 
-#: ../plug-ins/xfig/xfig-import.c:379
-#, c-format
-msgid "Depth %d of of range, only 0-%d allowed.\n"
+#: ../plug-ins/xfig/xfig-import.c:382
+#, fuzzy, c-format
+msgid "Depth %d out of range; only 0â??%d allowed.\n"
 msgstr "Ð?лÑ?бина %d за гÑ?аниÑ?ами допÑ?Ñ?Ñ?имÑ?Ñ? знаÑ?ений, Ñ?олÑ?ко 0-%d возможно.\n"
 
-#: ../plug-ins/xfig/xfig-import.c:426
+#: ../plug-ins/xfig/xfig-import.c:429
 #, c-format
 msgid "Couldn't read ellipse info: %s\n"
 msgstr "Ð?е Ñ?далоÑ?Ñ? пÑ?оÑ?еÑ?Ñ?Ñ? инÑ?оÑ?маÑ?иÑ? об Ñ?ллипÑ?е: %s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:494
+#: ../plug-ins/xfig/xfig-import.c:497
 #, c-format
 msgid "Couldn't read polyline info: %s\n"
 msgstr "Ð?е Ñ?далоÑ?Ñ? пÑ?оÑ?еÑ?Ñ?Ñ? инÑ?оÑ?маÑ?иÑ? о ломаной: %s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:509
+#: ../plug-ins/xfig/xfig-import.c:512
 #, c-format
 msgid "Couldn't read flipped bit: %s\n"
 msgstr "Ð?е Ñ?далоÑ?Ñ? пÑ?оÑ?еÑ?Ñ?Ñ? оÑ?Ñ?ажÑ?ннÑ?й биÑ?: %s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:527
-msgid "Negative corner radius, negating"
+#: ../plug-ins/xfig/xfig-import.c:530
+#, fuzzy
+msgid "Negative corner radius; negating"
 msgstr "Ð?Ñ?Ñ?иÑ?аÑ?елÑ?нÑ?й Ñ?адиÑ?Ñ? Ñ?гла, оÑ?Ñ?иÑ?ание"
 
-#: ../plug-ins/xfig/xfig-import.c:570
+#: ../plug-ins/xfig/xfig-import.c:573
 #, c-format
 msgid "Unknown polyline subtype: %d\n"
 msgstr "Ð?еизвеÑ?Ñ?нÑ?й подÑ?ип ломаной: %d\n"
 
-#: ../plug-ins/xfig/xfig-import.c:720
-#: ../plug-ins/xfig/xfig-import.c:752
+#: ../plug-ins/xfig/xfig-import.c:723 ../plug-ins/xfig/xfig-import.c:755
 #, c-format
 msgid "Couldn't read spline info: %s\n"
 msgstr "Ð?е Ñ?далоÑ?Ñ? пÑ?оÑ?иÑ?аÑ?Ñ? инÑ?оÑ?маÑ?иÑ? о Ñ?плайне: %s\n"
 
 #. Open approximated spline
 #. Closed approximated spline
-#: ../plug-ins/xfig/xfig-import.c:739
-#: ../plug-ins/xfig/xfig-import.c:757
+#: ../plug-ins/xfig/xfig-import.c:742 ../plug-ins/xfig/xfig-import.c:760
 msgid "Cannot convert approximated spline yet."
 msgstr "Ð?Ñ?еобÑ?азование аппÑ?окÑ?имиÑ?ованнÑ?й Ñ?плайнов пока невозможно."
 
-#: ../plug-ins/xfig/xfig-import.c:795
+#: ../plug-ins/xfig/xfig-import.c:798
 #, c-format
 msgid "Unknown spline subtype: %d\n"
 msgstr "Ð?еизвеÑ?Ñ?нÑ?й подÑ?ип Ñ?плайна: %d\n"
 
-#: ../plug-ins/xfig/xfig-import.c:860
+#: ../plug-ins/xfig/xfig-import.c:863
 #, c-format
 msgid "Couldn't read arc info: %s\n"
 msgstr "Ð?е Ñ?далоÑ?Ñ? пÑ?оÑ?еÑ?Ñ?Ñ? инÑ?оÑ?маÑ?иÑ? о дÑ?ге: %s\n"
 
 #. set new fill property on arc?
-#: ../plug-ins/xfig/xfig-import.c:889
+#: ../plug-ins/xfig/xfig-import.c:892
 msgid "Filled arc treated as unfilled"
 msgstr "Ð?акÑ?аÑ?еннаÑ? дÑ?га оÑ?иÑ?ена"
 
-#: ../plug-ins/xfig/xfig-import.c:893
+#: ../plug-ins/xfig/xfig-import.c:896
 #, c-format
 msgid "Unknown polyline arc: %d\n"
 msgstr "Ð?еизвеÑ?Ñ?нÑ?й подÑ?ип ломаной: %d\n"
 
-#: ../plug-ins/xfig/xfig-import.c:957
+#: ../plug-ins/xfig/xfig-import.c:960
 #, c-format
 msgid "Couldn't read text info: %s\n"
 msgstr "Ð?е Ñ?далоÑ?Ñ? пÑ?оÑ?еÑ?Ñ?Ñ? инÑ?оÑ?маÑ?иÑ? о Ñ?екÑ?Ñ?е: %s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1019
-#, c-format
-msgid "Couldn't identify FIG object: %s\n"
+#: ../plug-ins/xfig/xfig-import.c:1022
+#, fuzzy, c-format
+msgid "Couldn't identify Fig object: %s\n"
 msgstr "Ð?е Ñ?далоÑ?Ñ? иденÑ?иÑ?иÑ?иÑ?оваÑ?Ñ? обÑ?екÑ? FIG: %s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1027
+#: ../plug-ins/xfig/xfig-import.c:1030
 msgid "Compound end outside compound\n"
 msgstr "Ð?онеÑ? Ñ?оединениÑ? вне Ñ?оединениÑ?\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1051
-#, c-format
-msgid "Color number %d out of range 0..%d.  Discarding color.\n"
+#: ../plug-ins/xfig/xfig-import.c:1054
+#, fuzzy, c-format
+msgid "Color number %d out of range 0â??%d.  Discarding color.\n"
 msgstr "ЦвеÑ? Ñ? номеÑ?ом %d вÑ?Ñ?одиÑ? за гÑ?аниÑ?Ñ? 0..%d. Ð?Ñ?бÑ?аÑ?Ñ?ваеÑ?Ñ?Ñ?.\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1097
+#: ../plug-ins/xfig/xfig-import.c:1101
 #, c-format
 msgid "Couldn't read group extend: %s\n"
 msgstr "Ð?е Ñ?далоÑ?Ñ? пÑ?оÑ?еÑ?Ñ?Ñ? Ñ?аÑ?Ñ?иÑ?иÑ?елÑ? гÑ?Ñ?пп: %s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1108
+#: ../plug-ins/xfig/xfig-import.c:1112
 #, c-format
 msgid "Unknown object type %d\n"
 msgstr "Ð?еизвеÑ?Ñ?нÑ?й Ñ?ип обÑ?екÑ?а %d\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1132
+#: ../plug-ins/xfig/xfig-import.c:1136
 #, c-format
 msgid "`%s' is not one of `%s' or `%s'\n"
 msgstr "«%s» не один из «%s» или «%s»\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1142
+#: ../plug-ins/xfig/xfig-import.c:1146
 #, c-format
 msgid "Error reading paper size: %s\n"
 msgstr "Ð?Ñ?ибка пÑ?и Ñ?Ñ?ении Ñ?азмеÑ?а бÑ?маги: %s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1153
+#: ../plug-ins/xfig/xfig-import.c:1157
 #, c-format
 msgid "Unknown paper size `%s', using default\n"
 msgstr "Ð?еизвеÑ?Ñ?нÑ?й Ñ?азмеÑ? бÑ?маги «%s», иÑ?полÑ?зÑ?еÑ?Ñ?Ñ? иÑ?Ñ?однÑ?й\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1165
+#: ../plug-ins/xfig/xfig-import.c:1169
 #, c-format
 msgid "Error reading paper orientation: %s\n"
 msgstr "Ð?Ñ?ибка пÑ?и Ñ?Ñ?ении оÑ?иенÑ?аÑ?ии бÑ?маги: %s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1175
+#: ../plug-ins/xfig/xfig-import.c:1179
 #, c-format
 msgid "Error reading justification: %s\n"
 msgstr "Ð?Ñ?ибка пÑ?и Ñ?Ñ?ении вÑ?Ñ?авниваниÑ?: %s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1185
+#: ../plug-ins/xfig/xfig-import.c:1189
 #, c-format
 msgid "Error reading units: %s\n"
 msgstr "Ð?Ñ?ибка пÑ?и Ñ?Ñ?ении единиÑ?: %s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1201
+#: ../plug-ins/xfig/xfig-import.c:1205
 #, c-format
 msgid "Error reading magnification: %s\n"
 msgstr "Ð?Ñ?ибка пÑ?и Ñ?Ñ?ении Ñ?велиÑ?ениÑ?: %s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1214
+#: ../plug-ins/xfig/xfig-import.c:1218
 #, c-format
 msgid "Error reading multipage indicator: %s\n"
 msgstr "Ð?Ñ?ибка пÑ?и Ñ?Ñ?ении многоÑ?Ñ?Ñ?аниÑ?ного индикаÑ?оÑ?а: %s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1225
+#: ../plug-ins/xfig/xfig-import.c:1229
 #, c-format
 msgid "Error reading transparent color: %s\n"
 msgstr "Ð?Ñ?ибка пÑ?и Ñ?Ñ?ении пÑ?озÑ?аÑ?ного Ñ?веÑ?а: %s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1234
-#: ../plug-ins/xfig/xfig-import.c:1290
-#: ../plug-ins/xfig/xfig-import.c:1308
-#, c-format
-msgid "Error reading FIG file: %s\n"
+#: ../plug-ins/xfig/xfig-import.c:1238 ../plug-ins/xfig/xfig-import.c:1296
+#: ../plug-ins/xfig/xfig-import.c:1314
+#, fuzzy, c-format
+msgid "Error reading Fig file: %s\n"
 msgstr "Ð?Ñ?ибка пÑ?и Ñ?Ñ?ении Ñ?айла FIG: %s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1236
-#: ../plug-ins/xfig/xfig-import.c:1292
-msgid "Premature end of FIG file\n"
+#: ../plug-ins/xfig/xfig-import.c:1240 ../plug-ins/xfig/xfig-import.c:1298
+#, fuzzy
+msgid "Premature end of Fig file\n"
 msgstr "Ð?еожиданнÑ?й конеÑ? Ñ?айла FIG\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1245
+#: ../plug-ins/xfig/xfig-import.c:1249
 #, c-format
 msgid "Error reading resolution: %s\n"
 msgstr "Ð?Ñ?ибка пÑ?и Ñ?Ñ?ении Ñ?азÑ?еÑ?ениÑ?: %s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1277
+#: ../plug-ins/xfig/xfig-import.c:1283
 #, c-format
 msgid "Doesn't look like a Fig file: %s\n"
 msgstr "Ð?е поÑ?оже на Ñ?айл Fig: %s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1283
-#, c-format
-msgid "This is a FIG version %d.%d file, I may not understand it\n"
+#: ../plug-ins/xfig/xfig-import.c:1289
+#, fuzzy, c-format
+msgid "This is a Fig version %d.%d file. It may not be importable.\n"
 msgstr "ЭÑ?о Ñ?айл FIG веÑ?Ñ?ии %d.%d, возможно он не бÑ?деÑ? понÑ?Ñ?\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1331
-msgid "XFig File Format"
+#: ../plug-ins/xfig/xfig-import.c:1337
+#, fuzzy
+msgid "Xfig File Format"
 msgstr "Файл в Ñ?оÑ?маÑ?е XFig"
 
 #: ../plug-ins/xfig/xfig.c:51
 msgid "Fig Format import and export filter"
 msgstr "ФилÑ?Ñ?Ñ? импоÑ?Ñ?а/Ñ?кÑ?поÑ?Ñ?а Ñ?оÑ?маÑ?а Fig"
 
-#: ../plug-ins/xslt/xslt.c:108
+#: ../plug-ins/xslt/xslt.c:110
 #, c-format
 msgid "Error while parsing %s\n"
 msgstr "Ð?Ñ?ибка пÑ?и Ñ?азбоÑ?е %s\n"
 
-#: ../plug-ins/xslt/xslt.c:117
+#: ../plug-ins/xslt/xslt.c:119
 #, c-format
 msgid "Error while parsing stylesheet %s\n"
 msgstr "Ð?Ñ?ибка пÑ?и Ñ?азбоÑ?е Ñ?аблиÑ?Ñ? Ñ?Ñ?илей %s\n"
 
-#: ../plug-ins/xslt/xslt.c:124
+#: ../plug-ins/xslt/xslt.c:126
 #, c-format
 msgid "Error while applying stylesheet %s\n"
 msgstr "Ð?Ñ?ибка пÑ?и пÑ?именении Ñ?аблиÑ?Ñ? Ñ?Ñ?илей %s\n"
 
-#: ../plug-ins/xslt/xslt.c:133
+#: ../plug-ins/xslt/xslt.c:135
 #, c-format
 msgid "Error while parsing stylesheet: %s\n"
 msgstr "Ð?Ñ?ибка пÑ?и обÑ?абоÑ?ке Ñ?аблиÑ?Ñ? Ñ?Ñ?илей: %s\n"
 
-#: ../plug-ins/xslt/xslt.c:142
+#: ../plug-ins/xslt/xslt.c:144
 #, c-format
 msgid "Error while applying stylesheet: %s\n"
 msgstr "Ð?Ñ?ибка пÑ?и пÑ?именении Ñ?аблиÑ?Ñ? Ñ?Ñ?илей: %s\n"
 
-#: ../plug-ins/xslt/xslt.c:150
+#: ../plug-ins/xslt/xslt.c:152
 #, c-format
 msgid "Error while saving result: %s\n"
 msgstr "Ð?Ñ?ибка пÑ?и запиÑ?и Ñ?езÑ?лÑ?Ñ?аÑ?а: %s\n"
 
-#: ../plug-ins/xslt/xslt.c:335
+#: ../plug-ins/xslt/xslt.c:336
 msgid "XSL Transformation filter"
 msgstr "ФилÑ?Ñ?Ñ? пÑ?еобÑ?азованиÑ? XSL"
 
-#: ../plug-ins/xslt/xslt.c:362
-msgid "No valid configuration files found for the XSLT plugin, not loading."
-msgstr "Ð?е найдено коÑ?Ñ?екÑ?ного конÑ?игÑ?Ñ?аÑ?ионного Ñ?айла длÑ? дополниÑ?елÑ?ного модÑ?лÑ? XSLT, он не бÑ?деÑ? загÑ?Ñ?жен."
+#: ../plug-ins/xslt/xslt.c:363
+#, fuzzy
+msgid "No valid configuration files found for the XSLT plugin; not loading."
+msgstr ""
+"Ð?е найдено коÑ?Ñ?екÑ?ного конÑ?игÑ?Ñ?аÑ?ионного Ñ?айла длÑ? дополниÑ?елÑ?ного модÑ?лÑ? "
+"XSLT, он не бÑ?деÑ? загÑ?Ñ?жен."
 
-#: ../plug-ins/xslt/xsltdialog.c:97
+#: ../plug-ins/xslt/xsltdialog.c:99
 msgid "Export through XSLT"
 msgstr "ЭкÑ?поÑ?Ñ?иÑ?оваÑ?Ñ? Ñ?еÑ?ез XSLT"
 
-#: ../plug-ins/xslt/xsltdialog.c:112
+#: ../plug-ins/xslt/xsltdialog.c:114
 msgid "From:"
 msgstr "Ð?Ñ?:"
 
-#: ../plug-ins/xslt/xsltdialog.c:147
+#: ../plug-ins/xslt/xsltdialog.c:149
 msgid "To:"
 msgstr "Ð?Ñ?да:"
 
@@ -6987,8 +6816,11 @@ msgstr "Ð?Ñ?Ñ?ппа поÑ?оков"
 #. Leave as is for now, renaming too much hassle.
 #. Will probably need to split into seperate sheets soon anyway.
 #: ../sheets/Assorted.sheet.in.h:4
-msgid "An Assorted Collection of Polygons, Beziergons and other Miscellaneous Geometric Shapes"
-msgstr "Ð?оллекÑ?иÑ? Ñ?азлиÑ?нÑ?Ñ? полигонов, безÑ?егонов и дÑ?Ñ?гиÑ? геомеÑ?Ñ?иÑ?еÑ?киÑ? Ñ?игÑ?Ñ?"
+msgid ""
+"An Assorted Collection of Polygons, Beziergons and other Miscellaneous "
+"Geometric Shapes"
+msgstr ""
+"Ð?оллекÑ?иÑ? Ñ?азлиÑ?нÑ?Ñ? полигонов, безÑ?егонов и дÑ?Ñ?гиÑ? геомеÑ?Ñ?иÑ?еÑ?киÑ? Ñ?игÑ?Ñ?"
 
 #. Please talk to me before making any changes to this sheet
 #: ../sheets/Assorted.sheet.in.h:6
@@ -7000,11 +6832,13 @@ msgid "Chevron"
 msgstr "ШевÑ?он"
 
 #: ../sheets/Assorted.sheet.in.h:8
-msgid "Curved eight point star"
+#, fuzzy
+msgid "Curved eight-point star"
 msgstr "Ð?Ñ?иволинейнаÑ? воÑ?Ñ?миконеÑ?наÑ? звезда"
 
 #: ../sheets/Assorted.sheet.in.h:9
-msgid "Curved four point star"
+#, fuzzy
+msgid "Curved four-point star"
 msgstr "Ð?Ñ?иволинейнаÑ? Ñ?еÑ?Ñ?Ñ?Ñ?Ñ?конеÑ?наÑ? звезда"
 
 #: ../sheets/Assorted.sheet.in.h:10
@@ -7016,15 +6850,18 @@ msgid "Down arrow"
 msgstr "СÑ?Ñ?елка вниз"
 
 #: ../sheets/Assorted.sheet.in.h:12
-msgid "Eight point star"
+#, fuzzy
+msgid "Eight-point star"
 msgstr "Ð?оÑ?Ñ?миконеÑ?наÑ? звезда"
 
 #: ../sheets/Assorted.sheet.in.h:13
-msgid "Five point star"
+#, fuzzy
+msgid "Five-point star"
 msgstr "Ð?Ñ?Ñ?иконеÑ?наÑ? звезда"
 
 #: ../sheets/Assorted.sheet.in.h:14
-msgid "Four point star"
+#, fuzzy
+msgid "Four-point star"
 msgstr "ЧеÑ?Ñ?Ñ?Ñ?Ñ?конеÑ?наÑ? звезда"
 
 #: ../sheets/Assorted.sheet.in.h:15
@@ -7032,11 +6869,13 @@ msgid "Heart"
 msgstr "СеÑ?дÑ?е"
 
 #: ../sheets/Assorted.sheet.in.h:16
-msgid "Heptagon. Seven sided shape"
+#, fuzzy
+msgid "Heptagon. Seven-point shape"
 msgstr "Ð?епÑ?агон. СемиÑ?Ñ?оÑ?онний многоÑ?голÑ?ник"
 
 #: ../sheets/Assorted.sheet.in.h:17
-msgid "Hexagon. Six sided shape"
+#, fuzzy
+msgid "Hexagon. Six-point shape"
 msgstr "Ð?екÑ?агон. ШеÑ?Ñ?иÑ?Ñ?оÑ?онний многоÑ?голÑ?ник"
 
 #: ../sheets/Assorted.sheet.in.h:18
@@ -7076,7 +6915,8 @@ msgid "Notched right arrow"
 msgstr "Ð?Ñ?бÑ?аÑ?аÑ? Ñ?Ñ?Ñ?елка впÑ?аво"
 
 #: ../sheets/Assorted.sheet.in.h:27
-msgid "Octogon. Eight sided shape"
+#, fuzzy
+msgid "Octogon. Eight-point shape"
 msgstr "Ð?кÑ?огон. Ð?оÑ?Ñ?миÑ?Ñ?оÑ?онний многогÑ?анник"
 
 #: ../sheets/Assorted.sheet.in.h:28
@@ -7084,7 +6924,8 @@ msgid "Pentagon block arrow"
 msgstr "Ð?Ñ?Ñ?иÑ?голÑ?нÑ?й блок в виде Ñ?Ñ?Ñ?елки"
 
 #: ../sheets/Assorted.sheet.in.h:29
-msgid "Pentagon. Five sided shape"
+#, fuzzy
+msgid "Pentagon. Five-point shape"
 msgstr "Ð?епÑ?агон. СемиÑ?Ñ?оÑ?онний многогÑ?анник"
 
 #: ../sheets/Assorted.sheet.in.h:30
@@ -7116,15 +6957,18 @@ msgid "Right arrow"
 msgstr "СÑ?Ñ?елка напÑ?аво"
 
 #: ../sheets/Assorted.sheet.in.h:37
-msgid "Seven point star"
+#, fuzzy
+msgid "Seven-point star"
 msgstr "СемиконеÑ?наÑ? звезда"
 
 #: ../sheets/Assorted.sheet.in.h:38
-msgid "Sharp eight point star"
+#, fuzzy
+msgid "Sharp eight-point star"
 msgstr "ФигÑ?Ñ?а воÑ?Ñ?миконеÑ?ной звездÑ?"
 
 #: ../sheets/Assorted.sheet.in.h:39
-msgid "Six point star"
+#, fuzzy
+msgid "Six-point star"
 msgstr "ШеÑ?Ñ?иконеÑ?наÑ? звезда"
 
 #: ../sheets/Assorted.sheet.in.h:40
@@ -7201,31 +7045,38 @@ msgid "End Event"
 msgstr "Ð?онеÑ?ное Ñ?обÑ?Ñ?ие"
 
 #: ../sheets/BPMN.sheet.in.h:12
-msgid "End Event - Cancel"
+#, fuzzy
+msgid "End Event â?? Cancel"
 msgstr "Ð?онеÑ?ное Ñ?обÑ?Ñ?ие - оÑ?мена"
 
 #: ../sheets/BPMN.sheet.in.h:13
-msgid "End Event - Compensation"
+#, fuzzy
+msgid "End Event â?? Compensation"
 msgstr "Ð?онеÑ?ное Ñ?обÑ?Ñ?ие - компенÑ?аÑ?иÑ?"
 
 #: ../sheets/BPMN.sheet.in.h:14
-msgid "End Event - Error"
+#, fuzzy
+msgid "End Event â?? Error"
 msgstr "Ð?онеÑ?ное Ñ?обÑ?Ñ?ие - оÑ?ибка"
 
 #: ../sheets/BPMN.sheet.in.h:15
-msgid "End Event - Link"
+#, fuzzy
+msgid "End Event â?? Link"
 msgstr "Ð?онеÑ?ное Ñ?обÑ?Ñ?ие - Ñ?вÑ?зÑ?"
 
 #: ../sheets/BPMN.sheet.in.h:16
-msgid "End Event - Message"
+#, fuzzy
+msgid "End Event â?? Message"
 msgstr "Ð?онеÑ?ное Ñ?обÑ?Ñ?ие - Ñ?ообÑ?ение"
 
 #: ../sheets/BPMN.sheet.in.h:17
-msgid "End Event - Multiple"
+#, fuzzy
+msgid "End Event â?? Multiple"
 msgstr "Ð?онÑ?еное Ñ?обÑ?Ñ?ие - Ñ?оÑ?Ñ?авное"
 
 #: ../sheets/BPMN.sheet.in.h:18
-msgid "End Event - Terminate"
+#, fuzzy
+msgid "End Event â?? Terminate"
 msgstr "Ð?онеÑ?ное Ñ?обÑ?Ñ?ие - пÑ?еÑ?ваÑ?Ñ?"
 
 #: ../sheets/BPMN.sheet.in.h:19
@@ -7253,35 +7104,43 @@ msgid "Intermediate Event"
 msgstr "Ð?Ñ?омежÑ?Ñ?оÑ?ное Ñ?обÑ?Ñ?ие"
 
 #: ../sheets/BPMN.sheet.in.h:25
-msgid "Intermediate Event - Cancel"
+#, fuzzy
+msgid "Intermediate Event â?? Cancel"
 msgstr "Ð?Ñ?омежÑ?Ñ?оÑ?ное Ñ?обÑ?Ñ?ие - оÑ?мена"
 
 #: ../sheets/BPMN.sheet.in.h:26
-msgid "Intermediate Event - Compensation"
+#, fuzzy
+msgid "Intermediate Event â?? Compensation"
 msgstr "Ð?Ñ?омежÑ?Ñ?оÑ?ное Ñ?обÑ?Ñ?ие - компенÑ?аÑ?иÑ?"
 
 #: ../sheets/BPMN.sheet.in.h:27
-msgid "Intermediate Event - Error"
+#, fuzzy
+msgid "Intermediate Event â?? Error"
 msgstr "Ð?Ñ?омежÑ?Ñ?оÑ?ное Ñ?обÑ?Ñ?ие - оÑ?ибка"
 
 #: ../sheets/BPMN.sheet.in.h:28
-msgid "Intermediate Event - Link"
+#, fuzzy
+msgid "Intermediate Event â?? Link"
 msgstr "Ð?Ñ?омежÑ?Ñ?оÑ?ное Ñ?обÑ?Ñ?ие - Ñ?вÑ?зÑ?"
 
 #: ../sheets/BPMN.sheet.in.h:29
-msgid "Intermediate Event - Message"
+#, fuzzy
+msgid "Intermediate Event â?? Message"
 msgstr "Ð?Ñ?омежÑ?Ñ?оÑ?ное Ñ?обÑ?Ñ?ие - Ñ?ообÑ?ение"
 
 #: ../sheets/BPMN.sheet.in.h:30
-msgid "Intermediate Event - Multiple"
+#, fuzzy
+msgid "Intermediate Event â?? Multiple"
 msgstr "Ð?Ñ?омежÑ?Ñ?оÑ?ное Ñ?обÑ?Ñ?ие - Ñ?оÑ?Ñ?авное"
 
 #: ../sheets/BPMN.sheet.in.h:31
-msgid "Intermediate Event - Rule"
+#, fuzzy
+msgid "Intermediate Event â?? Rule"
 msgstr "Ð?Ñ?омежÑ?Ñ?оÑ?ное Ñ?обÑ?Ñ?ие - пÑ?авило"
 
 #: ../sheets/BPMN.sheet.in.h:32
-msgid "Intermediate Event - Timer"
+#, fuzzy
+msgid "Intermediate Event â?? Timer"
 msgstr "Ð?Ñ?омежÑ?Ñ?оÑ?ное Ñ?обÑ?Ñ?ие - Ñ?аймеÑ?"
 
 #: ../sheets/BPMN.sheet.in.h:33
@@ -7305,23 +7164,28 @@ msgid "Start Event"
 msgstr "Ð?аÑ?алÑ?ное Ñ?обÑ?Ñ?ие"
 
 #: ../sheets/BPMN.sheet.in.h:38
-msgid "Start Event - Link"
+#, fuzzy
+msgid "Start Event â?? Link"
 msgstr "Ð?аÑ?алÑ?ное Ñ?обÑ?Ñ?ие - Ñ?вÑ?зÑ?"
 
 #: ../sheets/BPMN.sheet.in.h:39
-msgid "Start Event - Message"
+#, fuzzy
+msgid "Start Event â?? Message"
 msgstr "Ð?аÑ?алÑ?ное Ñ?обÑ?Ñ?ие - Ñ?ообÑ?ение"
 
 #: ../sheets/BPMN.sheet.in.h:40
-msgid "Start Event - Multiple"
+#, fuzzy
+msgid "Start Event â?? Multiple"
 msgstr "Ð?аÑ?алÑ?наое Ñ?обÑ?Ñ?ие - Ñ?оÑ?Ñ?авное"
 
 #: ../sheets/BPMN.sheet.in.h:41
-msgid "Start Event - Rule"
+#, fuzzy
+msgid "Start Event â?? Rule"
 msgstr "Ð?аÑ?алÑ?ное Ñ?обÑ?Ñ?ие - пÑ?авило"
 
 #: ../sheets/BPMN.sheet.in.h:42
-msgid "Start Event - Timer"
+#, fuzzy
+msgid "Start Event â?? Timer"
 msgstr "Ð?аÑ?алÑ?ное Ñ?обÑ?Ñ?ие - Ñ?аймеÑ?"
 
 #: ../sheets/BPMN.sheet.in.h:44
@@ -7562,120 +7426,130 @@ msgid "Horizontal jumper"
 msgstr "Ð?оÑ?изонÑ?алÑ?нÑ?й пеÑ?еклÑ?Ñ?аÑ?елÑ?"
 
 #: ../sheets/Circuit.sheet.in.h:5
+#, fuzzy
+msgid "Horizontal xtal"
+msgstr "Ð?оÑ?изонÑ?алÑ?наÑ? опоÑ?а"
+
+#: ../sheets/Circuit.sheet.in.h:6
 msgid "Horizontally aligned LED"
 msgstr "Ð?оÑ?изонÑ?алÑ?но вÑ?Ñ?овненнÑ?й Ñ?веÑ?одиод"
 
-#: ../sheets/Circuit.sheet.in.h:6
+#: ../sheets/Circuit.sheet.in.h:7
 msgid "Horizontally aligned capacitor"
 msgstr "Ð?оÑ?изонÑ?алÑ?но вÑ?Ñ?овненнÑ?й конденÑ?аÑ?оÑ?"
 
-#: ../sheets/Circuit.sheet.in.h:7
+#: ../sheets/Circuit.sheet.in.h:8
 msgid "Horizontally aligned diode"
 msgstr "Ð?оÑ?изонÑ?алÑ?но вÑ?Ñ?овненнÑ?й диод"
 
-#: ../sheets/Circuit.sheet.in.h:8
+#: ../sheets/Circuit.sheet.in.h:9
 msgid "Horizontally aligned fuse"
 msgstr "Ð?оÑ?изонÑ?алÑ?но вÑ?Ñ?овненнÑ?й пÑ?едоÑ?Ñ?аниÑ?елÑ?"
 
-#: ../sheets/Circuit.sheet.in.h:9
+#: ../sheets/Circuit.sheet.in.h:10
 msgid "Horizontally aligned inductor"
 msgstr "Ð?оÑ?изонÑ?алÑ?но вÑ?Ñ?овненнаÑ? индÑ?кÑ?ивноÑ?Ñ?Ñ?"
 
-#: ../sheets/Circuit.sheet.in.h:10
+#: ../sheets/Circuit.sheet.in.h:11
 msgid "Horizontally aligned inductor (European)"
 msgstr "Ð?оÑ?изонÑ?алÑ?но вÑ?Ñ?овненнаÑ? индÑ?кÑ?ивноÑ?Ñ?Ñ? (Ð?о-евÑ?опейÑ?ки)"
 
-#: ../sheets/Circuit.sheet.in.h:11
-msgid "Horizontally aligned powersource"
+#: ../sheets/Circuit.sheet.in.h:12
+#, fuzzy
+msgid "Horizontally aligned power source"
 msgstr "Ð?оÑ?изонÑ?алÑ?но вÑ?Ñ?овненнÑ?й иÑ?Ñ?оÑ?ник пиÑ?аниÑ?"
 
-#: ../sheets/Circuit.sheet.in.h:12
+#: ../sheets/Circuit.sheet.in.h:13
 msgid "Horizontally aligned resistor"
 msgstr "Ð?оÑ?изонÑ?алÑ?но вÑ?Ñ?овненнÑ?й Ñ?езиÑ?Ñ?оÑ?"
 
-#: ../sheets/Circuit.sheet.in.h:13
+#: ../sheets/Circuit.sheet.in.h:14
 msgid "Horizontally aligned resistor (European)"
 msgstr "Ð?оÑ?изонÑ?алÑ?но вÑ?Ñ?овненнÑ?й Ñ?езиÑ?Ñ?оÑ? (Ð?о-евÑ?опейÑ?ки)"
 
-#: ../sheets/Circuit.sheet.in.h:14
+#: ../sheets/Circuit.sheet.in.h:15
 msgid "Horizontally aligned zener diode"
 msgstr "Ð?оÑ?изонÑ?алÑ?но вÑ?Ñ?овненнÑ?й зенеÑ?овÑ?кий диод"
 
-#: ../sheets/Circuit.sheet.in.h:15
+#: ../sheets/Circuit.sheet.in.h:16
 msgid "Lamp"
 msgstr "Ð?ампоÑ?ка"
 
-#: ../sheets/Circuit.sheet.in.h:16
-#: ../sheets/ciscomisc.sheet.in.h:30
+#: ../sheets/Circuit.sheet.in.h:17 ../sheets/ciscomisc.sheet.in.h:30
 msgid "Microphone"
 msgstr "Ð?икÑ?оÑ?он"
 
-#: ../sheets/Circuit.sheet.in.h:17
+#: ../sheets/Circuit.sheet.in.h:18
 msgid "NMOS transistor"
 msgstr "NMOS-Ñ?Ñ?анзиÑ?Ñ?оÑ?"
 
 #.
 #.
-#: ../sheets/Circuit.sheet.in.h:20
+#: ../sheets/Circuit.sheet.in.h:21
 msgid "NPN bipolar transistor"
 msgstr "npn-Ñ?Ñ?анзиÑ?Ñ?оÑ?, биполÑ?Ñ?нÑ?й"
 
-#: ../sheets/Circuit.sheet.in.h:21
+#: ../sheets/Circuit.sheet.in.h:22
 msgid "Operational amplifier"
 msgstr "Ð?пеÑ?аÑ?ионнÑ?й Ñ?Ñ?илиÑ?елÑ?"
 
-#: ../sheets/Circuit.sheet.in.h:22
+#: ../sheets/Circuit.sheet.in.h:23
 msgid "PMOS transistor"
 msgstr "PMOS-Ñ?Ñ?анзиÑ?Ñ?оÑ?"
 
 #.
 #.
-#: ../sheets/Circuit.sheet.in.h:25
+#: ../sheets/Circuit.sheet.in.h:26
 msgid "PNP bipolar transistor"
 msgstr "npn-Ñ?Ñ?анзиÑ?Ñ?оÑ?, биполÑ?Ñ?нÑ?й"
 
-#: ../sheets/Circuit.sheet.in.h:26
-#: ../sheets/ciscomisc.sheet.in.h:42
+#: ../sheets/Circuit.sheet.in.h:27 ../sheets/ciscomisc.sheet.in.h:42
 msgid "Speaker"
 msgstr "Ð?инамик"
 
-#: ../sheets/Circuit.sheet.in.h:27
+#: ../sheets/Circuit.sheet.in.h:28
+#, fuzzy
+msgid "Vertical xtal"
+msgstr "Ð?еÑ?Ñ?икалÑ?наÑ? опоÑ?а"
+
+#: ../sheets/Circuit.sheet.in.h:29
 msgid "Vertically aligned LED"
 msgstr "Ð?еÑ?Ñ?икалÑ?но вÑ?Ñ?овненнÑ?й Ð?Ð?Ð?"
 
-#: ../sheets/Circuit.sheet.in.h:28
+#: ../sheets/Circuit.sheet.in.h:30
 msgid "Vertically aligned capacitor"
 msgstr "Ð?еÑ?Ñ?икалÑ?но вÑ?Ñ?овненнÑ?й конденÑ?аÑ?оÑ?"
 
-#: ../sheets/Circuit.sheet.in.h:29
+#: ../sheets/Circuit.sheet.in.h:31
 msgid "Vertically aligned diode"
 msgstr "Ð?еÑ?Ñ?икалÑ?но вÑ?Ñ?овненнÑ?й диод"
 
-#: ../sheets/Circuit.sheet.in.h:30
+#: ../sheets/Circuit.sheet.in.h:32
 msgid "Vertically aligned fuse"
 msgstr "Ð?еÑ?Ñ?икалÑ?но вÑ?Ñ?овненнÑ?й пÑ?едоÑ?Ñ?аниÑ?елÑ?"
 
-#: ../sheets/Circuit.sheet.in.h:31
+#: ../sheets/Circuit.sheet.in.h:33
 msgid "Vertically aligned inductor"
 msgstr "Ð?еÑ?Ñ?икалÑ?но вÑ?Ñ?овненнаÑ? индÑ?кÑ?ивноÑ?Ñ?Ñ?"
 
-#: ../sheets/Circuit.sheet.in.h:32
+#: ../sheets/Circuit.sheet.in.h:34
 msgid "Vertically aligned inductor (European)"
 msgstr "Ð?еÑ?Ñ?икалÑ?но вÑ?Ñ?овненнаÑ? индÑ?кÑ?ивноÑ?Ñ?Ñ? (Ð?о-евÑ?опейÑ?ки)"
 
-#: ../sheets/Circuit.sheet.in.h:33
-msgid "Vertically aligned powersource"
+#: ../sheets/Circuit.sheet.in.h:35
+#, fuzzy
+msgid "Vertically aligned power source"
 msgstr "Ð?еÑ?Ñ?икалÑ?но вÑ?Ñ?овненнÑ?й иÑ?Ñ?оÑ?ник пиÑ?аниÑ?"
 
-#: ../sheets/Circuit.sheet.in.h:34
+#: ../sheets/Circuit.sheet.in.h:36
 msgid "Vertically aligned resistor"
 msgstr "Ð?еÑ?Ñ?икалÑ?но вÑ?Ñ?овненнÑ?й Ñ?езиÑ?Ñ?оÑ?"
 
-#: ../sheets/Circuit.sheet.in.h:35
+#: ../sheets/Circuit.sheet.in.h:37
 msgid "Vertically aligned resistor (European)"
 msgstr "Ð?еÑ?Ñ?икалÑ?но вÑ?Ñ?овненнÑ?й Ñ?езиÑ?Ñ?оÑ? (Ð?о-евÑ?опейÑ?ки)"
 
-#: ../sheets/Circuit.sheet.in.h:36
+#: ../sheets/Circuit.sheet.in.h:38
 msgid "Vertically aligned zener diode"
 msgstr "Ð?еÑ?Ñ?икалÑ?но вÑ?Ñ?овненнÑ?й зенеÑ?овÑ?кий диод"
 
@@ -7780,19 +7654,23 @@ msgid "High pass filter"
 msgstr "ФилÑ?Ñ?Ñ? вÑ?Ñ?окиÑ? Ñ?аÑ?Ñ?оÑ?"
 
 #: ../sheets/Cybernetics.sheet.in.h:12
-msgid "Integrator - input bottom"
+#, fuzzy
+msgid "Integrator â?? input bottom"
 msgstr "Ð?нÑ?егÑ?аÑ?оÑ? - вÑ?од Ñ?низÑ?"
 
 #: ../sheets/Cybernetics.sheet.in.h:13
-msgid "Integrator - input left"
+#, fuzzy
+msgid "Integrator â?? input left"
 msgstr "Ð?нÑ?егÑ?аÑ?оÑ? - вÑ?од Ñ?лева"
 
 #: ../sheets/Cybernetics.sheet.in.h:14
-msgid "Integrator - input right"
+#, fuzzy
+msgid "Integrator â?? input right"
 msgstr "Ð?нÑ?егÑ?аÑ?оÑ? - вÑ?од Ñ?пÑ?ава"
 
 #: ../sheets/Cybernetics.sheet.in.h:15
-msgid "Integrator - input top"
+#, fuzzy
+msgid "Integrator â?? input top"
 msgstr "Ð?нÑ?егÑ?аÑ?оÑ? - вÑ?од Ñ?веÑ?Ñ?Ñ?"
 
 #: ../sheets/Cybernetics.sheet.in.h:16
@@ -7812,19 +7690,23 @@ msgid "Saturation characteristic"
 msgstr "ХаÑ?акÑ?еÑ?иÑ?Ñ?ика наÑ?Ñ?Ñ?енноÑ?Ñ?и"
 
 #: ../sheets/Cybernetics.sheet.in.h:20
-msgid "Sensor - bottom"
+#, fuzzy
+msgid "Sensor â?? bottom"
 msgstr "Ð?аÑ?Ñ?ик - Ñ?низÑ?"
 
 #: ../sheets/Cybernetics.sheet.in.h:21
-msgid "Sensor - left"
+#, fuzzy
+msgid "Sensor â?? left"
 msgstr "Ð?аÑ?Ñ?ик - Ñ?лева"
 
 #: ../sheets/Cybernetics.sheet.in.h:22
-msgid "Sensor - right"
+#, fuzzy
+msgid "Sensor â?? right"
 msgstr "Ð?аÑ?Ñ?ик - Ñ?пÑ?ава"
 
 #: ../sheets/Cybernetics.sheet.in.h:23
-msgid "Sensor - top"
+#, fuzzy
+msgid "Sensor â?? top"
 msgstr "Ð?аÑ?Ñ?ик - Ñ?веÑ?Ñ?Ñ?"
 
 #: ../sheets/Cybernetics.sheet.in.h:24
@@ -7895,8 +7777,7 @@ msgstr "СлабаÑ? Ñ?Ñ?Ñ?ноÑ?Ñ?Ñ?"
 msgid "Components for electric circuits"
 msgstr "Ð?омпоненÑ?Ñ? длÑ? Ñ?лекÑ?Ñ?иÑ?еÑ?киÑ? Ñ?епей"
 
-#: ../sheets/Electric.sheet.in.h:2
-#: ../sheets/Pneumatic.sheet.in.h:7
+#: ../sheets/Electric.sheet.in.h:2 ../sheets/Pneumatic.sheet.in.h:7
 msgid "Connection point"
 msgstr "СоединиÑ?елÑ?наÑ? Ñ?оÑ?ка"
 
@@ -7993,8 +7874,7 @@ msgstr "Ð?оннекÑ?оÑ?"
 msgid "Data source"
 msgstr "Ð?Ñ?Ñ?оÑ?ник даннÑ?Ñ?"
 
-#: ../sheets/Flowchart.sheet.in.h:5
-#: ../sheets/SDL.sheet.in.h:4
+#: ../sheets/Flowchart.sheet.in.h:5 ../sheets/SDL.sheet.in.h:4
 msgid "Decision"
 msgstr "РеÑ?ение"
 
@@ -8128,8 +8008,7 @@ msgstr "Ð?Ð?Ð? пÑ?еделÑ?ное"
 msgid "Objects to design GRAFCET charts"
 msgstr "Ð?бÑ?екÑ?Ñ? длÑ? Ñ?азÑ?абоÑ?ки диагÑ?амм GRAFCET"
 
-#: ../sheets/GRAFCET.sheet.in.h:14
-#: ../sheets/UML.sheet.in.h:30
+#: ../sheets/GRAFCET.sheet.in.h:14 ../sheets/UML.sheet.in.h:30
 msgid "Transition"
 msgstr "Ð?еÑ?еÑ?од"
 
@@ -8241,7 +8120,8 @@ msgid "Road Section"
 msgstr "УÑ?аÑ?Ñ?ок доÑ?оги"
 
 #: ../sheets/IsometricMap.sheet.in.h:24
-msgid "Roof1"
+#, fuzzy
+msgid "Roof 1"
 msgstr "Ð?Ñ?Ñ?Ñ?а 1"
 
 #: ../sheets/IsometricMap.sheet.in.h:25
@@ -8469,7 +8349,8 @@ msgid "Ellipsoidal Reflector Spotlight"
 msgstr "Ð?одÑ?веÑ?ка Ñ?липÑ?оидного оÑ?Ñ?ажаÑ?елÑ?"
 
 #: ../sheets/Lights.sheet.in.h:5
-msgid "Fresel lantern"
+#, fuzzy
+msgid "Fresnel lantern"
 msgstr "Ð?аÑ?наÑ? Fresel"
 
 #: ../sheets/Lights.sheet.in.h:6
@@ -8496,8 +8377,7 @@ msgstr "Ð Ð?С.."
 msgid "Pebble Convex lantern"
 msgstr "Ð?аÑ?каÑ? Pebble Convex"
 
-#: ../sheets/Lights.sheet.in.h:12
-#: ../sheets/ciscocomputer.sheet.in.h:39
+#: ../sheets/Lights.sheet.in.h:12 ../sheets/ciscocomputer.sheet.in.h:39
 msgid "Scanner"
 msgstr "СканеÑ?"
 
@@ -8522,11 +8402,11 @@ msgid "Boolean Logic"
 msgstr "Ð?инаÑ?наÑ? логика"
 
 #: ../sheets/Logic.sheet.in.h:3
-msgid "Crossconnector"
+#, fuzzy
+msgid "Cross-connector"
 msgstr "Ð?еÑ?екÑ?Ñ?Ñ?Ñ?нÑ?й Ñ?оединиÑ?елÑ?"
 
-#: ../sheets/Logic.sheet.in.h:4
-#: ../sheets/SISSI.sheet.in.h:27
+#: ../sheets/Logic.sheet.in.h:4 ../sheets/SISSI.sheet.in.h:27
 msgid "Inverter"
 msgstr "Ð?нвеÑ?Ñ?оÑ?"
 
@@ -8599,8 +8479,9 @@ msgid "Measure distance"
 msgstr "Ð?змеÑ?Ñ?емаÑ? диÑ?Ñ?анÑ?иÑ?"
 
 #: ../sheets/Misc.sheet.in.h:4
-msgid "Misc"
-msgstr "Разное"
+#, fuzzy
+msgid "Miscellaneous"
+msgstr "РазлиÑ?нÑ?е Ñ?оÑ?мÑ?"
 
 #: ../sheets/Misc.sheet.in.h:5
 msgid "Miscellaneous Shapes"
@@ -8623,11 +8504,13 @@ msgid "Tree"
 msgstr "Ð?еÑ?ево"
 
 #: ../sheets/Misc.sheet.in.h:10
-msgid "expended node"
+#, fuzzy
+msgid "expanded node"
 msgstr "Ñ?аÑ?Ñ?иÑ?еннÑ?й Ñ?зел"
 
 #: ../sheets/Misc.sheet.in.h:11
-msgid "expensible node"
+#, fuzzy
+msgid "expansible node"
 msgstr "Ñ?зел болÑ?Ñ?ого Ñ?аÑ?Ñ?иÑ?ениÑ?"
 
 #: ../sheets/Pneumatic.sheet.in.h:1
@@ -8790,23 +8673,23 @@ msgstr "СÑ?Ñ?лка на Ñ?ип Ñ?еÑ?виÑ?а"
 msgid "Specification and Description Language."
 msgstr "ЯзÑ?к опиÑ?аний и деÑ?ализаÑ?ий (SDL)"
 
-#: ../sheets/SDL.sheet.in.h:18
-#: ../sheets/UML.sheet.in.h:28
+#: ../sheets/SDL.sheet.in.h:18 ../sheets/UML.sheet.in.h:28
 msgid "State"
 msgstr "СоÑ?Ñ?оÑ?ние"
 
 #: ../sheets/SISSI.sheet.in.h:1
+#, fuzzy
+msgid "Air conditioner"
+msgstr "Ð?ондиÑ?ионеÑ?"
+
+#: ../sheets/SISSI.sheet.in.h:2
 msgid "Air filter"
 msgstr "Ð?оздÑ?Ñ?нÑ?й Ñ?илÑ?Ñ?Ñ?"
 
-#: ../sheets/SISSI.sheet.in.h:2
+#: ../sheets/SISSI.sheet.in.h:3
 msgid "Air quality detector"
 msgstr "Ð?аÑ?Ñ?ик Ñ?оÑ?Ñ?ава воздÑ?Ñ?а"
 
-#: ../sheets/SISSI.sheet.in.h:3
-msgid "Airconditioner"
-msgstr "Ð?ондиÑ?ионеÑ?"
-
 #: ../sheets/SISSI.sheet.in.h:4
 msgid "Alarm center"
 msgstr "Ð?Ñ?лÑ?Ñ? аваÑ?ийной Ñ?игнализаÑ?ии"
@@ -8871,8 +8754,7 @@ msgstr "Ð?гнеÑ?Ñ?Ñ?иÑ?елÑ?"
 msgid "Faraday cage"
 msgstr "клеÑ?ка ФаÑ?адеÑ?"
 
-#: ../sheets/SISSI.sheet.in.h:20
-#: ../sheets/ciscomisc.sheet.in.h:9
+#: ../sheets/SISSI.sheet.in.h:20 ../sheets/ciscomisc.sheet.in.h:9
 msgid "File cabinet"
 msgstr "Ð?аÑ?Ñ?оÑ?ека"
 
@@ -8888,8 +8770,7 @@ msgstr "Ð?еогÑ?аÑ?иÑ?еÑ?кое меÑ?Ñ?оположение"
 msgid "Glass-break sensor"
 msgstr "Ð?аÑ?Ñ?ик Ñ?елоÑ?Ñ?ноÑ?Ñ?и Ñ?Ñ?екла"
 
-#: ../sheets/SISSI.sheet.in.h:24
-#: ../sheets/ciscohub.sheet.in.h:29
+#: ../sheets/SISSI.sheet.in.h:24 ../sheets/ciscohub.sheet.in.h:29
 msgid "Hub"
 msgstr "Ð?овÑ?оÑ?иÑ?елÑ?"
 
@@ -8901,8 +8782,7 @@ msgstr "Ð?нÑ?оÑ?маÑ?иÑ?"
 msgid "Information system"
 msgstr "Ð?нÑ?оÑ?маÑ?ионнаÑ? Ñ?иÑ?Ñ?ема"
 
-#: ../sheets/SISSI.sheet.in.h:28
-#: ../sheets/ciscocomputer.sheet.in.h:21
+#: ../sheets/SISSI.sheet.in.h:28 ../sheets/ciscocomputer.sheet.in.h:21
 msgid "Laptop"
 msgstr "Ð?оÑ?Ñ?бÑ?к"
 
@@ -8922,8 +8802,7 @@ msgstr "Ð?нализаÑ?оÑ? логов"
 msgid "Magnetic storage"
 msgstr "Ð¥Ñ?анилиÑ?е на магниÑ?нÑ?Ñ? ноÑ?иÑ?елÑ?Ñ?"
 
-#: ../sheets/SISSI.sheet.in.h:33
-#: ../sheets/ciscocomputer.sheet.in.h:25
+#: ../sheets/SISSI.sheet.in.h:33 ../sheets/ciscocomputer.sheet.in.h:25
 msgid "Modem"
 msgstr "Ð?одем"
 
@@ -8939,8 +8818,7 @@ msgstr "Ð?аÑ?Ñ?ик влажноÑ?Ñ?и"
 msgid "Movement detector"
 msgstr "Ð?аÑ?Ñ?ик движениÑ?"
 
-#: ../sheets/SISSI.sheet.in.h:37
-#: ../sheets/network.sheet.in.h:21
+#: ../sheets/SISSI.sheet.in.h:37 ../sheets/network.sheet.in.h:21
 msgid "Network cloud"
 msgstr "Ð?омпÑ?Ñ?Ñ?еÑ?наÑ? Ñ?еÑ?Ñ?"
 
@@ -8948,8 +8826,7 @@ msgstr "Ð?омпÑ?Ñ?Ñ?еÑ?наÑ? Ñ?еÑ?Ñ?"
 msgid "Objects to design sissi diagrams"
 msgstr "Ð?бÑ?екÑ?Ñ? длÑ? Ñ?азÑ?абоÑ?ки диагÑ?амм sissi"
 
-#: ../sheets/SISSI.sheet.in.h:39
-#: ../sheets/ciscocomputer.sheet.in.h:35
+#: ../sheets/SISSI.sheet.in.h:39 ../sheets/ciscocomputer.sheet.in.h:35
 msgid "PDA"
 msgstr "Ð?Ð?Ð?"
 
@@ -8973,8 +8850,7 @@ msgstr "Ð?аÑ?Ñ?ик давлениÑ?"
 msgid "Pump"
 msgstr "Ð?аÑ?оÑ?"
 
-#: ../sheets/SISSI.sheet.in.h:45
-#: ../sheets/ciscocomputer.sheet.in.h:37
+#: ../sheets/SISSI.sheet.in.h:45 ../sheets/ciscocomputer.sheet.in.h:37
 msgid "Relational Database"
 msgstr "РелÑ?Ñ?ионнаÑ? база даннÑ?Ñ?"
 
@@ -8986,8 +8862,7 @@ msgstr "Ð?Ñ?аÑ?аÑ?Ñ?аÑ?Ñ?Ñ? двеÑ?Ñ?"
 msgid "Room"
 msgstr "Ð?омнаÑ?а"
 
-#: ../sheets/SISSI.sheet.in.h:48
-#: ../sheets/ciscohub.sheet.in.h:53
+#: ../sheets/SISSI.sheet.in.h:48 ../sheets/ciscohub.sheet.in.h:53
 msgid "Router"
 msgstr "Ð?аÑ?Ñ?Ñ?Ñ?Ñ?изаÑ?оÑ?"
 
@@ -9011,13 +8886,11 @@ msgstr "СеÑ?веÑ?"
 msgid "Smoke detector"
 msgstr "Ð?аÑ?Ñ?ик дÑ?ма"
 
-#: ../sheets/SISSI.sheet.in.h:55
-#: ../sheets/ciscocomputer.sheet.in.h:42
+#: ../sheets/SISSI.sheet.in.h:55 ../sheets/ciscocomputer.sheet.in.h:42
 msgid "Storage array"
 msgstr "Ð?аÑ?Ñ?ив даннÑ?Ñ?"
 
-#: ../sheets/SISSI.sheet.in.h:56
-#: ../sheets/network.sheet.in.h:33
+#: ../sheets/SISSI.sheet.in.h:56 ../sheets/network.sheet.in.h:33
 msgid "Telephone"
 msgstr "ТелеÑ?он"
 
@@ -9078,7 +8951,8 @@ msgid "Editor for UML Static Structure Diagrams"
 msgstr "РедакÑ?оÑ? Ñ?Ñ?аÑ?иÑ?еÑ?киÑ? Ñ?Ñ?Ñ?Ñ?кÑ?Ñ?Ñ?нÑ?Ñ? диагÑ?амм UML"
 
 #: ../sheets/UML.sheet.in.h:15
-msgid "Fork/union"
+#, fuzzy
+msgid "Fork/Union"
 msgstr "Ð?Ñ?веÑ?вление/обÑ?единение"
 
 #: ../sheets/UML.sheet.in.h:16
@@ -9090,7 +8964,8 @@ msgid "Implements, class implements a specific interface"
 msgstr "РеализаÑ?иÑ?, клаÑ?Ñ? Ñ?еализÑ?Ñ?Ñ?ий опÑ?еделÑ?ннÑ?й инÑ?еÑ?Ñ?ейÑ?"
 
 #: ../sheets/UML.sheet.in.h:18
-msgid "Initial/end state"
+#, fuzzy
+msgid "Initial/End state"
 msgstr "Ð?аÑ?алÑ?ное/конеÑ?ное Ñ?оÑ?Ñ?оÑ?ние"
 
 #: ../sheets/UML.sheet.in.h:19
@@ -9154,13 +9029,13 @@ msgid "BBS"
 msgstr "BBS"
 
 #: ../sheets/ciscocomputer.sheet.in.h:2
-msgid "Cisco - Computer"
-msgstr "Cisco - Ð?омпÑ?Ñ?Ñ?еÑ?Ñ?"
-
-#: ../sheets/ciscocomputer.sheet.in.h:3
 msgid "Cisco CA"
 msgstr "Cisco CA"
 
+#: ../sheets/ciscocomputer.sheet.in.h:3
+msgid "Cisco â?? Computer"
+msgstr "Cisco â?? Ð?омпÑ?Ñ?Ñ?еÑ?Ñ?"
+
 #: ../sheets/ciscocomputer.sheet.in.h:4
 msgid "CiscoSecurity"
 msgstr "Ð?езопаÑ?ноÑ?Ñ?Ñ? Cisco"
@@ -9241,8 +9116,7 @@ msgstr "Ð?икÑ?овебÑ?еÑ?веÑ?"
 msgid "Mini VAX"
 msgstr "Mini VAX"
 
-#: ../sheets/ciscocomputer.sheet.in.h:26
-#: ../sheets/network.sheet.in.h:19
+#: ../sheets/ciscocomputer.sheet.in.h:26 ../sheets/network.sheet.in.h:19
 msgid "Monitor"
 msgstr "Ð?ониÑ?оÑ?"
 
@@ -9383,16 +9257,16 @@ msgid "Carrier Routing System"
 msgstr "СиÑ?Ñ?ема маÑ?Ñ?Ñ?Ñ?Ñ?изаÑ?ии ноÑ?иÑ?елÑ?"
 
 #: ../sheets/ciscohub.sheet.in.h:15
-msgid "Cisco - Switch"
-msgstr "Cisco - Ð?оммÑ?Ñ?аÑ?оÑ?"
-
-#: ../sheets/ciscohub.sheet.in.h:16
 msgid "Cisco 1000"
 msgstr "Cisco 1000"
 
-#: ../sheets/ciscohub.sheet.in.h:17
+#: ../sheets/ciscohub.sheet.in.h:16
 msgid "Cisco Hub"
-msgstr "Cisco Ð?овÑ?оÑ?иÑ?елÑ?"
+msgstr ""
+
+#: ../sheets/ciscohub.sheet.in.h:17
+msgid "Cisco â?? Switch"
+msgstr "Cisco â?? Ð?оммÑ?Ñ?аÑ?оÑ?"
 
 #: ../sheets/ciscohub.sheet.in.h:18
 msgid "Content Router"
@@ -9635,7 +9509,8 @@ msgid "Car"
 msgstr "Ð?аÑ?ина"
 
 #: ../sheets/ciscomisc.sheet.in.h:7
-msgid "Cisco - Misc"
+#, fuzzy
+msgid "Cisco â?? Miscellaneous"
 msgstr "Cisco - Ð?Ñ?Ñ?гие"
 
 #: ../sheets/ciscomisc.sheet.in.h:8
@@ -9674,10 +9549,6 @@ msgstr "Ð?ом"
 msgid "House blue"
 msgstr "Синий дом"
 
-#: ../sheets/ciscomisc.sheet.in.h:18
-msgid "Key"
-msgstr "Ð?лÑ?Ñ?"
-
 #: ../sheets/ciscomisc.sheet.in.h:20
 msgid "Lock and Key"
 msgstr "Ð?лÑ?Ñ? и замок"
@@ -9891,7 +9762,8 @@ msgid "Channelized Pipe"
 msgstr "Ð?аналÑ?наÑ? Ñ?Ñ?Ñ?ба"
 
 #: ../sheets/cisconetwork.sheet.in.h:20
-msgid "Cisco - Network"
+#, fuzzy
+msgid "Cisco â?? Network"
 msgstr "Cisco - СеÑ?Ñ?"
 
 #: ../sheets/cisconetwork.sheet.in.h:21
@@ -10251,7 +10123,8 @@ msgid "Cellular Phone"
 msgstr "СоÑ?овÑ?й Ñ?елеÑ?он"
 
 #: ../sheets/ciscotelephony.sheet.in.h:9
-msgid "Cisco - Telephony"
+#, fuzzy
+msgid "Cisco â?? Telephony"
 msgstr "Cisco - ТелеÑ?ониÑ?"
 
 #: ../sheets/ciscotelephony.sheet.in.h:10
@@ -10563,67 +10436,83 @@ msgid "Jigsaw"
 msgstr "Ð?азлÑ?"
 
 #: ../sheets/jigsaw.sheet.in.h:2
-msgid "Jigsaw - part_iiii"
+#, fuzzy
+msgid "Jigsaw â?? part_iiii"
 msgstr "Ð?азл - Ñ?аÑ?Ñ?Ñ? iiii"
 
 #: ../sheets/jigsaw.sheet.in.h:3
-msgid "Jigsaw - part_iiio"
+#, fuzzy
+msgid "Jigsaw â?? part_iiio"
 msgstr "Ð?азл - Ñ?аÑ?Ñ?Ñ? iiio"
 
 #: ../sheets/jigsaw.sheet.in.h:4
-msgid "Jigsaw - part_iioi"
+#, fuzzy
+msgid "Jigsaw â?? part_iioi"
 msgstr "Ð?азл - Ñ?аÑ?Ñ?Ñ? iioi"
 
 #: ../sheets/jigsaw.sheet.in.h:5
-msgid "Jigsaw - part_iioo"
+#, fuzzy
+msgid "Jigsaw â?? part_iioo"
 msgstr "Ð?азл - Ñ?аÑ?Ñ?Ñ? iioo"
 
 #: ../sheets/jigsaw.sheet.in.h:6
-msgid "Jigsaw - part_ioii"
+#, fuzzy
+msgid "Jigsaw â?? part_ioii"
 msgstr "Ð?азл - Ñ?аÑ?Ñ?Ñ? ioii"
 
 #: ../sheets/jigsaw.sheet.in.h:7
-msgid "Jigsaw - part_ioio"
+#, fuzzy
+msgid "Jigsaw â?? part_ioio"
 msgstr "Ð?азл - Ñ?аÑ?Ñ?Ñ? ioio"
 
 #: ../sheets/jigsaw.sheet.in.h:8
-msgid "Jigsaw - part_iooi"
+#, fuzzy
+msgid "Jigsaw â?? part_iooi"
 msgstr "Ð?азл - Ñ?аÑ?Ñ?Ñ? iooi"
 
 #: ../sheets/jigsaw.sheet.in.h:9
-msgid "Jigsaw - part_iooo"
+#, fuzzy
+msgid "Jigsaw â?? part_iooo"
 msgstr "Ð?азл - Ñ?аÑ?Ñ?Ñ? iooo"
 
 #: ../sheets/jigsaw.sheet.in.h:10
-msgid "Jigsaw - part_oiii"
+#, fuzzy
+msgid "Jigsaw â?? part_oiii"
 msgstr "Ð?азл - Ñ?аÑ?Ñ?Ñ? oiii"
 
 #: ../sheets/jigsaw.sheet.in.h:11
-msgid "Jigsaw - part_oiio"
+#, fuzzy
+msgid "Jigsaw â?? part_oiio"
 msgstr "Ð?азл - Ñ?аÑ?Ñ?Ñ? oiio"
 
 #: ../sheets/jigsaw.sheet.in.h:12
-msgid "Jigsaw - part_oioi"
+#, fuzzy
+msgid "Jigsaw â?? part_oioi"
 msgstr "Ð?азл - Ñ?аÑ?Ñ?Ñ? oioi"
 
 #: ../sheets/jigsaw.sheet.in.h:13
-msgid "Jigsaw - part_oioo"
+#, fuzzy
+msgid "Jigsaw â?? part_oioo"
 msgstr "Ð?азл - Ñ?аÑ?Ñ?Ñ? oioo"
 
 #: ../sheets/jigsaw.sheet.in.h:14
-msgid "Jigsaw - part_ooii"
+#, fuzzy
+msgid "Jigsaw â?? part_ooii"
 msgstr "Ð?азл - Ñ?аÑ?Ñ?Ñ? ooii"
 
 #: ../sheets/jigsaw.sheet.in.h:15
-msgid "Jigsaw - part_ooio"
+#, fuzzy
+msgid "Jigsaw â?? part_ooio"
 msgstr "Ð?азл - Ñ?аÑ?Ñ?Ñ? ooio"
 
 #: ../sheets/jigsaw.sheet.in.h:16
-msgid "Jigsaw - part_oooi"
+#, fuzzy
+msgid "Jigsaw â?? part_oooi"
 msgstr "Ð?азл - Ñ?аÑ?Ñ?Ñ? oooi"
 
 #: ../sheets/jigsaw.sheet.in.h:17
-msgid "Jigsaw - part_oooo"
+#, fuzzy
+msgid "Jigsaw â?? part_oooo"
 msgstr "Ð?азл - Ñ?аÑ?Ñ?Ñ? oooo"
 
 #: ../sheets/jigsaw.sheet.in.h:18
@@ -10802,23 +10691,205 @@ msgstr "СеÑ?веÑ? даннÑ?Ñ? Sybase"
 msgid "Sybase replication server"
 msgstr "СеÑ?веÑ? Ñ?епликаÑ?ий Sybase"
 
+#~ msgid "'%s' not found!\n"
+#~ msgstr "«%s» не найдено!\n"
+
+#, fuzzy
+#~ msgid "'%s' not found in '%s'!\n"
+#~ msgstr "«%s» не найдено!\n"
+
+#~ msgid "Could not initialize Bonobo!"
+#~ msgstr "Ð?е Ñ?далоÑ?Ñ? иниÑ?иализиÑ?оваÑ?Ñ? Bonobo!"
+
+#~ msgid ""
+#~ "You cannot group objects that belong to different groups or have "
+#~ "different parents"
+#~ msgstr ""
+#~ "Ð?елÑ?зÑ? Ñ?гÑ?Ñ?ппиÑ?оваÑ?Ñ? обÑ?екÑ?Ñ?, пÑ?инадлежаÑ?ие к Ñ?азнÑ?м гÑ?Ñ?ппам или имеÑ?Ñ?ие "
+#~ "Ñ?азнÑ?е Ñ?одиÑ?елÑ?Ñ?кие обÑ?екÑ?Ñ?"
+
+#~ msgid "/_Sort objects"
+#~ msgstr "/_УпоÑ?Ñ?доÑ?иваÑ?Ñ? обÑ?екÑ?Ñ?"
+
+#~ msgid "/Sort objects/by _name"
+#~ msgstr "/УпоÑ?Ñ?доÑ?иваÑ?Ñ? обÑ?екÑ?Ñ?/по _имени"
+
+#~ msgid "/Sort objects/by _type"
+#~ msgstr "/УпоÑ?Ñ?доÑ?иваÑ?Ñ? обÑ?екÑ?Ñ?/по _Ñ?ипÑ?"
+
+#~ msgid "/Sort objects/as _inserted"
+#~ msgstr "/УпоÑ?Ñ?доÑ?иваÑ?Ñ? обÑ?екÑ?Ñ?/как _вÑ?Ñ?авленнÑ?е"
+
+#~ msgid "/Sort objects/All by name"
+#~ msgstr "/УпоÑ?Ñ?доÑ?иваÑ?Ñ? обÑ?екÑ?Ñ?/Ð?Ñ?е по имени"
+
+#~ msgid "/Sort objects/All by type"
+#~ msgstr "/УпоÑ?Ñ?доÑ?иваÑ?Ñ? обÑ?екÑ?Ñ?/Ð?Ñ?е по Ñ?ипÑ?"
+
+#~ msgid "/Sort objects/All as inserted"
+#~ msgstr "/УпоÑ?Ñ?доÑ?иваÑ?Ñ? обÑ?екÑ?Ñ?/Ð?Ñ?е как вÑ?Ñ?авленÑ?"
+
+#~ msgid "/Sort objects/_Default"
+#~ msgstr "/УпоÑ?Ñ?доÑ?иваÑ?Ñ? обÑ?екÑ?Ñ?/Ð?о _Ñ?молÑ?аниÑ?"
+
+#~ msgid "/Sort objects/Default/by _name"
+#~ msgstr "/УпоÑ?Ñ?доÑ?иваÑ?Ñ? обÑ?екÑ?Ñ?/УмолÑ?ание/по _имени"
+
+#~ msgid "/Sort objects/Default/by _type"
+#~ msgstr "/УпоÑ?Ñ?доÑ?иваÑ?Ñ? обÑ?екÑ?Ñ?/УмолÑ?ание/по Ñ?ипÑ?"
+
+#~ msgid "/Sort objects/Default/as _inserted"
+#~ msgstr "/УпоÑ?Ñ?доÑ?иваÑ?Ñ? обÑ?екÑ?Ñ?/УмолÑ?ание/как вÑ?Ñ?авленÑ?"
+
+#~ msgid "/Sort _diagrams"
+#~ msgstr "/УпоÑ?Ñ?доÑ?иваÑ?Ñ? _диагÑ?аммÑ?"
+
+#~ msgid "/Sort _diagrams/by _name"
+#~ msgstr "/УпоÑ?Ñ?доÑ?иваÑ?Ñ? _диагÑ?аммÑ?/по _имени"
+
+#~ msgid "/Sort _diagrams/as _inserted"
+#~ msgstr "/УпоÑ?Ñ?доÑ?иваÑ?Ñ? _диагÑ?аммÑ?/как _вÑ?Ñ?авленнÑ?е"
+
+#~ msgid "/Sort diagrams/_Default"
+#~ msgstr "/УпоÑ?Ñ?доÑ?иваÑ?Ñ? _диагÑ?аммÑ?/по _Ñ?молÑ?аниÑ?"
+
+#~ msgid "/Sort diagrams/Default/by _name"
+#~ msgstr "/УпоÑ?Ñ?доÑ?иваÑ?Ñ? диагÑ?аммÑ?/УмолÑ?ание/по _имени"
+
+#~ msgid "/Sort diagrams/Default/as _inserted"
+#~ msgstr "/УпоÑ?Ñ?доÑ?иваÑ?Ñ? диагÑ?аммÑ?/УмолÑ?ание/как вÑ?Ñ?авленнÑ?е"
+
+#~ msgid "/_Locate"
+#~ msgstr "/_РаÑ?положение"
+
+#~ msgid "/_Hide this type"
+#~ msgstr "/СкÑ?Ñ?ваÑ?Ñ? даннÑ?й Ñ?ип"
+
+#~ msgid "Properties..."
+#~ msgstr "СвойÑ?Ñ?ва..."
+
+#~ msgid "active"
+#~ msgstr "дейÑ?Ñ?вÑ?Ñ?Ñ?ий"
+
+#~ msgid "Sheets and Objects..."
+#~ msgstr "Ð?аÑ?егоÑ?ии и обÑ?екÑ?Ñ?..."
+
+#~ msgid "Plugins..."
+#~ msgstr "Ð?одÑ?ли..."
+
+#~ msgid "_Diagram tree..."
+#~ msgstr "_Ð?еÑ?ево диагÑ?аммÑ?..."
+
+#~ msgid "_Export ..."
+#~ msgstr "_ЭкÑ?поÑ?Ñ?..."
+
+#~ msgid "Page Set_up..."
+#~ msgstr "Ð?аÑ?а_меÑ?Ñ?Ñ? Ñ?Ñ?Ñ?аниÑ?Ñ?..."
+
+#~ msgid "Add Layer..."
+#~ msgstr "Ð?обавиÑ?Ñ?..."
+
+#~ msgid "_Layers..."
+#~ msgstr "_Слои..."
+
+#~ msgid "Fullscr_een"
+#~ msgstr "_Ð?о веÑ?Ñ? Ñ?кÑ?ан"
+
+#~ msgid "Diagram tree window:"
+#~ msgstr "Ð?кно деÑ?ева диагÑ?аммÑ?"
+
+#~ msgid "Save hidden object types"
+#~ msgstr "СоÑ?Ñ?анÑ?Ñ?Ñ? Ñ?ипÑ? Ñ?пÑ?Ñ?Ñ?аннÑ?Ñ? обÑ?екÑ?ов"
+
+#~ msgid "Edit"
+#~ msgstr "РедакÑ?иÑ?оваÑ?Ñ?"
+
+#~ msgid "New"
+#~ msgstr "Ð?овÑ?й"
+
+#~ msgid "Browse..."
+#~ msgstr "Ð?Ñ?бÑ?аÑ?Ñ?..."
+
+#~ msgid "SVG Shape:"
+#~ msgstr "ФоÑ?мÑ? SVG:"
+
+#~ msgid "description:"
+#~ msgstr "опиÑ?ание:"
+
+#~ msgid "Sheet name:"
+#~ msgstr "Ð?азвание каÑ?егоÑ?ии:"
+
+#~ msgid "Edit Attributes"
+#~ msgstr "Ð?Ñ?авка аÑ?Ñ?ибÑ?Ñ?ов"
+
+#~ msgid "DiaObject"
+#~ msgstr "Ð?бÑ?екÑ? Dia"
+
+#~ msgid "Description:"
+#~ msgstr "Ð?пиÑ?ание:"
+
+#~ msgid "Sheet"
+#~ msgstr "Ð?аÑ?егоÑ?иÑ?"
+
+#~ msgid "DiaObject:"
+#~ msgstr "Ð?бÑ?екÑ? Dia:"
+
+#~ msgid "Sheet:"
+#~ msgstr "Ð?аÑ?егоÑ?иÑ?:"
+
+#~ msgid "%s<illegal characters>..."
+#~ msgstr "%s<некоÑ?Ñ?екÑ?нÑ?й Ñ?имвол>..."
+
+#~ msgid "Ok"
+#~ msgstr "Ok"
+
+#~ msgid "Open group"
+#~ msgstr "Ð?Ñ?кÑ?Ñ?Ñ?Ñ? гÑ?Ñ?ппÑ?"
+
+#~ msgid "Tablename"
+#~ msgstr "Ð?мÑ? Ñ?аблиÑ?Ñ?"
+
+#~ msgid "Classname"
+#~ msgstr "Ð?азвание клаÑ?Ñ?а"
+
+#~ msgid "Show Comments"
+#~ msgstr "Ð?оказаÑ?Ñ? комменÑ?аÑ?ии"
+
+#~ msgid "Printing with Gtk+(cairo) requires at least version 2.10."
+#~ msgstr "Ð?еÑ?аÑ?Ñ? Ñ?Ñ?ебÑ?еÑ? Gtk+(cairo) веÑ?Ñ?ии 2.10 и вÑ?Ñ?е."
+
+#~ msgid "Windows Meta File"
+#~ msgstr "Windows Meta File"
+
+#~ msgid "Enhanced Meta File"
+#~ msgstr "УлÑ?Ñ?Ñ?еннÑ?й Meta File"
+
+#~ msgid "Misc"
+#~ msgstr "Разное"
+
 #~ msgid ""
 #~ "You have loaded a non-Dia file.  The file has become an element in a new "
 #~ "diagram, and if you save it, it will be saved as a Dia diagram."
 #~ msgstr ""
 #~ "Ð?Ñ? загÑ?Ñ?зили Ñ?айл не в Ñ?оÑ?маÑ?е Dia. Ð?аннÑ?й Ñ?айл Ñ?Ñ?ал Ñ?леменÑ?ом в новой "
 #~ "диагÑ?амме. Ð?Ñ?и Ñ?оÑ?Ñ?анении, Ñ?айл бÑ?деÑ? Ñ?оÑ?Ñ?анÑ?н, как диагÑ?амма Dia."
+
 #~ msgid "NULL tooldata in tool_select_update"
 #~ msgstr "NULL даннÑ?е инÑ?Ñ?Ñ?Ñ?менÑ?а в tool_select_update"
+
 #~ msgid "Edit Layer Attributes"
 #~ msgstr "Ð?Ñ?авка паÑ?амеÑ?Ñ?ов Ñ?лоÑ?"
+
 #~ msgid "_Diagram"
 #~ msgstr "_Ð?иагÑ?амма"
+
 #~ msgid "Integrated UI"
 #~ msgstr "Ð?нÑ?егÑ?иÑ?ованнÑ?й UI"
+
 #~ msgid "User Interface type settings change will take after restart"
 #~ msgstr ""
 #~ "Ð?зменениÑ? Ñ?ипа полÑ?зоваÑ?елÑ?Ñ?кого инÑ?еÑ?Ñ?ейÑ?а бÑ?дÑ?Ñ? пÑ?имененÑ? поÑ?ле Ñ?еÑ?Ñ?аÑ?Ñ?а"
+
 #~ msgid ""
 #~ "Your local character set is UTF-8. Because of issues with libxml1 and the "
 #~ "support of files generated by previous versions of dia, you will "
@@ -10829,18 +10900,25 @@ msgstr "СеÑ?веÑ? Ñ?епликаÑ?ий Sybase"
 #~ "поддеÑ?жки Ñ?айлов, Ñ?озданнÑ?Ñ? пÑ?едÑ?дÑ?Ñ?ими веÑ?Ñ?иÑ?ми dia, вÑ? Ñ?Ñ?олкнÑ?лиÑ?Ñ? Ñ? "
 #~ "пÑ?облемами. Ð?ожалÑ?йÑ?Ñ?а, Ñ?ообÑ?иÑ?е в dia-list gnome org, еÑ?ли вÑ? Ñ?видели "
 #~ "Ñ?Ñ?о Ñ?ообÑ?ение."
+
 #~ msgid "Delete segement"
 #~ msgstr "УдалиÑ?Ñ? Ñ?егменÑ?"
+
 #~ msgid "Delete  connection point"
 #~ msgstr "УдалиÑ?Ñ? Ñ?оединиÑ?елÑ?нÑ?Ñ? Ñ?оÑ?кÑ?"
+
 #~ msgid "Cairo Clipboard"
 #~ msgstr "Ð?Ñ?Ñ?еÑ? Cairo"
+
 #~ msgid "Bad vertex bulge\n"
 #~ msgstr "Ð?евеÑ?наÑ? веÑ?Ñ?ина вÑ?пÑ?клоÑ?Ñ?и\n"
+
 #~ msgid "Scale: %f\n"
 #~ msgstr "Ð?аÑ?Ñ?Ñ?аб: %f\n"
+
 #~ msgid "Unknown dxf code %d\n"
 #~ msgstr "Ð?еизвеÑ?Ñ?нÑ?й код dxf %d\n"
+
 #~ msgid ""
 #~ "GNOME Print Backend\n"
 #~ " '%s'\n"
@@ -10849,12 +10927,15 @@ msgstr "СеÑ?веÑ? Ñ?епликаÑ?ий Sybase"
 #~ "Ð?омпоненÑ? пеÑ?аÑ?и GNOME\n"
 #~ " «%s»\n"
 #~ " не доÑ?Ñ?Ñ?пен"
+
 #~ msgid "GNOME PostScript"
 #~ msgstr "GNOME ЯзÑ?к Ð?пиÑ?аниÑ? СÑ?Ñ?аниÑ? PostScript (PS)"
+
 #~ msgid "GNOME Portable Document Format"
 #~ msgstr "GNOME Ð?оÑ?Ñ?иÑ?Ñ?емÑ?й ФоÑ?маÑ? Ð?окÑ?менÑ?а (PDF)"
+
 #~ msgid "GNOME Scalable Vector Graphic"
 #~ msgstr "GNOME Ð?аÑ?Ñ?Ñ?абиÑ?Ñ?емаÑ? Ð?екÑ?оÑ?наÑ? Ð?Ñ?аÑ?ика (SVG)"
+
 #~ msgid "GNOME Print based Rendering"
 #~ msgstr "Ð?Ñ?Ñ?иÑ?овка на оÑ?нове Ñ?иÑ?Ñ?емÑ? пеÑ?аÑ?и GNOME"
-