po/ru.po                    | 404 ++++++++++++++++++++------------------------

 properties/nm-pptp-editor.c |  10 +-

 2 files changed, 194 insertions(+), 220 deletions(-)

diff --git a/po/ru.po b/po/ru.po

index e77a266..f2d1f2e 100644

--- a/po/ru.po

+++ b/po/ru.po

@@ -10,39 +10,19 @@

 msgid ""

 msgstr ""

 "Project-Id-Version: ru\n"

-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"

-"product=NetworkManager&keywords=I18N+L10N&component=VPN: pptp\n"

-"POT-Creation-Date: 2017-08-03 13:59+0000\n"

-"PO-Revision-Date: 2017-12-20 00:24+0300\n"

-"Last-Translator: Stas Solovey <whats_up@tut.by>\n"

+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/NetworkManager-pptp/"

+"issues\n"

+"POT-Creation-Date: 2023-03-08 10:19+0000\n"

+"PO-Revision-Date: 2023-04-15 20:59+0300\n"

+"Last-Translator: Aleksandr Melman <Alexmelman88@gmail.com>\n"

 "Language-Team: п═я┐я│я│п╨п╦п╧ <gnome-cyr@gnome.org>\n"

 "Language: ru\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"

-"X-Generator: Poedit 2.0.5\n"

-

-#: ../appdata/network-manager-pptp.metainfo.xml.in.h:1

-msgid "PPTP VPN client"

-msgstr "PPTP VPN п╨п╩п╦п╣п╫я┌"

-

-#: ../appdata/network-manager-pptp.metainfo.xml.in.h:2

-msgid "Client for PPTP virtual private networks"

-msgstr "п п╩п╦п╣п╫я┌ п╢п╩я▐ п╡п╦я─я┌я┐п╟п╩я▄п╫я▀я┘ п©я─п╦п╡п╟я┌п╫я▀я┘ я│п╣я┌п╣п╧ PPTP"

-

-#: ../appdata/network-manager-pptp.metainfo.xml.in.h:3

-msgid "Support for configuring PPTP virtual private network connections."

-msgstr "п÷п╬п╢п╢п╣я─п╤п╨п╟ п╫п╟я│я┌я─п╬п╧п╨п╦ п©я─п╦п╡п╟я┌п╫я▀я┘ я│п╣я┌п╣п╡я▀я┘ я│п╬п╣п╢п╦п╫п╣п╫п╦п╧ PPTP."

-

-#: ../appdata/network-manager-pptp.metainfo.xml.in.h:4

-msgid "Compatible with various PPTP servers including Microsoft."

-msgstr "п║п╬п╡п╪п╣я│я┌п╦п╪ я│ я─п╟п╥п╩п╦я┤п╫я▀п╪п╦ я│п╣я─п╡п╣я─п╟п╪п╦ PPTP, п╡п╨п╩я▌я┤п╟я▐ Microsoft."

-

-#: ../appdata/network-manager-pptp.metainfo.xml.in.h:5

-msgid "The NetworkManager Developers"

-msgstr "п═п╟п╥я─п╟п╠п╬я┌я┤п╦п╨п╦ NetworkManager"

+"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"

+"X-Generator: Poedit 3.2.2\n"

 #. Otherwise, we have no saved password, or the password flags indicated

 #. * that the password should never be saved.

@@ -53,51 +33,51 @@ msgid "You need to authenticate to access the Virtual Private Network Б─°%sБ─²."

 msgstr ""

 "п²п╣п╬п╠я┘п╬п╢п╦п╪п╟ п╟я┐я┌п╣п╫я┌п╦я└п╦п╨п╟я├п╦я▐ п╢п╩я▐ п╢п╬я│я┌я┐п©п╟ п╨ п╡п╦я─я┌я┐п╟п╩я▄п╫п╬п╧ п©я─п╦п╡п╟я┌п╫п╬п╧ я│п╣я┌п╦ б╚%sб╩."

-#: ../auth-dialog/main.c:155 ../auth-dialog/main.c:175

+#: ../auth-dialog/main.c:155 ../auth-dialog/main.c:176

 msgid "Authenticate VPN"

 msgstr "п░я┐я┌п╣п╫я┌п╦я└п╦п╨п╟я├п╦я▐ VPN"

-#: ../auth-dialog/main.c:157 ../properties/nm-pptp-dialog.ui.h:43

-msgid "Password:"

-msgstr "п÷п╟я─п╬п╩я▄:"

+#: ../auth-dialog/main.c:157

+msgid "Password"

+msgstr "п÷п╟я─п╬п╩я▄"

-#: ../properties/advanced-dialog.c:169

+#: ../properties/advanced-dialog.c:170

 msgid "All Available (Default)"

 msgstr "п▓я│п╣ п╢п╬я│я┌я┐п©п╫я▀п╣ (п©п╬ я┐п╪п╬п╩я┤п╟п╫п╦я▌)"

-#: ../properties/advanced-dialog.c:173

+#: ../properties/advanced-dialog.c:174

 msgid "128-bit (most secure)"

 msgstr "128-п╠п╦я┌ (п╫п╟п╦п╠п╬п╩п╣п╣ п╥п╟я┴п╦я┴я▒п╫п╫п╬п╣)"

-#: ../properties/advanced-dialog.c:182

+#: ../properties/advanced-dialog.c:183

 msgid "40-bit (less secure)"

 msgstr "40-п╠п╦я┌ (п╪п╣п╫п╣п╣ п╥п╟я┴п╦я┴я▒п╫п╫п╬п╣)"

-#: ../properties/advanced-dialog.c:286

+#: ../properties/advanced-dialog.c:287

 msgid "PAP"

 msgstr "PAP"

-#: ../properties/advanced-dialog.c:299

+#: ../properties/advanced-dialog.c:300

 msgid "CHAP"

 msgstr "CHAP"

-#: ../properties/advanced-dialog.c:311

+#: ../properties/advanced-dialog.c:312

 msgid "MSCHAP"

 msgstr "MSCHAP"

-#: ../properties/advanced-dialog.c:323

+#: ../properties/advanced-dialog.c:324

 msgid "MSCHAPv2"

 msgstr "MSCHAPv2"

-#: ../properties/advanced-dialog.c:336

+#: ../properties/advanced-dialog.c:337

 msgid "EAP"

 msgstr "EAP"

-#: ../properties/nm-pptp-editor-plugin.c:34

+#: ../properties/nm-pptp-editor-plugin.c:29

 msgid "Point-to-Point Tunneling Protocol (PPTP)"

 msgstr "п╒я┐п╫п╫п╣п╩я▄п╫я▀п╧ п©я─п╬я┌п╬п╨п╬п╩ я┌п╦п©п╟ я┌п╬я┤п╨п╟-я┌п╬я┤п╨п╟ (PPTP)"

-#: ../properties/nm-pptp-editor-plugin.c:35

+#: ../properties/nm-pptp-editor-plugin.c:30

 msgid "Compatible with Microsoft and other PPTP VPN servers."

 msgstr "п║п╬п╡п╪п╣я│я┌п╦п╪ я│ я│п╣я─п╡п╣я─п╟п╪п╦ Microsoft п╦ п╢я─я┐пЁп╦п╪п╦ я│п╣я─п╡п╣я─п╟п╪п╦ PPTP VPN."

@@ -140,22 +120,27 @@ msgstr ""

 "п╥п╫п╟я┤п╣п╫п╦п╣ б╚%sб╩ я┌п╦п©п╟ б╚%sб╩ п╫п╣п╢п╣п╧я│я┌п╡п╦я┌п╣п╩я▄п╫п╬ п╦п╩п╦ п╡п╫п╣ п╢п╦п╟п©п╟п╥п╬п╫п╟ п╢п╩я▐ я│п╡п╬п╧я│я┌п╡п╟ б╚%sб╩ "

 "я┌п╦п©п╟ б╚%sб╩"

-#: ../shared/nm-utils/nm-vpn-plugin-utils.c:80

+#: ../shared/nm-utils/nm-vpn-plugin-utils.c:69

+#, c-format

+msgid "unable to get editor plugin name: %s"

+msgstr "п╫п╣ я┐п╢п╟п╩п╬я│я▄ п©п╬п╩я┐я┤п╦я┌я▄ п╦п╪я▐ п╪п╬п╢я┐п╩я▐ я─п╣п╢п╟п╨я┌п╬я─п╟: %s"

+

+#: ../shared/nm-utils/nm-vpn-plugin-utils.c:103

 #, c-format

 msgid "missing plugin file \"%s\""

 msgstr "п╬я┌я│я┐я┌я│я┌п╡я┐п╣я┌ я└п╟п╧п╩ п©п╩п╟пЁп╦п╫п╟ б╚%sб╩"

-#: ../shared/nm-utils/nm-vpn-plugin-utils.c:86

+#: ../shared/nm-utils/nm-vpn-plugin-utils.c:109

 #, c-format

 msgid "cannot load editor plugin: %s"

 msgstr "п╫п╣п╡п╬п╥п╪п╬п╤п╫п╬ п╥п╟пЁя─я┐п╥п╦я┌я▄ п©п╩п╟пЁп╦п╫ я─п╣п╢п╟п╨я┌п╬я─п╟: %s"

-#: ../shared/nm-utils/nm-vpn-plugin-utils.c:95

+#: ../shared/nm-utils/nm-vpn-plugin-utils.c:118

 #, c-format

 msgid "cannot load factory %s from plugin: %s"

 msgstr "п╫п╣п╡п╬п╥п╪п╬п╤п╫п╬ п╥п╟пЁя─я┐п╥п╦я┌я▄ п©я─п╬я┬п╦п╡п╨я┐ %s п╦п╥ п©п╩п╟пЁп╦п╫п╟: %s"

-#: ../shared/nm-utils/nm-vpn-plugin-utils.c:121

+#: ../shared/nm-utils/nm-vpn-plugin-utils.c:144

 msgid "unknown error creating editor instance"

 msgstr "п╫п╣п╦п╥п╡п╣я│я┌п╫п╟я▐ п╬я┬п╦п╠п╨п╟ я│п╬п╥п╢п╟п╫п╦я▐ я█п╨п╥п╣п╪п©п╩я▐я─п╟ я─п╣п╢п╟п╨я┌п╬я─п╟"

@@ -205,50 +190,50 @@ msgstr "п²п╣ я┐п╢п╟п╩п╬я│я▄ п╫п╟п╧я┌п╦ п╦я│п©п╬п╩п╫я▐п╣п╪я▀п╧ я└п╟п╧п╩ п╨п╩п╦п╣

 msgid "Missing VPN gateway."

 msgstr "п·я┌я│я┐я┌я│я┌п╡я┐п╣я┌ я┬п╩я▌п╥ VPN."

-#: ../src/nm-pptp-service.c:629

+#: ../src/nm-pptp-service.c:635

 msgid "Could not find the pppd binary."

 msgstr "п²п╣ я┐п╢п╟п╩п╬я│я▄ п╫п╟п╧я┌п╦ п╦я│п©п╬п╩п╫я▐п╣п╪я▀п╧ я└п╟п╧п╩ pppd."

-#: ../src/nm-pptp-service.c:689

+#: ../src/nm-pptp-service.c:695

 msgid "Missing VPN username."

 msgstr "п·я┌я│я┐я┌я│я┌п╡я┐п╣я┌ п╦п╪я▐ п©п╬п╩я▄п╥п╬п╡п╟я┌п╣п╩я▐ VPN."

-#: ../src/nm-pptp-service.c:698

+#: ../src/nm-pptp-service.c:704

 msgid "Missing or invalid VPN password."

 msgstr "п÷п╟я─п╬п╩я▄ VPN п╬я┌я│я┐я┌я│я┌п╡я┐п╣я┌ п╦п╩п╦ п╫п╣п╡п╣я─п╫я▀п╧."

-#: ../src/nm-pptp-service.c:804

+#: ../src/nm-pptp-service.c:810

 #, c-format

 msgid "couldnБ─≥t convert PPTP VPN gateway IP address Б─°%sБ─² (%d)"

 msgstr "п╫п╣ я┐п╢п╟п╩п╬я│я▄ п©я─п╣п╬п╠я─п╟п╥п╬п╡п╟я┌я▄ IP-п╟п╢я─п╣я│ я┬п╩я▌п╥п╟ PPTP VPN б╚%sб╩ (%d)"

-#: ../src/nm-pptp-service.c:822

+#: ../src/nm-pptp-service.c:828

 #, c-format

 msgid "couldnБ─≥t look up PPTP VPN gateway IP address Б─°%sБ─² (%d)"

 msgstr "п╫п╣ я┐п╢п╟п╩п╬я│я▄ п╫п╟п╧я┌п╦ IP-п╟п╢я─п╣я│ я┬п╩я▌п╥п╟ PPTP VPN б╚%sб╩ (%d)"

-#: ../src/nm-pptp-service.c:846

+#: ../src/nm-pptp-service.c:852

 #, c-format

 msgid "no usable addresses returned for PPTP VPN gateway Б─°%sБ─²"

 msgstr "п╫п╣ п©п╬п╩я┐я┤п╣п╫п╬ п©я─п╦п╣п╪п╩п╣п╪я▀я┘ п╟п╢я─п╣я│п╬п╡ п╢п╩я▐ я┬п╩я▌п╥п╟ PPTP VPN б╚%sб╩"

-#: ../src/nm-pptp-service.c:875

+#: ../src/nm-pptp-service.c:881

 msgid "Invalid or missing PPTP gateway."

 msgstr "п╗п╩я▌п╥ PPTP п╬я┌я│я┐я┌я│я┌п╡я┐п╣я┌ п╦п╩п╦ п╫п╣п╡п╣я─п╫я▀п╧."

-#: ../src/nm-pptp-service.c:1123

+#: ../src/nm-pptp-service.c:1129

 msgid "DonБ─≥t quit when VPN connection terminates"

 msgstr "п²п╣ п╥п╟п╡п╣я─я┬п╟я┌я▄ я─п╟п╠п╬я┌я┐ п©я─п╦ п╬я┌п╨п╩я▌я┤п╣п╫п╦п╦ VPN"

-#: ../src/nm-pptp-service.c:1124

+#: ../src/nm-pptp-service.c:1130

 msgid "Enable verbose debug logging (may expose passwords)"

 msgstr "п▓п╨п╩я▌я┤п╦я┌я▄ п©п╬п╢я─п╬п╠п╫я▀п╧ я─п╣п╤п╦п╪ п╬я┌п╩п╟п╢п╨п╦ (п╪п╬пЁя┐я┌ п╬я┌п╬п╠я─п╟п╤п╟я┌я▄я│я▐ п©п╟я─п╬п╩п╦)"

-#: ../src/nm-pptp-service.c:1125

+#: ../src/nm-pptp-service.c:1131

 msgid "D-Bus name to use for this instance"

 msgstr "п≤п╪я▐ D-Bus п╢п╩я▐ п╦я│п©п╬п╩я▄п╥п╬п╡п╟п╫п╦я▐ п╡ я█я┌п╬п╪ я█п╨п╥п╣п╪п©п╩я▐я─п╣"

-#: ../src/nm-pptp-service.c:1146

+#: ../src/nm-pptp-service.c:1152

 msgid ""

 "nm-pptp-service provides integrated PPTP VPN capability (compatible with "

 "Microsoft and other implementations) to NetworkManager."

@@ -256,201 +241,184 @@ msgstr ""

 "nm-pptp-service п©п╬п╥п╡п╬п╩я▐п╣я┌ п╦я│п©п╬п╩я▄п╥п╬п╡п╟я┌я▄ PPTP VPN (я│п╬п╡п╪п╣я│я┌п╦п╪я▀п╣ я│ Microsoft п╦ "

 "п╢я─я┐пЁп╦п╪п╦ я─п╣п╟п╩п╦п╥п╟я├п╦я▐п╪п╦) п╡ NetworkManager."

-#: ../properties/nm-pptp-dialog.ui.h:1

-msgid "Default"

-msgstr "п÷п╬ я┐п╪п╬п╩я┤п╟п╫п╦я▌"

+#~ msgid "PPTP VPN client"

+#~ msgstr "PPTP VPN п╨п╩п╦п╣п╫я┌"

-#: ../properties/nm-pptp-dialog.ui.h:2

-msgid "PPTP Advanced Options"

-msgstr "п■п╬п©п╬п╩п╫п╦я┌п╣п╩я▄п╫я▀п╣ п©п╟я─п╟п╪п╣я┌я─я▀ PPTP"

+#~ msgid "Client for PPTP virtual private networks"

+#~ msgstr "п п╩п╦п╣п╫я┌ п╢п╩я▐ п╡п╦я─я┌я┐п╟п╩я▄п╫я▀я┘ п©я─п╦п╡п╟я┌п╫я▀я┘ я│п╣я┌п╣п╧ PPTP"

-#: ../properties/nm-pptp-dialog.ui.h:3

-msgid "Authentication"

-msgstr "п░я┐я┌п╣п╫я┌п╦я└п╦п╨п╟я├п╦я▐"

+#~ msgid "Support for configuring PPTP virtual private network connections."

+#~ msgstr "п÷п╬п╢п╢п╣я─п╤п╨п╟ п╫п╟я│я┌я─п╬п╧п╨п╦ п©я─п╦п╡п╟я┌п╫я▀я┘ я│п╣я┌п╣п╡я▀я┘ я│п╬п╣п╢п╦п╫п╣п╫п╦п╧ PPTP."

-#: ../properties/nm-pptp-dialog.ui.h:4

-msgid "Allow the following authentication methods:"

-msgstr "п═п╟п╥я─п╣я┬п╦я┌я▄ я│п╩п╣п╢я┐я▌я┴п╦п╣ п╪п╣я┌п╬п╢я▀ п╟я┐я┌п╣п╫я┌п╦я└п╦п╨п╟я├п╦п╦:"

+#~ msgid "Compatible with various PPTP servers including Microsoft."

+#~ msgstr "п║п╬п╡п╪п╣я│я┌п╦п╪ я│ я─п╟п╥п╩п╦я┤п╫я▀п╪п╦ я│п╣я─п╡п╣я─п╟п╪п╦ PPTP, п╡п╨п╩я▌я┤п╟я▐ Microsoft."

-#: ../properties/nm-pptp-dialog.ui.h:5

-msgid ""

-"Allow/disable authentication methods.\n"

-"config: refuse-pap, refuse-chap, refuse-mschap, refuse-mschap-v2, refuse-eap"

-msgstr ""

-"п═п╟п╥я─п╣я┬п╦я┌я▄/п╥п╟п©я─п╣я┌п╦я┌я▄ п╪п╣я┌п╬п╢я▀ п╟я┐я┌п╣п╫я┌п╦я└п╦п╨п╟я├п╦п╦.\n"

-"config: refuse-pap, refuse-chap, refuse-mschap, refuse-mschap-v2, refuse-eap"

+#~ msgid "The NetworkManager Developers"

+#~ msgstr "п═п╟п╥я─п╟п╠п╬я┌я┤п╦п╨п╦ NetworkManager"

-#: ../properties/nm-pptp-dialog.ui.h:7

-msgid "Security and Compression"

-msgstr "п╗п╦я└я─п╬п╡п╟п╫п╦п╣ п╦ я│п╤п╟я┌п╦п╣"

+#~ msgid "Default"

+#~ msgstr "п÷п╬ я┐п╪п╬п╩я┤п╟п╫п╦я▌"

-#: ../properties/nm-pptp-dialog.ui.h:8

-msgid "Use _Point-to-Point encryption (MPPE)"

-msgstr "п≤я│п©п╬п╩я▄п╥п╬п╡п╟я┌я▄ я┬п╦я└я─п╬п╡п╟п╫п╦п╣ _MPPE"

+#~ msgid "PPTP Advanced Options"

+#~ msgstr "п■п╬п©п╬п╩п╫п╦я┌п╣п╩я▄п╫я▀п╣ п©п╟я─п╟п╪п╣я┌я─я▀ PPTP"

-#: ../properties/nm-pptp-dialog.ui.h:9

-msgid ""

-"Note: MPPE encryption is only available with MSCHAP authentication methods. "

-"To enable this checkbox, select one or more of the MSCHAP authentication "

-"methods: MSCHAP or MSCHAPv2."

-msgstr ""

-"п≈п╟п╪п╣я┤п╟п╫п╦п╣: п╗п╦я└я─п╬п╡п╟п╫п╦п╣ MPPE п╢п╬я│я┌я┐п©п╫п╬ я┌п╬п╩я▄п╨п╬ я│ п╪п╣я┌п╬п╢п╟п╪п╦ п╟я┐я┌п╣п╫я┌п╦я└п╦п╨п╟я├п╦п╦ MSCHAP. "

-"п╖я┌п╬п╠я▀ п╡п╨п╩я▌я┤п╦я┌я▄ п╢п╟п╫п╫я▀п╧ п©я┐п╫п╨я┌, п╡я▀п╠п╣я─п╦я┌п╣ п╬п╢п╦п╫ п╦п╩п╦ п╠п╬п╩п╣п╣ п╪п╣я┌п╬п╢п╬п╡ п╟я┐я┌п╣п╫я┌п╦я└п╦п╨п╟я├п╦п╦ "

-"MSCHAP: MSCHAP п╦п╩п╦ MSCHAPv2."

+#~ msgid "Authentication"

+#~ msgstr "п░я┐я┌п╣п╫я┌п╦я└п╦п╨п╟я├п╦я▐"

-#: ../properties/nm-pptp-dialog.ui.h:10

-msgid "_Security:"

-msgstr "_п╗п╦я└я─п╬п╡п╟п╫п╦п╣:"

+#~ msgid "Allow the following authentication methods:"

+#~ msgstr "п═п╟п╥я─п╣я┬п╦я┌я▄ я│п╩п╣п╢я┐я▌я┴п╦п╣ п╪п╣я┌п╬п╢я▀ п╟я┐я┌п╣п╫я┌п╦я└п╦п╨п╟я├п╦п╦:"

-#: ../properties/nm-pptp-dialog.ui.h:11

-msgid ""

-"Require the use of MPPE, with 40/128-bit encryption or all.\n"

-"config: require-mppe, require-mppe-128 or require-mppe-40"

-msgstr ""

-"п╒я─п╣п╠я┐п╣я┌я│я▐ п╦я│п©п╬п╩я▄п╥п╬п╡п╟я┌я▄ MPPE я│ 40- п╦п╩п╦ 128-п╠п╦я┌п╫я▀п╪ я┬п╦я└я─п╬п╡п╟п╫п╦п╣п╪.\n"

-"config: require-mppe, require-mppe-128 п╦п╩п╦ require-mppe-40"

+#~ msgid ""

+#~ "Allow/disable authentication methods.\n"

+#~ "config: refuse-pap, refuse-chap, refuse-mschap, refuse-mschap-v2, refuse-"

+#~ "eap"

+#~ msgstr ""

+#~ "п═п╟п╥я─п╣я┬п╦я┌я▄/п╥п╟п©я─п╣я┌п╦я┌я▄ п╪п╣я┌п╬п╢я▀ п╟я┐я┌п╣п╫я┌п╦я└п╦п╨п╟я├п╦п╦.\n"

+#~ "config: refuse-pap, refuse-chap, refuse-mschap, refuse-mschap-v2, refuse-"

+#~ "eap"

-#: ../properties/nm-pptp-dialog.ui.h:13

-msgid "Allow st_ateful encryption"

-msgstr "п▓п╨п╩я▌я┤п╦я┌я▄ _Stateful Encryption"

+#~ msgid "Security and Compression"

+#~ msgstr "п╗п╦я└я─п╬п╡п╟п╫п╦п╣ п╦ я│п╤п╟я┌п╦п╣"

-#: ../properties/nm-pptp-dialog.ui.h:14

-msgid ""

-"Allow MPPE to use stateful mode. Stateless mode is still attempted first.\n"

-"config: mppe-stateful (when checked)"

-msgstr ""

-"п═п╟п╥я─п╣я┬п╦я┌я▄ MPPE п╦я│п©п╬п╩я▄п╥п╬п╡п╟я┌я▄ п╨п╬п╫я┌п╣п╨я│я┌п╫я▀п╧ (stateful) я─п╣п╤п╦п╪. п║п╫п╟я┤п╟п╩п╟ "

-"п©я─п╬п╦п╥п╡п╬п╢п╦я┌я│я▐ п©п╬п©я▀я┌п╨п╟ п╦я│п©п╬п╩я▄п╥п╬п╡п╟я┌я▄ п©я─п╬я│я┌п╬п╧ (stateless) я─п╣п╤п╦п╪.\n"

-"config: mppe-stateful (п╣я│п╩п╦ п╫п╣ п╡я▀п╠я─п╟п╫п╬)"

+#~ msgid "Use _Point-to-Point encryption (MPPE)"

+#~ msgstr "п≤я│п©п╬п╩я▄п╥п╬п╡п╟я┌я▄ я┬п╦я└я─п╬п╡п╟п╫п╦п╣ _MPPE"

-#: ../properties/nm-pptp-dialog.ui.h:16

-msgid "Allow _BSD data compression"

-msgstr "п≤я│п©п╬п╩я▄п╥п╬п╡п╟я┌я▄ п╢п╩я▐ п╢п╟п╫п╫я▀я┘ я│п╤п╟я┌п╦п╣ _BSD"

+#~ msgid ""

+#~ "Note: MPPE encryption is only available with MSCHAP authentication "

+#~ "methods. To enable this checkbox, select one or more of the MSCHAP "

+#~ "authentication methods: MSCHAP or MSCHAPv2."

+#~ msgstr ""

+#~ "п≈п╟п╪п╣я┤п╟п╫п╦п╣: п╗п╦я└я─п╬п╡п╟п╫п╦п╣ MPPE п╢п╬я│я┌я┐п©п╫п╬ я┌п╬п╩я▄п╨п╬ я│ п╪п╣я┌п╬п╢п╟п╪п╦ п╟я┐я┌п╣п╫я┌п╦я└п╦п╨п╟я├п╦п╦ "

+#~ "MSCHAP. п╖я┌п╬п╠я▀ п╡п╨п╩я▌я┤п╦я┌я▄ п╢п╟п╫п╫я▀п╧ п©я┐п╫п╨я┌, п╡я▀п╠п╣я─п╦я┌п╣ п╬п╢п╦п╫ п╦п╩п╦ п╠п╬п╩п╣п╣ п╪п╣я┌п╬п╢п╬п╡ "

+#~ "п╟я┐я┌п╣п╫я┌п╦я└п╦п╨п╟я├п╦п╦ MSCHAP: MSCHAP п╦п╩п╦ MSCHAPv2."

-#: ../properties/nm-pptp-dialog.ui.h:17

-msgid ""

-"Allow/disable BSD-Compress compression.\n"

-"config: nobsdcomp (when unchecked)"

-msgstr ""

-"п═п╟п╥я─п╣я┬п╦я┌я▄/п╥п╟п©я─п╣я┌п╦я┌я▄ я│п╤п╟я┌п╦п╣ BSD-Compress.\n"

-"config: nobsdcomp (п╣я│п╩п╦ п╫п╣ п╡я▀п╠я─п╟п╫п╬)"

+#~ msgid "_Security:"

+#~ msgstr "_п╗п╦я└я─п╬п╡п╟п╫п╦п╣:"

-#: ../properties/nm-pptp-dialog.ui.h:19

-msgid "Allow _Deflate data compression"

-msgstr "п≤я│п©п╬п╩я▄п╥п╬п╡п╟я┌я▄ п╢п╩я▐ п╢п╟п╫п╫я▀я┘ я│п╤п╟я┌п╦п╣ _Deflate"

+#~ msgid ""

+#~ "Require the use of MPPE, with 40/128-bit encryption or all.\n"

+#~ "config: require-mppe, require-mppe-128 or require-mppe-40"

+#~ msgstr ""

+#~ "п╒я─п╣п╠я┐п╣я┌я│я▐ п╦я│п©п╬п╩я▄п╥п╬п╡п╟я┌я▄ MPPE я│ 40- п╦п╩п╦ 128-п╠п╦я┌п╫я▀п╪ я┬п╦я└я─п╬п╡п╟п╫п╦п╣п╪.\n"

+#~ "config: require-mppe, require-mppe-128 п╦п╩п╦ require-mppe-40"

-#: ../properties/nm-pptp-dialog.ui.h:20

-msgid ""

-"Allow/disable Deflate compression.\n"

-"config: nodeflate (when unchecked)"

-msgstr ""

-"п═п╟п╥я─п╣я┬п╦я┌я▄/п╥п╟п©я─п╣я┌п╦я┌я▄ я│п╤п╟я┌п╦п╣ Deflate.\n"

-"config: nodeflate (п╣я│п╩п╦ п╫п╣ п╡я▀п╠я─п╟п╫п╬)"

+#~ msgid "Allow st_ateful encryption"

+#~ msgstr "п▓п╨п╩я▌я┤п╦я┌я▄ _Stateful Encryption"

-#: ../properties/nm-pptp-dialog.ui.h:22

-msgid "Use TCP _header compression"

-msgstr "п≤я│п©п╬п╩я▄п╥п╬п╡п╟я┌я▄ я│п╤п╟я┌п╦п╣ _п╥п╟пЁп╬п╩п╬п╡п╨п╬п╡ TCP"

+#~ msgid ""

+#~ "Allow MPPE to use stateful mode. Stateless mode is still attempted "

+#~ "first.\n"

+#~ "config: mppe-stateful (when checked)"

+#~ msgstr ""

+#~ "п═п╟п╥я─п╣я┬п╦я┌я▄ MPPE п╦я│п©п╬п╩я▄п╥п╬п╡п╟я┌я▄ п╨п╬п╫я┌п╣п╨я│я┌п╫я▀п╧ (stateful) я─п╣п╤п╦п╪. п║п╫п╟я┤п╟п╩п╟ "

+#~ "п©я─п╬п╦п╥п╡п╬п╢п╦я┌я│я▐ п©п╬п©я▀я┌п╨п╟ п╦я│п©п╬п╩я▄п╥п╬п╡п╟я┌я▄ п©я─п╬я│я┌п╬п╧ (stateless) я─п╣п╤п╦п╪.\n"

+#~ "config: mppe-stateful (п╣я│п╩п╦ п╫п╣ п╡я▀п╠я─п╟п╫п╬)"

-#: ../properties/nm-pptp-dialog.ui.h:23

-msgid ""

-"Allow/disable Van Jacobson style TCP/IP header compression in both the "

-"transmit and the receive directions.\n"

-"config: novj (when unchecked)"

-msgstr ""

-"п═п╟п╥я─п╣я┬п╦я┌я▄/п╥п╟п©я─п╣я┌п╦я┌я▄ я│п╤п╟я┌п╦п╣ п╥п╟пЁп╬п╩п╬п╡п╨п╬п╡ TCP/IP п©п╬ п╪п╣я┌п╬п╢я┐ п▓п╟п╫ п╞п╨п╬п╠я│п╬п╫п╟ п╡ "

-"п╫п╟п©я─п╟п╡п╩п╣п╫п╦я▐я┘ п©п╣я─п╣п╢п╟я┤п╦ п╦ п©я─п╦я▒п╪п╟.\n"

-"config: novj (п╣я│п╩п╦ п╫п╣ п╡я▀п╠я─п╟п╫п╬)"

+#~ msgid "Allow _BSD data compression"

+#~ msgstr "п≤я│п©п╬п╩я▄п╥п╬п╡п╟я┌я▄ п╢п╩я▐ п╢п╟п╫п╫я▀я┘ я│п╤п╟я┌п╦п╣ _BSD"

-#: ../properties/nm-pptp-dialog.ui.h:25

-msgid "Echo"

-msgstr "п╜я┘п╬"

+#~ msgid ""

+#~ "Allow/disable BSD-Compress compression.\n"

+#~ "config: nobsdcomp (when unchecked)"

+#~ msgstr ""

+#~ "п═п╟п╥я─п╣я┬п╦я┌я▄/п╥п╟п©я─п╣я┌п╦я┌я▄ я│п╤п╟я┌п╦п╣ BSD-Compress.\n"

+#~ "config: nobsdcomp (п╣я│п╩п╦ п╫п╣ п╡я▀п╠я─п╟п╫п╬)"

-#: ../properties/nm-pptp-dialog.ui.h:26

-msgid "Send PPP _echo packets"

-msgstr "п÷п╬я│я▀п╩п╟я┌я▄ _я█я┘п╬-п©п╟п╨п╣я┌я▀ PPP"

+#~ msgid "Allow _Deflate data compression"

+#~ msgstr "п≤я│п©п╬п╩я▄п╥п╬п╡п╟я┌я▄ п╢п╩я▐ п╢п╟п╫п╫я▀я┘ я│п╤п╟я┌п╦п╣ _Deflate"

-#: ../properties/nm-pptp-dialog.ui.h:27

-msgid ""

-"Send LCP echo-requests to find out whether peer is alive.\n"

-"config: lcp-echo-failure and lcp-echo-interval"

-msgstr ""

-"п÷п╬я│я▀п╩п╟я┌я▄ я█я┘п╬-п╥п╟п©я─п╬я│я▀ LCP, я┤я┌п╬п╠я▀ п©я─п╬п╡п╣я─п╦я┌я▄ я│п╬я│я┌п╬я▐п╫п╦п╣ я┐п╥п╩п╟.\n"

-"config: lcp-echo-failure п╦ lcp-echo-interval"

+#~ msgid ""

+#~ "Allow/disable Deflate compression.\n"

+#~ "config: nodeflate (when unchecked)"

+#~ msgstr ""

+#~ "п═п╟п╥я─п╣я┬п╦я┌я▄/п╥п╟п©я─п╣я┌п╦я┌я▄ я│п╤п╟я┌п╦п╣ Deflate.\n"

+#~ "config: nodeflate (п╣я│п╩п╦ п╫п╣ п╡я▀п╠я─п╟п╫п╬)"

-#: ../properties/nm-pptp-dialog.ui.h:29

-msgid "Misc"

-msgstr "п÷я─п╬я┤п╣п╣"

+#~ msgid "Use TCP _header compression"

+#~ msgstr "п≤я│п©п╬п╩я▄п╥п╬п╡п╟я┌я▄ я│п╤п╟я┌п╦п╣ _п╥п╟пЁп╬п╩п╬п╡п╨п╬п╡ TCP"

-#: ../properties/nm-pptp-dialog.ui.h:30

-msgid "Use custom _unit number:"

-msgstr "п≤я│п©п╬п╩я▄п╥п╬п╡п╟я┌я▄ п©п╬п╩я▄п╥п╬п╡п╟я┌п╣п╩я▄я│п╨п╦п╧ п╫п╬п╪п╣я─ я┐я│я┌я─п╬п╧я│я┌п╡п╟:"

+#~ msgid ""

+#~ "Allow/disable Van Jacobson style TCP/IP header compression in both the "

+#~ "transmit and the receive directions.\n"

+#~ "config: novj (when unchecked)"

+#~ msgstr ""

+#~ "п═п╟п╥я─п╣я┬п╦я┌я▄/п╥п╟п©я─п╣я┌п╦я┌я▄ я│п╤п╟я┌п╦п╣ п╥п╟пЁп╬п╩п╬п╡п╨п╬п╡ TCP/IP п©п╬ п╪п╣я┌п╬п╢я┐ п▓п╟п╫ п╞п╨п╬п╠я│п╬п╫п╟ п╡ "

+#~ "п╫п╟п©я─п╟п╡п╩п╣п╫п╦я▐я┘ п©п╣я─п╣п╢п╟я┤п╦ п╦ п©я─п╦я▒п╪п╟.\n"

+#~ "config: novj (п╣я│п╩п╦ п╫п╣ п╡я▀п╠я─п╟п╫п╬)"

-#: ../properties/nm-pptp-dialog.ui.h:31

-msgid ""

-"Enable custom index for ppp<n> device name.\n"

-"config: unit <n>"

-msgstr ""

-"п▓п╨п╩я▌я┤п╦я┌я▄ п©п╬п╩я▄п╥п╬п╡п╟я┌п╣п╩я▄я│п╨п╦п╧ п╦п╫п╢п╣п╨я│ п╢п╩я▐ ppp<n> п╦п╪п╣п╫п╦ я┐я│я┌я─п╬п╧я│я┌п╡п╟.\n"

-"config: п╫п╬п╪п╣я─ <n>"

+#~ msgid "Echo"

+#~ msgstr "п╜я┘п╬"

-#: ../properties/nm-pptp-dialog.ui.h:33

-msgid "General"

-msgstr "п·п╠я┴п╦п╣"

+#~ msgid "Send PPP _echo packets"

+#~ msgstr "п÷п╬я│я▀п╩п╟я┌я▄ _я█я┘п╬-п©п╟п╨п╣я┌я▀ PPP"

-#: ../properties/nm-pptp-dialog.ui.h:34

-msgid ""

-"PPTP server IP or name.\n"

-"config: the first parameter of pptp"

-msgstr ""

-"IP-п╟п╢я─п╣я│ п╦п╩п╦ п╦п╪я▐ PPTP-я│п╣я─п╡п╣я─п╟.\n"

-"config: п©п╣я─п╡я▀п╧ п©п╟я─п╟п╪п╣я┌я─ pptp"

+#~ msgid ""

+#~ "Send LCP echo-requests to find out whether peer is alive.\n"

+#~ "config: lcp-echo-failure and lcp-echo-interval"

+#~ msgstr ""

+#~ "п÷п╬я│я▀п╩п╟я┌я▄ я█я┘п╬-п╥п╟п©я─п╬я│я▀ LCP, я┤я┌п╬п╠я▀ п©я─п╬п╡п╣я─п╦я┌я▄ я│п╬я│я┌п╬я▐п╫п╦п╣ я┐п╥п╩п╟.\n"

+#~ "config: lcp-echo-failure п╦ lcp-echo-interval"

-#: ../properties/nm-pptp-dialog.ui.h:36

-msgid "_Gateway:"

-msgstr "_п╗п╩я▌п╥:"

+#~ msgid "Misc"

+#~ msgstr "п÷я─п╬я┤п╣п╣"

-#: ../properties/nm-pptp-dialog.ui.h:37

-msgid "Optional"

-msgstr "п■п╬п©п╬п╩п╫п╦я┌п╣п╩я▄п╫я▀п╣"

+#~ msgid "Use custom _unit number:"

+#~ msgstr "п≤я│п©п╬п╩я▄п╥п╬п╡п╟я┌я▄ п©п╬п╩я▄п╥п╬п╡п╟я┌п╣п╩я▄я│п╨п╦п╧ п╫п╬п╪п╣я─ я┐я│я┌я─п╬п╧я│я┌п╡п╟:"

-#: ../properties/nm-pptp-dialog.ui.h:38

-msgid ""

-"Append the domain name <domain> to the local host name for authentication "

-"purposes.\n"

-"config: domain <domain>"

-msgstr ""

-"п■п╬п╠п╟п╡п╦я┌я▄ п╦п╪я▐ п╢п╬п╪п╣п╫п╟ <domain> п╨ п╦п╪п╣п╫п╦ п╩п╬п╨п╟п╩я▄п╫п╬пЁп╬ я┐п╥п╩п╟ п╢п╩я▐ п╟я┐я┌п╣п╫я┌п╦я└п╦п╨п╟я├п╦п╦.\n"

-"config: domain <domain>"

+#~ msgid ""

+#~ "Enable custom index for ppp<n> device name.\n"

+#~ "config: unit <n>"

+#~ msgstr ""

+#~ "п▓п╨п╩я▌я┤п╦я┌я▄ п©п╬п╩я▄п╥п╬п╡п╟я┌п╣п╩я▄я│п╨п╦п╧ п╦п╫п╢п╣п╨я│ п╢п╩я▐ ppp<n> п╦п╪п╣п╫п╦ я┐я│я┌я─п╬п╧я│я┌п╡п╟.\n"

+#~ "config: п╫п╬п╪п╣я─ <n>"

+

+#~ msgid "General"

+#~ msgstr "п·п╠я┴п╦п╣"

-#: ../properties/nm-pptp-dialog.ui.h:40

-msgid "NT Domain:"

-msgstr "NT-п╢п╬п╪п╣п╫:"

+#~ msgid ""

+#~ "PPTP server IP or name.\n"

+#~ "config: the first parameter of pptp"

+#~ msgstr ""

+#~ "IP-п╟п╢я─п╣я│ п╦п╩п╦ п╦п╪я▐ PPTP-я│п╣я─п╡п╣я─п╟.\n"

+#~ "config: п©п╣я─п╡я▀п╧ п©п╟я─п╟п╪п╣я┌я─ pptp"

-#: ../properties/nm-pptp-dialog.ui.h:41

-msgid "Show password"

-msgstr "п÷п╬п╨п╟п╥п╟я┌я▄ п©п╟я─п╬п╩я▄"

+#~ msgid "_Gateway:"

+#~ msgstr "_п╗п╩я▌п╥:"

-#: ../properties/nm-pptp-dialog.ui.h:42

-msgid "Password passed to PPTP when prompted for it."

-msgstr "п÷п╟я─п╬п╩я▄, п©п╣я─п╣п╢п╟п╡п╟п╣п╪я▀п╧ PPTP п©п╬ п╥п╟п©я─п╬я│я┐."

+#~ msgid "Optional"

+#~ msgstr "п■п╬п©п╬п╩п╫п╦я┌п╣п╩я▄п╫я▀п╣"

-#: ../properties/nm-pptp-dialog.ui.h:44

-msgid ""

-"Set the name used for authenticating the local system to the peer to "

-"<name>.\n"

-"config: user <name>"

-msgstr ""

-"пёя│я┌п╟п╫п╬п╡п╦я┌я▄ п╦п╪я▐, п╦я│п©п╬п╩я▄п╥я┐п╣п╪п╬п╣ п╢п╩я▐ п╟я┐я┌п╣п╫я┌п╦я└п╦п╨п╟я├п╦п╦ п╩п╬п╨п╟п╩я▄п╫п╬п╧ я│п╦я│я┌п╣п╪я▀ п╨ я┐п╥п╩я┐ "

-"<name>.\n"

-"config: п╦п╪я▐ п©п╬п╩я▄п╥п╬п╡п╟я┌п╣п╩я▐ <name>"

+#~ msgid ""

+#~ "Append the domain name <domain> to the local host name for authentication "

+#~ "purposes.\n"

+#~ "config: domain <domain>"

+#~ msgstr ""

+#~ "п■п╬п╠п╟п╡п╦я┌я▄ п╦п╪я▐ п╢п╬п╪п╣п╫п╟ <domain> п╨ п╦п╪п╣п╫п╦ п╩п╬п╨п╟п╩я▄п╫п╬пЁп╬ я┐п╥п╩п╟ п╢п╩я▐ п╟я┐я┌п╣п╫я┌п╦я└п╦п╨п╟я├п╦п╦.\n"

+#~ "config: domain <domain>"

+

+#~ msgid "NT Domain:"

+#~ msgstr "NT-п╢п╬п╪п╣п╫:"

+

+#~ msgid "Show password"

+#~ msgstr "п÷п╬п╨п╟п╥п╟я┌я▄ п©п╟я─п╬п╩я▄"

+

+#~ msgid "Password passed to PPTP when prompted for it."

+#~ msgstr "п÷п╟я─п╬п╩я▄, п©п╣я─п╣п╢п╟п╡п╟п╣п╪я▀п╧ PPTP п©п╬ п╥п╟п©я─п╬я│я┐."

+

+#~ msgid ""

+#~ "Set the name used for authenticating the local system to the peer to "

+#~ "<name>.\n"

+#~ "config: user <name>"

+#~ msgstr ""

+#~ "пёя│я┌п╟п╫п╬п╡п╦я┌я▄ п╦п╪я▐, п╦я│п©п╬п╩я▄п╥я┐п╣п╪п╬п╣ п╢п╩я▐ п╟я┐я┌п╣п╫я┌п╦я└п╦п╨п╟я├п╦п╦ п╩п╬п╨п╟п╩я▄п╫п╬п╧ я│п╦я│я┌п╣п╪я▀ п╨ я┐п╥п╩я┐ "

+#~ "<name>.\n"

+#~ "config: п╦п╪я▐ п©п╬п╩я▄п╥п╬п╡п╟я┌п╣п╩я▐ <name>"

-#: ../properties/nm-pptp-dialog.ui.h:46

-msgid "User name:"

-msgstr "п≤п╪я▐ п©п╬п╩я▄п╥п╬п╡п╟я┌п╣п╩я▐:"

+#~ msgid "User name:"

+#~ msgstr "п≤п╪я▐ п©п╬п╩я▄п╥п╬п╡п╟я┌п╣п╩я▐:"

-#: ../properties/nm-pptp-dialog.ui.h:47

-msgid "Ad_vancedБ─╕"

-msgstr "_п■п╬п©п╬п╩п╫п╦я┌п╣п╩я▄п╫п╬Б─╕"

+#~ msgid "Ad_vancedБ─╕"

+#~ msgstr "_п■п╬п©п╬п╩п╫п╦я┌п╣п╩я▄п╫п╬Б─╕"

 #~ msgid "no usable addresses returned for PPTP VPN gateway '%s' (%d)"

 #~ msgstr "п╫п╣ п©п╬п╩я┐я┤п╣п╫ п©я─п╦п╣п╪п╩п╣п╪я▀п╧ IP-п╟п╢я─п╣я│ я┬п╩я▌п╥п╟ PPTP VPN б╚%sб╩ (%d)"

diff --git a/properties/nm-pptp-editor.c b/properties/nm-pptp-editor.c

index da05368..609f75f 100644

--- a/properties/nm-pptp-editor.c

+++ b/properties/nm-pptp-editor.c

@@ -206,13 +206,13 @@ init_password_icon (PptpPluginUiWidget *self,

 	                                  TRUE, FALSE);

 	/* If there's no password and no flags in the setting,

-	 * initialize flags as "always-ask".

+	 * initialize flags as "secret agent storing".

 	 */

 	if (s_vpn)

 		nm_setting_get_secret_flags (NM_SETTING (s_vpn), secret_key, &pw_flags, NULL);

 	value = gtk_editable_get_text (GTK_EDITABLE (entry));

 	if ((!value || !*value) && (pw_flags == NM_SETTING_SECRET_FLAG_NONE))

-		nma_utils_update_password_storage (entry, NM_SETTING_SECRET_FLAG_NOT_SAVED,

+		nma_utils_update_password_storage (entry, NM_SETTING_SECRET_FLAG_AGENT_OWNED,

 		                                   (NMSetting *) s_vpn, secret_key);

 	g_signal_connect (entry, "notify::secondary-icon-name",

@@ -379,6 +379,12 @@ update_connection (NMVpnEditor *iface,

 	if (str && strlen (str))

 		nm_setting_vpn_add_data_item (s_vpn, NM_PPTP_KEY_DOMAIN, str);

+	/* User password */

+	widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "user_password_entry"));

+	str = gtk_editable_get_text (GTK_EDITABLE (widget));

+	if (str && strlen (str))

+		nm_setting_vpn_add_secret (s_vpn, NM_PPTP_KEY_PASSWORD, str);

+

 	if (priv->advanced)

 		g_hash_table_foreach (priv->advanced, hash_copy_advanced, s_vpn);