[NetworkManager-openvpn/lr/gtk-4.0: 18/19] editor: modernize the GtkBuilder file

From: Lubomir Rintel <lkundrak src gnome org>
To: commits-list gnome org
Cc:
Subject: [NetworkManager-openvpn/lr/gtk-4.0: 18/19] editor: modernize the GtkBuilder file
Date: Wed, 26 Jan 2022 13:26:34 +0000 (UTC)
commit 4819feacaaefd15ccff5454ea220249933a74dbf
Author: Lubomir Rintel <lkundrak v3 sk>
Date:   Thu Nov 11 09:56:17 2021 +0100

    editor: modernize the GtkBuilder file
    
    This notably removes GtkAlignments and a handful of deprecated
    properties. This is done to make it easier to carry it over to Gtk4.
    
    translations

 po/ar.po                        |  102 +-
 po/as.po                        |  108 +-
 po/be.po                        |  118 +-
 po/bg.po                        |  120 +-
 po/bs.po                        |  130 +-
 po/ca.po                        |  142 ++-
 po/ca valencia po               |  110 +-
 po/cs.po                        |  132 +--
 po/da.po                        |  144 ++-
 po/de.po                        |  138 +--
 po/dz.po                        |   92 +-
 po/el.po                        |  134 +--
 po/en_GB.po                     |  122 +-
 po/eo.po                        |   84 +-
 po/es.po                        |  142 ++-
 po/et.po                        |  118 +-
 po/eu.po                        |  130 +-
 po/fa.po                        |  122 +-
 po/fi.po                        |  130 +-
 po/fr.po                        |  128 +-
 po/fur.po                       |  136 +--
 po/gl.po                        |  138 +--
 po/gu.po                        |   90 +-
 po/he.po                        |  132 +--
 po/hr.po                        |  144 ++-
 po/hu.po                        |  138 +--
 po/id.po                        |  144 ++-
 po/it.po                        |  140 ++-
 po/ja.po                        |  120 +-
 po/ka.po                        |  102 +-
 po/kn.po                        |  112 +-
 po/ko.po                        |  102 +-
 po/lt.po                        |  144 ++-
 po/lv.po                        |  138 +--
 po/mk.po                        |   99 +-
 po/mr.po                        |  108 +-
 po/nb.po                        |  114 +-
 po/nl.po                        |  142 ++-
 po/pa.po                        |  116 +-
 po/pl.po                        |  144 ++-
 po/ps.po                        |   79 +-
 po/pt.po                        |  134 +--
 po/pt_BR.po                     |  144 ++-
 po/ro.po                        |  114 +-
 po/ru.po                        |  142 ++-
 po/sk.po                        |  110 +-
 po/sl.po                        |  130 +-
 po/sr.po                        |  144 ++-
 po/sr latin po                  |  136 +--
 po/sv.po                        |  144 ++-
 po/ta.po                        |  112 +-
 po/te.po                        |  112 +-
 po/th.po                        |  100 +-
 po/tr.po                        |  144 ++-
 po/ug.po                        |   90 +-
 po/uk.po                        |  142 ++-
 po/vi.po                        |   99 +-
 po/zh_CN.po                     |   76 +-
 po/zh_HK.po                     |  107 +-
 po/zh_TW.po                     |  107 +-
 properties/nm-openvpn-dialog.ui | 2492 +++++++++++++++++++--------------------
 61 files changed, 4596 insertions(+), 5211 deletions(-)
---
diff --git a/po/ar.po b/po/ar.po
index ce97606..659b19d 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -754,8 +754,8 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:13
 #, fuzzy
-msgid "_Gateway:"
-msgstr "Ù…Ù†ÙØ° Ø§Ù„_Ø¨ÙˆÙ‘Ø§Ø¨Ø©:"
+msgid "_Gateway"
+msgstr "Ù…Ù†ÙØ° Ø§Ù„_Ø¨ÙˆÙ‘Ø§Ø¨Ø©"
 
 #: ../properties/nm-openvpn-dialog.ui.h:14
 msgid ""
@@ -777,17 +777,12 @@ msgstr ""
 #: ../properties/nm-openvpn-dialog.ui.h:18
 #, fuzzy
 msgid "User"
-msgstr "Ø§Ø³Ù… Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù…:"
-
-#: ../properties/nm-openvpn-dialog.ui.h:19
-#, fuzzy
-msgid "Password:"
-msgstr "_ÙƒÙ„Ù…Ø© Ø§Ù„Ø³Ø±:"
+msgstr "Ø§Ø³Ù… Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù…"
 
 #: ../properties/nm-openvpn-dialog.ui.h:20
 #, fuzzy
-msgid "User name:"
-msgstr "Ø§_Ø³Ù… Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù…:"
+msgid "User name"
+msgstr "Ø§_Ø³Ù… Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù…"
 
 #: ../properties/nm-openvpn-dialog.ui.h:21
 msgid ""
@@ -804,23 +799,18 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:25
 #, fuzzy
-msgid "Remote IP Address:"
-msgstr "IP Ø§Ù„Ø¢Ø®Ø±:"
+msgid "Remote IP Address"
+msgstr "IP Ø§Ù„Ø¢Ø®Ø±"
 
 #: ../properties/nm-openvpn-dialog.ui.h:26
 #, fuzzy
-msgid "Local IP Address:"
+msgid "Local IP Address"
 msgstr "IP Ù…_ØÙ„Ù‘ÙŠ:  %s"
 
 #: ../properties/nm-openvpn-dialog.ui.h:27
 #, fuzzy
-msgid "Key Direction:"
-msgstr "Ø§Ù„Ø¥ØªØ¬Ø§Ù‡:"
-
-#: ../properties/nm-openvpn-dialog.ui.h:28
-#, fuzzy
-msgid "Static Key:"
-msgstr "Ù…ÙØªØ§Ø Ù…Ø´ØªØ±ÙŽÙƒ:"
+msgid "Key Direction"
+msgstr "Ø§Ù„Ø¥ØªØ¬Ø§Ù‡"
 
 #: ../properties/nm-openvpn-dialog.ui.h:29
 msgid ""
@@ -850,7 +840,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:38
-msgid "Type:"
+msgid "Type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:39
@@ -868,8 +858,8 @@ msgstr "Ø®ÙŠØ§Ø±Ø§Øª OpenVPN Ù…ØªÙ‚Ø¯Ù…Ø©"
 
 #: ../properties/nm-openvpn-dialog.ui.h:43
 #, fuzzy
-msgid "Use custom gateway p_ort:"
-msgstr "Ù…Ù†ÙØ° Ø§Ù„_Ø¨ÙˆÙ‘Ø§Ø¨Ø©:"
+msgid "Use custom gateway p_ort"
+msgstr "Ù…Ù†ÙØ° Ø§Ù„_Ø¨ÙˆÙ‘Ø§Ø¨Ø©"
 
 #: ../properties/nm-openvpn-dialog.ui.h:44
 msgid ""
@@ -879,7 +869,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:46
-msgid "Use custom _renegotiation interval:"
+msgid "Use custom _renegotiation interval"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:47
@@ -890,7 +880,7 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:49
 #, fuzzy
-msgid "Data _compression:"
+msgid "Data _compression"
 msgstr "Ø§Ø³ØªØ¹Ù…Ù„ _Ø¶ØºØ· LZO"
 
 #: ../properties/nm-openvpn-dialog.ui.h:50
@@ -914,7 +904,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:56
-msgid "Set virtual _device type:"
+msgid "Set virtual _device type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:57
@@ -928,7 +918,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:60
-msgid " and _name:"
+msgid " and _name"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:61
@@ -939,7 +929,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:63
-msgid "Use custom tunnel Maximum Transmission _Unit (MTU):"
+msgid "Use custom tunnel Maximum Transmission _Unit (MTU)"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:64
@@ -950,7 +940,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:66
-msgid "Use custom UDP _fragment size:"
+msgid "Use custom UDP _fragment size"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:67
@@ -1001,7 +991,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:81
-msgid "Specify pin_g interval:"
+msgid "Specify pin_g interval"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:82
@@ -1012,7 +1002,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:84
-msgid "Specify _exit or restart ping:"
+msgid "Specify _exit or restart ping"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:85
@@ -1043,7 +1033,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:93
-msgid "Specify max routes:"
+msgid "Specify max routes"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:94
@@ -1060,7 +1050,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:98
-msgid "Use custom _size of cipher key:"
+msgid "Use custom _size of cipher key"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:99
@@ -1079,12 +1069,12 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:103
 #, fuzzy
-msgid "Ci_pher:"
+msgid "Ci_pher"
 msgstr "Ø´ÙŠÙØ±Ø©:  %s"
 
 #: ../properties/nm-openvpn-dialog.ui.h:104
 #, fuzzy
-msgid "_HMAC Authentication:"
+msgid "_HMAC Authentication"
 msgstr "<b>Ø§Ø³Ù… Ø§Ù„Ø¥ØªØµØ§Ù„</b>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:105
@@ -1132,7 +1122,7 @@ msgid "Security"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:115
-msgid "_Subject Match:"
+msgid "_Subject Match"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:116
@@ -1145,8 +1135,8 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:120
 #, fuzzy
-msgid "Server _Certificate Check:"
-msgstr "Ø´_Ù‡Ø§Ø¯Ø©:"
+msgid "Server _Certificate Check"
+msgstr "Ø´_Ù‡Ø§Ø¯Ø©"
 
 #: ../properties/nm-openvpn-dialog.ui.h:121
 msgid ""
@@ -1176,7 +1166,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:133
-msgid "_Remote peer certificate TLS type:"
+msgid "_Remote peer certificate TLS type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:134
@@ -1197,7 +1187,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:138
-msgid "_Remote peer certificate nsCert designation:"
+msgid "_Remote peer certificate nsCert designation"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:139
@@ -1209,8 +1199,8 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:141
 #, fuzzy
-msgid "Key _Direction:"
-msgstr "Ø§Ù„Ø¥ØªØ¬Ø§Ù‡:"
+msgid "Key _Direction"
+msgstr "Ø§Ù„Ø¥ØªØ¬Ø§Ù‡"
 
 #: ../properties/nm-openvpn-dialog.ui.h:142
 msgid ""
@@ -1230,11 +1220,11 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:147
-msgid "Key _File:"
+msgid "Key _File"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:148
-msgid "Mode:"
+msgid "Mode"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:149
@@ -1243,8 +1233,8 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:150
 #, fuzzy
-msgid "Extra Certificates:"
-msgstr "Ø´_Ù‡Ø§Ø¯Ø©:"
+msgid "Extra Certificates"
+msgstr "Ø´_Ù‡Ø§Ø¯Ø©"
 
 #: ../properties/nm-openvpn-dialog.ui.h:151
 msgid ""
@@ -1266,7 +1256,7 @@ msgid "TLS version control"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:156
-msgid "TLS _min version: "
+msgid "TLS _min version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:157
@@ -1278,7 +1268,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:158
-msgid "TLS ma_x version: "
+msgid "TLS ma_x version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:159
@@ -1299,7 +1289,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:163
-msgid "Proxy _Type:"
+msgid "Proxy _Type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:164
@@ -1309,7 +1299,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:165
-msgid "Server _Address:"
+msgid "Server _Address"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:166
@@ -1320,7 +1310,7 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:168
 #, fuzzy
-msgid "_Port:"
+msgid "_Port"
 msgstr "Ù…ÙŠÙ†Ø§Ø¡:  %s"
 
 #: ../properties/nm-openvpn-dialog.ui.h:169
@@ -1341,13 +1331,13 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:174
 #, fuzzy
-msgid "Proxy _Username:"
-msgstr "Ø§_Ø³Ù… Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù…:"
+msgid "Proxy _Username"
+msgstr "Ø§_Ø³Ù… Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù…"
 
 #: ../properties/nm-openvpn-dialog.ui.h:175
 #, fuzzy
-msgid "Proxy Passwor_d:"
-msgstr "_ÙƒÙ„Ù…Ø© Ø§Ù„Ø³Ø±:"
+msgid "Proxy Passwor_d"
+msgstr "_ÙƒÙ„Ù…Ø© Ø§Ù„Ø³Ø±"
 
 #: ../properties/nm-openvpn-dialog.ui.h:176
 msgid "HTTP/Socks proxy username passed to OpenVPN when prompted for it."
@@ -1360,7 +1350,7 @@ msgstr ""
 #: ../properties/nm-openvpn-dialog.ui.h:178
 #, fuzzy
 msgid "_Show password"
-msgstr "_ÙƒÙ„Ù…Ø© Ø§Ù„Ø³Ø±:"
+msgstr "_ÙƒÙ„Ù…Ø© Ø§Ù„Ø³Ø±"
 
 #: ../properties/nm-openvpn-dialog.ui.h:179
 msgid "Proxies"
diff --git a/po/as.po b/po/as.po
index 62e7033..9fbbc3f 100644
--- a/po/as.po
+++ b/po/as.po
@@ -744,8 +744,8 @@ msgid "General"
 msgstr "à¦¸à¦¾à¦§à¦¾à§°à¦£"
 
 #: ../properties/nm-openvpn-dialog.ui.h:13
-msgid "_Gateway:"
-msgstr "à¦—à§‡à¦Ÿà§±à§‡ (_G):"
+msgid "_Gateway"
+msgstr "à¦—à§‡à¦Ÿà§±à§‡ (_G)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:14
 msgid ""
@@ -768,13 +768,9 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#: ../properties/nm-openvpn-dialog.ui.h:19
-msgid "Password:"
-msgstr "à¦—à§à¦ªà§à¦¤à¦¶à¦¬à§à¦¦:"
-
 #: ../properties/nm-openvpn-dialog.ui.h:20
-msgid "User name:"
-msgstr "à¦¬à§à¦¯à§±à¦¹à¦¾à§°à¦•à§°à§à¦¤à¦¾à§° à¦¨à¦¾à¦®:"
+msgid "User name"
+msgstr "à¦¬à§à¦¯à§±à¦¹à¦¾à§°à¦•à§°à§à¦¤à¦¾à§° à¦¨à¦¾à¦®"
 
 #: ../properties/nm-openvpn-dialog.ui.h:21
 msgid ""
@@ -790,21 +786,17 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:25
-msgid "Remote IP Address:"
-msgstr "à¦¦à§‚à§°à§° IP à¦ à¦¿à¦•à¦¨à¦¾:"
+msgid "Remote IP Address"
+msgstr "à¦¦à§‚à§°à§° IP à¦ à¦¿à¦•à¦¨à¦¾"
 
 #: ../properties/nm-openvpn-dialog.ui.h:26
-msgid "Local IP Address:"
-msgstr "à¦¸à§à¦¥à¦¾à¦¨à§€à§Ÿ IP à¦ à¦¿à¦•à¦¨à¦¾:"
+msgid "Local IP Address"
+msgstr "à¦¸à§à¦¥à¦¾à¦¨à§€à§Ÿ IP à¦ à¦¿à¦•à¦¨à¦¾"
 
 #: ../properties/nm-openvpn-dialog.ui.h:27
 #, fuzzy
-msgid "Key Direction:"
-msgstr "à¦šà¦¾à¦¬à¦¿à§° à¦¦à¦¿à¦¶:"
-
-#: ../properties/nm-openvpn-dialog.ui.h:28
-msgid "Static Key:"
-msgstr "à¦¸à§à¦Ÿà§‡à¦Ÿà¦¿à¦• à¦šà¦¾à¦¬à¦¿:"
+msgid "Key Direction"
+msgstr "à¦šà¦¾à¦¬à¦¿à§° à¦¦à¦¿à¦¶"
 
 #: ../properties/nm-openvpn-dialog.ui.h:29
 msgid ""
@@ -838,8 +830,8 @@ msgstr ""
 "à¦•à§°à¦¿à¦¬ à¦²à¦—à¦¾ à¦®à¦¾à¦¨à§° à¦¬à¦¿à¦·à§Ÿà§‡ à¦¨à¦¿à¦¶à§à¦šà¦¿à¦¤ à¦¨'à¦¹'à¦²à§‡, à¦†à¦ªà§‹à¦¨à¦¾à§° à¦¬à§à¦¯à§±à¦¸à§à¦¥à¦¾à¦ªà§à§°à¦£à¦¾à¦²à§€à§° à¦ªà§à§°à¦¶à¦¾à¦¸à¦•à¦• à¦²à¦— à¦§à§°à¦• à¥¤</i>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:38
-msgid "Type:"
-msgstr "à¦§à§°à¦£:"
+msgid "Type"
+msgstr "à¦§à§°à¦£"
 
 #: ../properties/nm-openvpn-dialog.ui.h:39
 #, fuzzy
@@ -856,8 +848,8 @@ msgid "OpenVPN Advanced Options"
 msgstr "OpenVPN à¦‰à¦¨à§à¦¨à¦¤ à¦¬à¦¿à¦•à¦²à§à¦ª"
 
 #: ../properties/nm-openvpn-dialog.ui.h:43
-msgid "Use custom gateway p_ort:"
-msgstr "à¦¨à¦¿à¦œà§° à¦ªà¦›à¦¨à§à¦¦à§° à¦—à§‡à¦Ÿà§±à§‡ à¦ª'à§°à§à¦Ÿ à¦¬à§à¦¯à§±à¦¹à¦¾à§° à¦•à§°à¦• (_o):"
+msgid "Use custom gateway p_ort"
+msgstr "à¦¨à¦¿à¦œà§° à¦ªà¦›à¦¨à§à¦¦à§° à¦—à§‡à¦Ÿà§±à§‡ à¦ª'à§°à§à¦Ÿ à¦¬à§à¦¯à§±à¦¹à¦¾à§° à¦•à§°à¦• (_o)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:44
 msgid ""
@@ -867,7 +859,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:46
-msgid "Use custom _renegotiation interval:"
+msgid "Use custom _renegotiation interval"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:47
@@ -878,7 +870,7 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:49
 #, fuzzy
-msgid "Data _compression:"
+msgid "Data _compression"
 msgstr "LZO à¦¤à¦¥à§à¦¯ à¦¸à¦™à§à¦•à§‹à¦šà¦¨ à¦¬à§à¦¯à§±à¦¹à¦¾à§° à¦•à§°à¦• (_Z)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:50
@@ -900,7 +892,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:56
-msgid "Set virtual _device type:"
+msgid "Set virtual _device type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:57
@@ -914,7 +906,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:60
-msgid " and _name:"
+msgid " and _name"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:61
@@ -925,7 +917,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:63
-msgid "Use custom tunnel Maximum Transmission _Unit (MTU):"
+msgid "Use custom tunnel Maximum Transmission _Unit (MTU)"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:64
@@ -936,7 +928,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:66
-msgid "Use custom UDP _fragment size:"
+msgid "Use custom UDP _fragment size"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:67
@@ -987,7 +979,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:81
-msgid "Specify pin_g interval:"
+msgid "Specify pin_g interval"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:82
@@ -998,7 +990,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:84
-msgid "Specify _exit or restart ping:"
+msgid "Specify _exit or restart ping"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:85
@@ -1029,7 +1021,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:93
-msgid "Specify max routes:"
+msgid "Specify max routes"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:94
@@ -1046,7 +1038,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:98
-msgid "Use custom _size of cipher key:"
+msgid "Use custom _size of cipher key"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:99
@@ -1064,12 +1056,12 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:103
-msgid "Ci_pher:"
-msgstr "Cipher:"
+msgid "Ci_pher"
+msgstr "Cipher"
 
 #: ../properties/nm-openvpn-dialog.ui.h:104
-msgid "_HMAC Authentication:"
-msgstr "HMAC à¦ªà§à§°à¦®à¦¾à¦£à§€à¦•à§°à¦£:"
+msgid "_HMAC Authentication"
+msgstr "HMAC à¦ªà§à§°à¦®à¦¾à¦£à§€à¦•à§°à¦£"
 
 #: ../properties/nm-openvpn-dialog.ui.h:105
 msgid "Disable cipher _negotiation"
@@ -1116,7 +1108,7 @@ msgid "Security"
 msgstr "à¦¸à§à§°à¦•à§à¦·à¦¾"
 
 #: ../properties/nm-openvpn-dialog.ui.h:115
-msgid "_Subject Match:"
+msgid "_Subject Match"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:116
@@ -1129,8 +1121,8 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:120
 #, fuzzy
-msgid "Server _Certificate Check:"
-msgstr "à¦¬à§à¦¯à§±à¦¹à¦¾à§°à¦•à§°à§à¦¤à¦¾à§° à¦ªà§à§°à¦®à¦¾à¦£à¦ªà¦¤à§à§°:"
+msgid "Server _Certificate Check"
+msgstr "à¦¬à§à¦¯à§±à¦¹à¦¾à§°à¦•à§°à§à¦¤à¦¾à§° à¦ªà§à§°à¦®à¦¾à¦£à¦ªà¦¤à§à§°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:121
 msgid ""
@@ -1160,7 +1152,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:133
-msgid "_Remote peer certificate TLS type:"
+msgid "_Remote peer certificate TLS type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:134
@@ -1181,7 +1173,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:138
-msgid "_Remote peer certificate nsCert designation:"
+msgid "_Remote peer certificate nsCert designation"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:139
@@ -1192,8 +1184,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:141
-msgid "Key _Direction:"
-msgstr "à¦šà¦¾à¦¬à¦¿à§° à¦¦à¦¿à¦¶:"
+msgid "Key _Direction"
+msgstr "à¦šà¦¾à¦¬à¦¿à§° à¦¦à¦¿à¦¶"
 
 #: ../properties/nm-openvpn-dialog.ui.h:142
 msgid ""
@@ -1217,11 +1209,11 @@ msgstr ""
 "à¦•à§°à¦¿à¦¬ à¦²à¦—à¦¾ à¦®à¦¾à¦¨à§° à¦¬à¦¿à¦·à§Ÿà§‡ à¦¨à¦¿à¦¶à§à¦šà¦¿à¦¤ à¦¨'à¦¹'à¦²à§‡, à¦†à¦ªà§‹à¦¨à¦¾à§° à¦¬à§à¦¯à§±à¦¸à§à¦¥à¦¾à¦ªà§à§°à¦£à¦¾à¦²à§€à§° à¦ªà§à§°à¦¶à¦¾à¦¸à¦•à¦• à¦²à¦— à¦§à§°à¦• à¥¤</i>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:147
-msgid "Key _File:"
-msgstr "à¦šà¦¾à¦¬à¦¿à§° à¦¨à¦¥à¦¿à¦ªà¦¤à§à§°:"
+msgid "Key _File"
+msgstr "à¦šà¦¾à¦¬à¦¿à§° à¦¨à¦¥à¦¿à¦ªà¦¤à§à§°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:148
-msgid "Mode:"
+msgid "Mode"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:149
@@ -1231,8 +1223,8 @@ msgstr "à¦…à¦¤à¦¿à§°à¦¿à¦•à§à¦¤ TLS à¦ªà§à§°à¦®à¦¾à¦£à§€à¦•à§°à¦£ à¦¬à§à¦¯à§±
 
 #: ../properties/nm-openvpn-dialog.ui.h:150
 #, fuzzy
-msgid "Extra Certificates:"
-msgstr "à¦¬à§à¦¯à§±à¦¹à¦¾à§°à¦•à§°à§à¦¤à¦¾à§° à¦ªà§à§°à¦®à¦¾à¦£à¦ªà¦¤à§à§°:"
+msgid "Extra Certificates"
+msgstr "à¦¬à§à¦¯à§±à¦¹à¦¾à§°à¦•à§°à§à¦¤à¦¾à§° à¦ªà§à§°à¦®à¦¾à¦£à¦ªà¦¤à§à§°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:151
 msgid ""
@@ -1255,7 +1247,7 @@ msgid "TLS version control"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:156
-msgid "TLS _min version: "
+msgid "TLS _min version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:157
@@ -1267,7 +1259,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:158
-msgid "TLS ma_x version: "
+msgid "TLS ma_x version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:159
@@ -1287,7 +1279,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:163
-msgid "Proxy _Type:"
+msgid "Proxy _Type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:164
@@ -1298,8 +1290,8 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:165
 #, fuzzy
-msgid "Server _Address:"
-msgstr "à¦¦à§‚à§°à§° IP à¦ à¦¿à¦•à¦¨à¦¾:"
+msgid "Server _Address"
+msgstr "à¦¦à§‚à§°à§° IP à¦ à¦¿à¦•à¦¨à¦¾"
 
 #: ../properties/nm-openvpn-dialog.ui.h:166
 msgid ""
@@ -1308,7 +1300,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:168
-msgid "_Port:"
+msgid "_Port"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:169
@@ -1329,13 +1321,13 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:174
 #, fuzzy
-msgid "Proxy _Username:"
-msgstr "à¦¬à§à¦¯à§±à¦¹à¦¾à§°à¦•à§°à§à¦¤à¦¾à§° à¦¨à¦¾à¦® (_U):"
+msgid "Proxy _Username"
+msgstr "à¦¬à§à¦¯à§±à¦¹à¦¾à§°à¦•à§°à§à¦¤à¦¾à§° à¦¨à¦¾à¦® (_U)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:175
 #, fuzzy
-msgid "Proxy Passwor_d:"
-msgstr "à¦—à§à¦ªà§à¦¤à¦¶à¦¬à§à¦¦:"
+msgid "Proxy Passwor_d"
+msgstr "à¦—à§à¦ªà§à¦¤à¦¶à¦¬à§à¦¦"
 
 #: ../properties/nm-openvpn-dialog.ui.h:176
 msgid "HTTP/Socks proxy username passed to OpenVPN when prompted for it."
diff --git a/po/be.po b/po/be.po
index e11256e..eabdeb6 100644
--- a/po/be.po
+++ b/po/be.po
@@ -746,8 +746,8 @@ msgid "General"
 msgstr "ÐÐ³ÑƒÐ»ÑŒÐ½Ð°Ðµ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:13
-msgid "_Gateway:"
-msgstr "Ð¡ÐµÑ‚ÐºÐ°Ð²Ð°Ñ _Ð±Ñ€Ð°Ð¼Ð°:"
+msgid "_Gateway"
+msgstr "Ð¡ÐµÑ‚ÐºÐ°Ð²Ð°Ñ _Ð±Ñ€Ð°Ð¼Ð°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:14
 msgid ""
@@ -770,13 +770,9 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#: ../properties/nm-openvpn-dialog.ui.h:19
-msgid "Password:"
-msgstr "ÐŸÐ°Ñ€Ð¾Ð»ÑŒ:"
-
 #: ../properties/nm-openvpn-dialog.ui.h:20
-msgid "User name:"
-msgstr "Ð†Ð¼Ñ ÐºÐ°Ñ€Ñ‹ÑÑ‚Ð°Ð»ÑŒÐ½Ñ–ÐºÐ°:"
+msgid "User name"
+msgstr "Ð†Ð¼Ñ ÐºÐ°Ñ€Ñ‹ÑÑ‚Ð°Ð»ÑŒÐ½Ñ–ÐºÐ°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:21
 msgid ""
@@ -792,21 +788,17 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:25
-msgid "Remote IP Address:"
-msgstr "ÐÐ´Ð´Ð°Ð»ÐµÐ½Ñ‹ IP-Ð°Ð´Ñ€Ð°Ñ:"
+msgid "Remote IP Address"
+msgstr "ÐÐ´Ð´Ð°Ð»ÐµÐ½Ñ‹ IP-Ð°Ð´Ñ€Ð°Ñ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:26
-msgid "Local IP Address:"
-msgstr "ÐœÑÑÑ†Ð¾Ð²Ñ‹ IP-Ð°Ð´Ñ€Ð°Ñ:"
+msgid "Local IP Address"
+msgstr "ÐœÑÑÑ†Ð¾Ð²Ñ‹ IP-Ð°Ð´Ñ€Ð°Ñ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:27
 #, fuzzy
-msgid "Key Direction:"
-msgstr "ÐšÑ–Ñ€ÑƒÐ½Ð°Ðº ÐºÐ»ÑŽÑ‡Ð°:"
-
-#: ../properties/nm-openvpn-dialog.ui.h:28
-msgid "Static Key:"
-msgstr "Ð¡Ñ‚Ð°Ñ‚Ñ‹Ñ‡Ð½Ñ‹ ÐºÐ»ÑŽÑ‡:"
+msgid "Key Direction"
+msgstr "ÐšÑ–Ñ€ÑƒÐ½Ð°Ðº ÐºÐ»ÑŽÑ‡Ð°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:29
 msgid ""
@@ -842,8 +834,8 @@ msgstr ""
 "ÑÑ–ÑÑ‚ÑÐ¼Ð½Ð°Ð³Ð° Ð°Ð´Ð¼Ñ–Ð½Ñ–ÑÑ‚Ñ€Ð°Ñ‚Ð°Ñ€Ð°.</i>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:38
-msgid "Type:"
-msgstr "Ð¢Ñ‹Ð¿:"
+msgid "Type"
+msgstr "Ð¢Ñ‹Ð¿"
 
 #: ../properties/nm-openvpn-dialog.ui.h:39
 #, fuzzy
@@ -860,8 +852,8 @@ msgid "OpenVPN Advanced Options"
 msgstr "ÐÐ´Ð¼Ñ‹ÑÐ»Ð¾Ð²Ñ‹Ñ Ð¾Ð¿Ñ†Ñ‹Ñ– OpenVPN"
 
 #: ../properties/nm-openvpn-dialog.ui.h:43
-msgid "Use custom gateway p_ort:"
-msgstr "Ð’Ñ‹ÐºÐ°Ñ€Ñ‹ÑÑ‚Ð¾ÑžÐ²Ð°Ñ†ÑŒ ÑƒÐ»Ð°ÑÐ½Ñ‹ Ð¿Ð¾Ñ€Ñ‚ ÑÐµÑ‚ÐºÐ°Ð²Ð°Ð¹ _Ð±Ñ€Ð°Ð¼Ñ‹:"
+msgid "Use custom gateway p_ort"
+msgstr "Ð’Ñ‹ÐºÐ°Ñ€Ñ‹ÑÑ‚Ð¾ÑžÐ²Ð°Ñ†ÑŒ ÑƒÐ»Ð°ÑÐ½Ñ‹ Ð¿Ð¾Ñ€Ñ‚ ÑÐµÑ‚ÐºÐ°Ð²Ð°Ð¹ _Ð±Ñ€Ð°Ð¼Ñ‹"
 
 #: ../properties/nm-openvpn-dialog.ui.h:44
 msgid ""
@@ -871,8 +863,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:46
-msgid "Use custom _renegotiation interval:"
-msgstr "_Ð’Ñ‹ÐºÐ°Ñ€Ñ‹ÑÑ‚Ð¾ÑžÐ²Ð°Ñ†ÑŒ ÑƒÐ»Ð°ÑÐ½Ñ‹ Ñ–Ð½Ñ‚ÑÑ€Ð²Ð°Ð» Ð¿ÐµÑ€Ð°Ð³Ð»ÑÐ´Ñƒ ÑžÐ¼Ð¾Ñž ÑÐµÐ°Ð½ÑÐ°:"
+msgid "Use custom _renegotiation interval"
+msgstr "_Ð’Ñ‹ÐºÐ°Ñ€Ñ‹ÑÑ‚Ð¾ÑžÐ²Ð°Ñ†ÑŒ ÑƒÐ»Ð°ÑÐ½Ñ‹ Ñ–Ð½Ñ‚ÑÑ€Ð²Ð°Ð» Ð¿ÐµÑ€Ð°Ð³Ð»ÑÐ´Ñƒ ÑžÐ¼Ð¾Ñž ÑÐµÐ°Ð½ÑÐ°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:47
 msgid ""
@@ -882,7 +874,7 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:49
 #, fuzzy
-msgid "Data _compression:"
+msgid "Data _compression"
 msgstr "Ð’Ñ‹ÐºÐ°Ñ€Ñ‹ÑÑ‚Ð¾ÑžÐ²Ð°Ñ†ÑŒ LZO-_ÑÑ†Ñ–ÑÐºÐ°Ð½Ð½Ðµ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:50
@@ -904,7 +896,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:56
-msgid "Set virtual _device type:"
+msgid "Set virtual _device type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:57
@@ -918,7 +910,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:60
-msgid " and _name:"
+msgid " and _name"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:61
@@ -929,7 +921,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:63
-msgid "Use custom tunnel Maximum Transmission _Unit (MTU):"
+msgid "Use custom tunnel Maximum Transmission _Unit (MTU)"
 msgstr ""
 "Ð’Ñ‹ÐºÐ°Ñ€Ñ‹ÑÑ‚Ð¾ÑžÐ²Ð°Ñ†ÑŒ ÑƒÐ»Ð°ÑÐ½Ñ‹ _Ð¼Ð°ÐºÑÑ–Ð¼Ð°Ð»ÑŒÐ½Ñ‹ Ð¿Ð°Ð¼ÐµÑ€ ÑÐ»ÐµÐ¼ÐµÐ½Ñ‚Ð° Ð¿ÐµÑ€Ð°Ð´Ð°Ñ‡Ñ‹ Ñ‚ÑƒÐ½ÑÐ»ÐµÐ¼ (MTU):"
 
@@ -941,8 +933,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:66
-msgid "Use custom UDP _fragment size:"
-msgstr "Ð’Ñ‹ÐºÐ°Ñ€Ñ‹ÑÑ‚Ð¾ÑžÐ²Ð°Ñ†ÑŒ Ñƒ_Ð»Ð°ÑÐ½Ñ‹ Ð¿Ð°Ð¼ÐµÑ€ UDP-Ñ„Ñ€Ð°Ð³Ð¼ÐµÐ½Ñ‚Ð°:"
+msgid "Use custom UDP _fragment size"
+msgstr "Ð’Ñ‹ÐºÐ°Ñ€Ñ‹ÑÑ‚Ð¾ÑžÐ²Ð°Ñ†ÑŒ Ñƒ_Ð»Ð°ÑÐ½Ñ‹ Ð¿Ð°Ð¼ÐµÑ€ UDP-Ñ„Ñ€Ð°Ð³Ð¼ÐµÐ½Ñ‚Ð°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:67
 msgid ""
@@ -992,7 +984,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:81
-msgid "Specify pin_g interval:"
+msgid "Specify pin_g interval"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:82
@@ -1003,7 +995,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:84
-msgid "Specify _exit or restart ping:"
+msgid "Specify _exit or restart ping"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:85
@@ -1034,7 +1026,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:93
-msgid "Specify max routes:"
+msgid "Specify max routes"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:94
@@ -1051,7 +1043,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:98
-msgid "Use custom _size of cipher key:"
+msgid "Use custom _size of cipher key"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:99
@@ -1069,12 +1061,12 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:103
-msgid "Ci_pher:"
-msgstr "Ð¨Ñ‹Ñ„Ñ€:"
+msgid "Ci_pher"
+msgstr "Ð¨Ñ‹Ñ„Ñ€"
 
 #: ../properties/nm-openvpn-dialog.ui.h:104
-msgid "_HMAC Authentication:"
-msgstr "HMAC-Ñ–Ð´ÑÐ½Ñ‚Ñ‹Ñ„Ñ–ÐºÐ°Ñ†Ñ‹Ñ:"
+msgid "_HMAC Authentication"
+msgstr "HMAC-Ñ–Ð´ÑÐ½Ñ‚Ñ‹Ñ„Ñ–ÐºÐ°Ñ†Ñ‹Ñ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:105
 msgid "Disable cipher _negotiation"
@@ -1121,8 +1113,8 @@ msgid "Security"
 msgstr "Ð‘ÑÑÐ¿ÐµÐºÐ°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:115
-msgid "_Subject Match:"
-msgstr "ÐÐ´Ð¿Ð°Ð²ÐµÐ´Ð½Ð°ÑÑ†ÑŒ Ð°Ñ‚Ñ€Ñ‹Ð¼Ð°Ð»ÑŒÐ½Ñ–ÐºÐ°:"
+msgid "_Subject Match"
+msgstr "ÐÐ´Ð¿Ð°Ð²ÐµÐ´Ð½Ð°ÑÑ†ÑŒ Ð°Ñ‚Ñ€Ñ‹Ð¼Ð°Ð»ÑŒÐ½Ñ–ÐºÐ°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:116
 msgid ""
@@ -1134,8 +1126,8 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:120
 #, fuzzy
-msgid "Server _Certificate Check:"
-msgstr "Ð¡ÐµÑ€Ñ‚Ñ‹Ñ„Ñ–ÐºÐ°Ñ‚ ÐºÐ°Ñ€Ñ‹ÑÑ‚Ð°Ð»ÑŒÐ½Ñ–ÐºÐ°:"
+msgid "Server _Certificate Check"
+msgstr "Ð¡ÐµÑ€Ñ‚Ñ‹Ñ„Ñ–ÐºÐ°Ñ‚ ÐºÐ°Ñ€Ñ‹ÑÑ‚Ð°Ð»ÑŒÐ½Ñ–ÐºÐ°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:121
 msgid ""
@@ -1165,7 +1157,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:133
-msgid "_Remote peer certificate TLS type:"
+msgid "_Remote peer certificate TLS type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:134
@@ -1186,7 +1178,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:138
-msgid "_Remote peer certificate nsCert designation:"
+msgid "_Remote peer certificate nsCert designation"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:139
@@ -1197,8 +1189,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:141
-msgid "Key _Direction:"
-msgstr "ÐšÑ–Ñ€ÑƒÐ½Ð°Ðº ÐºÐ»ÑŽÑ‡Ð°:"
+msgid "Key _Direction"
+msgstr "ÐšÑ–Ñ€ÑƒÐ½Ð°Ðº ÐºÐ»ÑŽÑ‡Ð°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:142
 msgid ""
@@ -1224,11 +1216,11 @@ msgstr ""
 "ÑÑ–ÑÑ‚ÑÐ¼Ð½Ð°Ð³Ð° Ð°Ð´Ð¼Ñ–Ð½Ñ–ÑÑ‚Ñ€Ð°Ñ‚Ð°Ñ€Ð°.</i>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:147
-msgid "Key _File:"
-msgstr "Ð¤Ð°Ð¹Ð» ÐºÐ»ÑŽÑ‡Ð°:"
+msgid "Key _File"
+msgstr "Ð¤Ð°Ð¹Ð» ÐºÐ»ÑŽÑ‡Ð°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:148
-msgid "Mode:"
+msgid "Mode"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:149
@@ -1238,8 +1230,8 @@ msgstr "Ð’Ñ‹ÐºÐ°Ñ€Ñ‹ÑÑ‚Ð¾ÑžÐ²Ð°Ñ†ÑŒ Ð´Ð°Ð´Ð°Ñ‚ÐºÐ¾Ð²ÑƒÑŽ TLS-Ñ–Ð´ÑÐ½Ñ‚Ñ‹Ñ„Ñ–Ðº
 
 #: ../properties/nm-openvpn-dialog.ui.h:150
 #, fuzzy
-msgid "Extra Certificates:"
-msgstr "Ð¡ÐµÑ€Ñ‚Ñ‹Ñ„Ñ–ÐºÐ°Ñ‚ ÐºÐ°Ñ€Ñ‹ÑÑ‚Ð°Ð»ÑŒÐ½Ñ–ÐºÐ°:"
+msgid "Extra Certificates"
+msgstr "Ð¡ÐµÑ€Ñ‚Ñ‹Ñ„Ñ–ÐºÐ°Ñ‚ ÐºÐ°Ñ€Ñ‹ÑÑ‚Ð°Ð»ÑŒÐ½Ñ–ÐºÐ°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:151
 msgid ""
@@ -1262,7 +1254,7 @@ msgid "TLS version control"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:156
-msgid "TLS _min version: "
+msgid "TLS _min version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:157
@@ -1274,7 +1266,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:158
-msgid "TLS ma_x version: "
+msgid "TLS ma_x version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:159
@@ -1294,8 +1286,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:163
-msgid "Proxy _Type:"
-msgstr "Ð¢Ñ‹Ð¿ Ð¿Ñ€Ð¾ÐºÑÑ–-ÑÐµÑ€Ð²ÐµÑ€Ð°:"
+msgid "Proxy _Type"
+msgstr "Ð¢Ñ‹Ð¿ Ð¿Ñ€Ð¾ÐºÑÑ–-ÑÐµÑ€Ð²ÐµÑ€Ð°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:164
 msgid ""
@@ -1306,8 +1298,8 @@ msgstr ""
 "ÑÐµÑ€Ð²ÐµÑ€ Ð´Ð»Ñ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ñƒ Ð´Ð° Ð†Ð½Ñ‚ÑÑ€Ð½ÑÑ‚Ñƒ.</i>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:165
-msgid "Server _Address:"
-msgstr "ÐÐ´Ñ€Ð°Ñ ÑÐµÑ€Ð²ÐµÑ€Ð°:"
+msgid "Server _Address"
+msgstr "ÐÐ´Ñ€Ð°Ñ ÑÐµÑ€Ð²ÐµÑ€Ð°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:166
 msgid ""
@@ -1316,8 +1308,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:168
-msgid "_Port:"
-msgstr "ÐŸÐ¾Ñ€Ñ‚:"
+msgid "_Port"
+msgstr "ÐŸÐ¾Ñ€Ñ‚"
 
 #: ../properties/nm-openvpn-dialog.ui.h:169
 msgid ""
@@ -1337,12 +1329,12 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:174
-msgid "Proxy _Username:"
-msgstr "Ð†Ð¼Ñ ÐºÐ°Ñ€Ñ‹ÑÑ‚Ð°Ð»ÑŒÐ½Ñ–ÐºÐ° Ð½Ð° Ð¿Ñ€Ð¾ÐºÑÑ–-ÑÐµÑ€Ð²ÐµÑ€Ñ‹:"
+msgid "Proxy _Username"
+msgstr "Ð†Ð¼Ñ ÐºÐ°Ñ€Ñ‹ÑÑ‚Ð°Ð»ÑŒÐ½Ñ–ÐºÐ° Ð½Ð° Ð¿Ñ€Ð¾ÐºÑÑ–-ÑÐµÑ€Ð²ÐµÑ€Ñ‹"
 
 #: ../properties/nm-openvpn-dialog.ui.h:175
-msgid "Proxy Passwor_d:"
-msgstr "ÐŸÐ°Ñ€Ð¾Ð»ÑŒ Ð´Ð° Ð¿Ñ€Ð¾ÐºÑÑ–-ÑÐµÑ€Ð²ÐµÑ€Ð°:"
+msgid "Proxy Passwor_d"
+msgstr "ÐŸÐ°Ñ€Ð¾Ð»ÑŒ Ð´Ð° Ð¿Ñ€Ð¾ÐºÑÑ–-ÑÐµÑ€Ð²ÐµÑ€Ð°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:176
 msgid "HTTP/Socks proxy username passed to OpenVPN when prompted for it."
diff --git a/po/bg.po b/po/bg.po
index 154e553..139de0f 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -739,8 +739,8 @@ msgid "General"
 msgstr "ÐžÐ±Ñ‰Ð¸"
 
 #: ../properties/nm-openvpn-dialog.ui.h:13
-msgid "_Gateway:"
-msgstr "_Ð¨Ð»ÑŽÐ·:"
+msgid "_Gateway"
+msgstr "_Ð¨Ð»ÑŽÐ·"
 
 #: ../properties/nm-openvpn-dialog.ui.h:14
 msgid ""
@@ -763,13 +763,9 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#: ../properties/nm-openvpn-dialog.ui.h:19
-msgid "Password:"
-msgstr "ÐŸÐ°Ñ€Ð¾Ð»Ð°:"
-
 #: ../properties/nm-openvpn-dialog.ui.h:20
-msgid "User name:"
-msgstr "ÐŸÐ¾Ñ‚Ñ€ÐµÐ±Ð¸Ñ‚ÐµÐ»ÑÐºÐ¾ Ð¸Ð¼Ðµ:"
+msgid "User name"
+msgstr "ÐŸÐ¾Ñ‚Ñ€ÐµÐ±Ð¸Ñ‚ÐµÐ»ÑÐºÐ¾ Ð¸Ð¼Ðµ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:21
 msgid ""
@@ -785,21 +781,17 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:25
-msgid "Remote IP Address:"
-msgstr "ÐžÑ‚Ð´Ð°Ð»ÐµÑ‡ÐµÐ½ Ð°Ð´Ñ€ÐµÑ:"
+msgid "Remote IP Address"
+msgstr "ÐžÑ‚Ð´Ð°Ð»ÐµÑ‡ÐµÐ½ Ð°Ð´Ñ€ÐµÑ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:26
-msgid "Local IP Address:"
-msgstr "Ð›Ð¾ÐºÐ°Ð»ÐµÐ½ Ð°Ð´Ñ€ÐµÑ:"
+msgid "Local IP Address"
+msgstr "Ð›Ð¾ÐºÐ°Ð»ÐµÐ½ Ð°Ð´Ñ€ÐµÑ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:27
 #, fuzzy
-msgid "Key Direction:"
-msgstr "ÐŸÐ¾ÑÐ¾ÐºÐ° Ð½Ð° ÐºÐ»ÑŽÑ‡Ð°:"
-
-#: ../properties/nm-openvpn-dialog.ui.h:28
-msgid "Static Key:"
-msgstr "Ð¡Ñ‚Ð°Ñ‚Ð¸Ñ‡ÐµÐ½ ÐºÐ»ÑŽÑ‡:"
+msgid "Key Direction"
+msgstr "ÐŸÐ¾ÑÐ¾ÐºÐ° Ð½Ð° ÐºÐ»ÑŽÑ‡Ð°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:29
 msgid ""
@@ -834,8 +826,8 @@ msgstr ""
 "Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€.</i>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:38
-msgid "Type:"
-msgstr "Ð’Ð¸Ð´:"
+msgid "Type"
+msgstr "Ð’Ð¸Ð´"
 
 #: ../properties/nm-openvpn-dialog.ui.h:39
 #, fuzzy
@@ -852,8 +844,8 @@ msgid "OpenVPN Advanced Options"
 msgstr "Ð”Ð¾Ð¿ÑŠÐ»Ð½Ð¸Ñ‚ÐµÐ»Ð½Ð¸ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ Ð½Ð° OpenVPN"
 
 #: ../properties/nm-openvpn-dialog.ui.h:43
-msgid "Use custom gateway p_ort:"
-msgstr "_ÐŸÐ¾Ñ‚Ñ€ÐµÐ±Ð¸Ñ‚ÐµÐ»ÑÐºÐ¸ Ð¿Ð¾Ñ€Ñ‚ Ð½Ð° ÑˆÐ»ÑŽÐ·Ð°:"
+msgid "Use custom gateway p_ort"
+msgstr "_ÐŸÐ¾Ñ‚Ñ€ÐµÐ±Ð¸Ñ‚ÐµÐ»ÑÐºÐ¸ Ð¿Ð¾Ñ€Ñ‚ Ð½Ð° ÑˆÐ»ÑŽÐ·Ð°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:44
 msgid ""
@@ -863,8 +855,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:46
-msgid "Use custom _renegotiation interval:"
-msgstr "_Ð Ð°Ð·Ð»Ð¸Ñ‡ÐµÐ½ Ð¸Ð½Ñ‚ÐµÑ€Ð²Ð°Ð» Ð½Ð° Ð¿Ñ€ÐµÐ´Ð¾Ð³Ð¾Ð²Ð°Ñ€ÑÐ½Ðµ:"
+msgid "Use custom _renegotiation interval"
+msgstr "_Ð Ð°Ð·Ð»Ð¸Ñ‡ÐµÐ½ Ð¸Ð½Ñ‚ÐµÑ€Ð²Ð°Ð» Ð½Ð° Ð¿Ñ€ÐµÐ´Ð¾Ð³Ð¾Ð²Ð°Ñ€ÑÐ½Ðµ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:47
 msgid ""
@@ -874,7 +866,7 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:49
 #, fuzzy
-msgid "Data _compression:"
+msgid "Data _compression"
 msgstr "Ð˜Ð·Ð¿Ð¾Ð»Ð·Ð²Ð°Ð½Ðµ Ð½Ð° _ÐºÐ¾Ð¼Ð¿Ñ€ÐµÑÐ¸Ñ LZO"
 
 #: ../properties/nm-openvpn-dialog.ui.h:50
@@ -896,7 +888,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:56
-msgid "Set virtual _device type:"
+msgid "Set virtual _device type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:57
@@ -910,7 +902,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:60
-msgid " and _name:"
+msgid " and _name"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:61
@@ -921,8 +913,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:63
-msgid "Use custom tunnel Maximum Transmission _Unit (MTU):"
-msgstr "Ð Ð°Ð·Ð»Ð¸Ñ‡ÐµÐ½ _Ð¼Ð°ÐºÑÐ¸Ð¼Ð°Ð»ÐµÐ½ Ñ€Ð°Ð·Ð¼ÐµÑ€ Ð½Ð° Ð¿Ð°ÐºÐµÑ‚Ð° (MTU) Ð·Ð° Ñ‚ÑƒÐ½ÐµÐ»Ð°:"
+msgid "Use custom tunnel Maximum Transmission _Unit (MTU)"
+msgstr "Ð Ð°Ð·Ð»Ð¸Ñ‡ÐµÐ½ _Ð¼Ð°ÐºÑÐ¸Ð¼Ð°Ð»ÐµÐ½ Ñ€Ð°Ð·Ð¼ÐµÑ€ Ð½Ð° Ð¿Ð°ÐºÐµÑ‚Ð° (MTU) Ð·Ð° Ñ‚ÑƒÐ½ÐµÐ»Ð°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:64
 msgid ""
@@ -932,8 +924,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:66
-msgid "Use custom UDP _fragment size:"
-msgstr "Ð Ð°Ð·Ð»Ð¸Ñ‡ÐµÐ½ Ñ€Ð°Ð·Ð¼ÐµÑ€ Ð½Ð° _Ñ„Ñ€Ð°Ð³Ð¼ÐµÐ½Ñ‚Ð¸Ñ‚Ðµ Ð½Ð° UDP:"
+msgid "Use custom UDP _fragment size"
+msgstr "Ð Ð°Ð·Ð»Ð¸Ñ‡ÐµÐ½ Ñ€Ð°Ð·Ð¼ÐµÑ€ Ð½Ð° _Ñ„Ñ€Ð°Ð³Ð¼ÐµÐ½Ñ‚Ð¸Ñ‚Ðµ Ð½Ð° UDP"
 
 #: ../properties/nm-openvpn-dialog.ui.h:67
 msgid ""
@@ -983,7 +975,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:81
-msgid "Specify pin_g interval:"
+msgid "Specify pin_g interval"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:82
@@ -994,7 +986,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:84
-msgid "Specify _exit or restart ping:"
+msgid "Specify _exit or restart ping"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:85
@@ -1025,7 +1017,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:93
-msgid "Specify max routes:"
+msgid "Specify max routes"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:94
@@ -1042,7 +1034,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:98
-msgid "Use custom _size of cipher key:"
+msgid "Use custom _size of cipher key"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:99
@@ -1060,12 +1052,12 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:103
-msgid "Ci_pher:"
-msgstr "Ð¨Ð¸Ñ„ÑŠÑ€:"
+msgid "Ci_pher"
+msgstr "Ð¨Ð¸Ñ„ÑŠÑ€"
 
 #: ../properties/nm-openvpn-dialog.ui.h:104
-msgid "_HMAC Authentication:"
-msgstr "Ð˜Ð´ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñ Ñ HMAC:"
+msgid "_HMAC Authentication"
+msgstr "Ð˜Ð´ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñ Ñ HMAC"
 
 #: ../properties/nm-openvpn-dialog.ui.h:105
 msgid "Disable cipher _negotiation"
@@ -1112,8 +1104,8 @@ msgid "Security"
 msgstr "Ð¡Ð¸Ð³ÑƒÑ€Ð½Ð¾ÑÑ‚"
 
 #: ../properties/nm-openvpn-dialog.ui.h:115
-msgid "_Subject Match:"
-msgstr "Ð¡ÑŠÐ²Ð¿Ð°Ð´Ð°Ð½Ðµ Ð½Ð° Ñ‚ÐµÐ¼Ð°Ñ‚Ð°:"
+msgid "_Subject Match"
+msgstr "Ð¡ÑŠÐ²Ð¿Ð°Ð´Ð°Ð½Ðµ Ð½Ð° Ñ‚ÐµÐ¼Ð°Ñ‚Ð°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:116
 msgid ""
@@ -1125,8 +1117,8 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:120
 #, fuzzy
-msgid "Server _Certificate Check:"
-msgstr "ÐŸÐ¾Ñ‚Ñ€ÐµÐ±Ð¸Ñ‚ÐµÐ»ÑÐºÐ¸ ÑÐµÑ€Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚:"
+msgid "Server _Certificate Check"
+msgstr "ÐŸÐ¾Ñ‚Ñ€ÐµÐ±Ð¸Ñ‚ÐµÐ»ÑÐºÐ¸ ÑÐµÑ€Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚"
 
 #: ../properties/nm-openvpn-dialog.ui.h:121
 msgid ""
@@ -1156,7 +1148,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:133
-msgid "_Remote peer certificate TLS type:"
+msgid "_Remote peer certificate TLS type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:134
@@ -1177,7 +1169,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:138
-msgid "_Remote peer certificate nsCert designation:"
+msgid "_Remote peer certificate nsCert designation"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:139
@@ -1188,8 +1180,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:141
-msgid "Key _Direction:"
-msgstr "ÐŸÐ¾ÑÐ¾ÐºÐ° Ð½Ð° ÐºÐ»ÑŽÑ‡Ð°:"
+msgid "Key _Direction"
+msgstr "ÐŸÐ¾ÑÐ¾ÐºÐ° Ð½Ð° ÐºÐ»ÑŽÑ‡Ð°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:142
 msgid ""
@@ -1214,11 +1206,11 @@ msgstr ""
 "Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€.</i>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:147
-msgid "Key _File:"
-msgstr "Ð¤Ð°Ð¹Ð»-ÐºÐ»ÑŽÑ‡:"
+msgid "Key _File"
+msgstr "Ð¤Ð°Ð¹Ð»-ÐºÐ»ÑŽÑ‡"
 
 #: ../properties/nm-openvpn-dialog.ui.h:148
-msgid "Mode:"
+msgid "Mode"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:149
@@ -1228,8 +1220,8 @@ msgstr "Ð˜Ð·Ð¿Ð¾Ð»Ð·Ð²Ð°Ð½Ðµ Ð½Ð° Ð´Ð¾Ð¿ÑŠÐ»Ð½Ð¸Ñ‚ÐµÐ»Ð½Ð° Ð¸Ð´ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°
 
 #: ../properties/nm-openvpn-dialog.ui.h:150
 #, fuzzy
-msgid "Extra Certificates:"
-msgstr "ÐŸÐ¾Ñ‚Ñ€ÐµÐ±Ð¸Ñ‚ÐµÐ»ÑÐºÐ¸ ÑÐµÑ€Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚:"
+msgid "Extra Certificates"
+msgstr "ÐŸÐ¾Ñ‚Ñ€ÐµÐ±Ð¸Ñ‚ÐµÐ»ÑÐºÐ¸ ÑÐµÑ€Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚"
 
 #: ../properties/nm-openvpn-dialog.ui.h:151
 msgid ""
@@ -1252,7 +1244,7 @@ msgid "TLS version control"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:156
-msgid "TLS _min version: "
+msgid "TLS _min version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:157
@@ -1264,7 +1256,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:158
-msgid "TLS ma_x version: "
+msgid "TLS ma_x version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:159
@@ -1284,8 +1276,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:163
-msgid "Proxy _Type:"
-msgstr "Ð’Ð¸Ð´ Ð¿Ð¾ÑÑ€ÐµÐ´Ð½Ð¸Ðº:"
+msgid "Proxy _Type"
+msgstr "Ð’Ð¸Ð´ Ð¿Ð¾ÑÑ€ÐµÐ´Ð½Ð¸Ðº"
 
 #: ../properties/nm-openvpn-dialog.ui.h:164
 msgid ""
@@ -1296,8 +1288,8 @@ msgstr ""
 "Ð·Ð°Ð´ÑŠÐ»Ð¶Ð°Ð²Ð° Ð´Ð° Ð¸Ð·Ð¿Ð¾Ð»Ð·Ð²Ð°Ñ‚Ðµ ÑÑŠÑ€Ð²ÑŠÑ€-Ð¿Ð¾ÑÑ€ÐµÐ´Ð½Ð¸Ðº Ð·Ð° Ð²Ñ€ÑŠÐ·ÐºÐ°Ñ‚Ð° Ð²Ð¸ ÐºÑŠÐ¼ Internet.</i>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:165
-msgid "Server _Address:"
-msgstr "ÐÐ´Ñ€ÐµÑ Ð½Ð° ÑÑŠÑ€Ð²ÑŠÑ€Ð°:"
+msgid "Server _Address"
+msgstr "ÐÐ´Ñ€ÐµÑ Ð½Ð° ÑÑŠÑ€Ð²ÑŠÑ€Ð°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:166
 msgid ""
@@ -1306,8 +1298,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:168
-msgid "_Port:"
-msgstr "ÐŸÐ¾Ñ€Ñ‚:"
+msgid "_Port"
+msgstr "ÐŸÐ¾Ñ€Ñ‚"
 
 #: ../properties/nm-openvpn-dialog.ui.h:169
 msgid ""
@@ -1327,12 +1319,12 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:174
-msgid "Proxy _Username:"
-msgstr "ÐŸÐ¾Ñ‚Ñ€ÐµÐ±Ð¸Ñ‚ÐµÐ»ÑÐºÐ¾ _Ð¸Ð¼Ðµ Ð·Ð° Ð¿Ð¾ÑÑ€ÐµÐ´Ð½Ð¸ÐºÐ°:"
+msgid "Proxy _Username"
+msgstr "ÐŸÐ¾Ñ‚Ñ€ÐµÐ±Ð¸Ñ‚ÐµÐ»ÑÐºÐ¾ _Ð¸Ð¼Ðµ Ð·Ð° Ð¿Ð¾ÑÑ€ÐµÐ´Ð½Ð¸ÐºÐ°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:175
-msgid "Proxy Passwor_d:"
-msgstr "ÐŸÐ°Ñ€Ð¾Ð»Ð° Ð·Ð° Ð¿Ð¾ÑÑ€ÐµÐ´Ð½Ð¸ÐºÐ°:"
+msgid "Proxy Passwor_d"
+msgstr "ÐŸÐ°Ñ€Ð¾Ð»Ð° Ð·Ð° Ð¿Ð¾ÑÑ€ÐµÐ´Ð½Ð¸ÐºÐ°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:176
 msgid "HTTP/Socks proxy username passed to OpenVPN when prompted for it."
diff --git a/po/bs.po b/po/bs.po
index 93627ce..d0fe009 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -746,8 +746,8 @@ msgid "General"
 msgstr "Generalno"
 
 #: ../properties/nm-openvpn-dialog.ui.h:13
-msgid "_Gateway:"
-msgstr "_MreÅ¾ni izlaz:"
+msgid "_Gateway"
+msgstr "_MreÅ¾ni izlaz"
 
 #: ../properties/nm-openvpn-dialog.ui.h:14
 msgid ""
@@ -774,13 +774,9 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#: ../properties/nm-openvpn-dialog.ui.h:19
-msgid "Password:"
-msgstr "Lozinka:"
-
 #: ../properties/nm-openvpn-dialog.ui.h:20
-msgid "User name:"
-msgstr "KorisniÄko ime:"
+msgid "User name"
+msgstr "KorisniÄko ime"
 
 #: ../properties/nm-openvpn-dialog.ui.h:21
 msgid ""
@@ -801,20 +797,16 @@ msgstr ""
 "config: auth-user-pass"
 
 #: ../properties/nm-openvpn-dialog.ui.h:25
-msgid "Remote IP Address:"
-msgstr "Daljinska IP adresa:"
+msgid "Remote IP Address"
+msgstr "Daljinska IP adresa"
 
 #: ../properties/nm-openvpn-dialog.ui.h:26
-msgid "Local IP Address:"
-msgstr "Lokalna IP adresa:"
+msgid "Local IP Address"
+msgstr "Lokalna IP adresa"
 
 #: ../properties/nm-openvpn-dialog.ui.h:27
-msgid "Key Direction:"
-msgstr "Smjer kljuÄa:"
-
-#: ../properties/nm-openvpn-dialog.ui.h:28
-msgid "Static Key:"
-msgstr "StatiÄni kljuÄ:"
+msgid "Key Direction"
+msgstr "Smjer kljuÄa"
 
 #: ../properties/nm-openvpn-dialog.ui.h:29
 msgid ""
@@ -858,8 +850,8 @@ msgstr ""
 "podeÅ¡avanje: â€žstatic <datoteka> [usmerenje]â€œ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:38
-msgid "Type:"
-msgstr "Tip:"
+msgid "Type"
+msgstr "Tip"
 
 #: ../properties/nm-openvpn-dialog.ui.h:39
 msgid "Select an authentication mode."
@@ -875,8 +867,8 @@ msgid "OpenVPN Advanced Options"
 msgstr "OpenVPN napredne postavke"
 
 #: ../properties/nm-openvpn-dialog.ui.h:43
-msgid "Use custom gateway p_ort:"
-msgstr "Koristi prilagoÄ‘eni izlazni _port:"
+msgid "Use custom gateway p_ort"
+msgstr "Koristi prilagoÄ‘eni izlazni _port"
 
 #: ../properties/nm-openvpn-dialog.ui.h:44
 #, fuzzy
@@ -889,8 +881,8 @@ msgstr ""
 "config: port"
 
 #: ../properties/nm-openvpn-dialog.ui.h:46
-msgid "Use custom _renegotiation interval:"
-msgstr "Koristi p_rilagoÄ‘eni intreval za ponovno pregovaranje:"
+msgid "Use custom _renegotiation interval"
+msgstr "Koristi p_rilagoÄ‘eni intreval za ponovno pregovaranje"
 
 #: ../properties/nm-openvpn-dialog.ui.h:47
 msgid ""
@@ -902,7 +894,7 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:49
 #, fuzzy
-msgid "Data _compression:"
+msgid "Data _compression"
 msgstr "Koristi L_ZO kompresiju podataka"
 
 #: ../properties/nm-openvpn-dialog.ui.h:50
@@ -929,8 +921,8 @@ msgstr ""
 "config: proto tcp-client | udp"
 
 #: ../properties/nm-openvpn-dialog.ui.h:56
-msgid "Set virtual _device type:"
-msgstr "Postavite virtualni _ureÄ‘aj Vrsta:"
+msgid "Set virtual _device type"
+msgstr "Postavite virtualni _ureÄ‘aj Vrsta"
 
 #: ../properties/nm-openvpn-dialog.ui.h:57
 msgid "Explicitly set virtual device type and name (TUN/TAP)."
@@ -945,8 +937,8 @@ msgstr ""
 "config: dev-tipa Tun | slavina"
 
 #: ../properties/nm-openvpn-dialog.ui.h:60
-msgid " and _name:"
-msgstr " i _ime:"
+msgid " and _name"
+msgstr " i _ime"
 
 #: ../properties/nm-openvpn-dialog.ui.h:61
 #, fuzzy
@@ -960,8 +952,8 @@ msgstr ""
 "Config: div <name>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:63
-msgid "Use custom tunnel Maximum Transmission _Unit (MTU):"
-msgstr "Koristi prilagoÄ‘eni tunel Maksimalna Jedinica Prijenosa (MTU):"
+msgid "Use custom tunnel Maximum Transmission _Unit (MTU)"
+msgstr "Koristi prilagoÄ‘eni tunel Maksimalna Jedinica Prijenosa (MTU)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:64
 msgid ""
@@ -974,8 +966,8 @@ msgstr ""
 "config: tun-mtu"
 
 #: ../properties/nm-openvpn-dialog.ui.h:66
-msgid "Use custom UDP _fragment size:"
-msgstr "Koristi prilagoÄ‘enu UDP veliÄinu _fragmenta:"
+msgid "Use custom UDP _fragment size"
+msgstr "Koristi prilagoÄ‘enu UDP veliÄinu _fragmenta"
 
 #: ../properties/nm-openvpn-dialog.ui.h:67
 msgid ""
@@ -1032,7 +1024,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:81
-msgid "Specify pin_g interval:"
+msgid "Specify pin_g interval"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:82
@@ -1043,7 +1035,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:84
-msgid "Specify _exit or restart ping:"
+msgid "Specify _exit or restart ping"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:85
@@ -1074,7 +1066,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:93
-msgid "Specify max routes:"
+msgid "Specify max routes"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:94
@@ -1094,8 +1086,8 @@ msgstr ""
 "config: cipher"
 
 #: ../properties/nm-openvpn-dialog.ui.h:98
-msgid "Use custom _size of cipher key:"
-msgstr "Koristi prilagoÄ‘enu veliÄinu Å¡ifarnog kljuÄa:"
+msgid "Use custom _size of cipher key"
+msgstr "Koristi prilagoÄ‘enu veliÄinu Å¡ifarnog kljuÄa"
 
 #: ../properties/nm-openvpn-dialog.ui.h:99
 msgid ""
@@ -1118,12 +1110,12 @@ msgstr ""
 "config: auth"
 
 #: ../properties/nm-openvpn-dialog.ui.h:103
-msgid "Ci_pher:"
-msgstr "Å i_fra:"
+msgid "Ci_pher"
+msgstr "Å i_fra"
 
 #: ../properties/nm-openvpn-dialog.ui.h:104
-msgid "_HMAC Authentication:"
-msgstr "_HMAC Autentifikacija:"
+msgid "_HMAC Authentication"
+msgstr "_HMAC Autentifikacija"
 
 #: ../properties/nm-openvpn-dialog.ui.h:105
 msgid "Disable cipher _negotiation"
@@ -1170,8 +1162,8 @@ msgid "Security"
 msgstr "Sigurnost"
 
 #: ../properties/nm-openvpn-dialog.ui.h:115
-msgid "_Subject Match:"
-msgstr "_Poklapanje predmeta:"
+msgid "_Subject Match"
+msgstr "_Poklapanje predmeta"
 
 #: ../properties/nm-openvpn-dialog.ui.h:116
 msgid ""
@@ -1183,8 +1175,8 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:120
 #, fuzzy
-msgid "Server _Certificate Check:"
-msgstr "Certifikat korisnika:"
+msgid "Server _Certificate Check"
+msgstr "Certifikat korisnika"
 
 #: ../properties/nm-openvpn-dialog.ui.h:121
 msgid ""
@@ -1216,8 +1208,8 @@ msgstr ""
 "kljuÄa i produÅ¾enom upotrebom kljuÄa bazirano na RFC3280 TLS pravilima."
 
 #: ../properties/nm-openvpn-dialog.ui.h:133
-msgid "_Remote peer certificate TLS type:"
-msgstr "_Daljinski certifikat za piljenje TLS tipa:"
+msgid "_Remote peer certificate TLS type"
+msgstr "_Daljinski certifikat za piljenje TLS tipa"
 
 #: ../properties/nm-openvpn-dialog.ui.h:134
 msgid ""
@@ -1245,8 +1237,8 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:138
 #, fuzzy
-msgid "_Remote peer certificate nsCert designation:"
-msgstr "_Daljinski certifikat za piljenje TLS tipa:"
+msgid "_Remote peer certificate nsCert designation"
+msgstr "_Daljinski certifikat za piljenje TLS tipa"
 
 #: ../properties/nm-openvpn-dialog.ui.h:139
 #, fuzzy
@@ -1260,8 +1252,8 @@ msgstr ""
 "config: remote-cert-tls client|server"
 
 #: ../properties/nm-openvpn-dialog.ui.h:141
-msgid "Key _Direction:"
-msgstr "_Direkcija kljuÄa:"
+msgid "Key _Direction"
+msgstr "_Direkcija kljuÄa"
 
 #: ../properties/nm-openvpn-dialog.ui.h:142
 #, fuzzy
@@ -1292,11 +1284,11 @@ msgstr ""
 "podeÅ¡avanje: â€žtls-auth <datoteka> [usmerenje]â€œ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:147
-msgid "Key _File:"
-msgstr "KljuÄna _Datoteka:"
+msgid "Key _File"
+msgstr "KljuÄna _Datoteka"
 
 #: ../properties/nm-openvpn-dialog.ui.h:148
-msgid "Mode:"
+msgid "Mode"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:149
@@ -1306,8 +1298,8 @@ msgstr "Dodaj dodatni sloj HMAC ovjere."
 
 #: ../properties/nm-openvpn-dialog.ui.h:150
 #, fuzzy
-msgid "Extra Certificates:"
-msgstr "Certifikat korisnika:"
+msgid "Extra Certificates"
+msgstr "Certifikat korisnika"
 
 #: ../properties/nm-openvpn-dialog.ui.h:151
 msgid ""
@@ -1330,7 +1322,7 @@ msgid "TLS version control"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:156
-msgid "TLS _min version: "
+msgid "TLS _min version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:157
@@ -1342,7 +1334,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:158
-msgid "TLS ma_x version: "
+msgid "TLS ma_x version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:159
@@ -1364,8 +1356,8 @@ msgstr ""
 "config: http-proxy or socks-proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:163
-msgid "Proxy _Type:"
-msgstr "Proxy _Tip:"
+msgid "Proxy _Type"
+msgstr "Proxy _Tip"
 
 #: ../properties/nm-openvpn-dialog.ui.h:164
 msgid ""
@@ -1376,8 +1368,8 @@ msgstr ""
 "servera za pristup internetu</i>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:165
-msgid "Server _Address:"
-msgstr "_Adresa servera:"
+msgid "Server _Address"
+msgstr "_Adresa servera"
 
 #: ../properties/nm-openvpn-dialog.ui.h:166
 msgid ""
@@ -1388,8 +1380,8 @@ msgstr ""
 "config: http-proxy or socks-proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:168
-msgid "_Port:"
-msgstr "_Port:"
+msgid "_Port"
+msgstr "_Port"
 
 #: ../properties/nm-openvpn-dialog.ui.h:169
 msgid ""
@@ -1412,12 +1404,12 @@ msgstr ""
 "config: http-proxy-retry or socks-proxy-retry"
 
 #: ../properties/nm-openvpn-dialog.ui.h:174
-msgid "Proxy _Username:"
-msgstr "_KorisniÄko Ime za Proxy:"
+msgid "Proxy _Username"
+msgstr "_KorisniÄko Ime za Proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:175
-msgid "Proxy Passwor_d:"
-msgstr "Proxy _Lozinka:"
+msgid "Proxy Passwor_d"
+msgstr "Proxy _Lozinka"
 
 #: ../properties/nm-openvpn-dialog.ui.h:176
 msgid "HTTP/Socks proxy username passed to OpenVPN when prompted for it."
diff --git a/po/ca.po b/po/ca.po
index 0487c28..e05283c 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -817,8 +817,8 @@ msgid "General"
 msgstr "General"
 
 #: ../properties/nm-openvpn-dialog.ui.h:14
-msgid "_Gateway:"
-msgstr "Pas_sarelÂ·la:"
+msgid "_Gateway"
+msgstr "Pas_sarelÂ·la"
 
 #: ../properties/nm-openvpn-dialog.ui.h:15
 msgid ""
@@ -840,13 +840,9 @@ msgstr "CA"
 msgid "User"
 msgstr "Usuari"
 
-#: ../properties/nm-openvpn-dialog.ui.h:20
-msgid "Password:"
-msgstr "Contrasenya:"
-
 #: ../properties/nm-openvpn-dialog.ui.h:21
-msgid "User name:"
-msgstr "Nom d'usuari:"
+msgid "User name"
+msgstr "Nom d'usuari"
 
 #: ../properties/nm-openvpn-dialog.ui.h:22
 msgid ""
@@ -865,20 +861,16 @@ msgstr ""
 "confi: auth-user-pass"
 
 #: ../properties/nm-openvpn-dialog.ui.h:26
-msgid "Remote IP Address:"
-msgstr "AdreÃ§a IP remota:"
+msgid "Remote IP Address"
+msgstr "AdreÃ§a IP remota"
 
 #: ../properties/nm-openvpn-dialog.ui.h:27
-msgid "Local IP Address:"
-msgstr "AdreÃ§a IP local:"
+msgid "Local IP Address"
+msgstr "AdreÃ§a IP local"
 
 #: ../properties/nm-openvpn-dialog.ui.h:28
-msgid "Key Direction:"
-msgstr "DirecciÃ³ de la clau:"
-
-#: ../properties/nm-openvpn-dialog.ui.h:29
-msgid "Static Key:"
-msgstr "Clau estÃ tica:"
+msgid "Key Direction"
+msgstr "DirecciÃ³ de la clau"
 
 #: ../properties/nm-openvpn-dialog.ui.h:30
 msgid ""
@@ -915,8 +907,8 @@ msgstr ""
 "config: static <fitxer> [direcciÃ³]"
 
 #: ../properties/nm-openvpn-dialog.ui.h:39
-msgid "Type:"
-msgstr "Tipus:"
+msgid "Type"
+msgstr "Tipus"
 
 #: ../properties/nm-openvpn-dialog.ui.h:40
 msgid "Select an authentication mode."
@@ -931,8 +923,8 @@ msgid "OpenVPN Advanced Options"
 msgstr "Opcions avanÃ§ades de l'OpenVPN"
 
 #: ../properties/nm-openvpn-dialog.ui.h:44
-msgid "Use custom gateway p_ort:"
-msgstr "Utilitza un _port de passarelÂ·la personalitzat:"
+msgid "Use custom gateway p_ort"
+msgstr "Utilitza un _port de passarelÂ·la personalitzat"
 
 #: ../properties/nm-openvpn-dialog.ui.h:45
 msgid ""
@@ -943,8 +935,8 @@ msgstr ""
 "config: port"
 
 #: ../properties/nm-openvpn-dialog.ui.h:47
-msgid "Use custom _renegotiation interval:"
-msgstr "Utilitza un interval de _renegociaciÃ³ personalitzat:"
+msgid "Use custom _renegotiation interval"
+msgstr "Utilitza un interval de _renegociaciÃ³ personalitzat"
 
 #: ../properties/nm-openvpn-dialog.ui.h:48
 msgid ""
@@ -955,8 +947,8 @@ msgstr ""
 "config: reneg-sec"
 
 #: ../properties/nm-openvpn-dialog.ui.h:50
-msgid "Data _compression:"
-msgstr "_CompressiÃ³ de dades:"
+msgid "Data _compression"
+msgstr "_CompressiÃ³ de dades"
 
 #: ../properties/nm-openvpn-dialog.ui.h:51
 msgid ""
@@ -981,8 +973,8 @@ msgstr ""
 "config: proto tcp-client | udp"
 
 #: ../properties/nm-openvpn-dialog.ui.h:57
-msgid "Set virtual _device type:"
-msgstr "Estableix el tipus del _dispositiu virtual:"
+msgid "Set virtual _device type"
+msgstr "Estableix el tipus del _dispositiu virtual"
 
 #: ../properties/nm-openvpn-dialog.ui.h:58
 msgid "Explicitly set virtual device type and name (TUN/TAP)."
@@ -998,8 +990,8 @@ msgstr ""
 "config: dev-type tun | tap"
 
 #: ../properties/nm-openvpn-dialog.ui.h:61
-msgid " and _name:"
-msgstr " i el _nom:"
+msgid " and _name"
+msgstr " i el _nom"
 
 #: ../properties/nm-openvpn-dialog.ui.h:62
 msgid ""
@@ -1010,7 +1002,7 @@ msgstr ""
 "config: dev <nom>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:64
-msgid "Use custom tunnel Maximum Transmission _Unit (MTU):"
+msgid "Use custom tunnel Maximum Transmission _Unit (MTU)"
 msgstr ""
 "_Utilitza una unitat de transmissiÃ³ mÃ xima del tÃºnel (MTU) personalitzada:"
 
@@ -1023,8 +1015,8 @@ msgstr ""
 "config: tun-mtu"
 
 #: ../properties/nm-openvpn-dialog.ui.h:67
-msgid "Use custom UDP _fragment size:"
-msgstr "Utilitza una mida de _fragment UDP personalitzada:"
+msgid "Use custom UDP _fragment size"
+msgstr "Utilitza una mida de _fragment UDP personalitzada"
 
 #: ../properties/nm-openvpn-dialog.ui.h:68
 msgid ""
@@ -1095,8 +1087,8 @@ msgstr ""
 "config: tun-ipv6"
 
 #: ../properties/nm-openvpn-dialog.ui.h:85
-msgid "Specify pin_g interval:"
-msgstr "Especifiqueu l'interval de pin_g:"
+msgid "Specify pin_g interval"
+msgstr "Especifiqueu l'interval de pin_g"
 
 #: ../properties/nm-openvpn-dialog.ui.h:86
 msgid ""
@@ -1107,8 +1099,8 @@ msgstr ""
 "config: ping <n>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:88
-msgid "Specify _exit or restart ping:"
-msgstr "Especifiqueu _exit o reinicieu el ping:"
+msgid "Specify _exit or restart ping"
+msgstr "Especifiqueu _exit o reinicieu el ping"
 
 #: ../properties/nm-openvpn-dialog.ui.h:89
 msgid ""
@@ -1137,8 +1129,8 @@ msgstr ""
 "config: float"
 
 #: ../properties/nm-openvpn-dialog.ui.h:97
-msgid "Specify max routes:"
-msgstr "Especifica les rutes mÃ x:"
+msgid "Specify max routes"
+msgstr "Especifica les rutes mÃ x"
 
 #: ../properties/nm-openvpn-dialog.ui.h:98
 msgid ""
@@ -1157,8 +1149,8 @@ msgstr ""
 "config: cipher"
 
 #: ../properties/nm-openvpn-dialog.ui.h:102
-msgid "Use custom _size of cipher key:"
-msgstr "U_sa una mida personalitzada per a la clau de xifrat:"
+msgid "Use custom _size of cipher key"
+msgstr "U_sa una mida personalitzada per a la clau de xifrat"
 
 #: ../properties/nm-openvpn-dialog.ui.h:103
 msgid ""
@@ -1177,12 +1169,12 @@ msgstr ""
 "config: auth"
 
 #: ../properties/nm-openvpn-dialog.ui.h:107
-msgid "Ci_pher:"
-msgstr "C_riptÃ²graf:"
+msgid "Ci_pher"
+msgstr "C_riptÃ²graf"
 
 #: ../properties/nm-openvpn-dialog.ui.h:108
-msgid "_HMAC Authentication:"
-msgstr "_AutenticaciÃ³ HMAC:"
+msgid "_HMAC Authentication"
+msgstr "_AutenticaciÃ³ HMAC"
 
 #: ../properties/nm-openvpn-dialog.ui.h:109
 msgid "Disable cipher _negotiation"
@@ -1238,8 +1230,8 @@ msgid "Security"
 msgstr "Seguretat"
 
 #: ../properties/nm-openvpn-dialog.ui.h:119
-msgid "_Subject Match:"
-msgstr "_Assumpte que ha de coincidir:"
+msgid "_Subject Match"
+msgstr "_Assumpte que ha de coincidir"
 
 #: ../properties/nm-openvpn-dialog.ui.h:120
 msgid ""
@@ -1254,8 +1246,8 @@ msgstr ""
 "config (legacy mode): tls-remote subject-or-name"
 
 #: ../properties/nm-openvpn-dialog.ui.h:124
-msgid "Server _Certificate Check:"
-msgstr "Comprova el _certificat del servidor:"
+msgid "Server _Certificate Check"
+msgstr "Comprova el _certificat del servidor"
 
 #: ../properties/nm-openvpn-dialog.ui.h:125
 msgid ""
@@ -1294,8 +1286,8 @@ msgstr ""
 "de clau i un Ãºs estÃ¨s de clau basat en regles RFC3280 TLS."
 
 #: ../properties/nm-openvpn-dialog.ui.h:137
-msgid "_Remote peer certificate TLS type:"
-msgstr "Tipus TLS del certificat del parell _remot:"
+msgid "_Remote peer certificate TLS type"
+msgstr "Tipus TLS del certificat del parell _remot"
 
 #: ../properties/nm-openvpn-dialog.ui.h:138
 msgid ""
@@ -1319,8 +1311,8 @@ msgstr ""
 "nsCertType explÃcita."
 
 #: ../properties/nm-openvpn-dialog.ui.h:142
-msgid "_Remote peer certificate nsCert designation:"
-msgstr "DesignaciÃ³ _remota nsCert del certificat del parell:"
+msgid "_Remote peer certificate nsCert designation"
+msgstr "DesignaciÃ³ _remota nsCert del certificat del parell"
 
 #: ../properties/nm-openvpn-dialog.ui.h:143
 msgid ""
@@ -1331,8 +1323,8 @@ msgstr ""
 "config: ns-cert-type client|server"
 
 #: ../properties/nm-openvpn-dialog.ui.h:145
-msgid "Key _Direction:"
-msgstr "_DirecciÃ³ de la clau:"
+msgid "Key _Direction"
+msgstr "_DirecciÃ³ de la clau"
 
 #: ../properties/nm-openvpn-dialog.ui.h:146
 msgid ""
@@ -1353,20 +1345,20 @@ msgstr ""
 "config: tls-auth <fitxer> [direcciÃ³]"
 
 #: ../properties/nm-openvpn-dialog.ui.h:151
-msgid "Key _File:"
-msgstr "_Fitxer de clau:"
+msgid "Key _File"
+msgstr "_Fitxer de clau"
 
 #: ../properties/nm-openvpn-dialog.ui.h:152
-msgid "Mode:"
-msgstr "Mode:"
+msgid "Mode"
+msgstr "Mode"
 
 #: ../properties/nm-openvpn-dialog.ui.h:153
 msgid "Add an additional layer of encryption or HMAC authentication."
 msgstr "Afegeix una capa addicional de xifrat o d'autenticaciÃ³ HMAC."
 
 #: ../properties/nm-openvpn-dialog.ui.h:154
-msgid "Extra Certificates:"
-msgstr "Certificats addicionals:"
+msgid "Extra Certificates"
+msgstr "Certificats addicionals"
 
 #: ../properties/nm-openvpn-dialog.ui.h:155
 msgid ""
@@ -1389,8 +1381,8 @@ msgid "TLS version control"
 msgstr "Control de versiÃ³ TLS"
 
 #: ../properties/nm-openvpn-dialog.ui.h:160
-msgid "TLS _min version: "
-msgstr "_VersiÃ³ mÃnima TLS: "
+msgid "TLS _min version"
+msgstr "_VersiÃ³ mÃnima TLS"
 
 #: ../properties/nm-openvpn-dialog.ui.h:161
 msgid ""
@@ -1405,8 +1397,8 @@ msgstr ""
 "versiÃ³ TLS mÃ©s alta suportada per la implementaciÃ³ SSL local."
 
 #: ../properties/nm-openvpn-dialog.ui.h:162
-msgid "TLS ma_x version: "
-msgstr "V_ersiÃ³ mÃ xima TLS: "
+msgid "TLS ma_x version"
+msgstr "V_ersiÃ³ mÃ xima TLS"
 
 #: ../properties/nm-openvpn-dialog.ui.h:163
 msgid ""
@@ -1429,8 +1421,8 @@ msgstr ""
 "config: http-proxy or socks-proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:167
-msgid "Proxy _Type:"
-msgstr "_Tipus de servidor intermediari:"
+msgid "Proxy _Type"
+msgstr "_Tipus de servidor intermediari"
 
 #: ../properties/nm-openvpn-dialog.ui.h:168
 msgid ""
@@ -1441,8 +1433,8 @@ msgstr ""
 "servidor intermediari per a accedir a Internet.</i>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:169
-msgid "Server _Address:"
-msgstr "_AdreÃ§a del servidor:"
+msgid "Server _Address"
+msgstr "_AdreÃ§a del servidor"
 
 #: ../properties/nm-openvpn-dialog.ui.h:170
 msgid ""
@@ -1453,8 +1445,8 @@ msgstr ""
 "config: http-proxy or socks-proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:172
-msgid "_Port:"
-msgstr "_Port:"
+msgid "_Port"
+msgstr "_Port"
 
 #: ../properties/nm-openvpn-dialog.ui.h:173
 msgid ""
@@ -1477,12 +1469,12 @@ msgstr ""
 "config: http-proxy-retry or socks-proxy-retry"
 
 #: ../properties/nm-openvpn-dialog.ui.h:178
-msgid "Proxy _Username:"
-msgstr "_Nom d'usuari del servidor intermediari:"
+msgid "Proxy _Username"
+msgstr "_Nom d'usuari del servidor intermediari"
 
 #: ../properties/nm-openvpn-dialog.ui.h:179
-msgid "Proxy Passwor_d:"
-msgstr "C_ontrasenya del servidor intermediari:"
+msgid "Proxy Passwor_d"
+msgstr "C_ontrasenya del servidor intermediari"
 
 #: ../properties/nm-openvpn-dialog.ui.h:180
 msgid "HTTP/Socks proxy username passed to OpenVPN when prompted for it."
diff --git a/po/ca valencia po b/po/ca valencia po
index 3875f55..7f5e8b7 100644
--- a/po/ca valencia po
+++ b/po/ca valencia po
@@ -753,8 +753,8 @@ msgid "General"
 msgstr "General"
 
 #: ../properties/nm-openvpn-dialog.ui.h:13
-msgid "_Gateway:"
-msgstr "Pas_sarelÂ·la:"
+msgid "_Gateway"
+msgstr "Pas_sarelÂ·la"
 
 #: ../properties/nm-openvpn-dialog.ui.h:14
 msgid ""
@@ -777,13 +777,9 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#: ../properties/nm-openvpn-dialog.ui.h:19
-msgid "Password:"
-msgstr "Contrasenya:"
-
 #: ../properties/nm-openvpn-dialog.ui.h:20
-msgid "User name:"
-msgstr "Nom d'usuari:"
+msgid "User name"
+msgstr "Nom d'usuari"
 
 #: ../properties/nm-openvpn-dialog.ui.h:21
 msgid ""
@@ -799,21 +795,17 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:25
-msgid "Remote IP Address:"
-msgstr "AdreÃ§a IP remota:"
+msgid "Remote IP Address"
+msgstr "AdreÃ§a IP remota"
 
 #: ../properties/nm-openvpn-dialog.ui.h:26
-msgid "Local IP Address:"
-msgstr "AdreÃ§a IP local:"
+msgid "Local IP Address"
+msgstr "AdreÃ§a IP local"
 
 #: ../properties/nm-openvpn-dialog.ui.h:27
 #, fuzzy
-msgid "Key Direction:"
-msgstr "DirecciÃ³ de la clau:"
-
-#: ../properties/nm-openvpn-dialog.ui.h:28
-msgid "Static Key:"
-msgstr "Clau estÃ tica:"
+msgid "Key Direction"
+msgstr "DirecciÃ³ de la clau"
 
 #: ../properties/nm-openvpn-dialog.ui.h:29
 msgid ""
@@ -848,8 +840,8 @@ msgstr ""
 "contacteu amb l'administrador del sistema.</i>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:38
-msgid "Type:"
-msgstr "Tipus:"
+msgid "Type"
+msgstr "Tipus"
 
 #: ../properties/nm-openvpn-dialog.ui.h:39
 #, fuzzy
@@ -866,8 +858,8 @@ msgid "OpenVPN Advanced Options"
 msgstr "Opcions avanÃ§ades de l'OpenVPN"
 
 #: ../properties/nm-openvpn-dialog.ui.h:43
-msgid "Use custom gateway p_ort:"
-msgstr "Utilitza un _port de passarelÂ·la personalitzat:"
+msgid "Use custom gateway p_ort"
+msgstr "Utilitza un _port de passarelÂ·la personalitzat"
 
 #: ../properties/nm-openvpn-dialog.ui.h:44
 msgid ""
@@ -877,7 +869,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:46
-msgid "Use custom _renegotiation interval:"
+msgid "Use custom _renegotiation interval"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:47
@@ -888,7 +880,7 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:49
 #, fuzzy
-msgid "Data _compression:"
+msgid "Data _compression"
 msgstr "Utilitza la compressiÃ³ de dades L_ZO"
 
 #: ../properties/nm-openvpn-dialog.ui.h:50
@@ -911,7 +903,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:56
-msgid "Set virtual _device type:"
+msgid "Set virtual _device type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:57
@@ -925,7 +917,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:60
-msgid " and _name:"
+msgid " and _name"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:61
@@ -936,7 +928,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:63
-msgid "Use custom tunnel Maximum Transmission _Unit (MTU):"
+msgid "Use custom tunnel Maximum Transmission _Unit (MTU)"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:64
@@ -947,7 +939,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:66
-msgid "Use custom UDP _fragment size:"
+msgid "Use custom UDP _fragment size"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:67
@@ -998,7 +990,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:81
-msgid "Specify pin_g interval:"
+msgid "Specify pin_g interval"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:82
@@ -1009,7 +1001,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:84
-msgid "Specify _exit or restart ping:"
+msgid "Specify _exit or restart ping"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:85
@@ -1040,7 +1032,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:93
-msgid "Specify max routes:"
+msgid "Specify max routes"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:94
@@ -1057,7 +1049,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:98
-msgid "Use custom _size of cipher key:"
+msgid "Use custom _size of cipher key"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:99
@@ -1075,12 +1067,12 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:103
-msgid "Ci_pher:"
-msgstr "CriptÃ²graf:"
+msgid "Ci_pher"
+msgstr "CriptÃ²graf"
 
 #: ../properties/nm-openvpn-dialog.ui.h:104
-msgid "_HMAC Authentication:"
-msgstr "AutenticaciÃ³ HMAC:"
+msgid "_HMAC Authentication"
+msgstr "AutenticaciÃ³ HMAC"
 
 #: ../properties/nm-openvpn-dialog.ui.h:105
 msgid "Disable cipher _negotiation"
@@ -1127,7 +1119,7 @@ msgid "Security"
 msgstr "Seguretat"
 
 #: ../properties/nm-openvpn-dialog.ui.h:115
-msgid "_Subject Match:"
+msgid "_Subject Match"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:116
@@ -1140,8 +1132,8 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:120
 #, fuzzy
-msgid "Server _Certificate Check:"
-msgstr "Certificat d'usuari:"
+msgid "Server _Certificate Check"
+msgstr "Certificat d'usuari"
 
 #: ../properties/nm-openvpn-dialog.ui.h:121
 msgid ""
@@ -1171,7 +1163,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:133
-msgid "_Remote peer certificate TLS type:"
+msgid "_Remote peer certificate TLS type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:134
@@ -1192,7 +1184,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:138
-msgid "_Remote peer certificate nsCert designation:"
+msgid "_Remote peer certificate nsCert designation"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:139
@@ -1203,8 +1195,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:141
-msgid "Key _Direction:"
-msgstr "DirecciÃ³ de la clau:"
+msgid "Key _Direction"
+msgstr "DirecciÃ³ de la clau"
 
 #: ../properties/nm-openvpn-dialog.ui.h:142
 msgid ""
@@ -1229,11 +1221,11 @@ msgstr ""
 "contacteu amb l'administrador del sistema.</i>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:147
-msgid "Key _File:"
-msgstr "Fitxer de clau:"
+msgid "Key _File"
+msgstr "Fitxer de clau"
 
 #: ../properties/nm-openvpn-dialog.ui.h:148
-msgid "Mode:"
+msgid "Mode"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:149
@@ -1243,8 +1235,8 @@ msgstr "Utilitza autenticaciÃ³ TLS addicional"
 
 #: ../properties/nm-openvpn-dialog.ui.h:150
 #, fuzzy
-msgid "Extra Certificates:"
-msgstr "Certificat d'usuari:"
+msgid "Extra Certificates"
+msgstr "Certificat d'usuari"
 
 #: ../properties/nm-openvpn-dialog.ui.h:151
 msgid ""
@@ -1267,7 +1259,7 @@ msgid "TLS version control"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:156
-msgid "TLS _min version: "
+msgid "TLS _min version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:157
@@ -1279,7 +1271,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:158
-msgid "TLS ma_x version: "
+msgid "TLS ma_x version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:159
@@ -1300,8 +1292,8 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:163
 #, fuzzy
-msgid "Proxy _Type:"
-msgstr "Tipus:"
+msgid "Proxy _Type"
+msgstr "Tipus"
 
 #: ../properties/nm-openvpn-dialog.ui.h:164
 msgid ""
@@ -1311,8 +1303,8 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:165
 #, fuzzy
-msgid "Server _Address:"
-msgstr "AdreÃ§a IP remota:"
+msgid "Server _Address"
+msgstr "AdreÃ§a IP remota"
 
 #: ../properties/nm-openvpn-dialog.ui.h:166
 msgid ""
@@ -1322,7 +1314,7 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:168
 #, fuzzy
-msgid "_Port:"
+msgid "_Port"
 msgstr "Port:  %s"
 
 #: ../properties/nm-openvpn-dialog.ui.h:169
@@ -1343,13 +1335,13 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:174
 #, fuzzy
-msgid "Proxy _Username:"
-msgstr "Nom d'usuari:"
+msgid "Proxy _Username"
+msgstr "Nom d'usuari"
 
 #: ../properties/nm-openvpn-dialog.ui.h:175
 #, fuzzy
-msgid "Proxy Passwor_d:"
-msgstr "Contrasenya:"
+msgid "Proxy Passwor_d"
+msgstr "Contrasenya"
 
 #: ../properties/nm-openvpn-dialog.ui.h:176
 msgid "HTTP/Socks proxy username passed to OpenVPN when prompted for it."
diff --git a/po/cs.po b/po/cs.po
index 49f6102..b23d61d 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -49,10 +49,6 @@ msgstr "VÃ½vojÃ¡Å™i aplikace NetworkManager"
 msgid "Authenticate VPN %s"
 msgstr "OvÄ›Å™it VPN %s"
 
-#: ../auth-dialog/main.c:182 ../properties/nm-openvpn-dialog.ui.h:13
-msgid "Password:"
-msgstr "Heslo:"
-
 #: ../auth-dialog/main.c:189
 msgid "Certificate password:"
 msgstr "Heslo certifikÃ¡tu:"
@@ -725,8 +721,8 @@ msgid "General"
 msgstr "ObecnÃ©"
 
 #: ../properties/nm-openvpn-dialog.ui.h:7
-msgid "_Gateway:"
-msgstr "_BrÃ¡na:"
+msgid "_Gateway"
+msgstr "_BrÃ¡na"
 
 #: ../properties/nm-openvpn-dialog.ui.h:8
 msgid ""
@@ -753,8 +749,8 @@ msgid "User"
 msgstr "UÅ¾ivatel"
 
 #: ../properties/nm-openvpn-dialog.ui.h:14
-msgid "User name:"
-msgstr "UÅ¾ivatelskÃ© jmÃ©no:"
+msgid "User name"
+msgstr "UÅ¾ivatelskÃ© jmÃ©no"
 
 #: ../properties/nm-openvpn-dialog.ui.h:15
 msgid ""
@@ -775,20 +771,16 @@ msgstr ""
 "config: auth-user-pass"
 
 #: ../properties/nm-openvpn-dialog.ui.h:19
-msgid "Remote IP Address:"
-msgstr "VzdÃ¡lenÃ¡ adresa IP:"
+msgid "Remote IP Address"
+msgstr "VzdÃ¡lenÃ¡ adresa IP"
 
 #: ../properties/nm-openvpn-dialog.ui.h:20
-msgid "Local IP Address:"
-msgstr "MÃstnÃ adresa IP:"
+msgid "Local IP Address"
+msgstr "MÃstnÃ adresa IP"
 
 #: ../properties/nm-openvpn-dialog.ui.h:21
-msgid "Key Direction:"
-msgstr "SmÄ›r klÃÄe:"
-
-#: ../properties/nm-openvpn-dialog.ui.h:22
-msgid "Static Key:"
-msgstr "StatickÃ½ klÃÄ:"
+msgid "Key Direction"
+msgstr "SmÄ›r klÃÄe"
 
 #: ../properties/nm-openvpn-dialog.ui.h:23
 msgid ""
@@ -829,8 +821,8 @@ msgstr ""
 "config: static <soubor> [smÄ›r]"
 
 #: ../properties/nm-openvpn-dialog.ui.h:32
-msgid "Type:"
-msgstr "Typ:"
+msgid "Type"
+msgstr "Typ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:33
 msgid "Select an authentication mode."
@@ -845,8 +837,8 @@ msgid "OpenVPN Advanced Options"
 msgstr "PokroÄilÃ© volby OpenVPN"
 
 #: ../properties/nm-openvpn-dialog.ui.h:37
-msgid "Use custom gateway p_ort:"
-msgstr "P_ouÅ¾Ãt vlastnÃ port brÃ¡ny:"
+msgid "Use custom gateway p_ort"
+msgstr "P_ouÅ¾Ãt vlastnÃ port brÃ¡ny"
 
 #: ../properties/nm-openvpn-dialog.ui.h:38
 msgid ""
@@ -859,8 +851,8 @@ msgstr ""
 "config: port"
 
 #: ../properties/nm-openvpn-dialog.ui.h:40
-msgid "Use custom _renegotiation interval:"
-msgstr "PouÅ¾Ãt vlastnÃ interval opÄ›tovnÃ©ho _pÅ™ipojenÃ:"
+msgid "Use custom _renegotiation interval"
+msgstr "PouÅ¾Ãt vlastnÃ interval opÄ›tovnÃ©ho _pÅ™ipojenÃ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:41
 msgid ""
@@ -907,8 +899,8 @@ msgstr ""
 "config: proto tcp-client | udp"
 
 #: ../properties/nm-openvpn-dialog.ui.h:52
-msgid "Set virtual _device type:"
-msgstr "Nastavit typ virtuÃ¡lnÃho _zaÅ™ÃzenÃ:"
+msgid "Set virtual _device type"
+msgstr "Nastavit typ virtuÃ¡lnÃho _zaÅ™ÃzenÃ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:53
 msgid "Explicitly set virtual device type and name (TUN/TAP)."
@@ -923,8 +915,8 @@ msgstr ""
 "config: dev-type tun | tap"
 
 #: ../properties/nm-openvpn-dialog.ui.h:56
-msgid " and _name:"
-msgstr " a _nÃ¡zev:"
+msgid " and _name"
+msgstr " a _nÃ¡zev"
 
 #: ../properties/nm-openvpn-dialog.ui.h:57
 msgid ""
@@ -937,8 +929,8 @@ msgstr ""
 "config: dev <nÃ¡zev>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:59
-msgid "Use custom tunnel Maximum Transmission _Unit (MTU):"
-msgstr "PouÅ¾Ãt vlastnÃ maximÃ¡lnÃ velikost pÅ™enosovÃ© _jednotky (MTU):"
+msgid "Use custom tunnel Maximum Transmission _Unit (MTU)"
+msgstr "PouÅ¾Ãt vlastnÃ maximÃ¡lnÃ velikost pÅ™enosovÃ© _jednotky (MTU)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:60
 msgid ""
@@ -950,8 +942,8 @@ msgstr ""
 "config: tun-mtu"
 
 #: ../properties/nm-openvpn-dialog.ui.h:62
-msgid "Use custom UDP _fragment size:"
-msgstr "PouÅ¾Ãt vlastnÃ velikost UDP _fragmentu:"
+msgid "Use custom UDP _fragment size"
+msgstr "PouÅ¾Ãt vlastnÃ velikost UDP _fragmentu"
 
 #: ../properties/nm-openvpn-dialog.ui.h:63
 msgid ""
@@ -999,8 +991,8 @@ msgstr ""
 "config: tun-ipv6"
 
 #: ../properties/nm-openvpn-dialog.ui.h:74
-msgid "Specify _exit or restart ping:"
-msgstr "Nastavit ukonÄenÃ nebo restart pinkÃ¡nÃ:"
+msgid "Specify _exit or restart ping"
+msgstr "Nastavit ukonÄenÃ nebo restart pinkÃ¡nÃ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:75
 msgid ""
@@ -1013,8 +1005,8 @@ msgstr ""
 "config: ping-exit | ping-restart <n>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:77
-msgid "Specify pin_g interval:"
-msgstr "Nastavit interval pin_knutÃ:"
+msgid "Specify pin_g interval"
+msgstr "Nastavit interval pin_knutÃ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:78
 msgid ""
@@ -1059,8 +1051,8 @@ msgstr ""
 "config: float"
 
 #: ../properties/nm-openvpn-dialog.ui.h:86
-msgid "Specify max routes:"
-msgstr "Zadejte max. poÄet cest:"
+msgid "Specify max routes"
+msgstr "Zadejte max. poÄet cest"
 
 #: ../properties/nm-openvpn-dialog.ui.h:87
 msgid ""
@@ -1081,8 +1073,8 @@ msgstr ""
 "config: cipher"
 
 #: ../properties/nm-openvpn-dialog.ui.h:91
-msgid "Use custom _size of cipher key:"
-msgstr "PouÅ¾Ãt vlastnÃ dÃ©lku klÃÄe Å¡ifry:"
+msgid "Use custom _size of cipher key"
+msgstr "PouÅ¾Ãt vlastnÃ dÃ©lku klÃÄe Å¡ifry"
 
 #: ../properties/nm-openvpn-dialog.ui.h:92
 msgid ""
@@ -1105,12 +1097,12 @@ msgstr ""
 "config: auth"
 
 #: ../properties/nm-openvpn-dialog.ui.h:96
-msgid "Ci_pher:"
-msgstr "Å ifra:"
+msgid "Ci_pher"
+msgstr "Å ifra"
 
 #: ../properties/nm-openvpn-dialog.ui.h:97
-msgid "_HMAC Authentication:"
-msgstr "Autentizace HMAC:"
+msgid "_HMAC Authentication"
+msgstr "Autentizace HMAC"
 
 #: ../properties/nm-openvpn-dialog.ui.h:98
 msgid "Disable cipher _negotiation"
@@ -1165,8 +1157,8 @@ msgid "Security"
 msgstr "ZabezpeÄenÃ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:108
-msgid "_Subject Match:"
-msgstr "_Subjekt odpovÃdÃ¡:"
+msgid "_Subject Match"
+msgstr "_Subjekt odpovÃdÃ¡"
 
 #: ../properties/nm-openvpn-dialog.ui.h:109
 msgid ""
@@ -1182,8 +1174,8 @@ msgstr ""
 "config (zastaralÃ½ reÅ¾im): tls-remote pÅ™edmÄ›t-nebo-nÃ¡zev"
 
 #: ../properties/nm-openvpn-dialog.ui.h:113
-msgid "Server _Certificate Check:"
-msgstr "Kontrola serverovÃ©ho _certifikÃ¡tu:"
+msgid "Server _Certificate Check"
+msgstr "Kontrola serverovÃ©ho _certifikÃ¡tu"
 
 #: ../properties/nm-openvpn-dialog.ui.h:114
 msgid ""
@@ -1228,8 +1220,8 @@ msgstr ""
 "(RFC3289)."
 
 #: ../properties/nm-openvpn-dialog.ui.h:126
-msgid "_Remote peer certificate TLS type:"
-msgstr "Typ TLS certifikÃ¡tu p_rotistrany:"
+msgid "_Remote peer certificate TLS type"
+msgstr "Typ TLS certifikÃ¡tu p_rotistrany"
 
 #: ../properties/nm-openvpn-dialog.ui.h:127
 msgid ""
@@ -1255,8 +1247,8 @@ msgstr ""
 "nsCertType."
 
 #: ../properties/nm-openvpn-dialog.ui.h:131
-msgid "_Remote peer certificate nsCert designation:"
-msgstr "OznaÄenÃ nsCert certifikÃ¡tu p_rotistrany:"
+msgid "_Remote peer certificate nsCert designation"
+msgstr "OznaÄenÃ nsCert certifikÃ¡tu p_rotistrany"
 
 #: ../properties/nm-openvpn-dialog.ui.h:132
 msgid ""
@@ -1269,8 +1261,8 @@ msgstr ""
 "config: ns-cert-type client|server"
 
 #: ../properties/nm-openvpn-dialog.ui.h:134
-msgid "Key _Direction:"
-msgstr "SmÄ›r _klÃÄe:"
+msgid "Key _Direction"
+msgstr "SmÄ›r _klÃÄe"
 
 #: ../properties/nm-openvpn-dialog.ui.h:135
 msgid ""
@@ -1298,20 +1290,20 @@ msgstr ""
 "config: tls-auth <soubor> [smÄ›r]"
 
 #: ../properties/nm-openvpn-dialog.ui.h:140
-msgid "Key _File:"
-msgstr "_Soubor klÃÄe:"
+msgid "Key _File"
+msgstr "_Soubor klÃÄe"
 
 #: ../properties/nm-openvpn-dialog.ui.h:141
-msgid "Mode:"
-msgstr "ReÅ¾im:"
+msgid "Mode"
+msgstr "ReÅ¾im"
 
 #: ../properties/nm-openvpn-dialog.ui.h:142
 msgid "Add an additional layer of encryption or HMAC authentication."
 msgstr "PÅ™idat dalÅ¡Ã ÃºroveÅˆ Å¡ifrovÃ¡nÃ nebo autentizace HMAC."
 
 #: ../properties/nm-openvpn-dialog.ui.h:143
-msgid "Extra Certificates:"
-msgstr "DalÅ¡Ã certifikÃ¡ty:"
+msgid "Extra Certificates"
+msgstr "DalÅ¡Ã certifikÃ¡ty"
 
 #: ../properties/nm-openvpn-dialog.ui.h:144
 msgid ""
@@ -1340,8 +1332,8 @@ msgstr ""
 "config: http-proxy nebo socks-proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:150
-msgid "Proxy _Type:"
-msgstr "_Typ proxy:"
+msgid "Proxy _Type"
+msgstr "_Typ proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:151
 msgid ""
@@ -1352,8 +1344,8 @@ msgstr ""
 "Internetu server proxy.</i>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:152
-msgid "Server _Address:"
-msgstr "_Adresa serveru:"
+msgid "Server _Address"
+msgstr "_Adresa serveru"
 
 #: ../properties/nm-openvpn-dialog.ui.h:153
 msgid ""
@@ -1364,8 +1356,8 @@ msgstr ""
 "config: http-proxy nebo socks-proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:155
-msgid "_Port:"
-msgstr "_Port:"
+msgid "_Port"
+msgstr "_Port"
 
 #: ../properties/nm-openvpn-dialog.ui.h:156
 msgid ""
@@ -1388,12 +1380,12 @@ msgstr ""
 "config: http-proxy-retry nebo socks-proxy-retry"
 
 #: ../properties/nm-openvpn-dialog.ui.h:161
-msgid "Proxy _Username:"
-msgstr "_UÅ¾ivatelskÃ© jmÃ©no proxy:"
+msgid "Proxy _Username"
+msgstr "_UÅ¾ivatelskÃ© jmÃ©no proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:162
-msgid "Proxy Passwor_d:"
-msgstr "_Heslo proxy:"
+msgid "Proxy Passwor_d"
+msgstr "_Heslo proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:163
 msgid "HTTP/Socks proxy username passed to OpenVPN when prompted for it."
diff --git a/po/da.po b/po/da.po
index dc63524..5ee3691 100644
--- a/po/da.po
+++ b/po/da.po
@@ -818,8 +818,8 @@ msgid "General"
 msgstr "Generelt"
 
 #: ../properties/nm-openvpn-dialog.ui.h:13
-msgid "_Gateway:"
-msgstr "_Gateway:"
+msgid "_Gateway"
+msgstr "_Gateway"
 
 #: ../properties/nm-openvpn-dialog.ui.h:14
 msgid ""
@@ -845,13 +845,9 @@ msgstr "CA"
 msgid "User"
 msgstr "Bruger"
 
-#: ../properties/nm-openvpn-dialog.ui.h:19
-msgid "Password:"
-msgstr "Adgangskode:"
-
 #: ../properties/nm-openvpn-dialog.ui.h:20
-msgid "User name:"
-msgstr "Brugernavn:"
+msgid "User name"
+msgstr "Brugernavn"
 
 #: ../properties/nm-openvpn-dialog.ui.h:21
 msgid ""
@@ -872,20 +868,16 @@ msgstr ""
 "Konfiguration: auth-user-pass"
 
 #: ../properties/nm-openvpn-dialog.ui.h:25
-msgid "Remote IP Address:"
-msgstr "Fjernsteds IP-adresse:"
+msgid "Remote IP Address"
+msgstr "Fjernsteds IP-adresse"
 
 #: ../properties/nm-openvpn-dialog.ui.h:26
-msgid "Local IP Address:"
-msgstr "Lokal IP-adresse:"
+msgid "Local IP Address"
+msgstr "Lokal IP-adresse"
 
 #: ../properties/nm-openvpn-dialog.ui.h:27
-msgid "Key Direction:"
-msgstr "NÃ¸gleretning:"
-
-#: ../properties/nm-openvpn-dialog.ui.h:28
-msgid "Static Key:"
-msgstr "Statisk nÃ¸gle:"
+msgid "Key Direction"
+msgstr "NÃ¸gleretning"
 
 #: ../properties/nm-openvpn-dialog.ui.h:29
 msgid ""
@@ -927,8 +919,8 @@ msgstr ""
 "Konfiguration: static <fil> [retning]"
 
 #: ../properties/nm-openvpn-dialog.ui.h:38
-msgid "Type:"
-msgstr "Type:"
+msgid "Type"
+msgstr "Type"
 
 #: ../properties/nm-openvpn-dialog.ui.h:39
 msgid "Select an authentication mode."
@@ -943,8 +935,8 @@ msgid "OpenVPN Advanced Options"
 msgstr "Avancerede indstillinger til OpenVPN"
 
 #: ../properties/nm-openvpn-dialog.ui.h:43
-msgid "Use custom gateway p_ort:"
-msgstr "A_nvend tilpasset port til gateway:"
+msgid "Use custom gateway p_ort"
+msgstr "A_nvend tilpasset port til gateway"
 
 #: ../properties/nm-openvpn-dialog.ui.h:44
 msgid ""
@@ -957,8 +949,8 @@ msgstr ""
 "Konfiguration: port"
 
 #: ../properties/nm-openvpn-dialog.ui.h:46
-msgid "Use custom _renegotiation interval:"
-msgstr "Anvend tilpasset _genforhandlingsinterval:"
+msgid "Use custom _renegotiation interval"
+msgstr "Anvend tilpasset _genforhandlingsinterval"
 
 #: ../properties/nm-openvpn-dialog.ui.h:47
 msgid ""
@@ -969,8 +961,8 @@ msgstr ""
 "Konfiguration: reneg-sec"
 
 #: ../properties/nm-openvpn-dialog.ui.h:49
-msgid "Data _compression:"
-msgstr "Data_komprimering:"
+msgid "Data _compression"
+msgstr "Data_komprimering"
 
 #: ../properties/nm-openvpn-dialog.ui.h:50
 msgid ""
@@ -997,8 +989,8 @@ msgstr ""
 "Konfiguration: proto tcp-client | udp"
 
 #: ../properties/nm-openvpn-dialog.ui.h:56
-msgid "Set virtual _device type:"
-msgstr "Angiv virtuel enhedst_ype:"
+msgid "Set virtual _device type"
+msgstr "Angiv virtuel enhedst_ype"
 
 #: ../properties/nm-openvpn-dialog.ui.h:57
 msgid "Explicitly set virtual device type and name (TUN/TAP)."
@@ -1013,8 +1005,8 @@ msgstr ""
 "Konfiguration: dev-type tun | tap"
 
 #: ../properties/nm-openvpn-dialog.ui.h:60
-msgid " and _name:"
-msgstr " og na_vn:"
+msgid " and _name"
+msgstr " og na_vn"
 
 #: ../properties/nm-openvpn-dialog.ui.h:61
 msgid ""
@@ -1027,8 +1019,8 @@ msgstr ""
 "Konfiguration: dev <navn>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:63
-msgid "Use custom tunnel Maximum Transmission _Unit (MTU):"
-msgstr "Anvend tilpasset maksimal transmissionsenhed (MTU) for t_unnel:"
+msgid "Use custom tunnel Maximum Transmission _Unit (MTU)"
+msgstr "Anvend tilpasset maksimal transmissionsenhed (MTU) for t_unnel"
 
 #: ../properties/nm-openvpn-dialog.ui.h:64
 msgid ""
@@ -1040,8 +1032,8 @@ msgstr ""
 "Konfiguration: tun-mtu"
 
 #: ../properties/nm-openvpn-dialog.ui.h:66
-msgid "Use custom UDP _fragment size:"
-msgstr "Anvend tilpasset UDP-_fragmentstÃ¸rrelse:"
+msgid "Use custom UDP _fragment size"
+msgstr "Anvend tilpasset UDP-_fragmentstÃ¸rrelse"
 
 #: ../properties/nm-openvpn-dialog.ui.h:67
 msgid ""
@@ -1115,8 +1107,8 @@ msgstr ""
 "Konfiguration: tun-ipv6"
 
 #: ../properties/nm-openvpn-dialog.ui.h:84
-msgid "Specify pin_g interval:"
-msgstr "Angiv _ping-interval:"
+msgid "Specify pin_g interval"
+msgstr "Angiv _ping-interval"
 
 #: ../properties/nm-openvpn-dialog.ui.h:85
 msgid ""
@@ -1129,8 +1121,8 @@ msgstr ""
 "Konfiguration: ping <n>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:87
-msgid "Specify _exit or restart ping:"
-msgstr "Angiv afslutning _eller genstart ifÃ¸lge ping:"
+msgid "Specify _exit or restart ping"
+msgstr "Angiv afslutning _eller genstart ifÃ¸lge ping"
 
 #: ../properties/nm-openvpn-dialog.ui.h:88
 msgid ""
@@ -1175,8 +1167,8 @@ msgstr ""
 "Konfiguration: float"
 
 #: ../properties/nm-openvpn-dialog.ui.h:96
-msgid "Specify max routes:"
-msgstr "Angiv maks. antal ruter:"
+msgid "Specify max routes"
+msgstr "Angiv maks. antal ruter"
 
 #: ../properties/nm-openvpn-dialog.ui.h:97
 msgid ""
@@ -1197,8 +1189,8 @@ msgstr ""
 "Konfiguration: cipher"
 
 #: ../properties/nm-openvpn-dialog.ui.h:101
-msgid "Use custom _size of cipher key:"
-msgstr "Anvend tilpasset _stÃ¸rrelse pÃ¥ krypteringsalgoritmenÃ¸gle:"
+msgid "Use custom _size of cipher key"
+msgstr "Anvend tilpasset _stÃ¸rrelse pÃ¥ krypteringsalgoritmenÃ¸gle"
 
 #: ../properties/nm-openvpn-dialog.ui.h:102
 msgid ""
@@ -1221,12 +1213,12 @@ msgstr ""
 "Konfiguration: auth"
 
 #: ../properties/nm-openvpn-dialog.ui.h:106
-msgid "Ci_pher:"
-msgstr "_Krypteringsalgoritme:"
+msgid "Ci_pher"
+msgstr "_Krypteringsalgoritme"
 
 #: ../properties/nm-openvpn-dialog.ui.h:107
-msgid "_HMAC Authentication:"
-msgstr "_HMAC-godkendelse:"
+msgid "_HMAC Authentication"
+msgstr "_HMAC-godkendelse"
 
 #: ../properties/nm-openvpn-dialog.ui.h:108
 msgid "Disable cipher _negotiation"
@@ -1281,8 +1273,8 @@ msgid "Security"
 msgstr "Sikkerhed"
 
 #: ../properties/nm-openvpn-dialog.ui.h:118
-msgid "_Subject Match:"
-msgstr "_Subjektmatch:"
+msgid "_Subject Match"
+msgstr "_Subjektmatch"
 
 #: ../properties/nm-openvpn-dialog.ui.h:119
 msgid ""
@@ -1298,8 +1290,8 @@ msgstr ""
 "Konfiguration (forÃ¦ldet tilstand): tls-remote subjekt-eller-navn"
 
 #: ../properties/nm-openvpn-dialog.ui.h:123
-msgid "Server _Certificate Check:"
-msgstr "Server_certifikatkontrol:"
+msgid "Server _Certificate Check"
+msgstr "Server_certifikatkontrol"
 
 #: ../properties/nm-openvpn-dialog.ui.h:124
 msgid ""
@@ -1343,8 +1335,8 @@ msgstr ""
 "nÃ¸glebrug baseret pÃ¥ TLS-reglerne fra RFC3280."
 
 #: ../properties/nm-openvpn-dialog.ui.h:136
-msgid "_Remote peer certificate TLS type:"
-msgstr "TLS-type af fje_rnpeers certifikat:"
+msgid "_Remote peer certificate TLS type"
+msgstr "TLS-type af fje_rnpeers certifikat"
 
 #: ../properties/nm-openvpn-dialog.ui.h:137
 msgid ""
@@ -1369,8 +1361,8 @@ msgstr ""
 "betegnelse."
 
 #: ../properties/nm-openvpn-dialog.ui.h:141
-msgid "_Remote peer certificate nsCert designation:"
-msgstr "nsCertType-betegnelse for certifikat fra _fjernpeer:"
+msgid "_Remote peer certificate nsCert designation"
+msgstr "nsCertType-betegnelse for certifikat fra _fjernpeer"
 
 #: ../properties/nm-openvpn-dialog.ui.h:142
 msgid ""
@@ -1383,8 +1375,8 @@ msgstr ""
 "Konfiguration: ns-cert-type client|server"
 
 #: ../properties/nm-openvpn-dialog.ui.h:144
-msgid "Key _Direction:"
-msgstr "N_Ã¸gleretning:"
+msgid "Key _Direction"
+msgstr "N_Ã¸gleretning"
 
 #: ../properties/nm-openvpn-dialog.ui.h:145
 msgid ""
@@ -1414,20 +1406,20 @@ msgstr ""
 "Konfiguration: tls-auth <fil> [retning]"
 
 #: ../properties/nm-openvpn-dialog.ui.h:150
-msgid "Key _File:"
-msgstr "NÃ¸_glefil:"
+msgid "Key _File"
+msgstr "NÃ¸_glefil"
 
 #: ../properties/nm-openvpn-dialog.ui.h:151
-msgid "Mode:"
-msgstr "Tilstand:"
+msgid "Mode"
+msgstr "Tilstand"
 
 #: ../properties/nm-openvpn-dialog.ui.h:152
 msgid "Add an additional layer of encryption or HMAC authentication."
 msgstr "TilfÃ¸j yderligere et lag af kryptering eller HMAC-godkendelse."
 
 #: ../properties/nm-openvpn-dialog.ui.h:153
-msgid "Extra Certificates:"
-msgstr "Ekstra certifikater:"
+msgid "Extra Certificates"
+msgstr "Ekstra certifikater"
 
 #: ../properties/nm-openvpn-dialog.ui.h:154
 msgid ""
@@ -1452,8 +1444,8 @@ msgid "TLS version control"
 msgstr "Styring af TLS-version"
 
 #: ../properties/nm-openvpn-dialog.ui.h:159
-msgid "TLS _min version: "
-msgstr "_Laveste TLS-version: "
+msgid "TLS _min version"
+msgstr "_Laveste TLS-version"
 
 #: ../properties/nm-openvpn-dialog.ui.h:160
 msgid ""
@@ -1468,8 +1460,8 @@ msgstr ""
 "hÃ¸jeste TLS-version, som understÃ¸ttes af den lokale implementering af SSL."
 
 #: ../properties/nm-openvpn-dialog.ui.h:161
-msgid "TLS ma_x version: "
-msgstr "_HÃ¸jeste TLS-version: "
+msgid "TLS ma_x version"
+msgstr "_HÃ¸jeste TLS-version"
 
 #: ../properties/nm-openvpn-dialog.ui.h:162
 msgid ""
@@ -1492,8 +1484,8 @@ msgstr ""
 "Konfiguration: http-proxy eller socks-proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:166
-msgid "Proxy _Type:"
-msgstr "_Proxytype:"
+msgid "Proxy _Type"
+msgstr "_Proxytype"
 
 #: ../properties/nm-openvpn-dialog.ui.h:167
 msgid ""
@@ -1504,8 +1496,8 @@ msgstr ""
 "proxyserver for at fÃ¥ adgang til internettet.</i>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:168
-msgid "Server _Address:"
-msgstr "_Serveradresse:"
+msgid "Server _Address"
+msgstr "_Serveradresse"
 
 #: ../properties/nm-openvpn-dialog.ui.h:169
 msgid ""
@@ -1516,8 +1508,8 @@ msgstr ""
 "Konfiguration: http-proxy eller socks-proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:171
-msgid "_Port:"
-msgstr "Po_rt:"
+msgid "_Port"
+msgstr "Po_rt"
 
 #: ../properties/nm-openvpn-dialog.ui.h:172
 msgid ""
@@ -1541,12 +1533,12 @@ msgstr ""
 "Konfiguration: http-proxy-retry eller socks-proxy-retry"
 
 #: ../properties/nm-openvpn-dialog.ui.h:177
-msgid "Proxy _Username:"
-msgstr "Proxybr_ugernavn:"
+msgid "Proxy _Username"
+msgstr "Proxybr_ugernavn"
 
 #: ../properties/nm-openvpn-dialog.ui.h:178
-msgid "Proxy Passwor_d:"
-msgstr "Proxyad_gangskode:"
+msgid "Proxy Passwor_d"
+msgstr "Proxyad_gangskode"
 
 #: ../properties/nm-openvpn-dialog.ui.h:179
 msgid "HTTP/Socks proxy username passed to OpenVPN when prompted for it."
diff --git a/po/de.po b/po/de.po
index d1d7e84..98c3c8b 100644
--- a/po/de.po
+++ b/po/de.po
@@ -775,8 +775,8 @@ msgid "General"
 msgstr "Allgemein"
 
 #: ../properties/nm-openvpn-dialog.ui.h:13
-msgid "_Gateway:"
-msgstr "_Gateway:"
+msgid "_Gateway"
+msgstr "_Gateway"
 
 #: ../properties/nm-openvpn-dialog.ui.h:14
 msgid ""
@@ -802,13 +802,9 @@ msgstr "CA"
 msgid "User"
 msgstr "Benutzer"
 
-#: ../properties/nm-openvpn-dialog.ui.h:19
-msgid "Password:"
-msgstr "Passwort:"
-
 #: ../properties/nm-openvpn-dialog.ui.h:20
-msgid "User name:"
-msgstr "Benutzername:"
+msgid "User name"
+msgstr "Benutzername"
 
 #: ../properties/nm-openvpn-dialog.ui.h:21
 msgid ""
@@ -829,20 +825,16 @@ msgstr ""
 "config: auth-user-pass"
 
 #: ../properties/nm-openvpn-dialog.ui.h:25
-msgid "Remote IP Address:"
-msgstr "Entfernte IP-Adresse:"
+msgid "Remote IP Address"
+msgstr "Entfernte IP-Adresse"
 
 #: ../properties/nm-openvpn-dialog.ui.h:26
-msgid "Local IP Address:"
-msgstr "Lokale IP-Adresse:"
+msgid "Local IP Address"
+msgstr "Lokale IP-Adresse"
 
 #: ../properties/nm-openvpn-dialog.ui.h:27
-msgid "Key Direction:"
-msgstr "SchlÃ¼sselrichtung:"
-
-#: ../properties/nm-openvpn-dialog.ui.h:28
-msgid "Static Key:"
-msgstr "Statischer SchlÃ¼ssel:"
+msgid "Key Direction"
+msgstr "SchlÃ¼sselrichtung"
 
 #: ../properties/nm-openvpn-dialog.ui.h:29
 msgid ""
@@ -885,8 +877,8 @@ msgstr ""
 "config: static <file> [direction]"
 
 #: ../properties/nm-openvpn-dialog.ui.h:38
-msgid "Type:"
-msgstr "Art:"
+msgid "Type"
+msgstr "Art"
 
 #: ../properties/nm-openvpn-dialog.ui.h:39
 msgid "Select an authentication mode."
@@ -901,8 +893,8 @@ msgid "OpenVPN Advanced Options"
 msgstr "Erweiterte OpenVPN-Einstellungen"
 
 #: ../properties/nm-openvpn-dialog.ui.h:43
-msgid "Use custom gateway p_ort:"
-msgstr "_Gateway-Port:"
+msgid "Use custom gateway p_ort"
+msgstr "_Gateway-Port"
 
 #: ../properties/nm-openvpn-dialog.ui.h:44
 msgid ""
@@ -915,8 +907,8 @@ msgstr ""
 "config: port"
 
 #: ../properties/nm-openvpn-dialog.ui.h:46
-msgid "Use custom _renegotiation interval:"
-msgstr "Benutze_rdefiniertes Intervall fÃ¼r erneute Verhandlung verwenden:"
+msgid "Use custom _renegotiation interval"
+msgstr "Benutze_rdefiniertes Intervall fÃ¼r erneute Verhandlung verwenden"
 
 #: ../properties/nm-openvpn-dialog.ui.h:47
 msgid ""
@@ -929,7 +921,7 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:49
 #, fuzzy
-msgid "Data _compression:"
+msgid "Data _compression"
 msgstr "L_ZO-Komprimierung verwenden"
 
 #: ../properties/nm-openvpn-dialog.ui.h:50
@@ -957,8 +949,8 @@ msgstr ""
 "config: proto tcp-client | udp"
 
 #: ../properties/nm-openvpn-dialog.ui.h:56
-msgid "Set virtual _device type:"
-msgstr "Virtuellen _GerÃ¤tetyp festlegen:"
+msgid "Set virtual _device type"
+msgstr "Virtuellen _GerÃ¤tetyp festlegen"
 
 #: ../properties/nm-openvpn-dialog.ui.h:57
 msgid "Explicitly set virtual device type and name (TUN/TAP)."
@@ -973,8 +965,8 @@ msgstr ""
 "config: dev-type tun | tap"
 
 #: ../properties/nm-openvpn-dialog.ui.h:60
-msgid " and _name:"
-msgstr " und _Name:"
+msgid " and _name"
+msgstr " und _Name"
 
 #: ../properties/nm-openvpn-dialog.ui.h:61
 msgid ""
@@ -987,8 +979,8 @@ msgstr ""
 "config: dev <GerÃ¤tname>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:63
-msgid "Use custom tunnel Maximum Transmission _Unit (MTU):"
-msgstr "Angepasste grÃ¶ÃŸte Ãœbertragungseinheit (MTU) fÃ¼r den _Tunnel verwenden:"
+msgid "Use custom tunnel Maximum Transmission _Unit (MTU)"
+msgstr "Angepasste grÃ¶ÃŸte Ãœbertragungseinheit (MTU) fÃ¼r den _Tunnel verwenden"
 
 #: ../properties/nm-openvpn-dialog.ui.h:64
 msgid ""
@@ -1001,8 +993,8 @@ msgstr ""
 "config: tun-mtu"
 
 #: ../properties/nm-openvpn-dialog.ui.h:66
-msgid "Use custom UDP _fragment size:"
-msgstr "Angepasste UDP-_FragmentgrÃ¶ÃŸe verwenden:"
+msgid "Use custom UDP _fragment size"
+msgstr "Angepasste UDP-_FragmentgrÃ¶ÃŸe verwenden"
 
 #: ../properties/nm-openvpn-dialog.ui.h:67
 msgid ""
@@ -1061,8 +1053,8 @@ msgstr ""
 "config: tun-ipv6"
 
 #: ../properties/nm-openvpn-dialog.ui.h:81
-msgid "Specify pin_g interval:"
-msgstr "Pin_g-Intervall:"
+msgid "Specify pin_g interval"
+msgstr "Pin_g-Intervall"
 
 #: ../properties/nm-openvpn-dialog.ui.h:82
 msgid ""
@@ -1075,8 +1067,8 @@ msgstr ""
 "config: ping <n>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:84
-msgid "Specify _exit or restart ping:"
-msgstr "_Abbruch- oder Neustart-Ping angeben:"
+msgid "Specify _exit or restart ping"
+msgstr "_Abbruch- oder Neustart-Ping angeben"
 
 #: ../properties/nm-openvpn-dialog.ui.h:85
 msgid ""
@@ -1124,8 +1116,8 @@ msgstr ""
 "config: float"
 
 #: ../properties/nm-openvpn-dialog.ui.h:93
-msgid "Specify max routes:"
-msgstr "Maximalrouten angeben:"
+msgid "Specify max routes"
+msgstr "Maximalrouten angeben"
 
 #: ../properties/nm-openvpn-dialog.ui.h:94
 msgid ""
@@ -1146,8 +1138,8 @@ msgstr ""
 "config: cipher"
 
 #: ../properties/nm-openvpn-dialog.ui.h:98
-msgid "Use custom _size of cipher key:"
-msgstr "Benutzerdefinierte _GrÃ¶ÃŸe des CodeschlÃ¼ssels verwenden:"
+msgid "Use custom _size of cipher key"
+msgstr "Benutzerdefinierte _GrÃ¶ÃŸe des CodeschlÃ¼ssels verwenden"
 
 #: ../properties/nm-openvpn-dialog.ui.h:99
 msgid ""
@@ -1170,12 +1162,12 @@ msgstr ""
 "config: auth"
 
 #: ../properties/nm-openvpn-dialog.ui.h:103
-msgid "Ci_pher:"
-msgstr "Chiffre:"
+msgid "Ci_pher"
+msgstr "Chiffre"
 
 #: ../properties/nm-openvpn-dialog.ui.h:104
-msgid "_HMAC Authentication:"
-msgstr "HMAC-Legitimierung:"
+msgid "_HMAC Authentication"
+msgstr "HMAC-Legitimierung"
 
 #: ../properties/nm-openvpn-dialog.ui.h:105
 msgid "Disable cipher _negotiation"
@@ -1230,8 +1222,8 @@ msgid "Security"
 msgstr "Sicherheit"
 
 #: ../properties/nm-openvpn-dialog.ui.h:115
-msgid "_Subject Match:"
-msgstr "Betreff-Ãœbereinstimmung:"
+msgid "_Subject Match"
+msgstr "Betreff-Ãœbereinstimmung"
 
 #: ../properties/nm-openvpn-dialog.ui.h:116
 msgid ""
@@ -1248,8 +1240,8 @@ msgstr ""
 "config (klassischer Modus): tls-remote Subjekt-oder-Name"
 
 #: ../properties/nm-openvpn-dialog.ui.h:120
-msgid "Server _Certificate Check:"
-msgstr "ÃœberprÃ¼fung des Server-_Zertifikats:"
+msgid "Server _Certificate Check"
+msgstr "ÃœberprÃ¼fung des Server-_Zertifikats"
 
 #: ../properties/nm-openvpn-dialog.ui.h:121
 msgid ""
@@ -1297,8 +1289,8 @@ msgstr ""
 "RFC3280 TLS-Regeln signiert ist."
 
 #: ../properties/nm-openvpn-dialog.ui.h:133
-msgid "_Remote peer certificate TLS type:"
-msgstr "TLS-Typ des Zertifikats des _entfernten Kommunikationspartners:"
+msgid "_Remote peer certificate TLS type"
+msgstr "TLS-Typ des Zertifikats des _entfernten Kommunikationspartners"
 
 #: ../properties/nm-openvpn-dialog.ui.h:134
 msgid ""
@@ -1326,8 +1318,8 @@ msgstr ""
 "SchlÃ¼ssel signiert ist."
 
 #: ../properties/nm-openvpn-dialog.ui.h:138
-msgid "_Remote peer certificate nsCert designation:"
-msgstr "TLS-Typ des Zertifikats des _entfernten Kommunikationspartners:"
+msgid "_Remote peer certificate nsCert designation"
+msgstr "TLS-Typ des Zertifikats des _entfernten Kommunikationspartners"
 
 #: ../properties/nm-openvpn-dialog.ui.h:139
 msgid ""
@@ -1340,8 +1332,8 @@ msgstr ""
 "config: remote-cert-tls client|server"
 
 #: ../properties/nm-openvpn-dialog.ui.h:141
-msgid "Key _Direction:"
-msgstr "_SchlÃ¼sselrichtung:"
+msgid "Key _Direction"
+msgstr "_SchlÃ¼sselrichtung"
 
 #: ../properties/nm-openvpn-dialog.ui.h:142
 msgid ""
@@ -1372,12 +1364,12 @@ msgstr ""
 "config: tls-auth <file> [direction]"
 
 #: ../properties/nm-openvpn-dialog.ui.h:147
-msgid "Key _File:"
-msgstr "SchlÃ¼sseldatei:"
+msgid "Key _File"
+msgstr "SchlÃ¼sseldatei"
 
 #: ../properties/nm-openvpn-dialog.ui.h:148
-msgid "Mode:"
-msgstr "Modus:"
+msgid "Mode"
+msgstr "Modus"
 
 #: ../properties/nm-openvpn-dialog.ui.h:149
 msgid "Add an additional layer of encryption or HMAC authentication."
@@ -1385,8 +1377,8 @@ msgstr ""
 "ZusÃ¤tzliche Ebene zur VerschlÃ¼sselung oder HMAC-Legitimierung hinzufÃ¼gen."
 
 #: ../properties/nm-openvpn-dialog.ui.h:150
-msgid "Extra Certificates:"
-msgstr "ZusÃ¤tzliche Zertifikate:"
+msgid "Extra Certificates"
+msgstr "ZusÃ¤tzliche Zertifikate"
 
 #: ../properties/nm-openvpn-dialog.ui.h:151
 msgid ""
@@ -1411,7 +1403,7 @@ msgid "TLS version control"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:156
-msgid "TLS _min version: "
+msgid "TLS _min version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:157
@@ -1423,7 +1415,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:158
-msgid "TLS ma_x version: "
+msgid "TLS ma_x version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:159
@@ -1445,8 +1437,8 @@ msgstr ""
 "config: http-proxy or socks-proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:163
-msgid "Proxy _Type:"
-msgstr "Proxy-Typ:"
+msgid "Proxy _Type"
+msgstr "Proxy-Typ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:164
 msgid ""
@@ -1457,8 +1449,8 @@ msgstr ""
 "Zugriff auf das Internet notwendig ist.</i>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:165
-msgid "Server _Address:"
-msgstr "Server-Adresse:"
+msgid "Server _Address"
+msgstr "Server-Adresse"
 
 #: ../properties/nm-openvpn-dialog.ui.h:166
 msgid ""
@@ -1469,8 +1461,8 @@ msgstr ""
 "config: http-proxy oder socks-proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:168
-msgid "_Port:"
-msgstr "Port:"
+msgid "_Port"
+msgstr "Port"
 
 #: ../properties/nm-openvpn-dialog.ui.h:169
 msgid ""
@@ -1494,12 +1486,12 @@ msgstr ""
 "config: http-proxy-retry or socks-proxy-retry"
 
 #: ../properties/nm-openvpn-dialog.ui.h:174
-msgid "Proxy _Username:"
-msgstr "Proxy-Benutzername:"
+msgid "Proxy _Username"
+msgstr "Proxy-Benutzername"
 
 #: ../properties/nm-openvpn-dialog.ui.h:175
-msgid "Proxy Passwor_d:"
-msgstr "Proxy-Passwort:"
+msgid "Proxy Passwor_d"
+msgstr "Proxy-Passwort"
 
 #: ../properties/nm-openvpn-dialog.ui.h:176
 msgid "HTTP/Socks proxy username passed to OpenVPN when prompted for it."
diff --git a/po/dz.po b/po/dz.po
index 2b06e5f..221f14f 100644
--- a/po/dz.po
+++ b/po/dz.po
@@ -750,7 +750,7 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:13
 #, fuzzy
-msgid "_Gateway:"
+msgid "_Gateway"
 msgstr "à½ à½›à½´à½£à¼‹à½¦à¾’à½¼à½ à½²à¼‹à½ à½‘à¾²à½ºà½“à¼‹à½£à½˜: (_P)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:14
@@ -774,15 +774,10 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#: ../properties/nm-openvpn-dialog.ui.h:19
-#, fuzzy
-msgid "Password:"
-msgstr "à½†à½¼à½‚à¼‹à½¡à½²à½‚: (_P)"
-
 #: ../properties/nm-openvpn-dialog.ui.h:20
 #, fuzzy
-msgid "User name:"
-msgstr "à½£à½‚à¼‹à½£à½ºà½“à¼‹à½”à½ à½²à¼‹à½˜à½²à½„à¼‹:"
+msgid "User name"
+msgstr "à½£à½‚à¼‹à½£à½ºà½“à¼‹à½”à½ à½²à¼‹à½˜à½²à½„à¼‹"
 
 #: ../properties/nm-openvpn-dialog.ui.h:21
 msgid ""
@@ -799,23 +794,18 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:25
 #, fuzzy
-msgid "Remote IP Address:"
-msgstr "à½à½‚à¼‹à½¢à½²à½„à¼‹à½‚à½²à¼‹à½¨à½ à½²à¼‹à½”à½²:"
+msgid "Remote IP Address"
+msgstr "à½à½‚à¼‹à½¢à½²à½„à¼‹à½‚à½²à¼‹à½¨à½ à½²à¼‹à½”à½²"
 
 #: ../properties/nm-openvpn-dialog.ui.h:26
 #, fuzzy
-msgid "Local IP Address:"
-msgstr "à½‰à½ºà¼‹à½‚à½“à½¦à¼‹à½¨à½ à½²à¼‹à½”à½²:"
+msgid "Local IP Address"
+msgstr "à½‰à½ºà¼‹à½‚à½“à½¦à¼‹à½¨à½ à½²à¼‹à½”à½²"
 
 #: ../properties/nm-openvpn-dialog.ui.h:27
 #, fuzzy
-msgid "Key Direction:"
-msgstr "à½•à¾±à½¼à½‚à½¦:"
-
-#: ../properties/nm-openvpn-dialog.ui.h:28
-#, fuzzy
-msgid "Static Key:"
-msgstr "à½¢à½´à½–à¼‹à½¦à¾¤à¾±à½¼à½‘à¼‹à½ à½–à½‘à¼‹à½¡à½¼à½‘à¼‹à½”à½ à½²à¼‹à½£à¾¡à½ºà¼‹à½˜à½²à½‚:"
+msgid "Key Direction"
+msgstr "à½•à¾±à½¼à½‚à½¦"
 
 #: ../properties/nm-openvpn-dialog.ui.h:29
 msgid ""
@@ -845,7 +835,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:38
-msgid "Type:"
+msgid "Type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:39
@@ -863,7 +853,7 @@ msgstr "à½à½²à¼‹à½”à½²à¼‹à½¨à½ºà½“à¼‹à½à¼‹à½•à¾±à½ºà¼‹à½¦à¾”à¼‹à½‚à½¡à½¢à¼‹à½‚
 
 #: ../properties/nm-openvpn-dialog.ui.h:43
 #, fuzzy
-msgid "Use custom gateway p_ort:"
+msgid "Use custom gateway p_ort"
 msgstr "à½ à½›à½´à½£à¼‹à½¦à¾’à½¼à½ à½²à¼‹à½ à½‘à¾²à½ºà½“à¼‹à½£à½˜: (_P)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:44
@@ -874,7 +864,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:46
-msgid "Use custom _renegotiation interval:"
+msgid "Use custom _renegotiation interval"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:47
@@ -885,7 +875,7 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:49
 #, fuzzy
-msgid "Data _compression:"
+msgid "Data _compression"
 msgstr "à½¨à½ºà½£à¼‹à½›à½ºà½¢à½Œà½²à¼‹à½¨à½ºà½–à¼‹à½–à½™à½´à½‚à½¦à¼‹à½£à½‚à¼‹à½£à½ºà½“à¼‹à½ à½à½–à¼‹"
 
 #: ../properties/nm-openvpn-dialog.ui.h:50
@@ -909,7 +899,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:56
-msgid "Set virtual _device type:"
+msgid "Set virtual _device type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:57
@@ -923,7 +913,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:60
-msgid " and _name:"
+msgid " and _name"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:61
@@ -934,7 +924,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:63
-msgid "Use custom tunnel Maximum Transmission _Unit (MTU):"
+msgid "Use custom tunnel Maximum Transmission _Unit (MTU)"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:64
@@ -945,7 +935,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:66
-msgid "Use custom UDP _fragment size:"
+msgid "Use custom UDP _fragment size"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:67
@@ -996,7 +986,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:81
-msgid "Specify pin_g interval:"
+msgid "Specify pin_g interval"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:82
@@ -1007,7 +997,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:84
-msgid "Specify _exit or restart ping:"
+msgid "Specify _exit or restart ping"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:85
@@ -1038,7 +1028,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:93
-msgid "Specify max routes:"
+msgid "Specify max routes"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:94
@@ -1055,7 +1045,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:98
-msgid "Use custom _size of cipher key:"
+msgid "Use custom _size of cipher key"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:99
@@ -1074,11 +1064,11 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:103
 #, fuzzy
-msgid "Ci_pher:"
+msgid "Ci_pher"
 msgstr "à½‚à½¦à½„à¼‹à½¡à½²à½‚:  %s"
 
 #: ../properties/nm-openvpn-dialog.ui.h:104
-msgid "_HMAC Authentication:"
+msgid "_HMAC Authentication"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:105
@@ -1126,7 +1116,7 @@ msgid "Security"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:115
-msgid "_Subject Match:"
+msgid "_Subject Match"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:116
@@ -1139,8 +1129,8 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:120
 #, fuzzy
-msgid "Server _Certificate Check:"
-msgstr "à½£à½‚à¼‹à½à¾±à½ºà½¢:"
+msgid "Server _Certificate Check"
+msgstr "à½£à½‚à¼‹à½à¾±à½ºà½¢"
 
 #: ../properties/nm-openvpn-dialog.ui.h:121
 msgid ""
@@ -1170,7 +1160,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:133
-msgid "_Remote peer certificate TLS type:"
+msgid "_Remote peer certificate TLS type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:134
@@ -1191,7 +1181,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:138
-msgid "_Remote peer certificate nsCert designation:"
+msgid "_Remote peer certificate nsCert designation"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:139
@@ -1203,8 +1193,8 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:141
 #, fuzzy
-msgid "Key _Direction:"
-msgstr "à½•à¾±à½¼à½‚à½¦:"
+msgid "Key _Direction"
+msgstr "à½•à¾±à½¼à½‚à½¦"
 
 #: ../properties/nm-openvpn-dialog.ui.h:142
 msgid ""
@@ -1224,11 +1214,11 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:147
-msgid "Key _File:"
+msgid "Key _File"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:148
-msgid "Mode:"
+msgid "Mode"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:149
@@ -1237,8 +1227,8 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:150
 #, fuzzy
-msgid "Extra Certificates:"
-msgstr "à½£à½‚à¼‹à½à¾±à½ºà½¢:"
+msgid "Extra Certificates"
+msgstr "à½£à½‚à¼‹à½à¾±à½ºà½¢"
 
 #: ../properties/nm-openvpn-dialog.ui.h:151
 msgid ""
@@ -1260,7 +1250,7 @@ msgid "TLS version control"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:156
-msgid "TLS _min version: "
+msgid "TLS _min version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:157
@@ -1272,7 +1262,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:158
-msgid "TLS ma_x version: "
+msgid "TLS ma_x version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:159
@@ -1293,7 +1283,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:163
-msgid "Proxy _Type:"
+msgid "Proxy _Type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:164
@@ -1304,7 +1294,7 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:165
 #, fuzzy
-msgid "Server _Address:"
+msgid "Server _Address"
 msgstr "à½ à½›à½´à½£à¼‹à½¦à¾’à½¼à½ à½²à¼‹à½à¼‹à½–à¾±à½„à¼‹: (_G)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:166
@@ -1315,7 +1305,7 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:168
 #, fuzzy
-msgid "_Port:"
+msgid "_Port"
 msgstr "à½ à½‘à¾²à½ºà½“à¼‹à½£à½˜:  %s"
 
 #: ../properties/nm-openvpn-dialog.ui.h:169
@@ -1336,12 +1326,12 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:174
 #, fuzzy
-msgid "Proxy _Username:"
+msgid "Proxy _Username"
 msgstr "à½£à½‚à¼‹à½£à½ºà½“à¼‹à½”à½ à½²à¼‹à½˜à½²à½„à¼‹: (_U)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:175
 #, fuzzy
-msgid "Proxy Passwor_d:"
+msgid "Proxy Passwor_d"
 msgstr "à½†à½¼à½‚à¼‹à½¡à½²à½‚: (_P)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:176
diff --git a/po/el.po b/po/el.po
index 2f14ec8..0dd8280 100644
--- a/po/el.po
+++ b/po/el.po
@@ -751,8 +751,8 @@ msgid "General"
 msgstr "Î“ÎµÎ½Î¹ÎºÎ¬"
 
 #: ../properties/nm-openvpn-dialog.ui.h:13
-msgid "_Gateway:"
-msgstr "Î Ï_Î»Î· Î´Î¹ÎºÏ„ÏÎ¿Ï…:"
+msgid "_Gateway"
+msgstr "Î Ï_Î»Î· Î´Î¹ÎºÏ„ÏÎ¿Ï…"
 
 #: ../properties/nm-openvpn-dialog.ui.h:14
 msgid ""
@@ -769,7 +769,7 @@ msgstr ""
 #: ../properties/nm-openvpn-dialog.ui.h:16
 #, fuzzy
 msgid "Authentication"
-msgstr "Î Î¹ÏƒÏ„Î¿Ï€Î¿Î¯Î·ÏƒÎ· TLS:"
+msgstr "Î Î¹ÏƒÏ„Î¿Ï€Î¿Î¯Î·ÏƒÎ· TLS"
 
 #: ../properties/nm-openvpn-dialog.ui.h:17
 msgid "CA"
@@ -779,13 +779,9 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#: ../properties/nm-openvpn-dialog.ui.h:19
-msgid "Password:"
-msgstr "ÎšÏ‰Î´Î¹ÎºÏŒÏ‚ Ï€ÏÏŒÏƒÎ²Î±ÏƒÎ·Ï‚:"
-
 #: ../properties/nm-openvpn-dialog.ui.h:20
-msgid "User name:"
-msgstr "ÎŒÎ½Î¿Î¼Î± Ï‡ÏÎ®ÏƒÏ„Î·:"
+msgid "User name"
+msgstr "ÎŒÎ½Î¿Î¼Î± Ï‡ÏÎ®ÏƒÏ„Î·"
 
 #: ../properties/nm-openvpn-dialog.ui.h:21
 msgid ""
@@ -806,20 +802,16 @@ msgstr ""
 "config: auth-user-pass"
 
 #: ../properties/nm-openvpn-dialog.ui.h:25
-msgid "Remote IP Address:"
-msgstr "Î‘Ï€Î¿Î¼Î±ÎºÏÏ…ÏƒÎ¼ÎÎ½Î· Î´Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ· IP:"
+msgid "Remote IP Address"
+msgstr "Î‘Ï€Î¿Î¼Î±ÎºÏÏ…ÏƒÎ¼ÎÎ½Î· Î´Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ· IP"
 
 #: ../properties/nm-openvpn-dialog.ui.h:26
-msgid "Local IP Address:"
-msgstr "Î¤Î¿Ï€Î¹ÎºÎ® Î´Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ· IP:"
+msgid "Local IP Address"
+msgstr "Î¤Î¿Ï€Î¹ÎºÎ® Î´Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ· IP"
 
 #: ../properties/nm-openvpn-dialog.ui.h:27
-msgid "Key Direction:"
-msgstr "ÎšÎ±Ï„ÎµÏÎ¸Ï…Î½ÏƒÎ· ÎºÎ»ÎµÎ¹Î´Î¹Î¿Ï:"
-
-#: ../properties/nm-openvpn-dialog.ui.h:28
-msgid "Static Key:"
-msgstr "Î£Ï„Î±Ï„Î¹ÎºÏŒ ÎšÎ»ÎµÎ¹Î´Î¯:"
+msgid "Key Direction"
+msgstr "ÎšÎ±Ï„ÎµÏÎ¸Ï…Î½ÏƒÎ· ÎºÎ»ÎµÎ¹Î´Î¹Î¿Ï"
 
 #: ../properties/nm-openvpn-dialog.ui.h:29
 msgid ""
@@ -864,8 +856,8 @@ msgstr ""
 "ÏÏÎ¸Î¼Î¹ÏƒÎ·: static <file> [ÎºÎ±Ï„ÎµÏÎ¸Ï…Î½ÏƒÎ·]"
 
 #: ../properties/nm-openvpn-dialog.ui.h:38
-msgid "Type:"
-msgstr "Î¤ÏÏ€Î¿Ï‚:"
+msgid "Type"
+msgstr "Î¤ÏÏ€Î¿Ï‚"
 
 #: ../properties/nm-openvpn-dialog.ui.h:39
 msgid "Select an authentication mode."
@@ -881,8 +873,8 @@ msgid "OpenVPN Advanced Options"
 msgstr "Î ÏÎ¿Ï‡Ï‰ÏÎ·Î¼ÎÎ½ÎµÏ‚ ÎµÏ€Î¹Î»Î¿Î³ÎÏ‚ OpenVPN"
 
 #: ../properties/nm-openvpn-dialog.ui.h:43
-msgid "Use custom gateway p_ort:"
-msgstr "Î§ÏÎ®ÏƒÎ· Ï€ÏÎ¿ÏƒÎ±ÏÎ¼Î¿ÏƒÎ¼ÎÎ½Î·Ï‚ _Î¸ÏÏÎ±Ï‚ Ï€ÏÎ»Î·Ï‚ Î´Î¹ÎºÏ„ÏÎ¿Ï…:"
+msgid "Use custom gateway p_ort"
+msgstr "Î§ÏÎ®ÏƒÎ· Ï€ÏÎ¿ÏƒÎ±ÏÎ¼Î¿ÏƒÎ¼ÎÎ½Î·Ï‚ _Î¸ÏÏÎ±Ï‚ Ï€ÏÎ»Î·Ï‚ Î´Î¹ÎºÏ„ÏÎ¿Ï…"
 
 #: ../properties/nm-openvpn-dialog.ui.h:44
 msgid ""
@@ -895,8 +887,8 @@ msgstr ""
 "config: port"
 
 #: ../properties/nm-openvpn-dialog.ui.h:46
-msgid "Use custom _renegotiation interval:"
-msgstr "Î§ÏÎ®ÏƒÎ· Ï€ÏÎ¿ÏƒÎ±ÏÎ¼Î¿ÏƒÎ¼ÎÎ½Î¿Ï… Ï‡ÏÏŒÎ½Î¿Ï… ÎµÏ€Î±Î½Î±_Î´Î¹Î±Ï€ÏÎ±Î³Î¼Î¬Ï„ÎµÏ…ÏƒÎ·Ï‚:"
+msgid "Use custom _renegotiation interval"
+msgstr "Î§ÏÎ®ÏƒÎ· Ï€ÏÎ¿ÏƒÎ±ÏÎ¼Î¿ÏƒÎ¼ÎÎ½Î¿Ï… Ï‡ÏÏŒÎ½Î¿Ï… ÎµÏ€Î±Î½Î±_Î´Î¹Î±Ï€ÏÎ±Î³Î¼Î¬Ï„ÎµÏ…ÏƒÎ·Ï‚"
 
 #: ../properties/nm-openvpn-dialog.ui.h:47
 msgid ""
@@ -909,7 +901,7 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:49
 #, fuzzy
-msgid "Data _compression:"
+msgid "Data _compression"
 msgstr "Î§ÏÎ®ÏƒÎ· ÏƒÏ…Î¼Ï€Î¯ÎµÏƒÎ·Ï‚ Î´ÎµÎ´Î¿Î¼ÎÎ½Ï‰Î½ L_ZO"
 
 #: ../properties/nm-openvpn-dialog.ui.h:50
@@ -937,8 +929,8 @@ msgstr ""
 "config: proto tcp-client | udp"
 
 #: ../properties/nm-openvpn-dialog.ui.h:56
-msgid "Set virtual _device type:"
-msgstr "ÎŸÏÎ¹ÏƒÎ¼ÏŒÏ‚ Ï„ÏÏ€Î¿Ï… ÎµÎ¹ÎºÎ¿Î½Î¹ÎºÎ®Ï‚ _ÏƒÏ…ÏƒÎºÎµÏ…Î®Ï‚:"
+msgid "Set virtual _device type"
+msgstr "ÎŸÏÎ¹ÏƒÎ¼ÏŒÏ‚ Ï„ÏÏ€Î¿Ï… ÎµÎ¹ÎºÎ¿Î½Î¹ÎºÎ®Ï‚ _ÏƒÏ…ÏƒÎºÎµÏ…Î®Ï‚"
 
 #: ../properties/nm-openvpn-dialog.ui.h:57
 msgid "Explicitly set virtual device type and name (TUN/TAP)."
@@ -953,8 +945,8 @@ msgstr ""
 "config: dev-type tun | tap"
 
 #: ../properties/nm-openvpn-dialog.ui.h:60
-msgid " and _name:"
-msgstr "ÎºÎ±Î¹ Î¿_Î½ÏŒÎ¼Î±Ï„Î¿Ï‚:"
+msgid " and _name"
+msgstr "ÎºÎ±Î¹ Î¿_Î½ÏŒÎ¼Î±Ï„Î¿Ï‚"
 
 #: ../properties/nm-openvpn-dialog.ui.h:61
 #, fuzzy
@@ -968,8 +960,8 @@ msgstr ""
 "config: dev <name>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:63
-msgid "Use custom tunnel Maximum Transmission _Unit (MTU):"
-msgstr "Î§ÏÎ®ÏƒÎ· Ï€ÏÎ¿ÏƒÎ±ÏÎ¼Î¿ÏƒÎ¼ÎÎ½Î·Ï‚ _Î¼Î¿Î½Î¬Î´Î±Ï‚ Î¼ÎÎ³Î¹ÏƒÏ„Î·Ï‚ Î¼ÎµÏ„Î¬Î´Î¿ÏƒÎ·Ï‚ Î´Î¹Î¿Ï‡ÎÏ„ÎµÏ…ÏƒÎ·Ï‚ (MTU):"
+msgid "Use custom tunnel Maximum Transmission _Unit (MTU)"
+msgstr "Î§ÏÎ®ÏƒÎ· Ï€ÏÎ¿ÏƒÎ±ÏÎ¼Î¿ÏƒÎ¼ÎÎ½Î·Ï‚ _Î¼Î¿Î½Î¬Î´Î±Ï‚ Î¼ÎÎ³Î¹ÏƒÏ„Î·Ï‚ Î¼ÎµÏ„Î¬Î´Î¿ÏƒÎ·Ï‚ Î´Î¹Î¿Ï‡ÎÏ„ÎµÏ…ÏƒÎ·Ï‚ (MTU)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:64
 msgid ""
@@ -982,8 +974,8 @@ msgstr ""
 "config: tun-mtu"
 
 #: ../properties/nm-openvpn-dialog.ui.h:66
-msgid "Use custom UDP _fragment size:"
-msgstr "Î§ÏÎ®ÏƒÎ· Ï€ÏÎ¿ÏƒÎ±ÏÎ¼Î¿ÏƒÎ¼ÎÎ½Î¿Ï… Î¼ÎµÎ³ÎÎ¸Î¿Ï…Ï‚ _Î±Ï€Î¿ÎºÏŒÎ¼Î¼Î±Ï„Î¿Ï‚ UDP:"
+msgid "Use custom UDP _fragment size"
+msgstr "Î§ÏÎ®ÏƒÎ· Ï€ÏÎ¿ÏƒÎ±ÏÎ¼Î¿ÏƒÎ¼ÎÎ½Î¿Ï… Î¼ÎµÎ³ÎÎ¸Î¿Ï…Ï‚ _Î±Ï€Î¿ÎºÏŒÎ¼Î¼Î±Ï„Î¿Ï‚ UDP"
 
 #: ../properties/nm-openvpn-dialog.ui.h:67
 msgid ""
@@ -1041,7 +1033,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:81
-msgid "Specify pin_g interval:"
+msgid "Specify pin_g interval"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:82
@@ -1052,7 +1044,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:84
-msgid "Specify _exit or restart ping:"
+msgid "Specify _exit or restart ping"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:85
@@ -1083,7 +1075,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:93
-msgid "Specify max routes:"
+msgid "Specify max routes"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:94
@@ -1103,8 +1095,8 @@ msgstr ""
 "config: cipher"
 
 #: ../properties/nm-openvpn-dialog.ui.h:98
-msgid "Use custom _size of cipher key:"
-msgstr "Î§ÏÎ®ÏƒÎ· Ï€ÏÎ¿ÏƒÎ±ÏÎ¼Î¿ÏƒÎ¼ÎÎ½Î¿Ï… _Î¼ÎµÎ³ÎÎ¸Î¿Ï…Ï‚ ÎºÎ»ÎµÎ¹Î´Î¹Î¿Ï ÎºÏÏ…Ï€Ï„Î¿Î³ÏÎ¬Ï†Î¹ÏƒÎ·Ï‚:"
+msgid "Use custom _size of cipher key"
+msgstr "Î§ÏÎ®ÏƒÎ· Ï€ÏÎ¿ÏƒÎ±ÏÎ¼Î¿ÏƒÎ¼ÎÎ½Î¿Ï… _Î¼ÎµÎ³ÎÎ¸Î¿Ï…Ï‚ ÎºÎ»ÎµÎ¹Î´Î¹Î¿Ï ÎºÏÏ…Ï€Ï„Î¿Î³ÏÎ¬Ï†Î¹ÏƒÎ·Ï‚"
 
 #: ../properties/nm-openvpn-dialog.ui.h:99
 msgid ""
@@ -1128,12 +1120,12 @@ msgstr ""
 "config: auth"
 
 #: ../properties/nm-openvpn-dialog.ui.h:103
-msgid "Ci_pher:"
-msgstr "Î‘Î»Î³ÏŒÏÎ¹Î¸Î¼Î¿Ï‚ ÎºÏÏ…Ï€Ï„Î¿Î³ÏÎ¬Ï†Î·ÏƒÎ·Ï‚:"
+msgid "Ci_pher"
+msgstr "Î‘Î»Î³ÏŒÏÎ¹Î¸Î¼Î¿Ï‚ ÎºÏÏ…Ï€Ï„Î¿Î³ÏÎ¬Ï†Î·ÏƒÎ·Ï‚"
 
 #: ../properties/nm-openvpn-dialog.ui.h:104
-msgid "_HMAC Authentication:"
-msgstr "Î Î¹ÏƒÏ„Î¿Ï€Î¿Î¯Î·ÏƒÎ· HMAC:"
+msgid "_HMAC Authentication"
+msgstr "Î Î¹ÏƒÏ„Î¿Ï€Î¿Î¯Î·ÏƒÎ· HMAC"
 
 #: ../properties/nm-openvpn-dialog.ui.h:105
 msgid "Disable cipher _negotiation"
@@ -1180,8 +1172,8 @@ msgid "Security"
 msgstr "Î‘ÏƒÏ†Î¬Î»ÎµÎ¹Î±"
 
 #: ../properties/nm-openvpn-dialog.ui.h:115
-msgid "_Subject Match:"
-msgstr "Î£Ï…Î¼Ï†Ï‰Î½Î¯Î± _Î¸ÎÎ¼Î±Ï„Î¿Ï‚:"
+msgid "_Subject Match"
+msgstr "Î£Ï…Î¼Ï†Ï‰Î½Î¯Î± _Î¸ÎÎ¼Î±Ï„Î¿Ï‚"
 
 #: ../properties/nm-openvpn-dialog.ui.h:116
 msgid ""
@@ -1193,8 +1185,8 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:120
 #, fuzzy
-msgid "Server _Certificate Check:"
-msgstr "Î Î¹ÏƒÏ„Î¿Ï€Î¿Î¹Î·Ï„Î¹ÎºÏŒ Ï‡ÏÎ®ÏƒÏ„Î·:"
+msgid "Server _Certificate Check"
+msgstr "Î Î¹ÏƒÏ„Î¿Ï€Î¿Î¹Î·Ï„Î¹ÎºÏŒ Ï‡ÏÎ®ÏƒÏ„Î·"
 
 #: ../properties/nm-openvpn-dialog.ui.h:121
 msgid ""
@@ -1226,8 +1218,8 @@ msgstr ""
 "ÎºÎ»ÎµÎ¹Î´Î¹Î¿Ï ÎºÎ±Î¹ ÎµÏ€ÎµÎºÏ„Î±Î¼ÎÎ½Î· Ï‡ÏÎ®ÏƒÎ· ÎºÎ»ÎµÎ¹Î´Î¹Î¿Ï Î¼Îµ Î²Î¬ÏƒÎ· Ï„Î¿Ï…Ï‚ ÎºÎ±Î½ÏŒÎ½ÎµÏ‚ TLS RFC3280."
 
 #: ../properties/nm-openvpn-dialog.ui.h:133
-msgid "_Remote peer certificate TLS type:"
-msgstr "Î‘_Ï€Î¿Î¼Î±ÎºÏÏ…ÏƒÎ¼ÎÎ½Î¿ Ï€Î¹ÏƒÏ„Î¿Ï€Î¿Î¹Î·Ï„Î¹ÎºÏŒ Î¿Î¼ÏŒÏ„Î¹Î¼Î¿Ï…, Ï„ÏÏ€Î¿Ï… TLS:"
+msgid "_Remote peer certificate TLS type"
+msgstr "Î‘_Ï€Î¿Î¼Î±ÎºÏÏ…ÏƒÎ¼ÎÎ½Î¿ Ï€Î¹ÏƒÏ„Î¿Ï€Î¿Î¹Î·Ï„Î¹ÎºÏŒ Î¿Î¼ÏŒÏ„Î¹Î¼Î¿Ï…, Ï„ÏÏ€Î¿Ï… TLS"
 
 #: ../properties/nm-openvpn-dialog.ui.h:134
 msgid ""
@@ -1255,8 +1247,8 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:138
 #, fuzzy
-msgid "_Remote peer certificate nsCert designation:"
-msgstr "Î‘_Ï€Î¿Î¼Î±ÎºÏÏ…ÏƒÎ¼ÎÎ½Î¿ Ï€Î¹ÏƒÏ„Î¿Ï€Î¿Î¹Î·Ï„Î¹ÎºÏŒ Î¿Î¼ÏŒÏ„Î¹Î¼Î¿Ï…, Ï„ÏÏ€Î¿Ï… TLS:"
+msgid "_Remote peer certificate nsCert designation"
+msgstr "Î‘_Ï€Î¿Î¼Î±ÎºÏÏ…ÏƒÎ¼ÎÎ½Î¿ Ï€Î¹ÏƒÏ„Î¿Ï€Î¿Î¹Î·Ï„Î¹ÎºÏŒ Î¿Î¼ÏŒÏ„Î¹Î¼Î¿Ï…, Ï„ÏÏ€Î¿Ï… TLS"
 
 #: ../properties/nm-openvpn-dialog.ui.h:139
 #, fuzzy
@@ -1270,8 +1262,8 @@ msgstr ""
 "config: remote-cert-tls client|server"
 
 #: ../properties/nm-openvpn-dialog.ui.h:141
-msgid "Key _Direction:"
-msgstr "_ÎšÎ±Ï„ÎµÏÎ¸Ï…Î½ÏƒÎ· ÎºÎ»ÎµÎ¹Î´Î¹Î¿Ï:"
+msgid "Key _Direction"
+msgstr "_ÎšÎ±Ï„ÎµÏÎ¸Ï…Î½ÏƒÎ· ÎºÎ»ÎµÎ¹Î´Î¹Î¿Ï"
 
 #: ../properties/nm-openvpn-dialog.ui.h:142
 #, fuzzy
@@ -1303,11 +1295,11 @@ msgstr ""
 "ÏÏÎ¸Î¼Î¹ÏƒÎ·: tls-auth <file> [ÎºÎ±Ï„ÎµÏÎ¸Ï…Î½ÏƒÎ·]"
 
 #: ../properties/nm-openvpn-dialog.ui.h:147
-msgid "Key _File:"
-msgstr "_Î‘ÏÏ‡ÎµÎ¯Î¿ ÎºÎ»ÎµÎ¹Î´Î¹Î¿Ï:"
+msgid "Key _File"
+msgstr "_Î‘ÏÏ‡ÎµÎ¯Î¿ ÎºÎ»ÎµÎ¹Î´Î¹Î¿Ï"
 
 #: ../properties/nm-openvpn-dialog.ui.h:148
-msgid "Mode:"
+msgid "Mode"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:149
@@ -1317,8 +1309,8 @@ msgstr "Î ÏÎ¿ÏƒÎ¸Î®ÎºÎ· Ï€ÏÏŒÏƒÎ¸ÎµÏ„Î·Ï‚ ÏƒÏ„ÏÏŽÏƒÎ·Ï‚ Ï€Î¹ÏƒÏ„Î¿Ï€Î¿Î¯Î·Ïƒ
 
 #: ../properties/nm-openvpn-dialog.ui.h:150
 #, fuzzy
-msgid "Extra Certificates:"
-msgstr "Î Î¹ÏƒÏ„Î¿Ï€Î¿Î¹Î·Ï„Î¹ÎºÏŒ Ï‡ÏÎ®ÏƒÏ„Î·:"
+msgid "Extra Certificates"
+msgstr "Î Î¹ÏƒÏ„Î¿Ï€Î¿Î¹Î·Ï„Î¹ÎºÏŒ Ï‡ÏÎ®ÏƒÏ„Î·"
 
 #: ../properties/nm-openvpn-dialog.ui.h:151
 msgid ""
@@ -1341,7 +1333,7 @@ msgid "TLS version control"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:156
-msgid "TLS _min version: "
+msgid "TLS _min version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:157
@@ -1353,7 +1345,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:158
-msgid "TLS ma_x version: "
+msgid "TLS ma_x version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:159
@@ -1364,7 +1356,7 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:160
 msgid "TLS Authentication"
-msgstr "Î Î¹ÏƒÏ„Î¿Ï€Î¿Î¯Î·ÏƒÎ· TLS:"
+msgstr "Î Î¹ÏƒÏ„Î¿Ï€Î¿Î¯Î·ÏƒÎ· TLS"
 
 #: ../properties/nm-openvpn-dialog.ui.h:161
 msgid ""
@@ -1375,8 +1367,8 @@ msgstr ""
 "config: http-proxy Î® socks-proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:163
-msgid "Proxy _Type:"
-msgstr "_Î¤ÏÏ€Î¿Ï‚ Î´Î¹Î±Î¼ÎµÏƒÎ¿Î»Î±Î²Î·Ï„Î®:"
+msgid "Proxy _Type"
+msgstr "_Î¤ÏÏ€Î¿Ï‚ Î´Î¹Î±Î¼ÎµÏƒÎ¿Î»Î±Î²Î·Ï„Î®"
 
 #: ../properties/nm-openvpn-dialog.ui.h:164
 msgid ""
@@ -1387,8 +1379,8 @@ msgstr ""
 "Î³Î¹Î± Ï€ÏÏŒÏƒÎ²Î±ÏƒÎ· ÏƒÏ„Î¿ Î´Î¹Î±Î´Î¯ÎºÏ„Ï…Î¿.</i>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:165
-msgid "Server _Address:"
-msgstr "_Î”Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ· Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î®:"
+msgid "Server _Address"
+msgstr "_Î”Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ· Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î®"
 
 #: ../properties/nm-openvpn-dialog.ui.h:166
 msgid ""
@@ -1400,8 +1392,8 @@ msgstr ""
 "config: http-proxy Î® socks-proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:168
-msgid "_Port:"
-msgstr "_Î˜ÏÏÎ±:"
+msgid "_Port"
+msgstr "_Î˜ÏÏÎ±"
 
 #: ../properties/nm-openvpn-dialog.ui.h:169
 msgid ""
@@ -1426,12 +1418,12 @@ msgstr ""
 "config: http-proxy-retry Î® socks-proxy-retry"
 
 #: ../properties/nm-openvpn-dialog.ui.h:174
-msgid "Proxy _Username:"
-msgstr "ÎŒ_Î½Î¿Î¼Î± Ï‡ÏÎ®ÏƒÏ„Î· Î´Î¹Î±Î¼ÎµÏƒÎ¿Î»Î±Î²Î·Ï„Î®:"
+msgid "Proxy _Username"
+msgstr "ÎŒ_Î½Î¿Î¼Î± Ï‡ÏÎ®ÏƒÏ„Î· Î´Î¹Î±Î¼ÎµÏƒÎ¿Î»Î±Î²Î·Ï„Î®"
 
 #: ../properties/nm-openvpn-dialog.ui.h:175
-msgid "Proxy Passwor_d:"
-msgstr "Îš_Ï‰Î´Î¹ÎºÏŒÏ‚ Ï€ÏÏŒÏƒÎ²Î±ÏƒÎ·Ï‚ Î´Î¹Î±Î¼ÎµÏƒÎ¿Î»Î±Î²Î·Ï„Î®:"
+msgid "Proxy Passwor_d"
+msgstr "Îš_Ï‰Î´Î¹ÎºÏŒÏ‚ Ï€ÏÏŒÏƒÎ²Î±ÏƒÎ·Ï‚ Î´Î¹Î±Î¼ÎµÏƒÎ¿Î»Î±Î²Î·Ï„Î®"
 
 #: ../properties/nm-openvpn-dialog.ui.h:176
 msgid "HTTP/Socks proxy username passed to OpenVPN when prompted for it."
diff --git a/po/en_GB.po b/po/en_GB.po
index cc58578..b3d937c 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -747,8 +747,8 @@ msgid "General"
 msgstr "General"
 
 #: ../properties/nm-openvpn-dialog.ui.h:13
-msgid "_Gateway:"
-msgstr "_Gateway:"
+msgid "_Gateway"
+msgstr "_Gateway"
 
 #: ../properties/nm-openvpn-dialog.ui.h:14
 #, fuzzy
@@ -774,15 +774,11 @@ msgstr ""
 #: ../properties/nm-openvpn-dialog.ui.h:18
 #, fuzzy
 msgid "User"
-msgstr "Username:"
-
-#: ../properties/nm-openvpn-dialog.ui.h:19
-msgid "Password:"
-msgstr "Password:"
+msgstr "Username"
 
 #: ../properties/nm-openvpn-dialog.ui.h:20
-msgid "User name:"
-msgstr "User name:"
+msgid "User name"
+msgstr "User name"
 
 #: ../properties/nm-openvpn-dialog.ui.h:21
 msgid ""
@@ -803,20 +799,16 @@ msgstr ""
 "config: auth-user-pass"
 
 #: ../properties/nm-openvpn-dialog.ui.h:25
-msgid "Remote IP Address:"
-msgstr "Remote IP Address:"
+msgid "Remote IP Address"
+msgstr "Remote IP Address"
 
 #: ../properties/nm-openvpn-dialog.ui.h:26
-msgid "Local IP Address:"
-msgstr "Local IP Address:"
+msgid "Local IP Address"
+msgstr "Local IP Address"
 
 #: ../properties/nm-openvpn-dialog.ui.h:27
-msgid "Key Direction:"
-msgstr "Key Direction:"
-
-#: ../properties/nm-openvpn-dialog.ui.h:28
-msgid "Static Key:"
-msgstr "Static Key:"
+msgid "Key Direction"
+msgstr "Key Direction"
 
 #: ../properties/nm-openvpn-dialog.ui.h:29
 msgid ""
@@ -858,8 +850,8 @@ msgstr ""
 "config: static <file> [direction]"
 
 #: ../properties/nm-openvpn-dialog.ui.h:38
-msgid "Type:"
-msgstr "Type:"
+msgid "Type"
+msgstr "Type"
 
 #: ../properties/nm-openvpn-dialog.ui.h:39
 msgid "Select an authentication mode."
@@ -875,8 +867,8 @@ msgid "OpenVPN Advanced Options"
 msgstr "OpenVPN Advanced Options"
 
 #: ../properties/nm-openvpn-dialog.ui.h:43
-msgid "Use custom gateway p_ort:"
-msgstr "Use custom gateway p_ort:"
+msgid "Use custom gateway p_ort"
+msgstr "Use custom gateway p_ort"
 
 #: ../properties/nm-openvpn-dialog.ui.h:44
 #, fuzzy
@@ -889,8 +881,8 @@ msgstr ""
 "config: port"
 
 #: ../properties/nm-openvpn-dialog.ui.h:46
-msgid "Use custom _renegotiation interval:"
-msgstr "Use custom _renegotiation interval:"
+msgid "Use custom _renegotiation interval"
+msgstr "Use custom _renegotiation interval"
 
 #: ../properties/nm-openvpn-dialog.ui.h:47
 msgid ""
@@ -902,7 +894,7 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:49
 #, fuzzy
-msgid "Data _compression:"
+msgid "Data _compression"
 msgstr "Use L_ZO data compression"
 
 #: ../properties/nm-openvpn-dialog.ui.h:50
@@ -929,7 +921,7 @@ msgstr ""
 "config: proto tcp-client | udp"
 
 #: ../properties/nm-openvpn-dialog.ui.h:56
-msgid "Set virtual _device type:"
+msgid "Set virtual _device type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:57
@@ -946,7 +938,7 @@ msgstr ""
 "config: dev tap | tun"
 
 #: ../properties/nm-openvpn-dialog.ui.h:60
-msgid " and _name:"
+msgid " and _name"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:61
@@ -957,8 +949,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:63
-msgid "Use custom tunnel Maximum Transmission _Unit (MTU):"
-msgstr "Use custom tunnel Maximum Transmission _Unit (MTU):"
+msgid "Use custom tunnel Maximum Transmission _Unit (MTU)"
+msgstr "Use custom tunnel Maximum Transmission _Unit (MTU)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:64
 msgid ""
@@ -971,8 +963,8 @@ msgstr ""
 "config: tun-mtu"
 
 #: ../properties/nm-openvpn-dialog.ui.h:66
-msgid "Use custom UDP _fragment size:"
-msgstr "Use custom UDP _fragment size:"
+msgid "Use custom UDP _fragment size"
+msgstr "Use custom UDP _fragment size"
 
 #: ../properties/nm-openvpn-dialog.ui.h:67
 msgid ""
@@ -1029,7 +1021,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:81
-msgid "Specify pin_g interval:"
+msgid "Specify pin_g interval"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:82
@@ -1040,7 +1032,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:84
-msgid "Specify _exit or restart ping:"
+msgid "Specify _exit or restart ping"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:85
@@ -1071,7 +1063,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:93
-msgid "Specify max routes:"
+msgid "Specify max routes"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:94
@@ -1091,7 +1083,7 @@ msgstr ""
 "config: cipher"
 
 #: ../properties/nm-openvpn-dialog.ui.h:98
-msgid "Use custom _size of cipher key:"
+msgid "Use custom _size of cipher key"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:99
@@ -1112,12 +1104,12 @@ msgstr ""
 "config: auth"
 
 #: ../properties/nm-openvpn-dialog.ui.h:103
-msgid "Ci_pher:"
-msgstr "Ci_pher:"
+msgid "Ci_pher"
+msgstr "Ci_pher"
 
 #: ../properties/nm-openvpn-dialog.ui.h:104
-msgid "_HMAC Authentication:"
-msgstr "_HMAC Authentication:"
+msgid "_HMAC Authentication"
+msgstr "_HMAC Authentication"
 
 #: ../properties/nm-openvpn-dialog.ui.h:105
 msgid "Disable cipher _negotiation"
@@ -1164,8 +1156,8 @@ msgid "Security"
 msgstr "Security"
 
 #: ../properties/nm-openvpn-dialog.ui.h:115
-msgid "_Subject Match:"
-msgstr "_Subject Match:"
+msgid "_Subject Match"
+msgstr "_Subject Match"
 
 #: ../properties/nm-openvpn-dialog.ui.h:116
 msgid ""
@@ -1177,8 +1169,8 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:120
 #, fuzzy
-msgid "Server _Certificate Check:"
-msgstr "User Certificate:"
+msgid "Server _Certificate Check"
+msgstr "User Certificate"
 
 #: ../properties/nm-openvpn-dialog.ui.h:121
 msgid ""
@@ -1208,7 +1200,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:133
-msgid "_Remote peer certificate TLS type:"
+msgid "_Remote peer certificate TLS type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:134
@@ -1229,7 +1221,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:138
-msgid "_Remote peer certificate nsCert designation:"
+msgid "_Remote peer certificate nsCert designation"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:139
@@ -1240,8 +1232,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:141
-msgid "Key _Direction:"
-msgstr "Key _Direction:"
+msgid "Key _Direction"
+msgstr "Key _Direction"
 
 #: ../properties/nm-openvpn-dialog.ui.h:142
 #, fuzzy
@@ -1271,11 +1263,11 @@ msgstr ""
 "config: tls-auth <file> [direction]"
 
 #: ../properties/nm-openvpn-dialog.ui.h:147
-msgid "Key _File:"
-msgstr "Key _File:"
+msgid "Key _File"
+msgstr "Key _File"
 
 #: ../properties/nm-openvpn-dialog.ui.h:148
-msgid "Mode:"
+msgid "Mode"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:149
@@ -1285,8 +1277,8 @@ msgstr "Add an additional layer of HMAC authentication."
 
 #: ../properties/nm-openvpn-dialog.ui.h:150
 #, fuzzy
-msgid "Extra Certificates:"
-msgstr "User Certificate:"
+msgid "Extra Certificates"
+msgstr "User Certificate"
 
 #: ../properties/nm-openvpn-dialog.ui.h:151
 msgid ""
@@ -1309,7 +1301,7 @@ msgid "TLS version control"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:156
-msgid "TLS _min version: "
+msgid "TLS _min version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:157
@@ -1321,7 +1313,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:158
-msgid "TLS ma_x version: "
+msgid "TLS ma_x version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:159
@@ -1343,8 +1335,8 @@ msgstr ""
 "config: http-proxy or socks-proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:163
-msgid "Proxy _Type:"
-msgstr "Proxy _Type:"
+msgid "Proxy _Type"
+msgstr "Proxy _Type"
 
 #: ../properties/nm-openvpn-dialog.ui.h:164
 msgid ""
@@ -1355,8 +1347,8 @@ msgstr ""
 "server to access the Internet.</i>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:165
-msgid "Server _Address:"
-msgstr "Server _Address:"
+msgid "Server _Address"
+msgstr "Server _Address"
 
 #: ../properties/nm-openvpn-dialog.ui.h:166
 msgid ""
@@ -1367,8 +1359,8 @@ msgstr ""
 "config: http-proxy or socks-proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:168
-msgid "_Port:"
-msgstr "_Port:"
+msgid "_Port"
+msgstr "_Port"
 
 #: ../properties/nm-openvpn-dialog.ui.h:169
 msgid ""
@@ -1391,12 +1383,12 @@ msgstr ""
 "config: http-proxy-retry or socks-proxy-retry"
 
 #: ../properties/nm-openvpn-dialog.ui.h:174
-msgid "Proxy _Username:"
-msgstr "Proxy _Username:"
+msgid "Proxy _Username"
+msgstr "Proxy _Username"
 
 #: ../properties/nm-openvpn-dialog.ui.h:175
-msgid "Proxy Passwor_d:"
-msgstr "Proxy Passwor_d:"
+msgid "Proxy Passwor_d"
+msgstr "Proxy Passwor_d"
 
 #: ../properties/nm-openvpn-dialog.ui.h:176
 msgid "HTTP/Socks proxy username passed to OpenVPN when prompted for it."
diff --git a/po/eo.po b/po/eo.po
index 502e6a8..22cd7ad 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -734,7 +734,7 @@ msgid "General"
 msgstr "Äœenerale"
 
 #: ../properties/nm-openvpn-dialog.ui.h:13
-msgid "_Gateway:"
+msgid "_Gateway"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:14
@@ -757,13 +757,9 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#: ../properties/nm-openvpn-dialog.ui.h:19
-msgid "Password:"
-msgstr "Pasvorto:"
-
 #: ../properties/nm-openvpn-dialog.ui.h:20
-msgid "User name:"
-msgstr "Uzantonomo:"
+msgid "User name"
+msgstr "Uzantonomo"
 
 #: ../properties/nm-openvpn-dialog.ui.h:21
 msgid ""
@@ -779,19 +775,15 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:25
-msgid "Remote IP Address:"
+msgid "Remote IP Address"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:26
-msgid "Local IP Address:"
+msgid "Local IP Address"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:27
-msgid "Key Direction:"
-msgstr ""
-
-#: ../properties/nm-openvpn-dialog.ui.h:28
-msgid "Static Key:"
+msgid "Key Direction"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:29
@@ -822,8 +814,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:38
-msgid "Type:"
-msgstr "Tipo:"
+msgid "Type"
+msgstr "Tipo"
 
 #: ../properties/nm-openvpn-dialog.ui.h:39
 msgid "Select an authentication mode."
@@ -839,7 +831,7 @@ msgid "OpenVPN Advanced Options"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:43
-msgid "Use custom gateway p_ort:"
+msgid "Use custom gateway p_ort"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:44
@@ -850,7 +842,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:46
-msgid "Use custom _renegotiation interval:"
+msgid "Use custom _renegotiation interval"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:47
@@ -860,7 +852,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:49
-msgid "Data _compression:"
+msgid "Data _compression"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:50
@@ -882,7 +874,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:56
-msgid "Set virtual _device type:"
+msgid "Set virtual _device type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:57
@@ -896,7 +888,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:60
-msgid " and _name:"
+msgid " and _name"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:61
@@ -907,7 +899,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:63
-msgid "Use custom tunnel Maximum Transmission _Unit (MTU):"
+msgid "Use custom tunnel Maximum Transmission _Unit (MTU)"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:64
@@ -918,7 +910,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:66
-msgid "Use custom UDP _fragment size:"
+msgid "Use custom UDP _fragment size"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:67
@@ -969,7 +961,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:81
-msgid "Specify pin_g interval:"
+msgid "Specify pin_g interval"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:82
@@ -980,7 +972,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:84
-msgid "Specify _exit or restart ping:"
+msgid "Specify _exit or restart ping"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:85
@@ -1011,7 +1003,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:93
-msgid "Specify max routes:"
+msgid "Specify max routes"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:94
@@ -1028,7 +1020,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:98
-msgid "Use custom _size of cipher key:"
+msgid "Use custom _size of cipher key"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:99
@@ -1046,11 +1038,11 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:103
-msgid "Ci_pher:"
+msgid "Ci_pher"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:104
-msgid "_HMAC Authentication:"
+msgid "_HMAC Authentication"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:105
@@ -1098,7 +1090,7 @@ msgid "Security"
 msgstr "Sekureco"
 
 #: ../properties/nm-openvpn-dialog.ui.h:115
-msgid "_Subject Match:"
+msgid "_Subject Match"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:116
@@ -1110,7 +1102,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:120
-msgid "Server _Certificate Check:"
+msgid "Server _Certificate Check"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:121
@@ -1141,7 +1133,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:133
-msgid "_Remote peer certificate TLS type:"
+msgid "_Remote peer certificate TLS type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:134
@@ -1162,7 +1154,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:138
-msgid "_Remote peer certificate nsCert designation:"
+msgid "_Remote peer certificate nsCert designation"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:139
@@ -1173,7 +1165,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:141
-msgid "Key _Direction:"
+msgid "Key _Direction"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:142
@@ -1194,11 +1186,11 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:147
-msgid "Key _File:"
+msgid "Key _File"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:148
-msgid "Mode:"
+msgid "Mode"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:149
@@ -1206,7 +1198,7 @@ msgid "Add an additional layer of encryption or HMAC authentication."
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:150
-msgid "Extra Certificates:"
+msgid "Extra Certificates"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:151
@@ -1229,7 +1221,7 @@ msgid "TLS version control"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:156
-msgid "TLS _min version: "
+msgid "TLS _min version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:157
@@ -1241,7 +1233,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:158
-msgid "TLS ma_x version: "
+msgid "TLS ma_x version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:159
@@ -1261,7 +1253,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:163
-msgid "Proxy _Type:"
+msgid "Proxy _Type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:164
@@ -1271,8 +1263,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:165
-msgid "Server _Address:"
-msgstr "Servilo_adreso:"
+msgid "Server _Address"
+msgstr "Servilo_adreso"
 
 #: ../properties/nm-openvpn-dialog.ui.h:166
 msgid ""
@@ -1281,8 +1273,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:168
-msgid "_Port:"
-msgstr "Pordo:"
+msgid "_Port"
+msgstr "Pordo"
 
 #: ../properties/nm-openvpn-dialog.ui.h:169
 msgid ""
@@ -1301,11 +1293,11 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:174
-msgid "Proxy _Username:"
+msgid "Proxy _Username"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:175
-msgid "Proxy Passwor_d:"
+msgid "Proxy Passwor_d"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:176
diff --git a/po/es.po b/po/es.po
index 70118a6..166e359 100644
--- a/po/es.po
+++ b/po/es.po
@@ -827,8 +827,8 @@ msgid "General"
 msgstr "General"
 
 #: ../properties/nm-openvpn-dialog.ui.h:14
-msgid "_Gateway:"
-msgstr "_Pasarela:"
+msgid "_Gateway"
+msgstr "_Pasarela"
 
 #: ../properties/nm-openvpn-dialog.ui.h:15
 msgid ""
@@ -854,13 +854,9 @@ msgstr "CA"
 msgid "User"
 msgstr "Usuario"
 
-#: ../properties/nm-openvpn-dialog.ui.h:20
-msgid "Password:"
-msgstr "ContraseÃ±a:"
-
 #: ../properties/nm-openvpn-dialog.ui.h:21
-msgid "User name:"
-msgstr "Nombre de usuario:"
+msgid "User name"
+msgstr "Nombre de usuario"
 
 #: ../properties/nm-openvpn-dialog.ui.h:22
 msgid ""
@@ -881,20 +877,16 @@ msgstr ""
 "opciÃ³n: auth-user-pass"
 
 #: ../properties/nm-openvpn-dialog.ui.h:26
-msgid "Remote IP Address:"
-msgstr "DirecciÃ³n IP remota:"
+msgid "Remote IP Address"
+msgstr "DirecciÃ³n IP remota"
 
 #: ../properties/nm-openvpn-dialog.ui.h:27
-msgid "Local IP Address:"
-msgstr "DirecciÃ³n IP local:"
+msgid "Local IP Address"
+msgstr "DirecciÃ³n IP local"
 
 #: ../properties/nm-openvpn-dialog.ui.h:28
-msgid "Key Direction:"
-msgstr "DirecciÃ³n de la clave:"
-
-#: ../properties/nm-openvpn-dialog.ui.h:29
-msgid "Static Key:"
-msgstr "Clave estÃ¡tica:"
+msgid "Key Direction"
+msgstr "DirecciÃ³n de la clave"
 
 #: ../properties/nm-openvpn-dialog.ui.h:30
 msgid ""
@@ -935,8 +927,8 @@ msgstr ""
 "opciÃ³n: static <file> [direction]"
 
 #: ../properties/nm-openvpn-dialog.ui.h:39
-msgid "Type:"
-msgstr "Tipo:"
+msgid "Type"
+msgstr "Tipo"
 
 #: ../properties/nm-openvpn-dialog.ui.h:40
 msgid "Select an authentication mode."
@@ -951,8 +943,8 @@ msgid "OpenVPN Advanced Options"
 msgstr "Opciones avanzadas de OpenVPN"
 
 #: ../properties/nm-openvpn-dialog.ui.h:44
-msgid "Use custom gateway p_ort:"
-msgstr "Usar un p_uerto de pasarela personalizado:"
+msgid "Use custom gateway p_ort"
+msgstr "Usar un p_uerto de pasarela personalizado"
 
 #: ../properties/nm-openvpn-dialog.ui.h:45
 msgid ""
@@ -965,8 +957,8 @@ msgstr ""
 "opciÃ³n: port"
 
 #: ../properties/nm-openvpn-dialog.ui.h:47
-msgid "Use custom _renegotiation interval:"
-msgstr "Usar intervalo de _renegociaciÃ³n personalizado:"
+msgid "Use custom _renegotiation interval"
+msgstr "Usar intervalo de _renegociaciÃ³n personalizado"
 
 #: ../properties/nm-openvpn-dialog.ui.h:48
 msgid ""
@@ -978,8 +970,8 @@ msgstr ""
 "opciÃ³n: reneg-sec"
 
 #: ../properties/nm-openvpn-dialog.ui.h:50
-msgid "Data _compression:"
-msgstr "_CompresiÃ³n de datos:"
+msgid "Data _compression"
+msgstr "_CompresiÃ³n de datos"
 
 #: ../properties/nm-openvpn-dialog.ui.h:51
 msgid ""
@@ -1007,8 +999,8 @@ msgstr ""
 "opciÃ³n: proto tcp-client | udp"
 
 #: ../properties/nm-openvpn-dialog.ui.h:57
-msgid "Set virtual _device type:"
-msgstr "Establecer tipo de _dispositivo virtual:"
+msgid "Set virtual _device type"
+msgstr "Establecer tipo de _dispositivo virtual"
 
 #: ../properties/nm-openvpn-dialog.ui.h:58
 msgid "Explicitly set virtual device type and name (TUN/TAP)."
@@ -1025,8 +1017,8 @@ msgstr ""
 "opciÃ³n: dev-type tun | tap"
 
 #: ../properties/nm-openvpn-dialog.ui.h:61
-msgid " and _name:"
-msgstr " y _nombre:"
+msgid " and _name"
+msgstr " y _nombre"
 
 #: ../properties/nm-openvpn-dialog.ui.h:62
 msgid ""
@@ -1039,8 +1031,8 @@ msgstr ""
 "opciÃ³n: dev <nombre>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:64
-msgid "Use custom tunnel Maximum Transmission _Unit (MTU):"
-msgstr "Usar unidad mÃ¡xima de transmisiÃ³n (MTU) del _tÃºnel personalizada:"
+msgid "Use custom tunnel Maximum Transmission _Unit (MTU)"
+msgstr "Usar unidad mÃ¡xima de transmisiÃ³n (MTU) del _tÃºnel personalizada"
 
 #: ../properties/nm-openvpn-dialog.ui.h:65
 msgid ""
@@ -1053,8 +1045,8 @@ msgstr ""
 "opciÃ³n: tun-mtu"
 
 #: ../properties/nm-openvpn-dialog.ui.h:67
-msgid "Use custom UDP _fragment size:"
-msgstr "Usar tamaÃ±o de _fragmentaciÃ³n UDP personalizado:"
+msgid "Use custom UDP _fragment size"
+msgstr "Usar tamaÃ±o de _fragmentaciÃ³n UDP personalizado"
 
 #: ../properties/nm-openvpn-dialog.ui.h:68
 msgid ""
@@ -1128,8 +1120,8 @@ msgstr ""
 "opciÃ³n: tun-ipv6"
 
 #: ../properties/nm-openvpn-dialog.ui.h:85
-msgid "Specify pin_g interval:"
-msgstr "Especificar intervalo de ping:"
+msgid "Specify pin_g interval"
+msgstr "Especificar intervalo de ping"
 
 #: ../properties/nm-openvpn-dialog.ui.h:86
 msgid ""
@@ -1142,8 +1134,8 @@ msgstr ""
 "opciÃ³n: ping <n>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:88
-msgid "Specify _exit or restart ping:"
-msgstr "Especifique ping _exit o restart:"
+msgid "Specify _exit or restart ping"
+msgstr "Especifique ping _exit o restart"
 
 #: ../properties/nm-openvpn-dialog.ui.h:89
 msgid ""
@@ -1190,8 +1182,8 @@ msgstr ""
 "opciÃ³n: float"
 
 #: ../properties/nm-openvpn-dialog.ui.h:97
-msgid "Specify max routes:"
-msgstr "Especificar el mÃ¡ximo de rutas:"
+msgid "Specify max routes"
+msgstr "Especificar el mÃ¡ximo de rutas"
 
 #: ../properties/nm-openvpn-dialog.ui.h:98
 msgid ""
@@ -1212,8 +1204,8 @@ msgstr ""
 "opciÃ³n: cipher"
 
 #: ../properties/nm-openvpn-dialog.ui.h:102
-msgid "Use custom _size of cipher key:"
-msgstr "Usar tamaÃ±o per_sonalizado para la clave de cifrado:"
+msgid "Use custom _size of cipher key"
+msgstr "Usar tamaÃ±o per_sonalizado para la clave de cifrado"
 
 #: ../properties/nm-openvpn-dialog.ui.h:103
 msgid ""
@@ -1239,11 +1231,11 @@ msgstr ""
 # clients/inst_custom_part.ycp:2336
 # clients/inst_custom_part.ycp:2350
 #: ../properties/nm-openvpn-dialog.ui.h:107
-msgid "Ci_pher:"
-msgstr "Cifrado:"
+msgid "Ci_pher"
+msgstr "Cifrado"
 
 #: ../properties/nm-openvpn-dialog.ui.h:108
-msgid "_HMAC Authentication:"
+msgid "_HMAC Authentication"
 msgstr "AutenticaciÃ³n HMAC"
 
 #: ../properties/nm-openvpn-dialog.ui.h:109
@@ -1300,8 +1292,8 @@ msgid "Security"
 msgstr "Seguridad"
 
 #: ../properties/nm-openvpn-dialog.ui.h:119
-msgid "_Subject Match:"
-msgstr "Coincidencia de asunto:"
+msgid "_Subject Match"
+msgstr "Coincidencia de asunto"
 
 #: ../properties/nm-openvpn-dialog.ui.h:120
 msgid ""
@@ -1317,8 +1309,8 @@ msgstr ""
 "opciÃ³n (modo heredado): tls-remote subject-or-name"
 
 #: ../properties/nm-openvpn-dialog.ui.h:124
-msgid "Server _Certificate Check:"
-msgstr "Comprobar el _certificado del servidor:"
+msgid "Server _Certificate Check"
+msgstr "Comprobar el _certificado del servidor"
 
 #: ../properties/nm-openvpn-dialog.ui.h:125
 msgid ""
@@ -1362,8 +1354,8 @@ msgstr ""
 "y una clave extendida basada en las reglas RFC3280 de TLS."
 
 #: ../properties/nm-openvpn-dialog.ui.h:137
-msgid "_Remote peer certificate TLS type:"
-msgstr "Tipo de certificado TLS del par _remoto:"
+msgid "_Remote peer certificate TLS type"
+msgstr "Tipo de certificado TLS del par _remoto"
 
 #: ../properties/nm-openvpn-dialog.ui.h:138
 msgid ""
@@ -1388,8 +1380,8 @@ msgstr ""
 "explÃcita."
 
 #: ../properties/nm-openvpn-dialog.ui.h:142
-msgid "_Remote peer certificate nsCert designation:"
-msgstr "Firma nsCertType del certificado del par _remoto:"
+msgid "_Remote peer certificate nsCert designation"
+msgstr "Firma nsCertType del certificado del par _remoto"
 
 #: ../properties/nm-openvpn-dialog.ui.h:143
 msgid ""
@@ -1402,8 +1394,8 @@ msgstr ""
 "opciÃ³n: ns-cert-type client|server"
 
 #: ../properties/nm-openvpn-dialog.ui.h:145
-msgid "Key _Direction:"
-msgstr "DirecciÃ³n de la clave:"
+msgid "Key _Direction"
+msgstr "DirecciÃ³n de la clave"
 
 #: ../properties/nm-openvpn-dialog.ui.h:146
 msgid ""
@@ -1432,20 +1424,20 @@ msgstr ""
 "opciÃ³n: tls-auth <file> [direction]"
 
 #: ../properties/nm-openvpn-dialog.ui.h:151
-msgid "Key _File:"
-msgstr "Archivo de clave:"
+msgid "Key _File"
+msgstr "Archivo de clave"
 
 #: ../properties/nm-openvpn-dialog.ui.h:152
-msgid "Mode:"
-msgstr "Modo:"
+msgid "Mode"
+msgstr "Modo"
 
 #: ../properties/nm-openvpn-dialog.ui.h:153
 msgid "Add an additional layer of encryption or HMAC authentication."
 msgstr "AÃ±adir una capa adicional de cifrado o autenticaciÃ³n HMAC."
 
 #: ../properties/nm-openvpn-dialog.ui.h:154
-msgid "Extra Certificates:"
-msgstr "Certificados adicionales:"
+msgid "Extra Certificates"
+msgstr "Certificados adicionales"
 
 #: ../properties/nm-openvpn-dialog.ui.h:155
 msgid ""
@@ -1470,8 +1462,8 @@ msgid "TLS version control"
 msgstr "Control de versiÃ³n de TLS"
 
 #: ../properties/nm-openvpn-dialog.ui.h:160
-msgid "TLS _min version: "
-msgstr "VersiÃ³n _mÃnima de TLS:"
+msgid "TLS _min version"
+msgstr "VersiÃ³n _mÃnima de TLS"
 
 #: ../properties/nm-openvpn-dialog.ui.h:161
 msgid ""
@@ -1486,8 +1478,8 @@ msgstr ""
 "versiÃ³n mÃ¡s alta soportada por la implementaciÃ³n local de SSL."
 
 #: ../properties/nm-openvpn-dialog.ui.h:162
-msgid "TLS ma_x version: "
-msgstr "VersiÃ³n _mÃ¡xima de TLS:"
+msgid "TLS ma_x version"
+msgstr "VersiÃ³n _mÃ¡xima de TLS"
 
 #: ../properties/nm-openvpn-dialog.ui.h:163
 msgid ""
@@ -1510,8 +1502,8 @@ msgstr ""
 "opciÃ³n: http-proxy or socks-proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:167
-msgid "Proxy _Type:"
-msgstr "Tipo de proxy:"
+msgid "Proxy _Type"
+msgstr "Tipo de proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:168
 msgid ""
@@ -1522,8 +1514,8 @@ msgstr ""
 "proxy para acceder a Internet.</i>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:169
-msgid "Server _Address:"
-msgstr "DireccioÌn del servidor:"
+msgid "Server _Address"
+msgstr "DireccioÌn del servidor"
 
 #: ../properties/nm-openvpn-dialog.ui.h:170
 msgid ""
@@ -1534,8 +1526,8 @@ msgstr ""
 "opciÃ³n: http-proxy or socks-proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:172
-msgid "_Port:"
-msgstr "Puerto:"
+msgid "_Port"
+msgstr "Puerto"
 
 #: ../properties/nm-openvpn-dialog.ui.h:173
 msgid ""
@@ -1559,12 +1551,12 @@ msgstr ""
 "opciÃ³n: http-proxy-retry or socks-proxy-retry"
 
 #: ../properties/nm-openvpn-dialog.ui.h:178
-msgid "Proxy _Username:"
-msgstr "Usuario del proxy:"
+msgid "Proxy _Username"
+msgstr "Usuario del proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:179
-msgid "Proxy Passwor_d:"
-msgstr "ContraseÃ±a del proxy:"
+msgid "Proxy Passwor_d"
+msgstr "ContraseÃ±a del proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:180
 msgid "HTTP/Socks proxy username passed to OpenVPN when prompted for it."
diff --git a/po/et.po b/po/et.po
index 321e79c..cfd49a9 100644
--- a/po/et.po
+++ b/po/et.po
@@ -741,8 +741,8 @@ msgid "General"
 msgstr "Ãœldine"
 
 #: ../properties/nm-openvpn-dialog.ui.h:13
-msgid "_Gateway:"
-msgstr "_Gateway:"
+msgid "_Gateway"
+msgstr "_Gateway"
 
 #: ../properties/nm-openvpn-dialog.ui.h:14
 msgid ""
@@ -765,13 +765,9 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#: ../properties/nm-openvpn-dialog.ui.h:19
-msgid "Password:"
-msgstr "Parool:"
-
 #: ../properties/nm-openvpn-dialog.ui.h:20
-msgid "User name:"
-msgstr "Kasutajanimi:"
+msgid "User name"
+msgstr "Kasutajanimi"
 
 #: ../properties/nm-openvpn-dialog.ui.h:21
 msgid ""
@@ -787,21 +783,17 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:25
-msgid "Remote IP Address:"
-msgstr "Kaugmasina IP-aadress:"
+msgid "Remote IP Address"
+msgstr "Kaugmasina IP-aadress"
 
 #: ../properties/nm-openvpn-dialog.ui.h:26
-msgid "Local IP Address:"
-msgstr "Kohalik IP-aadress:"
+msgid "Local IP Address"
+msgstr "Kohalik IP-aadress"
 
 #: ../properties/nm-openvpn-dialog.ui.h:27
 #, fuzzy
-msgid "Key Direction:"
-msgstr "VÃµtme suund:"
-
-#: ../properties/nm-openvpn-dialog.ui.h:28
-msgid "Static Key:"
-msgstr "PÃ¼sivÃµti:"
+msgid "Key Direction"
+msgstr "VÃµtme suund"
 
 #: ../properties/nm-openvpn-dialog.ui.h:29
 msgid ""
@@ -835,8 +827,8 @@ msgstr ""
 "Kui sa ei tea, millist vÃ¤Ã¤rtust kasutada, kÃ¼si sÃ¼steemiadministraatorilt.</i>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:38
-msgid "Type:"
-msgstr "TÃ¼Ã¼p:"
+msgid "Type"
+msgstr "TÃ¼Ã¼p"
 
 #: ../properties/nm-openvpn-dialog.ui.h:39
 #, fuzzy
@@ -853,8 +845,8 @@ msgid "OpenVPN Advanced Options"
 msgstr "OpenVPN laiendatud sÃ¤tted"
 
 #: ../properties/nm-openvpn-dialog.ui.h:43
-msgid "Use custom gateway p_ort:"
-msgstr "Kasuta muud gateway _porti:"
+msgid "Use custom gateway p_ort"
+msgstr "Kasuta muud gateway _porti"
 
 #: ../properties/nm-openvpn-dialog.ui.h:44
 msgid ""
@@ -864,8 +856,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:46
-msgid "Use custom _renegotiation interval:"
-msgstr "Kohandatud _korduslÃ¤birÃ¤Ã¤kimiste intervall:"
+msgid "Use custom _renegotiation interval"
+msgstr "Kohandatud _korduslÃ¤birÃ¤Ã¤kimiste intervall"
 
 #: ../properties/nm-openvpn-dialog.ui.h:47
 msgid ""
@@ -875,7 +867,7 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:49
 #, fuzzy
-msgid "Data _compression:"
+msgid "Data _compression"
 msgstr "L_ZO-pakkimise kasutamine"
 
 #: ../properties/nm-openvpn-dialog.ui.h:50
@@ -897,7 +889,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:56
-msgid "Set virtual _device type:"
+msgid "Set virtual _device type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:57
@@ -911,7 +903,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:60
-msgid " and _name:"
+msgid " and _name"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:61
@@ -922,8 +914,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:63
-msgid "Use custom tunnel Maximum Transmission _Unit (MTU):"
-msgstr "Kohandatud _tunneli suurima edastusÃ¼hiku suurus (MTU):"
+msgid "Use custom tunnel Maximum Transmission _Unit (MTU)"
+msgstr "Kohandatud _tunneli suurima edastusÃ¼hiku suurus (MTU)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:64
 msgid ""
@@ -933,8 +925,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:66
-msgid "Use custom UDP _fragment size:"
-msgstr "Kohandatud UDP-_fragmendi suurus:"
+msgid "Use custom UDP _fragment size"
+msgstr "Kohandatud UDP-_fragmendi suurus"
 
 #: ../properties/nm-openvpn-dialog.ui.h:67
 msgid ""
@@ -984,7 +976,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:81
-msgid "Specify pin_g interval:"
+msgid "Specify pin_g interval"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:82
@@ -995,7 +987,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:84
-msgid "Specify _exit or restart ping:"
+msgid "Specify _exit or restart ping"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:85
@@ -1026,7 +1018,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:93
-msgid "Specify max routes:"
+msgid "Specify max routes"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:94
@@ -1043,7 +1035,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:98
-msgid "Use custom _size of cipher key:"
+msgid "Use custom _size of cipher key"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:99
@@ -1061,11 +1053,11 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:103
-msgid "Ci_pher:"
-msgstr "Å iffer:"
+msgid "Ci_pher"
+msgstr "Å iffer"
 
 #: ../properties/nm-openvpn-dialog.ui.h:104
-msgid "_HMAC Authentication:"
+msgid "_HMAC Authentication"
 msgstr "HMAC'iga autentimine"
 
 #: ../properties/nm-openvpn-dialog.ui.h:105
@@ -1113,8 +1105,8 @@ msgid "Security"
 msgstr "Turvalisus"
 
 #: ../properties/nm-openvpn-dialog.ui.h:115
-msgid "_Subject Match:"
-msgstr "Kattuv nimi:"
+msgid "_Subject Match"
+msgstr "Kattuv nimi"
 
 #: ../properties/nm-openvpn-dialog.ui.h:116
 msgid ""
@@ -1126,8 +1118,8 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:120
 #, fuzzy
-msgid "Server _Certificate Check:"
-msgstr "Kasutaja sertifikaat:"
+msgid "Server _Certificate Check"
+msgstr "Kasutaja sertifikaat"
 
 #: ../properties/nm-openvpn-dialog.ui.h:121
 msgid ""
@@ -1157,7 +1149,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:133
-msgid "_Remote peer certificate TLS type:"
+msgid "_Remote peer certificate TLS type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:134
@@ -1178,7 +1170,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:138
-msgid "_Remote peer certificate nsCert designation:"
+msgid "_Remote peer certificate nsCert designation"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:139
@@ -1189,8 +1181,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:141
-msgid "Key _Direction:"
-msgstr "VÃµtme suund:"
+msgid "Key _Direction"
+msgstr "VÃµtme suund"
 
 #: ../properties/nm-openvpn-dialog.ui.h:142
 msgid ""
@@ -1214,11 +1206,11 @@ msgstr ""
 "Kui sa ei tea, millist vÃ¤Ã¤rtust kasutada, kÃ¼si sÃ¼steemiadministraatorilt.</i>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:147
-msgid "Key _File:"
-msgstr "VÃµtmefail:"
+msgid "Key _File"
+msgstr "VÃµtmefail"
 
 #: ../properties/nm-openvpn-dialog.ui.h:148
-msgid "Mode:"
+msgid "Mode"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:149
@@ -1228,8 +1220,8 @@ msgstr "Lisaks TLS-autentimise kasutamine"
 
 #: ../properties/nm-openvpn-dialog.ui.h:150
 #, fuzzy
-msgid "Extra Certificates:"
-msgstr "Kasutaja sertifikaat:"
+msgid "Extra Certificates"
+msgstr "Kasutaja sertifikaat"
 
 #: ../properties/nm-openvpn-dialog.ui.h:151
 msgid ""
@@ -1252,7 +1244,7 @@ msgid "TLS version control"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:156
-msgid "TLS _min version: "
+msgid "TLS _min version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:157
@@ -1264,7 +1256,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:158
-msgid "TLS ma_x version: "
+msgid "TLS ma_x version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:159
@@ -1284,8 +1276,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:163
-msgid "Proxy _Type:"
-msgstr "Proksi liik:"
+msgid "Proxy _Type"
+msgstr "Proksi liik"
 
 #: ../properties/nm-openvpn-dialog.ui.h:164
 msgid ""
@@ -1296,8 +1288,8 @@ msgstr ""
 "proksiserveri kaudu.</i>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:165
-msgid "Server _Address:"
-msgstr "Serveri aadress:"
+msgid "Server _Address"
+msgstr "Serveri aadress"
 
 #: ../properties/nm-openvpn-dialog.ui.h:166
 msgid ""
@@ -1306,8 +1298,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:168
-msgid "_Port:"
-msgstr "Port:"
+msgid "_Port"
+msgstr "Port"
 
 #: ../properties/nm-openvpn-dialog.ui.h:169
 msgid ""
@@ -1327,12 +1319,12 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:174
-msgid "Proxy _Username:"
-msgstr "_Proksi kasutajanimi:"
+msgid "Proxy _Username"
+msgstr "_Proksi kasutajanimi"
 
 #: ../properties/nm-openvpn-dialog.ui.h:175
-msgid "Proxy Passwor_d:"
-msgstr "Proksi parool:"
+msgid "Proxy Passwor_d"
+msgstr "Proksi parool"
 
 #: ../properties/nm-openvpn-dialog.ui.h:176
 msgid "HTTP/Socks proxy username passed to OpenVPN when prompted for it."
diff --git a/po/eu.po b/po/eu.po
index ad8d9e8..423895a 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -777,8 +777,8 @@ msgid "General"
 msgstr "Orokorra"
 
 #: ../properties/nm-openvpn-dialog.ui.h:14
-msgid "_Gateway:"
-msgstr "_Atebidea:"
+msgid "_Gateway"
+msgstr "_Atebidea"
 
 #: ../properties/nm-openvpn-dialog.ui.h:15
 msgid ""
@@ -800,13 +800,9 @@ msgstr "ZE"
 msgid "User"
 msgstr "Erabiltzailea"
 
-#: ../properties/nm-openvpn-dialog.ui.h:20
-msgid "Password:"
-msgstr "Pasahitza:"
-
 #: ../properties/nm-openvpn-dialog.ui.h:21
-msgid "User name:"
-msgstr "Erabiltzaile-izena:"
+msgid "User name"
+msgstr "Erabiltzaile-izena"
 
 #: ../properties/nm-openvpn-dialog.ui.h:22
 msgid ""
@@ -824,20 +820,16 @@ msgstr "OpenVPN-ri eskatutakoan igorritako erabiltzaile-izena. Ezartzen ez bada,
 "konfigurazioa: auth-user-pass"
 
 #: ../properties/nm-openvpn-dialog.ui.h:26
-msgid "Remote IP Address:"
-msgstr "Urruneko IP helbidea:"
+msgid "Remote IP Address"
+msgstr "Urruneko IP helbidea"
 
 #: ../properties/nm-openvpn-dialog.ui.h:27
-msgid "Local IP Address:"
-msgstr "IP helbide lokala:"
+msgid "Local IP Address"
+msgstr "IP helbide lokala"
 
 #: ../properties/nm-openvpn-dialog.ui.h:28
-msgid "Key Direction:"
-msgstr "Gakoaren helbidea:"
-
-#: ../properties/nm-openvpn-dialog.ui.h:29
-msgid "Static Key:"
-msgstr "Gako estatikoa:"
+msgid "Key Direction"
+msgstr "Gakoaren helbidea"
 
 #: ../properties/nm-openvpn-dialog.ui.h:30
 msgid ""
@@ -870,8 +862,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:39
-msgid "Type:"
-msgstr "Mota:"
+msgid "Type"
+msgstr "Mota"
 
 #: ../properties/nm-openvpn-dialog.ui.h:40
 msgid "Select an authentication mode."
@@ -886,8 +878,8 @@ msgid "OpenVPN Advanced Options"
 msgstr "OpenVPN-ren aukera aurreratuak"
 
 #: ../properties/nm-openvpn-dialog.ui.h:44
-msgid "Use custom gateway p_ort:"
-msgstr "Erabili atebidearen _ataka pertsonalizatua:"
+msgid "Use custom gateway p_ort"
+msgstr "Erabili atebidearen _ataka pertsonalizatua"
 
 #: ../properties/nm-openvpn-dialog.ui.h:45
 msgid ""
@@ -897,8 +889,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:47
-msgid "Use custom _renegotiation interval:"
-msgstr "Erabili berriro negoziatzeko bitarte pertsonalizatua:"
+msgid "Use custom _renegotiation interval"
+msgstr "Erabili berriro negoziatzeko bitarte pertsonalizatua"
 
 #: ../properties/nm-openvpn-dialog.ui.h:48
 msgid ""
@@ -908,8 +900,8 @@ msgstr "Negoziatu berriro datu-kanalaren gakoa zehaztutako segundoen ostean.\n"
 "konfigurazioa: reneg-sec"
 
 #: ../properties/nm-openvpn-dialog.ui.h:50
-msgid "Data _compression:"
-msgstr "Datu-_konpresioa:"
+msgid "Data _compression"
+msgstr "Datu-_konpresioa"
 
 #: ../properties/nm-openvpn-dialog.ui.h:51
 msgid ""
@@ -931,8 +923,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:57
-msgid "Set virtual _device type:"
-msgstr "Ezarri gailu _birtual mota:"
+msgid "Set virtual _device type"
+msgstr "Ezarri gailu _birtual mota"
 
 #: ../properties/nm-openvpn-dialog.ui.h:58
 msgid "Explicitly set virtual device type and name (TUN/TAP)."
@@ -946,8 +938,8 @@ msgstr "Ezarri esplizituki gailu birtualaren mota eta izena (TUN/TAP).\n"
 "konfigurazioa: dev-type tun | tap"
 
 #: ../properties/nm-openvpn-dialog.ui.h:61
-msgid " and _name:"
-msgstr " eta _izena:"
+msgid " and _name"
+msgstr " eta _izena"
 
 #: ../properties/nm-openvpn-dialog.ui.h:62
 msgid ""
@@ -957,8 +949,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:64
-msgid "Use custom tunnel Maximum Transmission _Unit (MTU):"
-msgstr "Erabili _tunelaren Gehienezko Transmisio Unitatea (MTU) pertsonalizatua:"
+msgid "Use custom tunnel Maximum Transmission _Unit (MTU)"
+msgstr "Erabili _tunelaren Gehienezko Transmisio Unitatea (MTU) pertsonalizatua"
 
 #: ../properties/nm-openvpn-dialog.ui.h:65
 msgid ""
@@ -969,8 +961,8 @@ msgstr "Hartu TUN gailuaren MTU-a zehaztutako balioa izateko, eta eratorri MTU e
 "konfigurazioa: tun-mtu"
 
 #: ../properties/nm-openvpn-dialog.ui.h:67
-msgid "Use custom UDP _fragment size:"
-msgstr "Erabili UDP _zatiaren tamaina pertsonalizatua:"
+msgid "Use custom UDP _fragment size"
+msgstr "Erabili UDP _zatiaren tamaina pertsonalizatua"
 
 #: ../properties/nm-openvpn-dialog.ui.h:68
 msgid ""
@@ -1033,7 +1025,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:85
-msgid "Specify pin_g interval:"
+msgid "Specify pin_g interval"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:86
@@ -1044,7 +1036,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:88
-msgid "Specify _exit or restart ping:"
+msgid "Specify _exit or restart ping"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:89
@@ -1075,7 +1067,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:97
-msgid "Specify max routes:"
+msgid "Specify max routes"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:98
@@ -1093,8 +1085,8 @@ msgstr "Enkriptatu paketeak zifratzeko algoritmoarekin. Lehenetsia BF-CBC da (Bl
 "konfigurazioa: cipher"
 
 #: ../properties/nm-openvpn-dialog.ui.h:102
-msgid "Use custom _size of cipher key:"
-msgstr "Erabili zifratze-gakoaren _tamaina pertsonalizatua:"
+msgid "Use custom _size of cipher key"
+msgstr "Erabili zifratze-gakoaren _tamaina pertsonalizatua"
 
 #: ../properties/nm-openvpn-dialog.ui.h:103
 msgid ""
@@ -1113,12 +1105,12 @@ msgstr "Autentifikatu paketeak HMAC-ekin mezuen laburpenaren algoritmoa erabiliz
 "konfigurazioa: auth"
 
 #: ../properties/nm-openvpn-dialog.ui.h:107
-msgid "Ci_pher:"
-msgstr "Zifratua:"
+msgid "Ci_pher"
+msgstr "Zifratua"
 
 #: ../properties/nm-openvpn-dialog.ui.h:108
-msgid "_HMAC Authentication:"
-msgstr "HMAC autentifikazioa:"
+msgid "_HMAC Authentication"
+msgstr "HMAC autentifikazioa"
 
 #: ../properties/nm-openvpn-dialog.ui.h:109
 msgid "Disable cipher _negotiation"
@@ -1165,8 +1157,8 @@ msgid "Security"
 msgstr "Segurtasuna"
 
 #: ../properties/nm-openvpn-dialog.ui.h:119
-msgid "_Subject Match:"
-msgstr "Gaiaren bat etortzea:"
+msgid "_Subject Match"
+msgstr "Gaiaren bat etortzea"
 
 #: ../properties/nm-openvpn-dialog.ui.h:120
 msgid ""
@@ -1177,7 +1169,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:124
-msgid "Server _Certificate Check:"
+msgid "Server _Certificate Check"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:125
@@ -1208,8 +1200,8 @@ msgid ""
 msgstr "Parekoaren ziurtagiria gako zehatz baten erabilerarekin sinatuta eta gakoaren erabilera RFC3280 TLS 
arauetan oinarrituta egotea egotea eskatzen du."
 
 #: ../properties/nm-openvpn-dialog.ui.h:137
-msgid "_Remote peer certificate TLS type:"
-msgstr "_Urruneko parekoaren TLS ziurtagiri mota:"
+msgid "_Remote peer certificate TLS type"
+msgstr "_Urruneko parekoaren TLS ziurtagiri mota"
 
 #: ../properties/nm-openvpn-dialog.ui.h:138
 msgid ""
@@ -1230,7 +1222,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:142
-msgid "_Remote peer certificate nsCert designation:"
+msgid "_Remote peer certificate nsCert designation"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:143
@@ -1241,8 +1233,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:145
-msgid "Key _Direction:"
-msgstr "Gakoaren helbidea:"
+msgid "Key _Direction"
+msgstr "Gakoaren helbidea"
 
 #: ../properties/nm-openvpn-dialog.ui.h:146
 msgid ""
@@ -1262,20 +1254,20 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:151
-msgid "Key _File:"
-msgstr "Gakoaren fitxategia:"
+msgid "Key _File"
+msgstr "Gakoaren fitxategia"
 
 #: ../properties/nm-openvpn-dialog.ui.h:152
-msgid "Mode:"
-msgstr "Modua:"
+msgid "Mode"
+msgstr "Modua"
 
 #: ../properties/nm-openvpn-dialog.ui.h:153
 msgid "Add an additional layer of encryption or HMAC authentication."
 msgstr "Gehitu zifratzerako geruza gehigarria edo HMAC autentifikazioa."
 
 #: ../properties/nm-openvpn-dialog.ui.h:154
-msgid "Extra Certificates:"
-msgstr "Ziurtagiri gehigarriak:"
+msgid "Extra Certificates"
+msgstr "Ziurtagiri gehigarriak"
 
 #: ../properties/nm-openvpn-dialog.ui.h:155
 msgid ""
@@ -1297,7 +1289,7 @@ msgid "TLS version control"
 msgstr "TLS bertsio-kontrola"
 
 #: ../properties/nm-openvpn-dialog.ui.h:160
-msgid "TLS _min version: "
+msgid "TLS _min version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:161
@@ -1309,7 +1301,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:162
-msgid "TLS ma_x version: "
+msgid "TLS ma_x version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:163
@@ -1330,8 +1322,8 @@ msgstr "Proxy mota: HTTP edo Socks.\n"
 "konfigurazioa: http-proxy edo socks-proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:167
-msgid "Proxy _Type:"
-msgstr "Proxy mota:"
+msgid "Proxy _Type"
+msgstr "Proxy mota"
 
 #: ../properties/nm-openvpn-dialog.ui.h:168
 msgid ""
@@ -1340,8 +1332,8 @@ msgid ""
 msgstr "<i>Hautatu aukera hau erakundeak proxy zerbitzari bat behar badu Internetera sarbidetzeko.</i>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:169
-msgid "Server _Address:"
-msgstr "Zerbitzariaren helbidea:"
+msgid "Server _Address"
+msgstr "Zerbitzariaren helbidea"
 
 #: ../properties/nm-openvpn-dialog.ui.h:170
 msgid ""
@@ -1351,8 +1343,8 @@ msgstr "Konektatu urruneko ostalariarekin helbide hau duen proxy-aren bidez.\n"
 "konfigurazioa: http-proxy edo socks-proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:172
-msgid "_Port:"
-msgstr "Ataka:"
+msgid "_Port"
+msgstr "Ataka"
 
 #: ../properties/nm-openvpn-dialog.ui.h:173
 msgid ""
@@ -1373,12 +1365,12 @@ msgstr "Saiatu etengabe proxy-aren erroreen aurrean. Honek SIGUSR1 leheneratzea
 "konfigurazioa: http-proxy-retry edo socks-proxy-retry"
 
 #: ../properties/nm-openvpn-dialog.ui.h:178
-msgid "Proxy _Username:"
-msgstr "Proxy-aren erabiltzaile-izena:"
+msgid "Proxy _Username"
+msgstr "Proxy-aren erabiltzaile-izena"
 
 #: ../properties/nm-openvpn-dialog.ui.h:179
-msgid "Proxy Passwor_d:"
-msgstr "Proxy-aren pasahitza:"
+msgid "Proxy Passwor_d"
+msgstr "Proxy-aren pasahitza"
 
 #: ../properties/nm-openvpn-dialog.ui.h:180
 msgid "HTTP/Socks proxy username passed to OpenVPN when prompted for it."
diff --git a/po/fa.po b/po/fa.po
index 77916cd..33d9cd0 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -737,8 +737,8 @@ msgid "General"
 msgstr "Ø¹Ù…ÙˆÙ…ÛŒ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:13
-msgid "_Gateway:"
-msgstr "_Ø¯Ø±ÙˆØ§Ø²Ù‡:"
+msgid "_Gateway"
+msgstr "_Ø¯Ø±ÙˆØ§Ø²Ù‡"
 
 #: ../properties/nm-openvpn-dialog.ui.h:14
 msgid ""
@@ -761,13 +761,9 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#: ../properties/nm-openvpn-dialog.ui.h:19
-msgid "Password:"
-msgstr "Ú¯Ø°Ø±ÙˆØ§Ú˜Ù‡:"
-
 #: ../properties/nm-openvpn-dialog.ui.h:20
-msgid "User name:"
-msgstr "Ù†Ø§Ù…â€ŒÚ©Ø§Ø±Ø¨Ø±ÛŒ:"
+msgid "User name"
+msgstr "Ù†Ø§Ù…â€ŒÚ©Ø§Ø±Ø¨Ø±ÛŒ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:21
 msgid ""
@@ -783,21 +779,17 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:25
-msgid "Remote IP Address:"
-msgstr "Ø¢Ø¯Ø±Ø³ IP Ø¯ÙˆØ±Ø¯Ø³Øª:"
+msgid "Remote IP Address"
+msgstr "Ø¢Ø¯Ø±Ø³ IP Ø¯ÙˆØ±Ø¯Ø³Øª"
 
 #: ../properties/nm-openvpn-dialog.ui.h:26
-msgid "Local IP Address:"
-msgstr "Ø¢Ø¯Ø±Ø³ IP Ù…ØÙ„ÛŒ:"
+msgid "Local IP Address"
+msgstr "Ø¢Ø¯Ø±Ø³ IP Ù…ØÙ„ÛŒ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:27
 #, fuzzy
-msgid "Key Direction:"
-msgstr "Ø¬Ù‡Øª Ú©Ù„ÛŒØ¯:"
-
-#: ../properties/nm-openvpn-dialog.ui.h:28
-msgid "Static Key:"
-msgstr "Ú©Ù„ÛŒØ¯ Ø§ÛŒØ³ØªØ§:"
+msgid "Key Direction"
+msgstr "Ø¬Ù‡Øª Ú©Ù„ÛŒØ¯"
 
 #: ../properties/nm-openvpn-dialog.ui.h:29
 msgid ""
@@ -831,8 +823,8 @@ msgstr ""
 "Ù…Ù‚Ø¯Ø§Ø±ÛŒ Ú©Ù‡ Ø¨Ø§ÛŒØ¯ Ø§Ø³ØªÙØ§Ø¯Ù‡ Ù†Ø§Ù…Ø·Ù…Ø¦Ù† Ù‡Ø³ØªÛŒØ¯ØŒ Ø¨Ø§ Ù…Ø¯ÛŒØ±ÛŒØª Ø³ÛŒØ³ØªÙ… Ø®ÙˆØ¯ ØªÙ…Ø§Ø³ Ø¨Ú¯ÛŒØ±ÛŒØ¯.</i>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:38
-msgid "Type:"
-msgstr "Ù†ÙˆØ¹:"
+msgid "Type"
+msgstr "Ù†ÙˆØ¹"
 
 #: ../properties/nm-openvpn-dialog.ui.h:39
 #, fuzzy
@@ -849,8 +841,8 @@ msgid "OpenVPN Advanced Options"
 msgstr "Ú¯Ø²ÛŒÙ†Ù‡â€ŒÙ‡Ø§ÛŒ Ù¾ÛŒØ´Ø±ÙØªÙ‡â€ŒÛŒ OpenVPN"
 
 #: ../properties/nm-openvpn-dialog.ui.h:43
-msgid "Use custom gateway p_ort:"
-msgstr "Ø§Ø³ØªÙØ§Ø¯Ù‡ Ø§Ø² _Ø¯Ø±Ú¯Ø§Ù‡ Ø¯Ø±ÙˆØ§Ø²Ù‡â€ŒÛŒ Ø§Ø®ØªØµØ§ØµÛŒ:"
+msgid "Use custom gateway p_ort"
+msgstr "Ø§Ø³ØªÙØ§Ø¯Ù‡ Ø§Ø² _Ø¯Ø±Ú¯Ø§Ù‡ Ø¯Ø±ÙˆØ§Ø²Ù‡â€ŒÛŒ Ø§Ø®ØªØµØ§ØµÛŒ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:44
 msgid ""
@@ -860,8 +852,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:46
-msgid "Use custom _renegotiation interval:"
-msgstr "Ø§Ø³ØªÙØ§Ø¯Ù‡ Ø§Ø² ÙˆÙ‚ÙÙ‡ Ø¯Ù„Ø®ÙˆØ§Ù‡ Ø¯Ø± Ø§Ø±ØªØ¨Ø§Ø· Ù…Ø¬Ø¯Ø¯:"
+msgid "Use custom _renegotiation interval"
+msgstr "Ø§Ø³ØªÙØ§Ø¯Ù‡ Ø§Ø² ÙˆÙ‚ÙÙ‡ Ø¯Ù„Ø®ÙˆØ§Ù‡ Ø¯Ø± Ø§Ø±ØªØ¨Ø§Ø· Ù…Ø¬Ø¯Ø¯"
 
 #: ../properties/nm-openvpn-dialog.ui.h:47
 msgid ""
@@ -871,7 +863,7 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:49
 #, fuzzy
-msgid "Data _compression:"
+msgid "Data _compression"
 msgstr "Ø§Ø³ØªÙØ§Ø¯Ù‡ Ø§Ø² ÙØ´Ø±Ø¯Ù‡â€ŒØ³Ø§Ø²ÛŒ Ø§Ø·Ù„Ø§Ø¹Ø§Øª _LZO"
 
 #: ../properties/nm-openvpn-dialog.ui.h:50
@@ -893,7 +885,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:56
-msgid "Set virtual _device type:"
+msgid "Set virtual _device type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:57
@@ -907,7 +899,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:60
-msgid " and _name:"
+msgid " and _name"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:61
@@ -918,8 +910,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:63
-msgid "Use custom tunnel Maximum Transmission _Unit (MTU):"
-msgstr "Ø§Ø³ØªÙØ§Ø¯Ù‡ Ø§Ø² _ØªÙˆÙ†Ù„ Ø¨ÛŒØ´ÛŒÙ†Ù‡ Ø§Ø±Ø³Ø§Ù„ ÙˆØ§ØØ¯ Ø¯Ù„Ø®ÙˆØ§Ù‡ (MTU):"
+msgid "Use custom tunnel Maximum Transmission _Unit (MTU)"
+msgstr "Ø§Ø³ØªÙØ§Ø¯Ù‡ Ø§Ø² _ØªÙˆÙ†Ù„ Ø¨ÛŒØ´ÛŒÙ†Ù‡ Ø§Ø±Ø³Ø§Ù„ ÙˆØ§ØØ¯ Ø¯Ù„Ø®ÙˆØ§Ù‡ (MTU)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:64
 msgid ""
@@ -929,8 +921,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:66
-msgid "Use custom UDP _fragment size:"
-msgstr "Ø§Ø³ØªÙØ§Ø¯Ù‡ Ø§Ø² Ø§Ù†Ø¯Ø§Ø²Ù‡ _Ù‚Ø·Ø¹Ù‡ USP Ø¯Ù„Ø®ÙˆØ§Ù‡:"
+msgid "Use custom UDP _fragment size"
+msgstr "Ø§Ø³ØªÙØ§Ø¯Ù‡ Ø§Ø² Ø§Ù†Ø¯Ø§Ø²Ù‡ _Ù‚Ø·Ø¹Ù‡ USP Ø¯Ù„Ø®ÙˆØ§Ù‡"
 
 #: ../properties/nm-openvpn-dialog.ui.h:67
 msgid ""
@@ -980,7 +972,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:81
-msgid "Specify pin_g interval:"
+msgid "Specify pin_g interval"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:82
@@ -991,7 +983,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:84
-msgid "Specify _exit or restart ping:"
+msgid "Specify _exit or restart ping"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:85
@@ -1022,7 +1014,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:93
-msgid "Specify max routes:"
+msgid "Specify max routes"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:94
@@ -1039,7 +1031,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:98
-msgid "Use custom _size of cipher key:"
+msgid "Use custom _size of cipher key"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:99
@@ -1057,12 +1049,12 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:103
-msgid "Ci_pher:"
-msgstr "Ø±Ù…Ø² (Cipher):"
+msgid "Ci_pher"
+msgstr "Ø±Ù…Ø² (Cipher)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:104
-msgid "_HMAC Authentication:"
-msgstr "ØªØ§ÛŒÛŒØ¯ Ù‡ÙˆÛŒØª HMAC:"
+msgid "_HMAC Authentication"
+msgstr "ØªØ§ÛŒÛŒØ¯ Ù‡ÙˆÛŒØª HMAC"
 
 #: ../properties/nm-openvpn-dialog.ui.h:105
 msgid "Disable cipher _negotiation"
@@ -1109,8 +1101,8 @@ msgid "Security"
 msgstr "Ø§Ù…Ù†ÛŒØª"
 
 #: ../properties/nm-openvpn-dialog.ui.h:115
-msgid "_Subject Match:"
-msgstr "Ù…Ø·Ø§Ø¨Ù‚Øª Ø¨Ø§ Ù…ÙˆØ±Ø¯:"
+msgid "_Subject Match"
+msgstr "Ù…Ø·Ø§Ø¨Ù‚Øª Ø¨Ø§ Ù…ÙˆØ±Ø¯"
 
 #: ../properties/nm-openvpn-dialog.ui.h:116
 msgid ""
@@ -1122,8 +1114,8 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:120
 #, fuzzy
-msgid "Server _Certificate Check:"
-msgstr "ØªØ§ÛŒÛŒØ¯ÛŒÙ‡ Ú©Ø§Ø±Ø¨Ø±:"
+msgid "Server _Certificate Check"
+msgstr "ØªØ§ÛŒÛŒØ¯ÛŒÙ‡ Ú©Ø§Ø±Ø¨Ø±"
 
 #: ../properties/nm-openvpn-dialog.ui.h:121
 msgid ""
@@ -1153,7 +1145,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:133
-msgid "_Remote peer certificate TLS type:"
+msgid "_Remote peer certificate TLS type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:134
@@ -1174,7 +1166,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:138
-msgid "_Remote peer certificate nsCert designation:"
+msgid "_Remote peer certificate nsCert designation"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:139
@@ -1185,8 +1177,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:141
-msgid "Key _Direction:"
-msgstr "Ø¬Ù‡Øª Ú©Ù„ÛŒØ¯:"
+msgid "Key _Direction"
+msgstr "Ø¬Ù‡Øª Ú©Ù„ÛŒØ¯"
 
 #: ../properties/nm-openvpn-dialog.ui.h:142
 msgid ""
@@ -1210,11 +1202,11 @@ msgstr ""
 "Ù…Ù‚Ø¯Ø§Ø±ÛŒ Ú©Ù‡ Ø¨Ø§ÛŒØ¯ Ø§Ø³ØªÙØ§Ø¯Ù‡ Ù†Ø§Ù…Ø·Ù…Ø¦Ù† Ù‡Ø³ØªÛŒØ¯ØŒ Ø¨Ø§ Ù…Ø¯ÛŒØ±ÛŒØª Ø³ÛŒØ³ØªÙ… Ø®ÙˆØ¯ ØªÙ…Ø§Ø³ Ø¨Ú¯ÛŒØ±ÛŒØ¯.</i>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:147
-msgid "Key _File:"
-msgstr "Ù¾Ø±ÙˆÙ†Ø¯Ù‡â€ŒÛŒ Ú©Ù„ÛŒØ¯:"
+msgid "Key _File"
+msgstr "Ù¾Ø±ÙˆÙ†Ø¯Ù‡â€ŒÛŒ Ú©Ù„ÛŒØ¯"
 
 #: ../properties/nm-openvpn-dialog.ui.h:148
-msgid "Mode:"
+msgid "Mode"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:149
@@ -1224,8 +1216,8 @@ msgstr "Ø§Ø³ØªÙØ§Ø¯Ù‡ Ø§Ø² ØªØ§ÛŒÛŒØ¯ÛŒÙ‡ TLS Ø§Ø¶Ø§ÙÛŒ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:150
 #, fuzzy
-msgid "Extra Certificates:"
-msgstr "ØªØ§ÛŒÛŒØ¯ÛŒÙ‡ Ú©Ø§Ø±Ø¨Ø±:"
+msgid "Extra Certificates"
+msgstr "ØªØ§ÛŒÛŒØ¯ÛŒÙ‡ Ú©Ø§Ø±Ø¨Ø±"
 
 #: ../properties/nm-openvpn-dialog.ui.h:151
 msgid ""
@@ -1248,7 +1240,7 @@ msgid "TLS version control"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:156
-msgid "TLS _min version: "
+msgid "TLS _min version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:157
@@ -1260,7 +1252,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:158
-msgid "TLS ma_x version: "
+msgid "TLS ma_x version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:159
@@ -1280,8 +1272,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:163
-msgid "Proxy _Type:"
-msgstr "Ù†ÙˆØ¹ Ù¾ÛŒØ´Ú©Ø§Ø±:"
+msgid "Proxy _Type"
+msgstr "Ù†ÙˆØ¹ Ù¾ÛŒØ´Ú©Ø§Ø±"
 
 #: ../properties/nm-openvpn-dialog.ui.h:164
 msgid ""
@@ -1292,8 +1284,8 @@ msgstr ""
 "Ø§Ø³ØªÙØ§Ø¯Ù‡ Ú©Ù†ÛŒØ¯.</i>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:165
-msgid "Server _Address:"
-msgstr "Ø¢Ø¯Ø±Ø³ Ú©Ø§Ø±Ú¯Ø²Ø§Ø±:"
+msgid "Server _Address"
+msgstr "Ø¢Ø¯Ø±Ø³ Ú©Ø§Ø±Ú¯Ø²Ø§Ø±"
 
 #: ../properties/nm-openvpn-dialog.ui.h:166
 msgid ""
@@ -1302,8 +1294,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:168
-msgid "_Port:"
-msgstr "Ø¯Ø±Ú¯Ø§Ù‡:"
+msgid "_Port"
+msgstr "Ø¯Ø±Ú¯Ø§Ù‡"
 
 #: ../properties/nm-openvpn-dialog.ui.h:169
 msgid ""
@@ -1323,12 +1315,12 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:174
-msgid "Proxy _Username:"
-msgstr "Ù†Ø§Ù…â€ŒÚ©Ø§Ø±Ø¨Ø±ÛŒ Ù¾ÛŒØ´Ú©Ø§Ø±:"
+msgid "Proxy _Username"
+msgstr "Ù†Ø§Ù…â€ŒÚ©Ø§Ø±Ø¨Ø±ÛŒ Ù¾ÛŒØ´Ú©Ø§Ø±"
 
 #: ../properties/nm-openvpn-dialog.ui.h:175
-msgid "Proxy Passwor_d:"
-msgstr "Ú¯Ø°Ø±ÙˆØ§Ú˜Ù‡ Ù¾ÛŒØ´Ú©Ø§Ø±:"
+msgid "Proxy Passwor_d"
+msgstr "Ú¯Ø°Ø±ÙˆØ§Ú˜Ù‡ Ù¾ÛŒØ´Ú©Ø§Ø±"
 
 #: ../properties/nm-openvpn-dialog.ui.h:176
 msgid "HTTP/Socks proxy username passed to OpenVPN when prompted for it."
@@ -1345,7 +1337,7 @@ msgstr "Ù†Ù…Ø§ÛŒØ´ Ú¯Ø°Ø±ÙˆØ§Ú˜Ù‡â€ŒÙ‡Ø§"
 
 #: ../properties/nm-openvpn-dialog.ui.h:179
 msgid "Proxies"
-msgstr "Ù¾ÛŒØ´Ú©Ø§Ø±Ù‡Ø§:"
+msgstr "Ù¾ÛŒØ´Ú©Ø§Ø±Ù‡Ø§"
 
 #: ../properties/nm-openvpn-dialog.ui.h:180
 msgid "Path mtu discovery"
diff --git a/po/fi.po b/po/fi.po
index 186a2f8..cadc9f5 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -741,8 +741,8 @@ msgid "General"
 msgstr "Yleisasetukset"
 
 #: ../properties/nm-openvpn-dialog.ui.h:13
-msgid "_Gateway:"
-msgstr "_YhdyskÃ¤ytÃ¤vÃ¤:"
+msgid "_Gateway"
+msgstr "_YhdyskÃ¤ytÃ¤vÃ¤"
 
 #: ../properties/nm-openvpn-dialog.ui.h:14
 msgid ""
@@ -764,13 +764,9 @@ msgstr "CA"
 msgid "User"
 msgstr "KÃ¤yttÃ¤jÃ¤"
 
-#: ../properties/nm-openvpn-dialog.ui.h:19
-msgid "Password:"
-msgstr "Salasana:"
-
 #: ../properties/nm-openvpn-dialog.ui.h:20
-msgid "User name:"
-msgstr "KÃ¤yttÃ¤jÃ¤tunnus:"
+msgid "User name"
+msgstr "KÃ¤yttÃ¤jÃ¤tunnus"
 
 #: ../properties/nm-openvpn-dialog.ui.h:21
 msgid ""
@@ -786,20 +782,16 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:25
-msgid "Remote IP Address:"
-msgstr "EtÃ¤-IP-osoite:"
+msgid "Remote IP Address"
+msgstr "EtÃ¤-IP-osoite"
 
 #: ../properties/nm-openvpn-dialog.ui.h:26
-msgid "Local IP Address:"
-msgstr "Paikallinen IP-osoite:"
+msgid "Local IP Address"
+msgstr "Paikallinen IP-osoite"
 
 #: ../properties/nm-openvpn-dialog.ui.h:27
-msgid "Key Direction:"
-msgstr "Avaimen suunta:"
-
-#: ../properties/nm-openvpn-dialog.ui.h:28
-msgid "Static Key:"
-msgstr "KiinteÃ¤ avain:"
+msgid "Key Direction"
+msgstr "Avaimen suunta"
 
 #: ../properties/nm-openvpn-dialog.ui.h:29
 msgid ""
@@ -836,8 +828,8 @@ msgstr ""
 "config: static <tiedosto> [suunta]"
 
 #: ../properties/nm-openvpn-dialog.ui.h:38
-msgid "Type:"
-msgstr "Tyyppi:"
+msgid "Type"
+msgstr "Tyyppi"
 
 #: ../properties/nm-openvpn-dialog.ui.h:39
 msgid "Select an authentication mode."
@@ -852,8 +844,8 @@ msgid "OpenVPN Advanced Options"
 msgstr "OpenVPN-lisÃ¤asetukset"
 
 #: ../properties/nm-openvpn-dialog.ui.h:43
-msgid "Use custom gateway p_ort:"
-msgstr "KÃ¤ytÃ¤ _mukautettua yhdyskÃ¤ytÃ¤vÃ¤n porttia:"
+msgid "Use custom gateway p_ort"
+msgstr "KÃ¤ytÃ¤ _mukautettua yhdyskÃ¤ytÃ¤vÃ¤n porttia"
 
 #: ../properties/nm-openvpn-dialog.ui.h:44
 msgid ""
@@ -863,8 +855,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:46
-msgid "Use custom _renegotiation interval:"
-msgstr "KÃ¤ytÃ¤ mukautettua _uudelleenneuvotteluvÃ¤liÃ¤:"
+msgid "Use custom _renegotiation interval"
+msgstr "KÃ¤ytÃ¤ mukautettua _uudelleenneuvotteluvÃ¤liÃ¤"
 
 #: ../properties/nm-openvpn-dialog.ui.h:47
 msgid ""
@@ -873,8 +865,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:49
-msgid "Data _compression:"
-msgstr "Datan _pakkaus:"
+msgid "Data _compression"
+msgstr "Datan _pakkaus"
 
 #: ../properties/nm-openvpn-dialog.ui.h:50
 #, fuzzy
@@ -896,8 +888,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:56
-msgid "Set virtual _device type:"
-msgstr "Aseta virtuaali_laitteen tyyppi:"
+msgid "Set virtual _device type"
+msgstr "Aseta virtuaali_laitteen tyyppi"
 
 #: ../properties/nm-openvpn-dialog.ui.h:57
 msgid "Explicitly set virtual device type and name (TUN/TAP)."
@@ -910,8 +902,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:60
-msgid " and _name:"
-msgstr " ja _nimi:"
+msgid " and _name"
+msgstr " ja _nimi"
 
 #: ../properties/nm-openvpn-dialog.ui.h:61
 msgid ""
@@ -921,7 +913,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:63
-msgid "Use custom tunnel Maximum Transmission _Unit (MTU):"
+msgid "Use custom tunnel Maximum Transmission _Unit (MTU)"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:64
@@ -932,8 +924,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:66
-msgid "Use custom UDP _fragment size:"
-msgstr "KÃ¤ytÃ¤ omavalintaisia _UDP-osien kokoa:"
+msgid "Use custom UDP _fragment size"
+msgstr "KÃ¤ytÃ¤ omavalintaisia _UDP-osien kokoa"
 
 #: ../properties/nm-openvpn-dialog.ui.h:67
 msgid ""
@@ -983,7 +975,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:81
-msgid "Specify pin_g interval:"
+msgid "Specify pin_g interval"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:82
@@ -994,7 +986,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:84
-msgid "Specify _exit or restart ping:"
+msgid "Specify _exit or restart ping"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:85
@@ -1025,8 +1017,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:93
-msgid "Specify max routes:"
-msgstr "MÃ¤Ã¤ritÃ¤ enimmÃ¤isreitit:"
+msgid "Specify max routes"
+msgstr "MÃ¤Ã¤ritÃ¤ enimmÃ¤isreitit"
 
 #: ../properties/nm-openvpn-dialog.ui.h:94
 msgid ""
@@ -1042,7 +1034,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:98
-msgid "Use custom _size of cipher key:"
+msgid "Use custom _size of cipher key"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:99
@@ -1060,12 +1052,12 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:103
-msgid "Ci_pher:"
-msgstr "SalausmenetelmÃ¤:"
+msgid "Ci_pher"
+msgstr "SalausmenetelmÃ¤"
 
 #: ../properties/nm-openvpn-dialog.ui.h:104
-msgid "_HMAC Authentication:"
-msgstr "_HMAC-tunnistautuminen:"
+msgid "_HMAC Authentication"
+msgstr "_HMAC-tunnistautuminen"
 
 #: ../properties/nm-openvpn-dialog.ui.h:105
 msgid "Disable cipher _negotiation"
@@ -1112,7 +1104,7 @@ msgid "Security"
 msgstr "Salaus"
 
 #: ../properties/nm-openvpn-dialog.ui.h:115
-msgid "_Subject Match:"
+msgid "_Subject Match"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:116
@@ -1124,8 +1116,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:120
-msgid "Server _Certificate Check:"
-msgstr "_Palvelimen varmenteen tarkistus:"
+msgid "Server _Certificate Check"
+msgstr "_Palvelimen varmenteen tarkistus"
 
 #: ../properties/nm-openvpn-dialog.ui.h:121
 msgid ""
@@ -1155,7 +1147,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:133
-msgid "_Remote peer certificate TLS type:"
+msgid "_Remote peer certificate TLS type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:134
@@ -1176,7 +1168,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:138
-msgid "_Remote peer certificate nsCert designation:"
+msgid "_Remote peer certificate nsCert designation"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:139
@@ -1187,8 +1179,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:141
-msgid "Key _Direction:"
-msgstr "Avai_men suunta:"
+msgid "Key _Direction"
+msgstr "Avai_men suunta"
 
 #: ../properties/nm-openvpn-dialog.ui.h:142
 msgid ""
@@ -1215,12 +1207,12 @@ msgstr ""
 "config: static <tiedosto> [suunta]"
 
 #: ../properties/nm-openvpn-dialog.ui.h:147
-msgid "Key _File:"
-msgstr "_Avaintiedosto:"
+msgid "Key _File"
+msgstr "_Avaintiedosto"
 
 #: ../properties/nm-openvpn-dialog.ui.h:148
-msgid "Mode:"
-msgstr "Tila:"
+msgid "Mode"
+msgstr "Tila"
 
 #: ../properties/nm-openvpn-dialog.ui.h:149
 #, fuzzy
@@ -1228,8 +1220,8 @@ msgid "Add an additional layer of encryption or HMAC authentication."
 msgstr "KÃ¤ytÃ¤ lisÃ¤ksi TLS-tunnistatumista"
 
 #: ../properties/nm-openvpn-dialog.ui.h:150
-msgid "Extra Certificates:"
-msgstr "LisÃ¤varmenteet:"
+msgid "Extra Certificates"
+msgstr "LisÃ¤varmenteet"
 
 #: ../properties/nm-openvpn-dialog.ui.h:151
 msgid ""
@@ -1252,8 +1244,8 @@ msgid "TLS version control"
 msgstr "TLS-versiohallinta"
 
 #: ../properties/nm-openvpn-dialog.ui.h:156
-msgid "TLS _min version: "
-msgstr "TLS:n _vÃ¤himmÃ¤isversio: "
+msgid "TLS _min version"
+msgstr "TLS:n _vÃ¤himmÃ¤isversio"
 
 #: ../properties/nm-openvpn-dialog.ui.h:157
 msgid ""
@@ -1264,8 +1256,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:158
-msgid "TLS ma_x version: "
-msgstr "TLS:n eni_mmÃ¤isversio: "
+msgid "TLS ma_x version"
+msgstr "TLS:n eni_mmÃ¤isversio"
 
 #: ../properties/nm-openvpn-dialog.ui.h:159
 msgid ""
@@ -1284,8 +1276,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:163
-msgid "Proxy _Type:"
-msgstr "_VÃ¤lityspalvelimen tyyppi:"
+msgid "Proxy _Type"
+msgstr "_VÃ¤lityspalvelimen tyyppi"
 
 #: ../properties/nm-openvpn-dialog.ui.h:164
 msgid ""
@@ -1294,8 +1286,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:165
-msgid "Server _Address:"
-msgstr "_Palvelimen osoite:"
+msgid "Server _Address"
+msgstr "_Palvelimen osoite"
 
 #: ../properties/nm-openvpn-dialog.ui.h:166
 msgid ""
@@ -1304,8 +1296,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:168
-msgid "_Port:"
-msgstr "P_ortti:"
+msgid "_Port"
+msgstr "P_ortti"
 
 #: ../properties/nm-openvpn-dialog.ui.h:169
 msgid ""
@@ -1324,12 +1316,12 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:174
-msgid "Proxy _Username:"
-msgstr "VÃ¤lityspalvelimen _kÃ¤yttÃ¤jÃ¤tunnus:"
+msgid "Proxy _Username"
+msgstr "VÃ¤lityspalvelimen _kÃ¤yttÃ¤jÃ¤tunnus"
 
 #: ../properties/nm-openvpn-dialog.ui.h:175
-msgid "Proxy Passwor_d:"
-msgstr "VÃ¤lityspalvelimen _salasana:"
+msgid "Proxy Passwor_d"
+msgstr "VÃ¤lityspalvelimen _salasana"
 
 #: ../properties/nm-openvpn-dialog.ui.h:176
 msgid "HTTP/Socks proxy username passed to OpenVPN when prompted for it."
diff --git a/po/fr.po b/po/fr.po
index e99e94a..de7fd89 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -754,8 +754,8 @@ msgid "General"
 msgstr "GÃ©nÃ©ral"
 
 #: ../properties/nm-openvpn-dialog.ui.h:13
-msgid "_Gateway:"
-msgstr "_PasserelleÂ :"
+msgid "_Gateway"
+msgstr "_PasserelleÂ "
 
 #: ../properties/nm-openvpn-dialog.ui.h:14
 msgid ""
@@ -782,13 +782,9 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#: ../properties/nm-openvpn-dialog.ui.h:19
-msgid "Password:"
-msgstr "Mot de passeÂ :"
-
 #: ../properties/nm-openvpn-dialog.ui.h:20
-msgid "User name:"
-msgstr "Nom d'utilisateurÂ :"
+msgid "User name"
+msgstr "Nom d'utilisateurÂ "
 
 #: ../properties/nm-openvpn-dialog.ui.h:21
 msgid ""
@@ -809,20 +805,16 @@ msgstr ""
 "ConfigurationÂ : auth-user-pass"
 
 #: ../properties/nm-openvpn-dialog.ui.h:25
-msgid "Remote IP Address:"
-msgstr "Adresse IP distanteÂ :"
+msgid "Remote IP Address"
+msgstr "Adresse IP distanteÂ "
 
 #: ../properties/nm-openvpn-dialog.ui.h:26
-msgid "Local IP Address:"
-msgstr "Adresse IP localeÂ :"
+msgid "Local IP Address"
+msgstr "Adresse IP localeÂ "
 
 #: ../properties/nm-openvpn-dialog.ui.h:27
-msgid "Key Direction:"
-msgstr "Direction de la clÃ©Â :"
-
-#: ../properties/nm-openvpn-dialog.ui.h:28
-msgid "Static Key:"
-msgstr "ClÃ© statiqueÂ :"
+msgid "Key Direction"
+msgstr "Direction de la clÃ©Â "
 
 #: ../properties/nm-openvpn-dialog.ui.h:29
 msgid ""
@@ -865,8 +857,8 @@ msgstr ""
 "ConfigurationÂ : static <fichier> [direction]"
 
 #: ../properties/nm-openvpn-dialog.ui.h:38
-msgid "Type:"
-msgstr "TypeÂ :"
+msgid "Type"
+msgstr "TypeÂ "
 
 #: ../properties/nm-openvpn-dialog.ui.h:39
 msgid "Select an authentication mode."
@@ -882,8 +874,8 @@ msgid "OpenVPN Advanced Options"
 msgstr "Options avancÃ©es OpenVPN"
 
 #: ../properties/nm-openvpn-dialog.ui.h:43
-msgid "Use custom gateway p_ort:"
-msgstr "Utiliser un p_ort de passerelle personnalisÃ©Â :"
+msgid "Use custom gateway p_ort"
+msgstr "Utiliser un p_ort de passerelle personnalisÃ©Â "
 
 #: ../properties/nm-openvpn-dialog.ui.h:44
 #, fuzzy
@@ -896,8 +888,8 @@ msgstr ""
 "ConfigurationÂ : port"
 
 #: ../properties/nm-openvpn-dialog.ui.h:46
-msgid "Use custom _renegotiation interval:"
-msgstr "Utiliser un intervalle personnalisÃ© de _renÃ©gociationÂ :"
+msgid "Use custom _renegotiation interval"
+msgstr "Utiliser un intervalle personnalisÃ© de _renÃ©gociationÂ "
 
 #: ../properties/nm-openvpn-dialog.ui.h:47
 msgid ""
@@ -909,7 +901,7 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:49
 #, fuzzy
-msgid "Data _compression:"
+msgid "Data _compression"
 msgstr "Utiliser la compression de donnÃ©es L_ZO"
 
 #: ../properties/nm-openvpn-dialog.ui.h:50
@@ -936,8 +928,8 @@ msgstr ""
 "ConfigurationÂ : proto tcp-client | udp"
 
 #: ../properties/nm-openvpn-dialog.ui.h:56
-msgid "Set virtual _device type:"
-msgstr "Configurer le type du pÃ©riphÃ©rique rÃ©seauÂ :"
+msgid "Set virtual _device type"
+msgstr "Configurer le type du pÃ©riphÃ©rique rÃ©seauÂ "
 
 #: ../properties/nm-openvpn-dialog.ui.h:57
 msgid "Explicitly set virtual device type and name (TUN/TAP)."
@@ -954,8 +946,8 @@ msgstr ""
 "ConfigurationÂ : dev-type tun | tap"
 
 #: ../properties/nm-openvpn-dialog.ui.h:60
-msgid " and _name:"
-msgstr " et le _nomÂ :"
+msgid " and _name"
+msgstr " et le _nomÂ "
 
 #: ../properties/nm-openvpn-dialog.ui.h:61
 #, fuzzy
@@ -969,7 +961,7 @@ msgstr ""
 "ConfigurationÂ : dev <name>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:63
-msgid "Use custom tunnel Maximum Transmission _Unit (MTU):"
+msgid "Use custom tunnel Maximum Transmission _Unit (MTU)"
 msgstr ""
 "Utilise une unitÃ© maximale de _transmission (MTU en anglais) personnalisÃ©eÂ :"
 
@@ -984,8 +976,8 @@ msgstr ""
 "ConfigurationÂ : tun-mtu"
 
 #: ../properties/nm-openvpn-dialog.ui.h:66
-msgid "Use custom UDP _fragment size:"
-msgstr "Utiliser une taille personnalisÃ©e du _fragment UDPÂ :"
+msgid "Use custom UDP _fragment size"
+msgstr "Utiliser une taille personnalisÃ©e du _fragment UDPÂ "
 
 #: ../properties/nm-openvpn-dialog.ui.h:67
 msgid ""
@@ -1042,7 +1034,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:81
-msgid "Specify pin_g interval:"
+msgid "Specify pin_g interval"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:82
@@ -1053,7 +1045,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:84
-msgid "Specify _exit or restart ping:"
+msgid "Specify _exit or restart ping"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:85
@@ -1084,7 +1076,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:93
-msgid "Specify max routes:"
+msgid "Specify max routes"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:94
@@ -1104,8 +1096,8 @@ msgstr ""
 "ConfigurationÂ : cipher"
 
 #: ../properties/nm-openvpn-dialog.ui.h:98
-msgid "Use custom _size of cipher key:"
-msgstr "Utili_ser une taille de clef personnalisÃ©eÂ :"
+msgid "Use custom _size of cipher key"
+msgstr "Utili_ser une taille de clef personnalisÃ©eÂ "
 
 #: ../properties/nm-openvpn-dialog.ui.h:99
 msgid ""
@@ -1128,12 +1120,12 @@ msgstr ""
 "ConfigurationÂ : auth"
 
 #: ../properties/nm-openvpn-dialog.ui.h:103
-msgid "Ci_pher:"
-msgstr "ChiffrementÂ :"
+msgid "Ci_pher"
+msgstr "ChiffrementÂ "
 
 #: ../properties/nm-openvpn-dialog.ui.h:104
-msgid "_HMAC Authentication:"
-msgstr "Authentification HMACÂ :"
+msgid "_HMAC Authentication"
+msgstr "Authentification HMACÂ "
 
 #: ../properties/nm-openvpn-dialog.ui.h:105
 msgid "Disable cipher _negotiation"
@@ -1180,8 +1172,8 @@ msgid "Security"
 msgstr "SÃ©curitÃ©"
 
 #: ../properties/nm-openvpn-dialog.ui.h:115
-msgid "_Subject Match:"
-msgstr "Correspondance du sujetÂ :"
+msgid "_Subject Match"
+msgstr "Correspondance du sujetÂ "
 
 #: ../properties/nm-openvpn-dialog.ui.h:116
 msgid ""
@@ -1192,8 +1184,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:120
-msgid "Server _Certificate Check:"
-msgstr "VÃ©rification du certificat de l'utilisateurÂ :"
+msgid "Server _Certificate Check"
+msgstr "VÃ©rification du certificat de l'utilisateurÂ "
 
 #: ../properties/nm-openvpn-dialog.ui.h:121
 msgid ""
@@ -1225,8 +1217,8 @@ msgstr ""
 "ou clÃ© Ã©tendu suivant les rÃ¨gles de la RFC 3280 sur TLS."
 
 #: ../properties/nm-openvpn-dialog.ui.h:133
-msgid "_Remote peer certificate TLS type:"
-msgstr "Type du certificat TLS distantÂ :"
+msgid "_Remote peer certificate TLS type"
+msgstr "Type du certificat TLS distantÂ "
 
 #: ../properties/nm-openvpn-dialog.ui.h:134
 msgid ""
@@ -1254,8 +1246,8 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:138
 #, fuzzy
-msgid "_Remote peer certificate nsCert designation:"
-msgstr "Type du certificat TLS distantÂ :"
+msgid "_Remote peer certificate nsCert designation"
+msgstr "Type du certificat TLS distantÂ "
 
 #: ../properties/nm-openvpn-dialog.ui.h:139
 #, fuzzy
@@ -1269,8 +1261,8 @@ msgstr ""
 "ConfigurationÂ : remote-cert-tls client|server"
 
 #: ../properties/nm-openvpn-dialog.ui.h:141
-msgid "Key _Direction:"
-msgstr "Direction de la clÃ©Â :"
+msgid "Key _Direction"
+msgstr "Direction de la clÃ©Â "
 
 #: ../properties/nm-openvpn-dialog.ui.h:142
 #, fuzzy
@@ -1301,11 +1293,11 @@ msgstr ""
 "ConfigurationÂ : tls-auth <fichier> [direction]"
 
 #: ../properties/nm-openvpn-dialog.ui.h:147
-msgid "Key _File:"
-msgstr "_Fichier de clÃ©Â :"
+msgid "Key _File"
+msgstr "_Fichier de clÃ©Â "
 
 #: ../properties/nm-openvpn-dialog.ui.h:148
-msgid "Mode:"
+msgid "Mode"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:149
@@ -1315,8 +1307,8 @@ msgstr "Ajouter une couche supplÃ©mentaire d'authentification HMAC."
 
 #: ../properties/nm-openvpn-dialog.ui.h:150
 #, fuzzy
-msgid "Extra Certificates:"
-msgstr "Certificat de l'utilisateurÂ :"
+msgid "Extra Certificates"
+msgstr "Certificat de l'utilisateurÂ "
 
 #: ../properties/nm-openvpn-dialog.ui.h:151
 msgid ""
@@ -1339,7 +1331,7 @@ msgid "TLS version control"
 msgstr "ContrÃ´le de la version de TLS"
 
 #: ../properties/nm-openvpn-dialog.ui.h:156
-msgid "TLS _min version: "
+msgid "TLS _min version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:157
@@ -1356,7 +1348,7 @@ msgstr ""
 "l'implÃ©mentation locale de SSL sera acceptÃ©e."
 
 #: ../properties/nm-openvpn-dialog.ui.h:158
-msgid "TLS ma_x version: "
+msgid "TLS ma_x version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:159
@@ -1381,8 +1373,8 @@ msgstr ""
 "ConfigurationÂ : http-proxy ou socks-proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:163
-msgid "Proxy _Type:"
-msgstr "_Type de serveur mandataireÂ :"
+msgid "Proxy _Type"
+msgstr "_Type de serveur mandataireÂ "
 
 #: ../properties/nm-openvpn-dialog.ui.h:164
 msgid ""
@@ -1393,8 +1385,8 @@ msgstr ""
 "serveur mandataire (proxy) pour accÃ©der Ã  Internet.</i>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:165
-msgid "Server _Address:"
-msgstr "_Adresse du serveurÂ :"
+msgid "Server _Address"
+msgstr "_Adresse du serveurÂ "
 
 #: ../properties/nm-openvpn-dialog.ui.h:166
 msgid ""
@@ -1405,8 +1397,8 @@ msgstr ""
 "ConfigurationÂ : http-proxy ou socks-proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:168
-msgid "_Port:"
-msgstr "_PortÂ :"
+msgid "_Port"
+msgstr "_PortÂ "
 
 #: ../properties/nm-openvpn-dialog.ui.h:169
 msgid ""
@@ -1430,12 +1422,12 @@ msgstr ""
 "ConfigurationÂ : http-proxy-retry ou socks-proxy-retry"
 
 #: ../properties/nm-openvpn-dialog.ui.h:174
-msgid "Proxy _Username:"
-msgstr "Nom d'utilisateur du serveur mandataireÂ :"
+msgid "Proxy _Username"
+msgstr "Nom d'utilisateur du serveur mandataireÂ "
 
 #: ../properties/nm-openvpn-dialog.ui.h:175
-msgid "Proxy Passwor_d:"
-msgstr "Mot de passe du serveur mandataireÂ :"
+msgid "Proxy Passwor_d"
+msgstr "Mot de passe du serveur mandataireÂ "
 
 #: ../properties/nm-openvpn-dialog.ui.h:176
 msgid "HTTP/Socks proxy username passed to OpenVPN when prompted for it."
diff --git a/po/fur.po b/po/fur.po
index af8ebb8..abb99bd 100644
--- a/po/fur.po
+++ b/po/fur.po
@@ -798,8 +798,8 @@ msgid "General"
 msgstr "GjenerÃ¢l"
 
 #: ../properties/nm-openvpn-dialog.ui.h:13
-msgid "_Gateway:"
-msgstr "_Gateway:"
+msgid "_Gateway"
+msgstr "_Gateway"
 
 #: ../properties/nm-openvpn-dialog.ui.h:14
 msgid ""
@@ -825,13 +825,9 @@ msgstr "CA"
 msgid "User"
 msgstr "Utent"
 
-#: ../properties/nm-openvpn-dialog.ui.h:19
-msgid "Password:"
-msgstr "Password:"
-
 #: ../properties/nm-openvpn-dialog.ui.h:20
-msgid "User name:"
-msgstr "Non utent:"
+msgid "User name"
+msgstr "Non utent"
 
 #: ../properties/nm-openvpn-dialog.ui.h:21
 msgid ""
@@ -852,20 +848,16 @@ msgstr ""
 "config: auth-user-pass"
 
 #: ../properties/nm-openvpn-dialog.ui.h:25
-msgid "Remote IP Address:"
-msgstr "Direzion IP esterne:"
+msgid "Remote IP Address"
+msgstr "Direzion IP esterne"
 
 #: ../properties/nm-openvpn-dialog.ui.h:26
-msgid "Local IP Address:"
-msgstr "Direzion IP locÃ¢l:"
+msgid "Local IP Address"
+msgstr "Direzion IP locÃ¢l"
 
 #: ../properties/nm-openvpn-dialog.ui.h:27
-msgid "Key Direction:"
-msgstr "Direzion de clÃ¢f:"
-
-#: ../properties/nm-openvpn-dialog.ui.h:28
-msgid "Static Key:"
-msgstr "ClÃ¢f statiche:"
+msgid "Key Direction"
+msgstr "Direzion de clÃ¢f"
 
 #: ../properties/nm-openvpn-dialog.ui.h:29
 msgid ""
@@ -907,8 +899,8 @@ msgstr ""
 "config: static <file> [direzion]"
 
 #: ../properties/nm-openvpn-dialog.ui.h:38
-msgid "Type:"
-msgstr "Gjenar:"
+msgid "Type"
+msgstr "Gjenar"
 
 #: ../properties/nm-openvpn-dialog.ui.h:39
 msgid "Select an authentication mode."
@@ -923,8 +915,8 @@ msgid "OpenVPN Advanced Options"
 msgstr "Opzions avanzadis di OpenVPN"
 
 #: ../properties/nm-openvpn-dialog.ui.h:43
-msgid "Use custom gateway p_ort:"
-msgstr "Dopre p_uarte gateway personalizade:"
+msgid "Use custom gateway p_ort"
+msgstr "Dopre p_uarte gateway personalizade"
 
 #: ../properties/nm-openvpn-dialog.ui.h:44
 msgid ""
@@ -937,8 +929,8 @@ msgstr ""
 "config: port"
 
 #: ../properties/nm-openvpn-dialog.ui.h:46
-msgid "Use custom _renegotiation interval:"
-msgstr "DoprÃ¢ un interval di _rinegoziazion personalizÃ¢t:"
+msgid "Use custom _renegotiation interval"
+msgstr "DoprÃ¢ un interval di _rinegoziazion personalizÃ¢t"
 
 #: ../properties/nm-openvpn-dialog.ui.h:47
 msgid ""
@@ -949,8 +941,8 @@ msgstr ""
 "config: reneg-sec"
 
 #: ../properties/nm-openvpn-dialog.ui.h:49
-msgid "Data _compression:"
-msgstr "_Compression dÃ¢ts:"
+msgid "Data _compression"
+msgstr "_Compression dÃ¢ts"
 
 #: ../properties/nm-openvpn-dialog.ui.h:50
 msgid ""
@@ -977,8 +969,8 @@ msgstr ""
 "config: proto tcp-client | udp"
 
 #: ../properties/nm-openvpn-dialog.ui.h:56
-msgid "Set virtual _device type:"
-msgstr "StabilÃ¬s gjenar di _dispositÃ®f virtuÃ¢l:"
+msgid "Set virtual _device type"
+msgstr "StabilÃ¬s gjenar di _dispositÃ®f virtuÃ¢l"
 
 #: ../properties/nm-openvpn-dialog.ui.h:57
 msgid "Explicitly set virtual device type and name (TUN/TAP)."
@@ -994,8 +986,8 @@ msgstr ""
 "config: dev-type tun | tap"
 
 #: ../properties/nm-openvpn-dialog.ui.h:60
-msgid " and _name:"
-msgstr " e _non:"
+msgid " and _name"
+msgstr " e _non"
 
 #: ../properties/nm-openvpn-dialog.ui.h:61
 msgid ""
@@ -1008,7 +1000,7 @@ msgstr ""
 "config: dev <non>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:63
-msgid "Use custom tunnel Maximum Transmission _Unit (MTU):"
+msgid "Use custom tunnel Maximum Transmission _Unit (MTU)"
 msgstr ""
 "DoprÃ¢ un MTU (_UnitÃ¢t di Trasmission Massime) personalizade pal tunnel:"
 
@@ -1023,8 +1015,8 @@ msgstr ""
 "config: tun-mtu"
 
 #: ../properties/nm-openvpn-dialog.ui.h:66
-msgid "Use custom UDP _fragment size:"
-msgstr "DoprÃ¢ une dimension di _frament UDP personalizade:"
+msgid "Use custom UDP _fragment size"
+msgstr "DoprÃ¢ une dimension di _frament UDP personalizade"
 
 #: ../properties/nm-openvpn-dialog.ui.h:67
 msgid ""
@@ -1093,8 +1085,8 @@ msgstr ""
 "config: tun-ipv6"
 
 #: ../properties/nm-openvpn-dialog.ui.h:84
-msgid "Specify pin_g interval:"
-msgstr "Specifiche l'interval di pin_g:"
+msgid "Specify pin_g interval"
+msgstr "Specifiche l'interval di pin_g"
 
 #: ../properties/nm-openvpn-dialog.ui.h:85
 msgid ""
@@ -1107,8 +1099,8 @@ msgstr ""
 "config: ping <N>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:87
-msgid "Specify _exit or restart ping:"
-msgstr "Specifiche se ping _exit o restart:"
+msgid "Specify _exit or restart ping"
+msgstr "Specifiche se ping _exit o restart"
 
 #: ../properties/nm-openvpn-dialog.ui.h:88
 msgid ""
@@ -1141,7 +1133,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:96
-msgid "Specify max routes:"
+msgid "Specify max routes"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:97
@@ -1158,8 +1150,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:101
-msgid "Use custom _size of cipher key:"
-msgstr "DoprÃ¢ _dimension personalizade de clÃ¢f dal cifrari:"
+msgid "Use custom _size of cipher key"
+msgstr "DoprÃ¢ _dimension personalizade de clÃ¢f dal cifrari"
 
 #: ../properties/nm-openvpn-dialog.ui.h:102
 msgid ""
@@ -1182,12 +1174,12 @@ msgstr ""
 "config: auth"
 
 #: ../properties/nm-openvpn-dialog.ui.h:106
-msgid "Ci_pher:"
-msgstr "Ci_frari:"
+msgid "Ci_pher"
+msgstr "Ci_frari"
 
 #: ../properties/nm-openvpn-dialog.ui.h:107
-msgid "_HMAC Authentication:"
-msgstr "Autenticazion _HMAC:"
+msgid "_HMAC Authentication"
+msgstr "Autenticazion _HMAC"
 
 #: ../properties/nm-openvpn-dialog.ui.h:108
 msgid "Disable cipher _negotiation"
@@ -1242,8 +1234,8 @@ msgid "Security"
 msgstr "Sigurece"
 
 #: ../properties/nm-openvpn-dialog.ui.h:118
-msgid "_Subject Match:"
-msgstr "Corispondence _ogjet:"
+msgid "_Subject Match"
+msgstr "Corispondence _ogjet"
 
 #: ../properties/nm-openvpn-dialog.ui.h:119
 msgid ""
@@ -1259,8 +1251,8 @@ msgstr ""
 "config (vecje maniere): tls-remote subject-or-name"
 
 #: ../properties/nm-openvpn-dialog.ui.h:123
-msgid "Server _Certificate Check:"
-msgstr "Verifiche _certificÃ¢t servidÃ´r:"
+msgid "Server _Certificate Check"
+msgstr "Verifiche _certificÃ¢t servidÃ´r"
 
 #: ../properties/nm-openvpn-dialog.ui.h:124
 msgid ""
@@ -1303,7 +1295,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:136
-msgid "_Remote peer certificate TLS type:"
+msgid "_Remote peer certificate TLS type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:137
@@ -1324,7 +1316,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:141
-msgid "_Remote peer certificate nsCert designation:"
+msgid "_Remote peer certificate nsCert designation"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:142
@@ -1335,8 +1327,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:144
-msgid "Key _Direction:"
-msgstr "_Direzion de clÃ¢f:"
+msgid "Key _Direction"
+msgstr "_Direzion de clÃ¢f"
 
 #: ../properties/nm-openvpn-dialog.ui.h:145
 msgid ""
@@ -1356,20 +1348,20 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:150
-msgid "Key _File:"
-msgstr "_File clÃ¢f:"
+msgid "Key _File"
+msgstr "_File clÃ¢f"
 
 #: ../properties/nm-openvpn-dialog.ui.h:151
-msgid "Mode:"
-msgstr "ModalitÃ¢t:"
+msgid "Mode"
+msgstr "ModalitÃ¢t"
 
 #: ../properties/nm-openvpn-dialog.ui.h:152
 msgid "Add an additional layer of encryption or HMAC authentication."
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:153
-msgid "Extra Certificates:"
-msgstr "CertificÃ¢ts adizionÃ¢i:"
+msgid "Extra Certificates"
+msgstr "CertificÃ¢ts adizionÃ¢i"
 
 #: ../properties/nm-openvpn-dialog.ui.h:154
 msgid ""
@@ -1391,8 +1383,8 @@ msgid "TLS version control"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:159
-msgid "TLS _min version: "
-msgstr "Version _min di TLS: "
+msgid "TLS _min version"
+msgstr "Version _min di TLS"
 
 #: ../properties/nm-openvpn-dialog.ui.h:160
 msgid ""
@@ -1403,8 +1395,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:161
-msgid "TLS ma_x version: "
-msgstr "Version ma_x di TLS: "
+msgid "TLS ma_x version"
+msgstr "Version ma_x di TLS"
 
 #: ../properties/nm-openvpn-dialog.ui.h:162
 msgid ""
@@ -1428,8 +1420,8 @@ msgstr ""
 "config: http-proxy o socks-proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:166
-msgid "Proxy _Type:"
-msgstr "_Gjenar di proxy:"
+msgid "Proxy _Type"
+msgstr "_Gjenar di proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:167
 msgid ""
@@ -1440,8 +1432,8 @@ msgstr ""
 "servidÃ´r proxy par lÃ¢ su internet.</i>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:168
-msgid "Server _Address:"
-msgstr "_Direzion servidÃ´r:"
+msgid "Server _Address"
+msgstr "_Direzion servidÃ´r"
 
 #: ../properties/nm-openvpn-dialog.ui.h:169
 msgid ""
@@ -1450,8 +1442,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:171
-msgid "_Port:"
-msgstr "_Puarte:"
+msgid "_Port"
+msgstr "_Puarte"
 
 #: ../properties/nm-openvpn-dialog.ui.h:172
 msgid ""
@@ -1473,12 +1465,12 @@ msgstr ""
 "config: http-proxy-retry o socks-proxy-retry"
 
 #: ../properties/nm-openvpn-dialog.ui.h:177
-msgid "Proxy _Username:"
-msgstr "_Non utent dal proxy:"
+msgid "Proxy _Username"
+msgstr "_Non utent dal proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:178
-msgid "Proxy Passwor_d:"
-msgstr "_Password dal proxy:"
+msgid "Proxy Passwor_d"
+msgstr "_Password dal proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:179
 msgid "HTTP/Socks proxy username passed to OpenVPN when prompted for it."
diff --git a/po/gl.po b/po/gl.po
index 496b484..e5e1d0c 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -765,8 +765,8 @@ msgid "General"
 msgstr "Xeral"
 
 #: ../properties/nm-openvpn-dialog.ui.h:13
-msgid "_Gateway:"
-msgstr "_Pasarela:"
+msgid "_Gateway"
+msgstr "_Pasarela"
 
 #: ../properties/nm-openvpn-dialog.ui.h:14
 msgid ""
@@ -792,13 +792,9 @@ msgstr "AC"
 msgid "User"
 msgstr "Usuario"
 
-#: ../properties/nm-openvpn-dialog.ui.h:19
-msgid "Password:"
-msgstr "Contrasinal:"
-
 #: ../properties/nm-openvpn-dialog.ui.h:20
-msgid "User name:"
-msgstr "Nome de usuario:"
+msgid "User name"
+msgstr "Nome de usuario"
 
 #: ../properties/nm-openvpn-dialog.ui.h:21
 msgid ""
@@ -819,20 +815,16 @@ msgstr ""
 "config: auth-user-pass"
 
 #: ../properties/nm-openvpn-dialog.ui.h:25
-msgid "Remote IP Address:"
-msgstr "Enderezo IP remoto:"
+msgid "Remote IP Address"
+msgstr "Enderezo IP remoto"
 
 #: ../properties/nm-openvpn-dialog.ui.h:26
-msgid "Local IP Address:"
-msgstr "Enderezo IP local:"
+msgid "Local IP Address"
+msgstr "Enderezo IP local"
 
 #: ../properties/nm-openvpn-dialog.ui.h:27
-msgid "Key Direction:"
-msgstr "Enderezo da chave:"
-
-#: ../properties/nm-openvpn-dialog.ui.h:28
-msgid "Static Key:"
-msgstr "Chave estÃ¡tica:"
+msgid "Key Direction"
+msgstr "Enderezo da chave"
 
 #: ../properties/nm-openvpn-dialog.ui.h:29
 msgid ""
@@ -874,8 +866,8 @@ msgstr ""
 "config: static <file> [direction]"
 
 #: ../properties/nm-openvpn-dialog.ui.h:38
-msgid "Type:"
-msgstr "Tipo:"
+msgid "Type"
+msgstr "Tipo"
 
 #: ../properties/nm-openvpn-dialog.ui.h:39
 msgid "Select an authentication mode."
@@ -890,8 +882,8 @@ msgid "OpenVPN Advanced Options"
 msgstr "OpciÃ³ns avanzadas de OpenVPN"
 
 #: ../properties/nm-openvpn-dialog.ui.h:43
-msgid "Use custom gateway p_ort:"
-msgstr "Usar un p_orto personalizado de pasarela:"
+msgid "Use custom gateway p_ort"
+msgstr "Usar un p_orto personalizado de pasarela"
 
 #: ../properties/nm-openvpn-dialog.ui.h:44
 msgid ""
@@ -904,8 +896,8 @@ msgstr ""
 "config: port"
 
 #: ../properties/nm-openvpn-dialog.ui.h:46
-msgid "Use custom _renegotiation interval:"
-msgstr "Usar un intervalo de _renegociaciÃ³n personalizado:"
+msgid "Use custom _renegotiation interval"
+msgstr "Usar un intervalo de _renegociaciÃ³n personalizado"
 
 #: ../properties/nm-openvpn-dialog.ui.h:47
 msgid ""
@@ -918,7 +910,7 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:49
 #, fuzzy
-msgid "Data _compression:"
+msgid "Data _compression"
 msgstr "Usar a compresiÃ³n de datos L_ZO"
 
 #: ../properties/nm-openvpn-dialog.ui.h:50
@@ -946,8 +938,8 @@ msgstr ""
 "opciÃ³n: proto tcp-client | udp"
 
 #: ../properties/nm-openvpn-dialog.ui.h:56
-msgid "Set virtual _device type:"
-msgstr "Estabelecer o tipo de _dispositivo virtual:"
+msgid "Set virtual _device type"
+msgstr "Estabelecer o tipo de _dispositivo virtual"
 
 #: ../properties/nm-openvpn-dialog.ui.h:57
 msgid "Explicitly set virtual device type and name (TUN/TAP)."
@@ -963,8 +955,8 @@ msgstr ""
 "config: dev-type tun | tap"
 
 #: ../properties/nm-openvpn-dialog.ui.h:60
-msgid " and _name:"
-msgstr " e _nome:"
+msgid " and _name"
+msgstr " e _nome"
 
 #: ../properties/nm-openvpn-dialog.ui.h:61
 msgid ""
@@ -977,8 +969,8 @@ msgstr ""
 "config: dev <name>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:63
-msgid "Use custom tunnel Maximum Transmission _Unit (MTU):"
-msgstr "Usar unha Unidade de TransmisiÃ³n MÃ¡xima de _tÃºnel personalizada (MTU):"
+msgid "Use custom tunnel Maximum Transmission _Unit (MTU)"
+msgstr "Usar unha Unidade de TransmisiÃ³n MÃ¡xima de _tÃºnel personalizada (MTU)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:64
 msgid ""
@@ -991,8 +983,8 @@ msgstr ""
 "config: tun-mtu"
 
 #: ../properties/nm-openvpn-dialog.ui.h:66
-msgid "Use custom UDP _fragment size:"
-msgstr "Usar un tamaÃ±o de _fragmento UDP personalizado:"
+msgid "Use custom UDP _fragment size"
+msgstr "Usar un tamaÃ±o de _fragmento UDP personalizado"
 
 #: ../properties/nm-openvpn-dialog.ui.h:67
 msgid ""
@@ -1051,8 +1043,8 @@ msgstr ""
 "config: tun-ipv6"
 
 #: ../properties/nm-openvpn-dialog.ui.h:81
-msgid "Specify pin_g interval:"
-msgstr "Especificar o intervalo de pin_g:"
+msgid "Specify pin_g interval"
+msgstr "Especificar o intervalo de pin_g"
 
 #: ../properties/nm-openvpn-dialog.ui.h:82
 msgid ""
@@ -1065,8 +1057,8 @@ msgstr ""
 "config: ping <n>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:84
-msgid "Specify _exit or restart ping:"
-msgstr "Especificar s_aÃr ou reiniciar ping:"
+msgid "Specify _exit or restart ping"
+msgstr "Especificar s_aÃr ou reiniciar ping"
 
 #: ../properties/nm-openvpn-dialog.ui.h:85
 msgid ""
@@ -1113,8 +1105,8 @@ msgstr ""
 "config: float"
 
 #: ../properties/nm-openvpn-dialog.ui.h:93
-msgid "Specify max routes:"
-msgstr "Especificar o nÃºmero mÃ¡ximo de rutas:"
+msgid "Specify max routes"
+msgstr "Especificar o nÃºmero mÃ¡ximo de rutas"
 
 #: ../properties/nm-openvpn-dialog.ui.h:94
 msgid ""
@@ -1136,8 +1128,8 @@ msgstr ""
 "config: cipher"
 
 #: ../properties/nm-openvpn-dialog.ui.h:98
-msgid "Use custom _size of cipher key:"
-msgstr "Usar _tamaÃ±o de chave de cifrado personalizada:"
+msgid "Use custom _size of cipher key"
+msgstr "Usar _tamaÃ±o de chave de cifrado personalizada"
 
 #: ../properties/nm-openvpn-dialog.ui.h:99
 msgid ""
@@ -1160,12 +1152,12 @@ msgstr ""
 "config: auth"
 
 #: ../properties/nm-openvpn-dialog.ui.h:103
-msgid "Ci_pher:"
-msgstr "_Cifrado:"
+msgid "Ci_pher"
+msgstr "_Cifrado"
 
 #: ../properties/nm-openvpn-dialog.ui.h:104
-msgid "_HMAC Authentication:"
-msgstr "AutenticaciÃ³n _HMAC:"
+msgid "_HMAC Authentication"
+msgstr "AutenticaciÃ³n _HMAC"
 
 #: ../properties/nm-openvpn-dialog.ui.h:105
 msgid "Disable cipher _negotiation"
@@ -1212,8 +1204,8 @@ msgid "Security"
 msgstr "Seguranza"
 
 #: ../properties/nm-openvpn-dialog.ui.h:115
-msgid "_Subject Match:"
-msgstr "_Coincidir o asunto:"
+msgid "_Subject Match"
+msgstr "_Coincidir o asunto"
 
 #: ../properties/nm-openvpn-dialog.ui.h:116
 msgid ""
@@ -1229,8 +1221,8 @@ msgstr ""
 "config (legacy mode): tls-remote subject-or-name"
 
 #: ../properties/nm-openvpn-dialog.ui.h:120
-msgid "Server _Certificate Check:"
-msgstr "ComprobaciÃ³n do _certificado do servidor:"
+msgid "Server _Certificate Check"
+msgstr "ComprobaciÃ³n do _certificado do servidor"
 
 #: ../properties/nm-openvpn-dialog.ui.h:121
 msgid ""
@@ -1276,8 +1268,8 @@ msgstr ""
 "uso de chave estentido baseado nas regras de TLS RFC3280."
 
 #: ../properties/nm-openvpn-dialog.ui.h:133
-msgid "_Remote peer certificate TLS type:"
-msgstr "_Tipo de certificado de par remoto TLS:"
+msgid "_Remote peer certificate TLS type"
+msgstr "_Tipo de certificado de par remoto TLS"
 
 #: ../properties/nm-openvpn-dialog.ui.h:134
 msgid ""
@@ -1302,8 +1294,8 @@ msgstr ""
 "explÃcita."
 
 #: ../properties/nm-openvpn-dialog.ui.h:138
-msgid "_Remote peer certificate nsCert designation:"
-msgstr "DesignaciÃ³n nsCert do ce_rtificado do par remoto:"
+msgid "_Remote peer certificate nsCert designation"
+msgstr "DesignaciÃ³n nsCert do ce_rtificado do par remoto"
 
 #: ../properties/nm-openvpn-dialog.ui.h:139
 msgid ""
@@ -1316,8 +1308,8 @@ msgstr ""
 "config: remote-cert-tls client|server"
 
 #: ../properties/nm-openvpn-dialog.ui.h:141
-msgid "Key _Direction:"
-msgstr "_DirecciÃ³n da chave:"
+msgid "Key _Direction"
+msgstr "_DirecciÃ³n da chave"
 
 #: ../properties/nm-openvpn-dialog.ui.h:142
 msgid ""
@@ -1347,20 +1339,20 @@ msgstr ""
 "config: tls-auth <file> [direction]"
 
 #: ../properties/nm-openvpn-dialog.ui.h:147
-msgid "Key _File:"
-msgstr "_Ficheiro de chave:"
+msgid "Key _File"
+msgstr "_Ficheiro de chave"
 
 #: ../properties/nm-openvpn-dialog.ui.h:148
-msgid "Mode:"
-msgstr "Modo:"
+msgid "Mode"
+msgstr "Modo"
 
 #: ../properties/nm-openvpn-dialog.ui.h:149
 msgid "Add an additional layer of encryption or HMAC authentication."
 msgstr "Engadir unha capa adicional de cifrado ou de autenticaciÃ³n HMAC."
 
 #: ../properties/nm-openvpn-dialog.ui.h:150
-msgid "Extra Certificates:"
-msgstr "Certificados adicionais:"
+msgid "Extra Certificates"
+msgstr "Certificados adicionais"
 
 #: ../properties/nm-openvpn-dialog.ui.h:151
 msgid ""
@@ -1385,7 +1377,7 @@ msgid "TLS version control"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:156
-msgid "TLS _min version: "
+msgid "TLS _min version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:157
@@ -1397,7 +1389,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:158
-msgid "TLS ma_x version: "
+msgid "TLS ma_x version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:159
@@ -1419,8 +1411,8 @@ msgstr ""
 "config: http-proxy ou socks-proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:163
-msgid "Proxy _Type:"
-msgstr "_Tipo de proxy:"
+msgid "Proxy _Type"
+msgstr "_Tipo de proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:164
 msgid ""
@@ -1431,8 +1423,8 @@ msgstr ""
 "servidor proxy para acceder a Internet.</i>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:165
-msgid "Server _Address:"
-msgstr "_Enderezo do servidor:"
+msgid "Server _Address"
+msgstr "_Enderezo do servidor"
 
 #: ../properties/nm-openvpn-dialog.ui.h:166
 msgid ""
@@ -1443,8 +1435,8 @@ msgstr ""
 "config: http-proxy ou socks-proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:168
-msgid "_Port:"
-msgstr "_Porto:"
+msgid "_Port"
+msgstr "_Porto"
 
 #: ../properties/nm-openvpn-dialog.ui.h:169
 msgid ""
@@ -1468,12 +1460,12 @@ msgstr ""
 "config: http-proxy-retry ou socks-proxy-retry"
 
 #: ../properties/nm-openvpn-dialog.ui.h:174
-msgid "Proxy _Username:"
-msgstr "_Usuario do proxy:"
+msgid "Proxy _Username"
+msgstr "_Usuario do proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:175
-msgid "Proxy Passwor_d:"
-msgstr "Contrasinal _do proxy:"
+msgid "Proxy Passwor_d"
+msgstr "Contrasinal _do proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:176
 msgid "HTTP/Socks proxy username passed to OpenVPN when prompted for it."
diff --git a/po/gu.po b/po/gu.po
index 9dd0d02..fda6a0b 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -738,7 +738,7 @@ msgid "General"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:13
-msgid "_Gateway:"
+msgid "_Gateway"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:14
@@ -762,15 +762,10 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#: ../properties/nm-openvpn-dialog.ui.h:19
-#, fuzzy
-msgid "Password:"
-msgstr "àªªàª¾àª¸àªµàª°à«àª¡ (_P):"
-
 #: ../properties/nm-openvpn-dialog.ui.h:20
 #, fuzzy
-msgid "User name:"
-msgstr "àªµàªªàª°àª¾àª¶àª•àª°à«àª¤àª¾ àª¨àª¾àª® (_U):"
+msgid "User name"
+msgstr "àªµàªªàª°àª¾àª¶àª•àª°à«àª¤àª¾ àª¨àª¾àª® (_U)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:21
 msgid ""
@@ -786,22 +781,17 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:25
-msgid "Remote IP Address:"
+msgid "Remote IP Address"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:26
-msgid "Local IP Address:"
+msgid "Local IP Address"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:27
-msgid "Key Direction:"
+msgid "Key Direction"
 msgstr ""
 
-#: ../properties/nm-openvpn-dialog.ui.h:28
-#, fuzzy
-msgid "Static Key:"
-msgstr "àª¸à«àªŸà«‡àªŸà«€àª• àª•à«€"
-
 #: ../properties/nm-openvpn-dialog.ui.h:29
 msgid ""
 "Pre-shared file for Static Key encryption mode (non-TLS).\n"
@@ -830,7 +820,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:38
-msgid "Type:"
+msgid "Type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:39
@@ -846,7 +836,7 @@ msgid "OpenVPN Advanced Options"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:43
-msgid "Use custom gateway p_ort:"
+msgid "Use custom gateway p_ort"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:44
@@ -857,7 +847,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:46
-msgid "Use custom _renegotiation interval:"
+msgid "Use custom _renegotiation interval"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:47
@@ -867,7 +857,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:49
-msgid "Data _compression:"
+msgid "Data _compression"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:50
@@ -889,7 +879,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:56
-msgid "Set virtual _device type:"
+msgid "Set virtual _device type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:57
@@ -903,7 +893,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:60
-msgid " and _name:"
+msgid " and _name"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:61
@@ -914,7 +904,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:63
-msgid "Use custom tunnel Maximum Transmission _Unit (MTU):"
+msgid "Use custom tunnel Maximum Transmission _Unit (MTU)"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:64
@@ -925,7 +915,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:66
-msgid "Use custom UDP _fragment size:"
+msgid "Use custom UDP _fragment size"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:67
@@ -976,7 +966,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:81
-msgid "Specify pin_g interval:"
+msgid "Specify pin_g interval"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:82
@@ -987,7 +977,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:84
-msgid "Specify _exit or restart ping:"
+msgid "Specify _exit or restart ping"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:85
@@ -1018,7 +1008,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:93
-msgid "Specify max routes:"
+msgid "Specify max routes"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:94
@@ -1035,7 +1025,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:98
-msgid "Use custom _size of cipher key:"
+msgid "Use custom _size of cipher key"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:99
@@ -1053,11 +1043,11 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:103
-msgid "Ci_pher:"
+msgid "Ci_pher"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:104
-msgid "_HMAC Authentication:"
+msgid "_HMAC Authentication"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:105
@@ -1105,7 +1095,7 @@ msgid "Security"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:115
-msgid "_Subject Match:"
+msgid "_Subject Match"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:116
@@ -1118,8 +1108,8 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:120
 #, fuzzy
-msgid "Server _Certificate Check:"
-msgstr "àªªà«àª°àª®àª¾àª£àªªàª¤à«àª° àªªàª¾àª¸àªµàª°à«àª¡:"
+msgid "Server _Certificate Check"
+msgstr "àªªà«àª°àª®àª¾àª£àªªàª¤à«àª° àªªàª¾àª¸àªµàª°à«àª¡"
 
 #: ../properties/nm-openvpn-dialog.ui.h:121
 msgid ""
@@ -1149,7 +1139,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:133
-msgid "_Remote peer certificate TLS type:"
+msgid "_Remote peer certificate TLS type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:134
@@ -1170,7 +1160,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:138
-msgid "_Remote peer certificate nsCert designation:"
+msgid "_Remote peer certificate nsCert designation"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:139
@@ -1181,7 +1171,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:141
-msgid "Key _Direction:"
+msgid "Key _Direction"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:142
@@ -1202,11 +1192,11 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:147
-msgid "Key _File:"
+msgid "Key _File"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:148
-msgid "Mode:"
+msgid "Mode"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:149
@@ -1215,8 +1205,8 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:150
 #, fuzzy
-msgid "Extra Certificates:"
-msgstr "àªªà«àª°àª®àª¾àª£àªªàª¤à«àª° àªªàª¾àª¸àªµàª°à«àª¡:"
+msgid "Extra Certificates"
+msgstr "àªªà«àª°àª®àª¾àª£àªªàª¤à«àª° àªªàª¾àª¸àªµàª°à«àª¡"
 
 #: ../properties/nm-openvpn-dialog.ui.h:151
 msgid ""
@@ -1238,7 +1228,7 @@ msgid "TLS version control"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:156
-msgid "TLS _min version: "
+msgid "TLS _min version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:157
@@ -1250,7 +1240,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:158
-msgid "TLS ma_x version: "
+msgid "TLS ma_x version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:159
@@ -1271,7 +1261,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:163
-msgid "Proxy _Type:"
+msgid "Proxy _Type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:164
@@ -1281,7 +1271,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:165
-msgid "Server _Address:"
+msgid "Server _Address"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:166
@@ -1291,7 +1281,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:168
-msgid "_Port:"
+msgid "_Port"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:169
@@ -1312,13 +1302,13 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:174
 #, fuzzy
-msgid "Proxy _Username:"
-msgstr "àªµàªªàª°àª¾àª¶àª•àª°à«àª¤àª¾ àª¨àª¾àª® (_U):"
+msgid "Proxy _Username"
+msgstr "àªµàªªàª°àª¾àª¶àª•àª°à«àª¤àª¾ àª¨àª¾àª® (_U)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:175
 #, fuzzy
-msgid "Proxy Passwor_d:"
-msgstr "àªªàª¾àª¸àªµàª°à«àª¡ (_P):"
+msgid "Proxy Passwor_d"
+msgstr "àªªàª¾àª¸àªµàª°à«àª¡ (_P)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:176
 msgid "HTTP/Socks proxy username passed to OpenVPN when prompted for it."
@@ -1331,7 +1321,7 @@ msgstr ""
 #: ../properties/nm-openvpn-dialog.ui.h:178
 #, fuzzy
 msgid "_Show password"
-msgstr "àªªàª¾àª¸àªµàª°à«àª¡ (_P):"
+msgstr "àªªàª¾àª¸àªµàª°à«àª¡ (_P)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:179
 msgid "Proxies"
diff --git a/po/he.po b/po/he.po
index bf9fb13..a91ebcb 100644
--- a/po/he.po
+++ b/po/he.po
@@ -792,8 +792,8 @@ msgid "General"
 msgstr "×›×œ×œ×™"
 
 #: ../properties/nm-openvpn-dialog.ui.h:14
-msgid "_Gateway:"
-msgstr "_×©×¢×¨ ×’×™×©×”:"
+msgid "_Gateway"
+msgstr "_×©×¢×¨ ×’×™×©×”"
 
 #: ../properties/nm-openvpn-dialog.ui.h:15
 msgid ""
@@ -815,13 +815,9 @@ msgstr "×¨×©×•×ª ××™×©×•×¨×™×"
 msgid "User"
 msgstr "×ž×©×ª×ž×©"
 
-#: ../properties/nm-openvpn-dialog.ui.h:20
-msgid "Password:"
-msgstr "×¡×™×¡×ž×”:"
-
 #: ../properties/nm-openvpn-dialog.ui.h:21
-msgid "User name:"
-msgstr "×©× ×ž×©×ª×ž×©:"
+msgid "User name"
+msgstr "×©× ×ž×©×ª×ž×©"
 
 #: ../properties/nm-openvpn-dialog.ui.h:22
 msgid ""
@@ -844,20 +840,16 @@ msgstr ""
 "â€«×”×’×“×¨×”: auth-user-pass"
 
 #: ../properties/nm-openvpn-dialog.ui.h:26
-msgid "Remote IP Address:"
-msgstr "×›×ª×•×‘×ª IP ×ž×¨×•×—×§×ª:"
+msgid "Remote IP Address"
+msgstr "×›×ª×•×‘×ª IP ×ž×¨×•×—×§×ª"
 
 #: ../properties/nm-openvpn-dialog.ui.h:27
-msgid "Local IP Address:"
-msgstr "×›×ª×•×‘×ª IP ×ž×§×•×ž×™×ª:"
+msgid "Local IP Address"
+msgstr "×›×ª×•×‘×ª IP ×ž×§×•×ž×™×ª"
 
 #: ../properties/nm-openvpn-dialog.ui.h:28
-msgid "Key Direction:"
-msgstr "×›×™×•×•×Ÿ ×”×ž×¤×ª×—:"
-
-#: ../properties/nm-openvpn-dialog.ui.h:29
-msgid "Static Key:"
-msgstr "×ž×¤×ª×— ×¡×˜×˜×™:"
+msgid "Key Direction"
+msgstr "×›×™×•×•×Ÿ ×”×ž×¤×ª×—"
 
 #: ../properties/nm-openvpn-dialog.ui.h:30
 msgid ""
@@ -896,8 +888,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:39
-msgid "Type:"
-msgstr "×¡×•×’:"
+msgid "Type"
+msgstr "×¡×•×’"
 
 #: ../properties/nm-openvpn-dialog.ui.h:40
 msgid "Select an authentication mode."
@@ -912,8 +904,8 @@ msgid "OpenVPN Advanced Options"
 msgstr "××¤×©×¨×•×™×•×ª ×ž×ª×§×“×ž×•×ª ×œÖ¾OpenVPN"
 
 #: ../properties/nm-openvpn-dialog.ui.h:44
-msgid "Use custom gateway p_ort:"
-msgstr "×œ×”×©×ª×ž×© ×‘_×¤×ª×—×” ×ž×¡×•×™×ž×ª ×‘×©×¢×¨ ×”×’×™×©×”:"
+msgid "Use custom gateway p_ort"
+msgstr "×œ×”×©×ª×ž×© ×‘_×¤×ª×—×” ×ž×¡×•×™×ž×ª ×‘×©×¢×¨ ×”×’×™×©×”"
 
 #: ../properties/nm-openvpn-dialog.ui.h:45
 msgid ""
@@ -926,8 +918,8 @@ msgstr ""
 "â€«×”×’×“×¨×”: port"
 
 #: ../properties/nm-openvpn-dialog.ui.h:47
-msgid "Use custom _renegotiation interval:"
-msgstr "×œ×”×©×ª×ž×© ×‘×¤×¨×§ ×–×ž×Ÿ ×ž×•×ª×× ×œ_×—×™×“×•×© ×ž×©× ×•×ž×ª×Ÿ:"
+msgid "Use custom _renegotiation interval"
+msgstr "×œ×”×©×ª×ž×© ×‘×¤×¨×§ ×–×ž×Ÿ ×ž×•×ª×× ×œ_×—×™×“×•×© ×ž×©× ×•×ž×ª×Ÿ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:48
 msgid ""
@@ -939,8 +931,8 @@ msgstr ""
 "â€«×”×’×“×¨×”: reneg-sec"
 
 #: ../properties/nm-openvpn-dialog.ui.h:50
-msgid "Data _compression:"
-msgstr "_×“×—×™×¡×ª × ×ª×•× ×™×:"
+msgid "Data _compression"
+msgstr "_×“×—×™×¡×ª × ×ª×•× ×™×"
 
 #: ../properties/nm-openvpn-dialog.ui.h:51
 msgid ""
@@ -969,8 +961,8 @@ msgstr ""
 "â€«×”×’×“×¨×”: proto tcp-client | udp"
 
 #: ../properties/nm-openvpn-dialog.ui.h:57
-msgid "Set virtual _device type:"
-msgstr "×”×’×“×¨×ª ×¡×•×’ ×”_×ª×§×Ÿ ×•×™×¨×˜×•××œ×™:"
+msgid "Set virtual _device type"
+msgstr "×”×’×“×¨×ª ×¡×•×’ ×”_×ª×§×Ÿ ×•×™×¨×˜×•××œ×™"
 
 #: ../properties/nm-openvpn-dialog.ui.h:58
 msgid "Explicitly set virtual device type and name (TUN/TAP)."
@@ -986,8 +978,8 @@ msgstr ""
 "â€«×”×’×“×¨×”: dev-type tun | tap"
 
 #: ../properties/nm-openvpn-dialog.ui.h:61
-msgid " and _name:"
-msgstr " ×•_×©×:"
+msgid " and _name"
+msgstr " ×•_×©×"
 
 #: ../properties/nm-openvpn-dialog.ui.h:62
 msgid ""
@@ -997,7 +989,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:64
-msgid "Use custom tunnel Maximum Transmission _Unit (MTU):"
+msgid "Use custom tunnel Maximum Transmission _Unit (MTU)"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:65
@@ -1008,7 +1000,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:67
-msgid "Use custom UDP _fragment size:"
+msgid "Use custom UDP _fragment size"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:68
@@ -1078,8 +1070,8 @@ msgstr ""
 "â€«×”×’×“×¨×”: tun-ipv6"
 
 #: ../properties/nm-openvpn-dialog.ui.h:85
-msgid "Specify pin_g interval:"
-msgstr "×”×’×“×¨×ª ×”_×¤×¨×©×™ ×¤×™× ×’:"
+msgid "Specify pin_g interval"
+msgstr "×”×’×“×¨×ª ×”_×¤×¨×©×™ ×¤×™× ×’"
 
 #: ../properties/nm-openvpn-dialog.ui.h:86
 msgid ""
@@ -1093,7 +1085,7 @@ msgstr ""
 "â€«×”×’×“×¨×”: ping <n>â€Ž"
 
 #: ../properties/nm-openvpn-dialog.ui.h:88
-msgid "Specify _exit or restart ping:"
+msgid "Specify _exit or restart ping"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:89
@@ -1124,8 +1116,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:97
-msgid "Specify max routes:"
-msgstr "×¦×™×•×Ÿ ×›×ž×•×ª ×”× ×™×ª×•×‘×™× ×”×ž×¨×‘×™×ª:"
+msgid "Specify max routes"
+msgstr "×¦×™×•×Ÿ ×›×ž×•×ª ×”× ×™×ª×•×‘×™× ×”×ž×¨×‘×™×ª"
 
 #: ../properties/nm-openvpn-dialog.ui.h:98
 msgid ""
@@ -1141,7 +1133,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:102
-msgid "Use custom _size of cipher key:"
+msgid "Use custom _size of cipher key"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:103
@@ -1159,12 +1151,12 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:107
-msgid "Ci_pher:"
-msgstr "_×¦×•×¤×Ÿ:"
+msgid "Ci_pher"
+msgstr "_×¦×•×¤×Ÿ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:108
-msgid "_HMAC Authentication:"
-msgstr "××™×ž×•_×ª HMAC:"
+msgid "_HMAC Authentication"
+msgstr "××™×ž×•_×ª HMAC"
 
 #: ../properties/nm-openvpn-dialog.ui.h:109
 msgid "Disable cipher _negotiation"
@@ -1214,8 +1206,8 @@ msgid "Security"
 msgstr "××‘×˜×—×”"
 
 #: ../properties/nm-openvpn-dialog.ui.h:119
-msgid "_Subject Match:"
-msgstr "×”×ª_××ž×ª × ×•×©×:"
+msgid "_Subject Match"
+msgstr "×”×ª_××ž×ª × ×•×©×"
 
 #: ../properties/nm-openvpn-dialog.ui.h:120
 msgid ""
@@ -1226,8 +1218,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:124
-msgid "Server _Certificate Check:"
-msgstr "×‘×“×™×§×ª _××™×©×•×¨ ×©×¨×ª:"
+msgid "Server _Certificate Check"
+msgstr "×‘×“×™×§×ª _××™×©×•×¨ ×©×¨×ª"
 
 #: ../properties/nm-openvpn-dialog.ui.h:125
 msgid ""
@@ -1257,7 +1249,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:137
-msgid "_Remote peer certificate TLS type:"
+msgid "_Remote peer certificate TLS type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:138
@@ -1278,7 +1270,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:142
-msgid "_Remote peer certificate nsCert designation:"
+msgid "_Remote peer certificate nsCert designation"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:143
@@ -1289,8 +1281,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:145
-msgid "Key _Direction:"
-msgstr "_×›×™×•×•×Ÿ ×ž×¤×ª×—:"
+msgid "Key _Direction"
+msgstr "_×›×™×•×•×Ÿ ×ž×¤×ª×—"
 
 #: ../properties/nm-openvpn-dialog.ui.h:146
 msgid ""
@@ -1310,20 +1302,20 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:151
-msgid "Key _File:"
-msgstr "_×§×•×‘×¥ ×ž×¤×ª×—:"
+msgid "Key _File"
+msgstr "_×§×•×‘×¥ ×ž×¤×ª×—"
 
 #: ../properties/nm-openvpn-dialog.ui.h:152
-msgid "Mode:"
-msgstr "×ž×¦×‘:"
+msgid "Mode"
+msgstr "×ž×¦×‘"
 
 #: ../properties/nm-openvpn-dialog.ui.h:153
 msgid "Add an additional layer of encryption or HMAC authentication."
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:154
-msgid "Extra Certificates:"
-msgstr "××™×©×•×¨×™× × ×•×¡×¤×™×:"
+msgid "Extra Certificates"
+msgstr "××™×©×•×¨×™× × ×•×¡×¤×™×"
 
 #: ../properties/nm-openvpn-dialog.ui.h:155
 msgid ""
@@ -1345,8 +1337,8 @@ msgid "TLS version control"
 msgstr "×‘×§×¨×ª ×’×¨×¡×ª TLS"
 
 #: ../properties/nm-openvpn-dialog.ui.h:160
-msgid "TLS _min version: "
-msgstr "×’×¨×¡×” ×ž_×–×¢×¨×™×ª ×©×œ TLS: "
+msgid "TLS _min version"
+msgstr "×’×¨×¡×” ×ž_×–×¢×¨×™×ª ×©×œ TLS"
 
 #: ../properties/nm-openvpn-dialog.ui.h:161
 msgid ""
@@ -1357,8 +1349,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:162
-msgid "TLS ma_x version: "
-msgstr "×’×¨×¡×” ×ž_×¨×‘×™×ª ×©×œ TLS: "
+msgid "TLS ma_x version"
+msgstr "×’×¨×¡×” ×ž_×¨×‘×™×ª ×©×œ TLS"
 
 #: ../properties/nm-openvpn-dialog.ui.h:163
 msgid ""
@@ -1380,8 +1372,8 @@ msgstr ""
 "â€«×”×’×“×¨×”: http-proxy ××• socks-proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:167
-msgid "Proxy _Type:"
-msgstr "_×¡×•×’ ×ž×ª×•×•×š:"
+msgid "Proxy _Type"
+msgstr "_×¡×•×’ ×ž×ª×•×•×š"
 
 #: ../properties/nm-openvpn-dialog.ui.h:168
 msgid ""
@@ -1392,8 +1384,8 @@ msgstr ""
 "×œ××™× ×˜×¨× ×˜.</i>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:169
-msgid "Server _Address:"
-msgstr "_×›×ª×•×‘×ª ×”×©×¨×ª:"
+msgid "Server _Address"
+msgstr "_×›×ª×•×‘×ª ×”×©×¨×ª"
 
 #: ../properties/nm-openvpn-dialog.ui.h:170
 msgid ""
@@ -1405,8 +1397,8 @@ msgstr ""
 "â€«×”×’×“×¨×”: http-proxy ××• socks-proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:172
-msgid "_Port:"
-msgstr "_×¤×ª×—×”:"
+msgid "_Port"
+msgstr "_×¤×ª×—×”"
 
 #: ../properties/nm-openvpn-dialog.ui.h:173
 msgid ""
@@ -1431,12 +1423,12 @@ msgstr ""
 "â€«×”×’×“×¨×”: http-proxy-retry ××• socks-proxy-retry"
 
 #: ../properties/nm-openvpn-dialog.ui.h:178
-msgid "Proxy _Username:"
-msgstr "_×©× ×ž×©×ª×ž×© ×‘×ž×ª×•×•×š:"
+msgid "Proxy _Username"
+msgstr "_×©× ×ž×©×ª×ž×© ×‘×ž×ª×•×•×š"
 
 #: ../properties/nm-openvpn-dialog.ui.h:179
-msgid "Proxy Passwor_d:"
-msgstr "_×¡×™×¡×ž×” ×‘×ž×ª×•×•×š:"
+msgid "Proxy Passwor_d"
+msgstr "_×¡×™×¡×ž×” ×‘×ž×ª×•×•×š"
 
 #: ../properties/nm-openvpn-dialog.ui.h:180
 msgid "HTTP/Socks proxy username passed to OpenVPN when prompted for it."
diff --git a/po/hr.po b/po/hr.po
index e212b08..1b4c440 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -801,8 +801,8 @@ msgid "General"
 msgstr "OpÄ‡enito"
 
 #: ../properties/nm-openvpn-dialog.ui.h:14
-msgid "_Gateway:"
-msgstr "_Pristupnik:"
+msgid "_Gateway"
+msgstr "_Pristupnik"
 
 #: ../properties/nm-openvpn-dialog.ui.h:15
 msgid ""
@@ -828,13 +828,9 @@ msgstr "CA"
 msgid "User"
 msgstr "Korisnik"
 
-#: ../properties/nm-openvpn-dialog.ui.h:20
-msgid "Password:"
-msgstr "Lozinka:"
-
 #: ../properties/nm-openvpn-dialog.ui.h:21
-msgid "User name:"
-msgstr "KorisniÄko ime:"
+msgid "User name"
+msgstr "KorisniÄko ime"
 
 #: ../properties/nm-openvpn-dialog.ui.h:22
 msgid ""
@@ -855,20 +851,16 @@ msgstr ""
 "podeÅ¡avanje: auth-user-pass"
 
 #: ../properties/nm-openvpn-dialog.ui.h:26
-msgid "Remote IP Address:"
-msgstr "Udaljena IP adresa:"
+msgid "Remote IP Address"
+msgstr "Udaljena IP adresa"
 
 #: ../properties/nm-openvpn-dialog.ui.h:27
-msgid "Local IP Address:"
-msgstr "Lokalna IP adresa:"
+msgid "Local IP Address"
+msgstr "Lokalna IP adresa"
 
 #: ../properties/nm-openvpn-dialog.ui.h:28
-msgid "Key Direction:"
-msgstr "Smjer kljuÄa:"
-
-#: ../properties/nm-openvpn-dialog.ui.h:29
-msgid "Static Key:"
-msgstr "Nepromjenjivi kljuÄ:"
+msgid "Key Direction"
+msgstr "Smjer kljuÄa"
 
 #: ../properties/nm-openvpn-dialog.ui.h:30
 msgid ""
@@ -910,8 +902,8 @@ msgstr ""
 "podeÅ¡avanje: static <datoteka> [smjer]"
 
 #: ../properties/nm-openvpn-dialog.ui.h:39
-msgid "Type:"
-msgstr "Vrsta:"
+msgid "Type"
+msgstr "Vrsta"
 
 #: ../properties/nm-openvpn-dialog.ui.h:40
 msgid "Select an authentication mode."
@@ -926,8 +918,8 @@ msgid "OpenVPN Advanced Options"
 msgstr "OpenVPN napredne moguÄ‡nosti"
 
 #: ../properties/nm-openvpn-dialog.ui.h:44
-msgid "Use custom gateway p_ort:"
-msgstr "Koristi prilagoÄ‘eni ulaz pris_tupnika:"
+msgid "Use custom gateway p_ort"
+msgstr "Koristi prilagoÄ‘eni ulaz pris_tupnika"
 
 #: ../properties/nm-openvpn-dialog.ui.h:45
 msgid ""
@@ -940,8 +932,8 @@ msgstr ""
 "podeÅ¡avanje: port"
 
 #: ../properties/nm-openvpn-dialog.ui.h:47
-msgid "Use custom _renegotiation interval:"
-msgstr "Koristi prilagoÄ‘eno razdoblje _ponovnog pregovaranja:"
+msgid "Use custom _renegotiation interval"
+msgstr "Koristi prilagoÄ‘eno razdoblje _ponovnog pregovaranja"
 
 #: ../properties/nm-openvpn-dialog.ui.h:48
 msgid ""
@@ -952,8 +944,8 @@ msgstr ""
 "podeÅ¡avanje: reneg-sec"
 
 #: ../properties/nm-openvpn-dialog.ui.h:50
-msgid "Data _compression:"
-msgstr "SaÅ¾imanje _podataka:"
+msgid "Data _compression"
+msgstr "SaÅ¾imanje _podataka"
 
 #: ../properties/nm-openvpn-dialog.ui.h:51
 msgid ""
@@ -980,8 +972,8 @@ msgstr ""
 "podeÅ¡avanje: proto tcp-client | udp"
 
 #: ../properties/nm-openvpn-dialog.ui.h:57
-msgid "Set virtual _device type:"
-msgstr "Postavi vrstu _virtualnog ureÄ‘aja:"
+msgid "Set virtual _device type"
+msgstr "Postavi vrstu _virtualnog ureÄ‘aja"
 
 #: ../properties/nm-openvpn-dialog.ui.h:58
 msgid "Explicitly set virtual device type and name (TUN/TAP)."
@@ -996,8 +988,8 @@ msgstr ""
 "podeÅ¡avanje: dev-type tun | tap"
 
 #: ../properties/nm-openvpn-dialog.ui.h:61
-msgid " and _name:"
-msgstr " i _naziv:"
+msgid " and _name"
+msgstr " i _naziv"
 
 #: ../properties/nm-openvpn-dialog.ui.h:62
 msgid ""
@@ -1010,8 +1002,8 @@ msgstr ""
 "podeÅ¡avanje: dev <naziv>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:64
-msgid "Use custom tunnel Maximum Transmission _Unit (MTU):"
-msgstr "Koristi najveÄ‡u jedinicu prijenosa (MTU) _prilagoÄ‘enog tunela:"
+msgid "Use custom tunnel Maximum Transmission _Unit (MTU)"
+msgstr "Koristi najveÄ‡u jedinicu prijenosa (MTU) _prilagoÄ‘enog tunela"
 
 #: ../properties/nm-openvpn-dialog.ui.h:65
 msgid ""
@@ -1024,8 +1016,8 @@ msgstr ""
 "podeÅ¡avanje: tun-mtu"
 
 #: ../properties/nm-openvpn-dialog.ui.h:67
-msgid "Use custom UDP _fragment size:"
-msgstr "Koristi prilagoÄ‘enu veliÄinu UDP _fragmenta:"
+msgid "Use custom UDP _fragment size"
+msgstr "Koristi prilagoÄ‘enu veliÄinu UDP _fragmenta"
 
 #: ../properties/nm-openvpn-dialog.ui.h:68
 msgid ""
@@ -1099,8 +1091,8 @@ msgstr ""
 "podeÅ¡avanje: tun-ipv6"
 
 #: ../properties/nm-openvpn-dialog.ui.h:85
-msgid "Specify pin_g interval:"
-msgstr "Navedi pin_g razdoblje:"
+msgid "Specify pin_g interval"
+msgstr "Navedi pin_g razdoblje"
 
 #: ../properties/nm-openvpn-dialog.ui.h:86
 msgid ""
@@ -1113,8 +1105,8 @@ msgstr ""
 "podeÅ¡avanje: ping <n>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:88
-msgid "Specify _exit or restart ping:"
-msgstr "Navedi _ping _zatvaranja i ponovnog pokretanja:"
+msgid "Specify _exit or restart ping"
+msgstr "Navedi _ping _zatvaranja i ponovnog pokretanja"
 
 #: ../properties/nm-openvpn-dialog.ui.h:89
 msgid ""
@@ -1159,8 +1151,8 @@ msgstr ""
 "podeÅ¡avanje: float"
 
 #: ../properties/nm-openvpn-dialog.ui.h:97
-msgid "Specify max routes:"
-msgstr "Navedi najviÅ¡e rute:"
+msgid "Specify max routes"
+msgstr "Navedi najviÅ¡e rute"
 
 #: ../properties/nm-openvpn-dialog.ui.h:98
 msgid ""
@@ -1181,8 +1173,8 @@ msgstr ""
 "podeÅ¡avanje: cipher"
 
 #: ../properties/nm-openvpn-dialog.ui.h:102
-msgid "Use custom _size of cipher key:"
-msgstr "Koristi prilagoÄ‘enu _veliÄinu kljuÄa Å¡ifratora:"
+msgid "Use custom _size of cipher key"
+msgstr "Koristi prilagoÄ‘enu _veliÄinu kljuÄa Å¡ifratora"
 
 #: ../properties/nm-openvpn-dialog.ui.h:103
 msgid ""
@@ -1204,12 +1196,12 @@ msgstr ""
 "podeÅ¡avanje: auth"
 
 #: ../properties/nm-openvpn-dialog.ui.h:107
-msgid "Ci_pher:"
-msgstr "Å i_frator:"
+msgid "Ci_pher"
+msgstr "Å i_frator"
 
 #: ../properties/nm-openvpn-dialog.ui.h:108
-msgid "_HMAC Authentication:"
-msgstr "_HMAC ovjera:"
+msgid "_HMAC Authentication"
+msgstr "_HMAC ovjera"
 
 #: ../properties/nm-openvpn-dialog.ui.h:109
 msgid "Disable cipher _negotiation"
@@ -1264,8 +1256,8 @@ msgid "Security"
 msgstr "Sigurnost"
 
 #: ../properties/nm-openvpn-dialog.ui.h:119
-msgid "_Subject Match:"
-msgstr "_SadrÅ¾aj podudaranja:"
+msgid "_Subject Match"
+msgstr "_SadrÅ¾aj podudaranja"
 
 #: ../properties/nm-openvpn-dialog.ui.h:120
 msgid ""
@@ -1281,8 +1273,8 @@ msgstr ""
 "podeÅ¡avanje (legacy mode): tls-remote subject-or-name"
 
 #: ../properties/nm-openvpn-dialog.ui.h:124
-msgid "Server _Certificate Check:"
-msgstr "Provjera _vjerodajnice posluÅ¾itelja:"
+msgid "Server _Certificate Check"
+msgstr "Provjera _vjerodajnice posluÅ¾itelja"
 
 #: ../properties/nm-openvpn-dialog.ui.h:125
 msgid ""
@@ -1326,8 +1318,8 @@ msgstr ""
 "koriÅ¡tenjem proÅ¡irenog kljuÄa temeljenim na  RFC3280 TLS pravilima."
 
 #: ../properties/nm-openvpn-dialog.ui.h:137
-msgid "_Remote peer certificate TLS type:"
-msgstr "_TLS vrsta udaljene vjerodajnice toÄke:"
+msgid "_Remote peer certificate TLS type"
+msgstr "_TLS vrsta udaljene vjerodajnice toÄke"
 
 #: ../properties/nm-openvpn-dialog.ui.h:138
 msgid ""
@@ -1351,8 +1343,8 @@ msgstr ""
 "Zahtijeva da je vjerodajnica toÄke potpisana sa izriÄitom nsCertType oznakom."
 
 #: ../properties/nm-openvpn-dialog.ui.h:142
-msgid "_Remote peer certificate nsCert designation:"
-msgstr "_nsCert oznaka vjerodajnice udaljene toÄke:"
+msgid "_Remote peer certificate nsCert designation"
+msgstr "_nsCert oznaka vjerodajnice udaljene toÄke"
 
 #: ../properties/nm-openvpn-dialog.ui.h:143
 msgid ""
@@ -1365,8 +1357,8 @@ msgstr ""
 "podeÅ¡avanje: ns-cert-type client|serverr"
 
 #: ../properties/nm-openvpn-dialog.ui.h:145
-msgid "Key _Direction:"
-msgstr "Smjer _kljuÄa:"
+msgid "Key _Direction"
+msgstr "Smjer _kljuÄa"
 
 #: ../properties/nm-openvpn-dialog.ui.h:146
 msgid ""
@@ -1396,20 +1388,20 @@ msgstr ""
 "podeÅ¡avanje: tls-auth <datoteka> [smjer]"
 
 #: ../properties/nm-openvpn-dialog.ui.h:151
-msgid "Key _File:"
-msgstr "Datoteka _kljuÄa:"
+msgid "Key _File"
+msgstr "Datoteka _kljuÄa"
 
 #: ../properties/nm-openvpn-dialog.ui.h:152
-msgid "Mode:"
-msgstr "NaÄin:"
+msgid "Mode"
+msgstr "NaÄin"
 
 #: ../properties/nm-openvpn-dialog.ui.h:153
 msgid "Add an additional layer of encryption or HMAC authentication."
 msgstr "Dodaj dodatni sloj Å¡ifriranja ili HMAC ovjere."
 
 #: ../properties/nm-openvpn-dialog.ui.h:154
-msgid "Extra Certificates:"
-msgstr "Dodatne vjerodajnice:"
+msgid "Extra Certificates"
+msgstr "Dodatne vjerodajnice"
 
 #: ../properties/nm-openvpn-dialog.ui.h:155
 msgid ""
@@ -1434,8 +1426,8 @@ msgid "TLS version control"
 msgstr "Upravljanje TLS inaÄicom"
 
 #: ../properties/nm-openvpn-dialog.ui.h:160
-msgid "TLS _min version: "
-msgstr "TLS _najmanja inaÄica: "
+msgid "TLS _min version"
+msgstr "TLS _najmanja inaÄica"
 
 #: ../properties/nm-openvpn-dialog.ui.h:161
 msgid ""
@@ -1450,8 +1442,8 @@ msgstr ""
 "najveÄ‡a TLS inaÄica podrÅ¾ana lokalnom SSL implementacijom."
 
 #: ../properties/nm-openvpn-dialog.ui.h:162
-msgid "TLS ma_x version: "
-msgstr "TLS naj_veÄ‡a inaÄica: "
+msgid "TLS ma_x version"
+msgstr "TLS naj_veÄ‡a inaÄica"
 
 #: ../properties/nm-openvpn-dialog.ui.h:163
 msgid ""
@@ -1475,8 +1467,8 @@ msgstr ""
 "podeÅ¡avanje: http-proxy ili socks-proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:167
-msgid "Proxy _Type:"
-msgstr "Vrsta _proxya:"
+msgid "Proxy _Type"
+msgstr "Vrsta _proxya"
 
 #: ../properties/nm-openvpn-dialog.ui.h:168
 msgid ""
@@ -1487,8 +1479,8 @@ msgstr ""
 "posluÅ¾itelja za pristup Internetu.</i>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:169
-msgid "Server _Address:"
-msgstr "Adresa _posluÅ¾itelja:"
+msgid "Server _Address"
+msgstr "Adresa _posluÅ¾itelja"
 
 #: ../properties/nm-openvpn-dialog.ui.h:170
 msgid ""
@@ -1499,8 +1491,8 @@ msgstr ""
 "podeÅ¡avanje: http-proxy ili socks-proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:172
-msgid "_Port:"
-msgstr "_Ulaz:"
+msgid "_Port"
+msgstr "_Ulaz"
 
 #: ../properties/nm-openvpn-dialog.ui.h:173
 msgid ""
@@ -1524,12 +1516,12 @@ msgstr ""
 "podeÅ¡avanje: http-proxy-retry ili socks-proxy-retry"
 
 #: ../properties/nm-openvpn-dialog.ui.h:178
-msgid "Proxy _Username:"
-msgstr "KorisniÄko ime _proxya:"
+msgid "Proxy _Username"
+msgstr "KorisniÄko ime _proxya"
 
 #: ../properties/nm-openvpn-dialog.ui.h:179
-msgid "Proxy Passwor_d:"
-msgstr "Lozinka _proxya:"
+msgid "Proxy Passwor_d"
+msgstr "Lozinka _proxya"
 
 #: ../properties/nm-openvpn-dialog.ui.h:180
 msgid "HTTP/Socks proxy username passed to OpenVPN when prompted for it."
diff --git a/po/hu.po b/po/hu.po
index 07b794b..43400fc 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -758,8 +758,8 @@ msgid "General"
 msgstr "ÃltalÃ¡nos"
 
 #: ../properties/nm-openvpn-dialog.ui.h:13
-msgid "_Gateway:"
-msgstr "Ã_tjÃ¡rÃ³:"
+msgid "_Gateway"
+msgstr "Ã_tjÃ¡rÃ³"
 
 #: ../properties/nm-openvpn-dialog.ui.h:14
 msgid ""
@@ -785,13 +785,9 @@ msgstr "CA"
 msgid "User"
 msgstr "FelhasznÃ¡lÃ³"
 
-#: ../properties/nm-openvpn-dialog.ui.h:19
-msgid "Password:"
-msgstr "JelszÃ³:"
-
 #: ../properties/nm-openvpn-dialog.ui.h:20
-msgid "User name:"
-msgstr "FelhasznÃ¡lÃ³nÃ©v:"
+msgid "User name"
+msgstr "FelhasznÃ¡lÃ³nÃ©v"
 
 #: ../properties/nm-openvpn-dialog.ui.h:21
 msgid ""
@@ -813,20 +809,16 @@ msgstr ""
 "config: auth-user-pass"
 
 #: ../properties/nm-openvpn-dialog.ui.h:25
-msgid "Remote IP Address:"
-msgstr "TÃ¡voli IP-cÃm:"
+msgid "Remote IP Address"
+msgstr "TÃ¡voli IP-cÃm"
 
 #: ../properties/nm-openvpn-dialog.ui.h:26
-msgid "Local IP Address:"
-msgstr "Helyi IP-cÃm:"
+msgid "Local IP Address"
+msgstr "Helyi IP-cÃm"
 
 #: ../properties/nm-openvpn-dialog.ui.h:27
-msgid "Key Direction:"
-msgstr "KulcsirÃ¡ny:"
-
-#: ../properties/nm-openvpn-dialog.ui.h:28
-msgid "Static Key:"
-msgstr "Statikus kulcs:"
+msgid "Key Direction"
+msgstr "KulcsirÃ¡ny"
 
 #: ../properties/nm-openvpn-dialog.ui.h:29
 msgid ""
@@ -868,8 +860,8 @@ msgstr ""
 "config: static <fÃ¡jl> [irÃ¡ny]"
 
 #: ../properties/nm-openvpn-dialog.ui.h:38
-msgid "Type:"
-msgstr "TÃpus:"
+msgid "Type"
+msgstr "TÃpus"
 
 #: ../properties/nm-openvpn-dialog.ui.h:39
 msgid "Select an authentication mode."
@@ -884,8 +876,8 @@ msgid "OpenVPN Advanced Options"
 msgstr "OpenVPN speciÃ¡lis beÃ¡llÃtÃ¡sai"
 
 #: ../properties/nm-openvpn-dialog.ui.h:43
-msgid "Use custom gateway p_ort:"
-msgstr "EgyÃ©ni Ã¡tjÃ¡rÃ³_port hasznÃ¡lata:"
+msgid "Use custom gateway p_ort"
+msgstr "EgyÃ©ni Ã¡tjÃ¡rÃ³_port hasznÃ¡lata"
 
 #: ../properties/nm-openvpn-dialog.ui.h:44
 msgid ""
@@ -898,8 +890,8 @@ msgstr ""
 "config: port"
 
 #: ../properties/nm-openvpn-dialog.ui.h:46
-msgid "Use custom _renegotiation interval:"
-msgstr "_EgyÃ©ni ÃºjratÃ¡rgyalÃ¡si idÅ‘kÃ¶z hasznÃ¡lata:"
+msgid "Use custom _renegotiation interval"
+msgstr "_EgyÃ©ni ÃºjratÃ¡rgyalÃ¡si idÅ‘kÃ¶z hasznÃ¡lata"
 
 #: ../properties/nm-openvpn-dialog.ui.h:47
 msgid ""
@@ -911,7 +903,7 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:49
 #, fuzzy
-msgid "Data _compression:"
+msgid "Data _compression"
 msgstr "L_ZO tÃ¶mÃ¶rÃtÃ©s hasznÃ¡lata"
 
 #: ../properties/nm-openvpn-dialog.ui.h:50
@@ -939,8 +931,8 @@ msgstr ""
 "config: proto tcp-client | udp"
 
 #: ../properties/nm-openvpn-dialog.ui.h:56
-msgid "Set virtual _device type:"
-msgstr "VirtuÃ¡lis _eszkÃ¶ztÃpus beÃ¡llÃtÃ¡sa:"
+msgid "Set virtual _device type"
+msgstr "VirtuÃ¡lis _eszkÃ¶ztÃpus beÃ¡llÃtÃ¡sa"
 
 #: ../properties/nm-openvpn-dialog.ui.h:57
 msgid "Explicitly set virtual device type and name (TUN/TAP)."
@@ -955,8 +947,8 @@ msgstr ""
 "beÃ¡llÃtÃ¡s: dev-type tun | tap"
 
 #: ../properties/nm-openvpn-dialog.ui.h:60
-msgid " and _name:"
-msgstr " Ã©s _nÃ©v:"
+msgid " and _name"
+msgstr " Ã©s _nÃ©v"
 
 #: ../properties/nm-openvpn-dialog.ui.h:61
 msgid ""
@@ -969,8 +961,8 @@ msgstr ""
 "beÃ¡llÃtÃ¡s: dev <nÃ©v>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:63
-msgid "Use custom tunnel Maximum Transmission _Unit (MTU):"
-msgstr "EgyÃ©ni _maximÃ¡lis Ã¡tviteli egysÃ©g (MTU) hasznÃ¡lata az alagÃºthoz:"
+msgid "Use custom tunnel Maximum Transmission _Unit (MTU)"
+msgstr "EgyÃ©ni _maximÃ¡lis Ã¡tviteli egysÃ©g (MTU) hasznÃ¡lata az alagÃºthoz"
 
 #: ../properties/nm-openvpn-dialog.ui.h:64
 msgid ""
@@ -983,8 +975,8 @@ msgstr ""
 "config: tun-mtu"
 
 #: ../properties/nm-openvpn-dialog.ui.h:66
-msgid "Use custom UDP _fragment size:"
-msgstr "EgyÃ©ni _UDP-darab mÃ©ret hasznÃ¡lata:"
+msgid "Use custom UDP _fragment size"
+msgstr "EgyÃ©ni _UDP-darab mÃ©ret hasznÃ¡lata"
 
 #: ../properties/nm-openvpn-dialog.ui.h:67
 msgid ""
@@ -1043,8 +1035,8 @@ msgstr ""
 "config: tun-ipv6"
 
 #: ../properties/nm-openvpn-dialog.ui.h:81
-msgid "Specify pin_g interval:"
-msgstr "Adja meg a pin_g idÅ‘kÃ¶zÃ©t:"
+msgid "Specify pin_g interval"
+msgstr "Adja meg a pin_g idÅ‘kÃ¶zÃ©t"
 
 #: ../properties/nm-openvpn-dialog.ui.h:82
 msgid ""
@@ -1057,8 +1049,8 @@ msgstr ""
 "beÃ¡llÃtÃ¡s: ping <n>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:84
-msgid "Specify _exit or restart ping:"
-msgstr "Ping _leÃ¡llÃtÃ¡sa vagy ÃºjraindÃtÃ¡sa:"
+msgid "Specify _exit or restart ping"
+msgstr "Ping _leÃ¡llÃtÃ¡sa vagy ÃºjraindÃtÃ¡sa"
 
 #: ../properties/nm-openvpn-dialog.ui.h:85
 msgid ""
@@ -1105,8 +1097,8 @@ msgstr ""
 "config: float"
 
 #: ../properties/nm-openvpn-dialog.ui.h:93
-msgid "Specify max routes:"
-msgstr "Ãštvonalak legnagyobb szÃ¡mÃ¡nak megadÃ¡sa:"
+msgid "Specify max routes"
+msgstr "Ãštvonalak legnagyobb szÃ¡mÃ¡nak megadÃ¡sa"
 
 #: ../properties/nm-openvpn-dialog.ui.h:94
 msgid ""
@@ -1127,8 +1119,8 @@ msgstr ""
 "config: cipher"
 
 #: ../properties/nm-openvpn-dialog.ui.h:98
-msgid "Use custom _size of cipher key:"
-msgstr "EgyÃ©ni _mÃ©retÅ± titkosÃtÃ³kulcs hasznÃ¡lata:"
+msgid "Use custom _size of cipher key"
+msgstr "EgyÃ©ni _mÃ©retÅ± titkosÃtÃ³kulcs hasznÃ¡lata"
 
 #: ../properties/nm-openvpn-dialog.ui.h:99
 msgid ""
@@ -1151,12 +1143,12 @@ msgstr ""
 "config: auth"
 
 #: ../properties/nm-openvpn-dialog.ui.h:103
-msgid "Ci_pher:"
-msgstr "_RejtjelezÃ©s:"
+msgid "Ci_pher"
+msgstr "_RejtjelezÃ©s"
 
 #: ../properties/nm-openvpn-dialog.ui.h:104
-msgid "_HMAC Authentication:"
-msgstr "_HMAC hitelesÃtÃ©s:"
+msgid "_HMAC Authentication"
+msgstr "_HMAC hitelesÃtÃ©s"
 
 #: ../properties/nm-openvpn-dialog.ui.h:105
 msgid "Disable cipher _negotiation"
@@ -1213,8 +1205,8 @@ msgid "Security"
 msgstr "BiztonsÃ¡g"
 
 #: ../properties/nm-openvpn-dialog.ui.h:115
-msgid "_Subject Match:"
-msgstr "_Alany egyezik:"
+msgid "_Subject Match"
+msgstr "_Alany egyezik"
 
 #: ../properties/nm-openvpn-dialog.ui.h:116
 msgid ""
@@ -1229,8 +1221,8 @@ msgstr ""
 "beÃ¡llÃtÃ¡s (Ã¶rÃ¶kÃ¶lt mÃ³d): tls-remote alany-vagy-nÃ©v"
 
 #: ../properties/nm-openvpn-dialog.ui.h:120
-msgid "Server _Certificate Check:"
-msgstr "KiszolgÃ¡lÃ³_tanÃºsÃtvÃ¡ny ellenÅ‘rzÃ©se:"
+msgid "Server _Certificate Check"
+msgstr "KiszolgÃ¡lÃ³_tanÃºsÃtvÃ¡ny ellenÅ‘rzÃ©se"
 
 #: ../properties/nm-openvpn-dialog.ui.h:121
 msgid ""
@@ -1274,8 +1266,8 @@ msgstr ""
 "alapjÃ¡n bÅ‘vÃtett kulcshasznÃ¡lattal valÃ³ alÃ¡ÃrÃ¡sÃ¡nak megkÃ¶vetelÃ©se."
 
 #: ../properties/nm-openvpn-dialog.ui.h:133
-msgid "_Remote peer certificate TLS type:"
-msgstr "_TÃ¡voli partner tanÃºsÃtvÃ¡nyÃ¡nak TLS tÃpusa:"
+msgid "_Remote peer certificate TLS type"
+msgstr "_TÃ¡voli partner tanÃºsÃtvÃ¡nyÃ¡nak TLS tÃpusa"
 
 #: ../properties/nm-openvpn-dialog.ui.h:134
 msgid ""
@@ -1301,8 +1293,8 @@ msgstr ""
 "megkÃ¶vetelÃ©se."
 
 #: ../properties/nm-openvpn-dialog.ui.h:138
-msgid "_Remote peer certificate nsCert designation:"
-msgstr "_TÃ¡voli partner tanÃºsÃtvÃ¡nyÃ¡nak nsCert meghatÃ¡rozÃ¡sa:"
+msgid "_Remote peer certificate nsCert designation"
+msgstr "_TÃ¡voli partner tanÃºsÃtvÃ¡nyÃ¡nak nsCert meghatÃ¡rozÃ¡sa"
 
 #: ../properties/nm-openvpn-dialog.ui.h:139
 msgid ""
@@ -1315,8 +1307,8 @@ msgstr ""
 "config: ns-cert-type client|server"
 
 #: ../properties/nm-openvpn-dialog.ui.h:141
-msgid "Key _Direction:"
-msgstr "_KulcsirÃ¡ny:"
+msgid "Key _Direction"
+msgstr "_KulcsirÃ¡ny"
 
 #: ../properties/nm-openvpn-dialog.ui.h:142
 msgid ""
@@ -1346,20 +1338,20 @@ msgstr ""
 "config: tls-auth <fÃ¡jl> [irÃ¡ny]"
 
 #: ../properties/nm-openvpn-dialog.ui.h:147
-msgid "Key _File:"
-msgstr "Kulcs_fÃ¡jl:"
+msgid "Key _File"
+msgstr "Kulcs_fÃ¡jl"
 
 #: ../properties/nm-openvpn-dialog.ui.h:148
-msgid "Mode:"
-msgstr "MÃ³d:"
+msgid "Mode"
+msgstr "MÃ³d"
 
 #: ../properties/nm-openvpn-dialog.ui.h:149
 msgid "Add an additional layer of encryption or HMAC authentication."
 msgstr "TovÃ¡bbi titkosÃtÃ¡si rÃ©teg vagy HMAC hitelesÃtÃ©s hozzÃ¡adÃ¡sa."
 
 #: ../properties/nm-openvpn-dialog.ui.h:150
-msgid "Extra Certificates:"
-msgstr "TovÃ¡bbi tanÃºsÃtvÃ¡nyok:"
+msgid "Extra Certificates"
+msgstr "TovÃ¡bbi tanÃºsÃtvÃ¡nyok"
 
 #: ../properties/nm-openvpn-dialog.ui.h:151
 msgid ""
@@ -1384,7 +1376,7 @@ msgid "TLS version control"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:156
-msgid "TLS _min version: "
+msgid "TLS _min version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:157
@@ -1396,7 +1388,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:158
-msgid "TLS ma_x version: "
+msgid "TLS ma_x version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:159
@@ -1418,8 +1410,8 @@ msgstr ""
 "config: http-proxy vagy socks-proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:163
-msgid "Proxy _Type:"
-msgstr "Proxy _tÃpus:"
+msgid "Proxy _Type"
+msgstr "Proxy _tÃpus"
 
 #: ../properties/nm-openvpn-dialog.ui.h:164
 msgid ""
@@ -1430,8 +1422,8 @@ msgstr ""
 "kÃ¶veteli meg az internet elÃ©rÃ©sÃ©hez.</i>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:165
-msgid "Server _Address:"
-msgstr "_KiszolgÃ¡lÃ³ cÃme:"
+msgid "Server _Address"
+msgstr "_KiszolgÃ¡lÃ³ cÃme"
 
 #: ../properties/nm-openvpn-dialog.ui.h:166
 msgid ""
@@ -1442,8 +1434,8 @@ msgstr ""
 "config: http-proxy vagy socks-proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:168
-msgid "_Port:"
-msgstr "_Port:"
+msgid "_Port"
+msgstr "_Port"
 
 #: ../properties/nm-openvpn-dialog.ui.h:169
 msgid ""
@@ -1466,12 +1458,12 @@ msgstr ""
 "config: http-proxy-retry vagy socks-proxy-retry"
 
 #: ../properties/nm-openvpn-dialog.ui.h:174
-msgid "Proxy _Username:"
-msgstr "Proxy _felhasznÃ¡lÃ³i nÃ©v:"
+msgid "Proxy _Username"
+msgstr "Proxy _felhasznÃ¡lÃ³i nÃ©v"
 
 #: ../properties/nm-openvpn-dialog.ui.h:175
-msgid "Proxy Passwor_d:"
-msgstr "_Proxy jelszÃ³:"
+msgid "Proxy Passwor_d"
+msgstr "_Proxy jelszÃ³"
 
 #: ../properties/nm-openvpn-dialog.ui.h:176
 msgid "HTTP/Socks proxy username passed to OpenVPN when prompted for it."
diff --git a/po/id.po b/po/id.po
index 1130aad..6669b2f 100644
--- a/po/id.po
+++ b/po/id.po
@@ -804,8 +804,8 @@ msgid "General"
 msgstr "Umum"
 
 #: ../properties/nm-openvpn-dialog.ui.h:14
-msgid "_Gateway:"
-msgstr "_Gateway:"
+msgid "_Gateway"
+msgstr "_Gateway"
 
 #: ../properties/nm-openvpn-dialog.ui.h:15
 msgid ""
@@ -831,13 +831,9 @@ msgstr "CA"
 msgid "User"
 msgstr "Pengguna"
 
-#: ../properties/nm-openvpn-dialog.ui.h:20
-msgid "Password:"
-msgstr "Kata Sandi:"
-
 #: ../properties/nm-openvpn-dialog.ui.h:21
-msgid "User name:"
-msgstr "Nama pengguna:"
+msgid "User name"
+msgstr "Nama pengguna"
 
 #: ../properties/nm-openvpn-dialog.ui.h:22
 msgid ""
@@ -858,20 +854,16 @@ msgstr ""
 "config: auth-user-pass"
 
 #: ../properties/nm-openvpn-dialog.ui.h:26
-msgid "Remote IP Address:"
-msgstr "Alamat IP Jauh:"
+msgid "Remote IP Address"
+msgstr "Alamat IP Jauh"
 
 #: ../properties/nm-openvpn-dialog.ui.h:27
-msgid "Local IP Address:"
-msgstr "Alamat IP Lokal:"
+msgid "Local IP Address"
+msgstr "Alamat IP Lokal"
 
 #: ../properties/nm-openvpn-dialog.ui.h:28
-msgid "Key Direction:"
-msgstr "Arah Kunci:"
-
-#: ../properties/nm-openvpn-dialog.ui.h:29
-msgid "Static Key:"
-msgstr "Kunci Statik:"
+msgid "Key Direction"
+msgstr "Arah Kunci"
 
 #: ../properties/nm-openvpn-dialog.ui.h:30
 msgid ""
@@ -913,8 +905,8 @@ msgstr ""
 "config: static <berkas> [arah]"
 
 #: ../properties/nm-openvpn-dialog.ui.h:39
-msgid "Type:"
-msgstr "Jenis:"
+msgid "Type"
+msgstr "Jenis"
 
 #: ../properties/nm-openvpn-dialog.ui.h:40
 msgid "Select an authentication mode."
@@ -929,8 +921,8 @@ msgid "OpenVPN Advanced Options"
 msgstr "Opsi Tingkat Lanjut OpenVPN"
 
 #: ../properties/nm-openvpn-dialog.ui.h:44
-msgid "Use custom gateway p_ort:"
-msgstr "Gunakan p_ort gateway gubahan:"
+msgid "Use custom gateway p_ort"
+msgstr "Gunakan p_ort gateway gubahan"
 
 #: ../properties/nm-openvpn-dialog.ui.h:45
 msgid ""
@@ -943,8 +935,8 @@ msgstr ""
 "config: port"
 
 #: ../properties/nm-openvpn-dialog.ui.h:47
-msgid "Use custom _renegotiation interval:"
-msgstr "Gunakan interval _renegosiasi gubahan:"
+msgid "Use custom _renegotiation interval"
+msgstr "Gunakan interval _renegosiasi gubahan"
 
 #: ../properties/nm-openvpn-dialog.ui.h:48
 msgid ""
@@ -955,8 +947,8 @@ msgstr ""
 "config: reneg-sec"
 
 #: ../properties/nm-openvpn-dialog.ui.h:50
-msgid "Data _compression:"
-msgstr "_Kompresi data:"
+msgid "Data _compression"
+msgstr "_Kompresi data"
 
 #: ../properties/nm-openvpn-dialog.ui.h:51
 msgid ""
@@ -983,8 +975,8 @@ msgstr ""
 "config: proto tcp-client | udp"
 
 #: ../properties/nm-openvpn-dialog.ui.h:57
-msgid "Set virtual _device type:"
-msgstr "Atur tipe _perangkat virtual:"
+msgid "Set virtual _device type"
+msgstr "Atur tipe _perangkat virtual"
 
 #: ../properties/nm-openvpn-dialog.ui.h:58
 msgid "Explicitly set virtual device type and name (TUN/TAP)."
@@ -999,8 +991,8 @@ msgstr ""
 "config: dev-type tap | tun"
 
 #: ../properties/nm-openvpn-dialog.ui.h:61
-msgid " and _name:"
-msgstr " dan _nama:"
+msgid " and _name"
+msgstr " dan _nama"
 
 #: ../properties/nm-openvpn-dialog.ui.h:62
 msgid ""
@@ -1013,8 +1005,8 @@ msgstr ""
 "config: dev <nama>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:64
-msgid "Use custom tunnel Maximum Transmission _Unit (MTU):"
-msgstr "Gunakan MTU _tembusan gubahan:"
+msgid "Use custom tunnel Maximum Transmission _Unit (MTU)"
+msgstr "Gunakan MTU _tembusan gubahan"
 
 #: ../properties/nm-openvpn-dialog.ui.h:65
 msgid ""
@@ -1027,8 +1019,8 @@ msgstr ""
 "config: tun-mtu"
 
 #: ../properties/nm-openvpn-dialog.ui.h:67
-msgid "Use custom UDP _fragment size:"
-msgstr "Gunakan ukuran _fragmen UDP gubahan:"
+msgid "Use custom UDP _fragment size"
+msgstr "Gunakan ukuran _fragmen UDP gubahan"
 
 #: ../properties/nm-openvpn-dialog.ui.h:68
 msgid ""
@@ -1101,8 +1093,8 @@ msgstr ""
 "config: tun-ipv6"
 
 #: ../properties/nm-openvpn-dialog.ui.h:85
-msgid "Specify pin_g interval:"
-msgstr "Nyatakan interval pin_g:"
+msgid "Specify pin_g interval"
+msgstr "Nyatakan interval pin_g"
 
 #: ../properties/nm-openvpn-dialog.ui.h:86
 msgid ""
@@ -1115,8 +1107,8 @@ msgstr ""
 "config: ping <n>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:88
-msgid "Specify _exit or restart ping:"
-msgstr "Nyatakan ping _exit atau restart:"
+msgid "Specify _exit or restart ping"
+msgstr "Nyatakan ping _exit atau restart"
 
 #: ../properties/nm-openvpn-dialog.ui.h:89
 msgid ""
@@ -1162,8 +1154,8 @@ msgstr ""
 "config: float"
 
 #: ../properties/nm-openvpn-dialog.ui.h:97
-msgid "Specify max routes:"
-msgstr "Nyatakan rute maksimum:"
+msgid "Specify max routes"
+msgstr "Nyatakan rute maksimum"
 
 #: ../properties/nm-openvpn-dialog.ui.h:98
 msgid ""
@@ -1184,8 +1176,8 @@ msgstr ""
 "config: cipher"
 
 #: ../properties/nm-openvpn-dialog.ui.h:102
-msgid "Use custom _size of cipher key:"
-msgstr "Gunakan uku_ran gubahan kunci cipher:"
+msgid "Use custom _size of cipher key"
+msgstr "Gunakan uku_ran gubahan kunci cipher"
 
 #: ../properties/nm-openvpn-dialog.ui.h:103
 msgid ""
@@ -1208,12 +1200,12 @@ msgstr ""
 "config: auth"
 
 #: ../properties/nm-openvpn-dialog.ui.h:107
-msgid "Ci_pher:"
-msgstr "Cipher:"
+msgid "Ci_pher"
+msgstr "Cipher"
 
 #: ../properties/nm-openvpn-dialog.ui.h:108
-msgid "_HMAC Authentication:"
-msgstr "Autentikasi HMAC:"
+msgid "_HMAC Authentication"
+msgstr "Autentikasi HMAC"
 
 #: ../properties/nm-openvpn-dialog.ui.h:109
 msgid "Disable cipher _negotiation"
@@ -1269,8 +1261,8 @@ msgid "Security"
 msgstr "Keamanan"
 
 #: ../properties/nm-openvpn-dialog.ui.h:119
-msgid "_Subject Match:"
-msgstr "Cocok Subjek:"
+msgid "_Subject Match"
+msgstr "Cocok Subjek"
 
 #: ../properties/nm-openvpn-dialog.ui.h:120
 msgid ""
@@ -1286,8 +1278,8 @@ msgstr ""
 "config (mode warisan): tls-remote subject-or-name"
 
 #: ../properties/nm-openvpn-dialog.ui.h:124
-msgid "Server _Certificate Check:"
-msgstr "Pemeriksaan _Sertifikat Server:"
+msgid "Server _Certificate Check"
+msgstr "Pemeriksaan _Sertifikat Server"
 
 #: ../properties/nm-openvpn-dialog.ui.h:125
 msgid ""
@@ -1331,8 +1323,8 @@ msgstr ""
 "eksplisit dan penggunaan kunci yang diperluas berbasis aturan TLS RFC3280."
 
 #: ../properties/nm-openvpn-dialog.ui.h:137
-msgid "_Remote peer certificate TLS type:"
-msgstr "Tipe TLS sertifikat peer _remote:"
+msgid "_Remote peer certificate TLS type"
+msgstr "Tipe TLS sertifikat peer _remote"
 
 #: ../properties/nm-openvpn-dialog.ui.h:138
 msgid ""
@@ -1357,8 +1349,8 @@ msgstr ""
 "yang eksplisit."
 
 #: ../properties/nm-openvpn-dialog.ui.h:142
-msgid "_Remote peer certificate nsCert designation:"
-msgstr "Penugasan nsCert sertifikat peer _remote:"
+msgid "_Remote peer certificate nsCert designation"
+msgstr "Penugasan nsCert sertifikat peer _remote"
 
 #: ../properties/nm-openvpn-dialog.ui.h:143
 msgid ""
@@ -1371,8 +1363,8 @@ msgstr ""
 "config: ns-cert-type client|server"
 
 #: ../properties/nm-openvpn-dialog.ui.h:145
-msgid "Key _Direction:"
-msgstr "Arah Kunci:"
+msgid "Key _Direction"
+msgstr "Arah Kunci"
 
 #: ../properties/nm-openvpn-dialog.ui.h:146
 msgid ""
@@ -1402,20 +1394,20 @@ msgstr ""
 "config: tls-auth <berkas> [arah]"
 
 #: ../properties/nm-openvpn-dialog.ui.h:151
-msgid "Key _File:"
-msgstr "Berkas Kunci:"
+msgid "Key _File"
+msgstr "Berkas Kunci"
 
 #: ../properties/nm-openvpn-dialog.ui.h:152
-msgid "Mode:"
-msgstr "Mode:"
+msgid "Mode"
+msgstr "Mode"
 
 #: ../properties/nm-openvpn-dialog.ui.h:153
 msgid "Add an additional layer of encryption or HMAC authentication."
 msgstr "Tambahkan lapisan tambahan enkripsi atau autentikasi HMAC."
 
 #: ../properties/nm-openvpn-dialog.ui.h:154
-msgid "Extra Certificates:"
-msgstr "Sertifikat Ekstra:"
+msgid "Extra Certificates"
+msgstr "Sertifikat Ekstra"
 
 #: ../properties/nm-openvpn-dialog.ui.h:155
 msgid ""
@@ -1440,8 +1432,8 @@ msgid "TLS version control"
 msgstr "Kontrol versi TLS"
 
 #: ../properties/nm-openvpn-dialog.ui.h:160
-msgid "TLS _min version: "
-msgstr "Versi _min TLS: "
+msgid "TLS _min version"
+msgstr "Versi _min TLS"
 
 #: ../properties/nm-openvpn-dialog.ui.h:161
 msgid ""
@@ -1456,8 +1448,8 @@ msgstr ""
 "akan menerima versi TLS tertinggi yang didukung oleh implementasi SSL lokal."
 
 #: ../properties/nm-openvpn-dialog.ui.h:162
-msgid "TLS ma_x version: "
-msgstr "Versi ma_ks TLS: "
+msgid "TLS ma_x version"
+msgstr "Versi ma_ks TLS"
 
 #: ../properties/nm-openvpn-dialog.ui.h:163
 msgid ""
@@ -1481,8 +1473,8 @@ msgstr ""
 "config: http-proxy atau socks-proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:167
-msgid "Proxy _Type:"
-msgstr "Jenis Proksi:"
+msgid "Proxy _Type"
+msgstr "Jenis Proksi"
 
 #: ../properties/nm-openvpn-dialog.ui.h:168
 msgid ""
@@ -1493,8 +1485,8 @@ msgstr ""
 "untuk mengakses Internet.</i>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:169
-msgid "Server _Address:"
-msgstr "Alamat Server:"
+msgid "Server _Address"
+msgstr "Alamat Server"
 
 #: ../properties/nm-openvpn-dialog.ui.h:170
 msgid ""
@@ -1505,8 +1497,8 @@ msgstr ""
 "config: http-proxy atau socks-proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:172
-msgid "_Port:"
-msgstr "Port:"
+msgid "_Port"
+msgstr "Port"
 
 #: ../properties/nm-openvpn-dialog.ui.h:173
 msgid ""
@@ -1530,12 +1522,12 @@ msgstr ""
 "config: http-proxy-retry atau socks-proxy-retry"
 
 #: ../properties/nm-openvpn-dialog.ui.h:178
-msgid "Proxy _Username:"
-msgstr "Nama Pengguna Proksi:"
+msgid "Proxy _Username"
+msgstr "Nama Pengguna Proksi"
 
 #: ../properties/nm-openvpn-dialog.ui.h:179
-msgid "Proxy Passwor_d:"
-msgstr "Sandi Proksi:"
+msgid "Proxy Passwor_d"
+msgstr "Sandi Proksi"
 
 #: ../properties/nm-openvpn-dialog.ui.h:180
 msgid "HTTP/Socks proxy username passed to OpenVPN when prompted for it."
diff --git a/po/it.po b/po/it.po
index db3c245..8c47ff9 100644
--- a/po/it.po
+++ b/po/it.po
@@ -809,8 +809,8 @@ msgid "General"
 msgstr "Generale"
 
 #: ../properties/nm-openvpn-dialog.ui.h:14
-msgid "_Gateway:"
-msgstr "_Gateway:"
+msgid "_Gateway"
+msgstr "_Gateway"
 
 #: ../properties/nm-openvpn-dialog.ui.h:15
 msgid ""
@@ -836,13 +836,9 @@ msgstr "CA"
 msgid "User"
 msgstr "Utente"
 
-#: ../properties/nm-openvpn-dialog.ui.h:20
-msgid "Password:"
-msgstr "Password:"
-
 #: ../properties/nm-openvpn-dialog.ui.h:21
-msgid "User name:"
-msgstr "Nome utente:"
+msgid "User name"
+msgstr "Nome utente"
 
 #: ../properties/nm-openvpn-dialog.ui.h:22
 msgid ""
@@ -863,20 +859,16 @@ msgstr ""
 "config: auth-user-pass"
 
 #: ../properties/nm-openvpn-dialog.ui.h:26
-msgid "Remote IP Address:"
-msgstr "Indirizzo IP remoto:"
+msgid "Remote IP Address"
+msgstr "Indirizzo IP remoto"
 
 #: ../properties/nm-openvpn-dialog.ui.h:27
-msgid "Local IP Address:"
-msgstr "Indirizzo IP locale:"
+msgid "Local IP Address"
+msgstr "Indirizzo IP locale"
 
 #: ../properties/nm-openvpn-dialog.ui.h:28
-msgid "Key Direction:"
-msgstr "Direzione della chiave:"
-
-#: ../properties/nm-openvpn-dialog.ui.h:29
-msgid "Static Key:"
-msgstr "Chiave statica:"
+msgid "Key Direction"
+msgstr "Direzione della chiave"
 
 #: ../properties/nm-openvpn-dialog.ui.h:30
 msgid ""
@@ -917,8 +909,8 @@ msgstr ""
 "config: static <file> [direzione]"
 
 #: ../properties/nm-openvpn-dialog.ui.h:39
-msgid "Type:"
-msgstr "Tipo:"
+msgid "Type"
+msgstr "Tipo"
 
 #: ../properties/nm-openvpn-dialog.ui.h:40
 msgid "Select an authentication mode."
@@ -934,8 +926,8 @@ msgid "OpenVPN Advanced Options"
 msgstr "Opzioni OpenVPN avanzate"
 
 #: ../properties/nm-openvpn-dialog.ui.h:44
-msgid "Use custom gateway p_ort:"
-msgstr "Usare una p_orta gateway personalizzata:"
+msgid "Use custom gateway p_ort"
+msgstr "Usare una p_orta gateway personalizzata"
 
 #: ../properties/nm-openvpn-dialog.ui.h:45
 msgid ""
@@ -948,8 +940,8 @@ msgstr ""
 "config: port"
 
 #: ../properties/nm-openvpn-dialog.ui.h:47
-msgid "Use custom _renegotiation interval:"
-msgstr "Usare un intervallo di _rinegoziazione personalizzato:"
+msgid "Use custom _renegotiation interval"
+msgstr "Usare un intervallo di _rinegoziazione personalizzato"
 
 #: ../properties/nm-openvpn-dialog.ui.h:48
 msgid ""
@@ -960,8 +952,8 @@ msgstr ""
 "config: reneg-sec"
 
 #: ../properties/nm-openvpn-dialog.ui.h:50
-msgid "Data _compression:"
-msgstr "Compressione _dati:"
+msgid "Data _compression"
+msgstr "Compressione _dati"
 
 #: ../properties/nm-openvpn-dialog.ui.h:51
 msgid ""
@@ -988,8 +980,8 @@ msgstr ""
 "config: proto tcp-client | udp"
 
 #: ../properties/nm-openvpn-dialog.ui.h:57
-msgid "Set virtual _device type:"
-msgstr "Imposta tipo device _virtuale:"
+msgid "Set virtual _device type"
+msgstr "Imposta tipo device _virtuale"
 
 #: ../properties/nm-openvpn-dialog.ui.h:58
 msgid "Explicitly set virtual device type and name (TUN/TAP)."
@@ -1004,8 +996,8 @@ msgstr ""
 "config: dev-type tun | tap"
 
 #: ../properties/nm-openvpn-dialog.ui.h:61
-msgid " and _name:"
-msgstr " e _nome:"
+msgid " and _name"
+msgstr " e _nome"
 
 #: ../properties/nm-openvpn-dialog.ui.h:62
 msgid ""
@@ -1018,7 +1010,7 @@ msgstr ""
 "config: dev <nome>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:64
-msgid "Use custom tunnel Maximum Transmission _Unit (MTU):"
+msgid "Use custom tunnel Maximum Transmission _Unit (MTU)"
 msgstr ""
 "Usare una MTU (Maximum Transmission Unit) personalizzata per il _tunnel:"
 
@@ -1033,8 +1025,8 @@ msgstr ""
 "config: tun-mtu"
 
 #: ../properties/nm-openvpn-dialog.ui.h:67
-msgid "Use custom UDP _fragment size:"
-msgstr "Usare una dimensione di _frammento UDP personalizzata:"
+msgid "Use custom UDP _fragment size"
+msgstr "Usare una dimensione di _frammento UDP personalizzata"
 
 #: ../properties/nm-openvpn-dialog.ui.h:68
 msgid ""
@@ -1109,8 +1101,8 @@ msgstr ""
 "config: tun-ipv6"
 
 #: ../properties/nm-openvpn-dialog.ui.h:85
-msgid "Specify pin_g interval:"
-msgstr "Specificare intervallo p_ing:"
+msgid "Specify pin_g interval"
+msgstr "Specificare intervallo p_ing"
 
 #: ../properties/nm-openvpn-dialog.ui.h:86
 msgid ""
@@ -1123,8 +1115,8 @@ msgstr ""
 "config: ping <N>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:88
-msgid "Specify _exit or restart ping:"
-msgstr "Specificare il _ping di uscita o riavvio:"
+msgid "Specify _exit or restart ping"
+msgstr "Specificare il _ping di uscita o riavvio"
 
 #: ../properties/nm-openvpn-dialog.ui.h:89
 msgid ""
@@ -1170,8 +1162,8 @@ msgstr ""
 "config: float"
 
 #: ../properties/nm-openvpn-dialog.ui.h:97
-msgid "Specify max routes:"
-msgstr "Rotte massime:"
+msgid "Specify max routes"
+msgstr "Rotte massime"
 
 #: ../properties/nm-openvpn-dialog.ui.h:98
 msgid ""
@@ -1192,8 +1184,8 @@ msgstr ""
 "config: cipher"
 
 #: ../properties/nm-openvpn-dialog.ui.h:102
-msgid "Use custom _size of cipher key:"
-msgstr "Usare dimensione _personalizzata per la chiave del cifrario:"
+msgid "Use custom _size of cipher key"
+msgstr "Usare dimensione _personalizzata per la chiave del cifrario"
 
 #: ../properties/nm-openvpn-dialog.ui.h:103
 msgid ""
@@ -1216,12 +1208,12 @@ msgstr ""
 "config: auth"
 
 #: ../properties/nm-openvpn-dialog.ui.h:107
-msgid "Ci_pher:"
-msgstr "Ci_frario:"
+msgid "Ci_pher"
+msgstr "Ci_frario"
 
 #: ../properties/nm-openvpn-dialog.ui.h:108
-msgid "_HMAC Authentication:"
-msgstr "Autenticazione _HMAC:"
+msgid "_HMAC Authentication"
+msgstr "Autenticazione _HMAC"
 
 #: ../properties/nm-openvpn-dialog.ui.h:109
 msgid "Disable cipher _negotiation"
@@ -1276,8 +1268,8 @@ msgid "Security"
 msgstr "Sicurezza"
 
 #: ../properties/nm-openvpn-dialog.ui.h:119
-msgid "_Subject Match:"
-msgstr "Corrispondenza _oggetto:"
+msgid "_Subject Match"
+msgstr "Corrispondenza _oggetto"
 
 #: ../properties/nm-openvpn-dialog.ui.h:120
 msgid ""
@@ -1293,8 +1285,8 @@ msgstr ""
 "config (modalitÃ  legacy): tls-remote subject-or-name"
 
 #: ../properties/nm-openvpn-dialog.ui.h:124
-msgid "Server _Certificate Check:"
-msgstr "Verifica _certificato server:"
+msgid "Server _Certificate Check"
+msgstr "Verifica _certificato server"
 
 #: ../properties/nm-openvpn-dialog.ui.h:125
 msgid ""
@@ -1339,8 +1331,8 @@ msgstr ""
 "Â«Extended Key UsageÂ» particolari basati sulle regole TLS di RFC3280."
 
 #: ../properties/nm-openvpn-dialog.ui.h:137
-msgid "_Remote peer certificate TLS type:"
-msgstr "Ti_po di certificato TLS del nodo remoto:"
+msgid "_Remote peer certificate TLS type"
+msgstr "Ti_po di certificato TLS del nodo remoto"
 
 #: ../properties/nm-openvpn-dialog.ui.h:138
 msgid ""
@@ -1365,8 +1357,8 @@ msgstr ""
 "nsCertType esplicita."
 
 #: ../properties/nm-openvpn-dialog.ui.h:142
-msgid "_Remote peer certificate nsCert designation:"
-msgstr "Designazione nsCert certificato del nodo _remoto:"
+msgid "_Remote peer certificate nsCert designation"
+msgstr "Designazione nsCert certificato del nodo _remoto"
 
 #: ../properties/nm-openvpn-dialog.ui.h:143
 msgid ""
@@ -1379,8 +1371,8 @@ msgstr ""
 "config: ns-cert-type client|server"
 
 #: ../properties/nm-openvpn-dialog.ui.h:145
-msgid "Key _Direction:"
-msgstr "_Direzione della chiave:"
+msgid "Key _Direction"
+msgstr "_Direzione della chiave"
 
 #: ../properties/nm-openvpn-dialog.ui.h:146
 msgid ""
@@ -1409,20 +1401,20 @@ msgstr ""
 "config: tls-auth <file> [direzione]"
 
 #: ../properties/nm-openvpn-dialog.ui.h:151
-msgid "Key _File:"
-msgstr "File _chiave:"
+msgid "Key _File"
+msgstr "File _chiave"
 
 #: ../properties/nm-openvpn-dialog.ui.h:152
-msgid "Mode:"
-msgstr "ModalitÃ :"
+msgid "Mode"
+msgstr "ModalitÃ "
 
 #: ../properties/nm-openvpn-dialog.ui.h:153
 msgid "Add an additional layer of encryption or HMAC authentication."
 msgstr "Aggiunge un ulteriore livello di cifratura o autenticazione HMAC"
 
 #: ../properties/nm-openvpn-dialog.ui.h:154
-msgid "Extra Certificates:"
-msgstr "Certificati aggiuntivi:"
+msgid "Extra Certificates"
+msgstr "Certificati aggiuntivi"
 
 #: ../properties/nm-openvpn-dialog.ui.h:155
 msgid ""
@@ -1447,7 +1439,7 @@ msgid "TLS version control"
 msgstr "Controllo versione TLS"
 
 #: ../properties/nm-openvpn-dialog.ui.h:160
-msgid "TLS _min version: "
+msgid "TLS _min version"
 msgstr "Versione mi_nima TLS"
 
 #: ../properties/nm-openvpn-dialog.ui.h:161
@@ -1463,8 +1455,8 @@ msgstr ""
 "TLS piÃ¹ alta supportata dall'implementazione locale"
 
 #: ../properties/nm-openvpn-dialog.ui.h:162
-msgid "TLS ma_x version: "
-msgstr "Versione _massima TLS:"
+msgid "TLS ma_x version"
+msgstr "Versione _massima TLS"
 
 #: ../properties/nm-openvpn-dialog.ui.h:163
 msgid ""
@@ -1487,8 +1479,8 @@ msgstr ""
 "config: http-proxy oppure socks-proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:167
-msgid "Proxy _Type:"
-msgstr "Tipo pro_xy:"
+msgid "Proxy _Type"
+msgstr "Tipo pro_xy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:168
 msgid ""
@@ -1499,8 +1491,8 @@ msgstr ""
 "un server proxy per accedere a Internet.</i>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:169
-msgid "Server _Address:"
-msgstr "In_dirizzo server:"
+msgid "Server _Address"
+msgstr "In_dirizzo server"
 
 #: ../properties/nm-openvpn-dialog.ui.h:170
 msgid ""
@@ -1511,8 +1503,8 @@ msgstr ""
 "config: http-proxy oppure socks-proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:172
-msgid "_Port:"
-msgstr "_Porta:"
+msgid "_Port"
+msgstr "_Porta"
 
 #: ../properties/nm-openvpn-dialog.ui.h:173
 msgid ""
@@ -1536,12 +1528,12 @@ msgstr ""
 "config: http-proxy-retry oppure socks-proxy-retry"
 
 #: ../properties/nm-openvpn-dialog.ui.h:178
-msgid "Proxy _Username:"
-msgstr "Nome utente proxy:"
+msgid "Proxy _Username"
+msgstr "Nome utente proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:179
-msgid "Proxy Passwor_d:"
-msgstr "Password del proxy:"
+msgid "Proxy Passwor_d"
+msgstr "Password del proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:180
 msgid "HTTP/Socks proxy username passed to OpenVPN when prompted for it."
diff --git a/po/ja.po b/po/ja.po
index 2aad636..245c655 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -737,8 +737,8 @@ msgid "General"
 msgstr "å…¨èˆ¬"
 
 #: ../properties/nm-openvpn-dialog.ui.h:13
-msgid "_Gateway:"
-msgstr "ã‚²ãƒ¼ãƒˆã‚¦ã‚§ã‚¤(_G):"
+msgid "_Gateway"
+msgstr "ã‚²ãƒ¼ãƒˆã‚¦ã‚§ã‚¤(_G)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:14
 msgid ""
@@ -760,13 +760,9 @@ msgstr "CA"
 msgid "User"
 msgstr "ãƒ¦ãƒ¼ã‚¶ãƒ¼"
 
-#: ../properties/nm-openvpn-dialog.ui.h:19
-msgid "Password:"
-msgstr "ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰:"
-
 #: ../properties/nm-openvpn-dialog.ui.h:20
-msgid "User name:"
-msgstr "ãƒ¦ãƒ¼ã‚¶ãƒ¼å:"
+msgid "User name"
+msgstr "ãƒ¦ãƒ¼ã‚¶ãƒ¼å"
 
 #: ../properties/nm-openvpn-dialog.ui.h:21
 msgid ""
@@ -782,20 +778,16 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:25
-msgid "Remote IP Address:"
-msgstr "ãƒªãƒ¢ãƒ¼ãƒˆ IP ã‚¢ãƒ‰ãƒ¬ã‚¹:"
+msgid "Remote IP Address"
+msgstr "ãƒªãƒ¢ãƒ¼ãƒˆ IP ã‚¢ãƒ‰ãƒ¬ã‚¹"
 
 #: ../properties/nm-openvpn-dialog.ui.h:26
-msgid "Local IP Address:"
-msgstr "ãƒãƒ¼ã‚«ãƒ« IP ã‚¢ãƒ‰ãƒ¬ã‚¹:"
+msgid "Local IP Address"
+msgstr "ãƒãƒ¼ã‚«ãƒ« IP ã‚¢ãƒ‰ãƒ¬ã‚¹"
 
 #: ../properties/nm-openvpn-dialog.ui.h:27
-msgid "Key Direction:"
-msgstr "éµã®æ–¹å‘:"
-
-#: ../properties/nm-openvpn-dialog.ui.h:28
-msgid "Static Key:"
-msgstr "å…±é€šéµ:"
+msgid "Key Direction"
+msgstr "éµã®æ–¹å‘"
 
 #: ../properties/nm-openvpn-dialog.ui.h:29
 msgid ""
@@ -829,8 +821,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:38
-msgid "Type:"
-msgstr "ã‚¿ã‚¤ãƒ—:"
+msgid "Type"
+msgstr "ã‚¿ã‚¤ãƒ—"
 
 #: ../properties/nm-openvpn-dialog.ui.h:39
 msgid "Select an authentication mode."
@@ -845,8 +837,8 @@ msgid "OpenVPN Advanced Options"
 msgstr "OpenVPN ã®è©³ç´°ã‚ªãƒ—ã‚·ãƒ§ãƒ³"
 
 #: ../properties/nm-openvpn-dialog.ui.h:43
-msgid "Use custom gateway p_ort:"
-msgstr "ã‚«ã‚¹ã‚¿ãƒ ã®ã‚²ãƒ¼ãƒˆã‚¦ã‚§ã‚¤ãƒãƒ¼ãƒˆ(_O):"
+msgid "Use custom gateway p_ort"
+msgstr "ã‚«ã‚¹ã‚¿ãƒ ã®ã‚²ãƒ¼ãƒˆã‚¦ã‚§ã‚¤ãƒãƒ¼ãƒˆ(_O)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:44
 msgid ""
@@ -858,8 +850,8 @@ msgstr ""
 "config: port"
 
 #: ../properties/nm-openvpn-dialog.ui.h:46
-msgid "Use custom _renegotiation interval:"
-msgstr "ã‚«ã‚¹ã‚¿ãƒ ã®å†äº¤æ¸‰é–“éš”ã‚’åˆ©ç”¨ã™ã‚‹(_R):"
+msgid "Use custom _renegotiation interval"
+msgstr "ã‚«ã‚¹ã‚¿ãƒ ã®å†äº¤æ¸‰é–“éš”ã‚’åˆ©ç”¨ã™ã‚‹(_R)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:47
 msgid ""
@@ -868,8 +860,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:49
-msgid "Data _compression:"
-msgstr "ãƒ‡ãƒ¼ã‚¿åœ§ç¸®(_C):"
+msgid "Data _compression"
+msgstr "ãƒ‡ãƒ¼ã‚¿åœ§ç¸®(_C)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:50
 msgid ""
@@ -896,7 +888,7 @@ msgstr ""
 "config: proto tcp-client | udp"
 
 #: ../properties/nm-openvpn-dialog.ui.h:56
-msgid "Set virtual _device type:"
+msgid "Set virtual _device type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:57
@@ -910,7 +902,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:60
-msgid " and _name:"
+msgid " and _name"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:61
@@ -921,8 +913,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:63
-msgid "Use custom tunnel Maximum Transmission _Unit (MTU):"
-msgstr "ã‚«ã‚¹ã‚¿ãƒ ã®ãƒˆãƒ³ãƒãƒ« Maximum Transmission _Unit (MTU) ã‚’åˆ©ç”¨ã™ã‚‹:"
+msgid "Use custom tunnel Maximum Transmission _Unit (MTU)"
+msgstr "ã‚«ã‚¹ã‚¿ãƒ ã®ãƒˆãƒ³ãƒãƒ« Maximum Transmission _Unit (MTU) ã‚’åˆ©ç”¨ã™ã‚‹"
 
 #: ../properties/nm-openvpn-dialog.ui.h:64
 msgid ""
@@ -932,8 +924,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:66
-msgid "Use custom UDP _fragment size:"
-msgstr "ã‚«ã‚¹ã‚¿ãƒ ã® UDP ãƒ•ãƒ©ã‚°ãƒ¡ãƒ³ãƒˆã‚µã‚¤ã‚ºã‚’åˆ©ç”¨ã™ã‚‹(_F):"
+msgid "Use custom UDP _fragment size"
+msgstr "ã‚«ã‚¹ã‚¿ãƒ ã® UDP ãƒ•ãƒ©ã‚°ãƒ¡ãƒ³ãƒˆã‚µã‚¤ã‚ºã‚’åˆ©ç”¨ã™ã‚‹(_F)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:67
 msgid ""
@@ -985,7 +977,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:81
-msgid "Specify pin_g interval:"
+msgid "Specify pin_g interval"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:82
@@ -996,7 +988,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:84
-msgid "Specify _exit or restart ping:"
+msgid "Specify _exit or restart ping"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:85
@@ -1027,7 +1019,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:93
-msgid "Specify max routes:"
+msgid "Specify max routes"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:94
@@ -1044,7 +1036,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:98
-msgid "Use custom _size of cipher key:"
+msgid "Use custom _size of cipher key"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:99
@@ -1062,12 +1054,12 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:103
-msgid "Ci_pher:"
-msgstr "æš—å·(_P):"
+msgid "Ci_pher"
+msgstr "æš—å·(_P)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:104
-msgid "_HMAC Authentication:"
-msgstr "HMAC èªè¨¼(_H):"
+msgid "_HMAC Authentication"
+msgstr "HMAC èªè¨¼(_H)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:105
 msgid "Disable cipher _negotiation"
@@ -1114,7 +1106,7 @@ msgid "Security"
 msgstr "ã‚»ã‚ãƒ¥ãƒªãƒ†ã‚£"
 
 #: ../properties/nm-openvpn-dialog.ui.h:115
-msgid "_Subject Match:"
+msgid "_Subject Match"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:116
@@ -1126,8 +1118,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:120
-msgid "Server _Certificate Check:"
-msgstr "ã‚µãƒ¼ãƒãƒ¼è¨¼æ˜Žæ›¸ã‚’ç¢ºèª(_C):"
+msgid "Server _Certificate Check"
+msgstr "ã‚µãƒ¼ãƒãƒ¼è¨¼æ˜Žæ›¸ã‚’ç¢ºèª(_C)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:121
 msgid ""
@@ -1157,7 +1149,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:133
-msgid "_Remote peer certificate TLS type:"
+msgid "_Remote peer certificate TLS type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:134
@@ -1178,7 +1170,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:138
-msgid "_Remote peer certificate nsCert designation:"
+msgid "_Remote peer certificate nsCert designation"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:139
@@ -1189,8 +1181,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:141
-msgid "Key _Direction:"
-msgstr "éµã®æ–¹å‘(_D):"
+msgid "Key _Direction"
+msgstr "éµã®æ–¹å‘(_D)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:142
 msgid ""
@@ -1210,19 +1202,19 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:147
-msgid "Key _File:"
-msgstr "éµãƒ•ã‚¡ã‚¤ãƒ«(_F):"
+msgid "Key _File"
+msgstr "éµãƒ•ã‚¡ã‚¤ãƒ«(_F)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:148
-msgid "Mode:"
-msgstr "ãƒ¢ãƒ¼ãƒ‰:"
+msgid "Mode"
+msgstr "ãƒ¢ãƒ¼ãƒ‰"
 
 #: ../properties/nm-openvpn-dialog.ui.h:149
 msgid "Add an additional layer of encryption or HMAC authentication."
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:150
-msgid "Extra Certificates:"
+msgid "Extra Certificates"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:151
@@ -1245,7 +1237,7 @@ msgid "TLS version control"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:156
-msgid "TLS _min version: "
+msgid "TLS _min version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:157
@@ -1257,7 +1249,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:158
-msgid "TLS ma_x version: "
+msgid "TLS ma_x version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:159
@@ -1277,8 +1269,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:163
-msgid "Proxy _Type:"
-msgstr "ãƒ—ãƒã‚ã‚·ã®ã‚¿ã‚¤ãƒ—(_T):"
+msgid "Proxy _Type"
+msgstr "ãƒ—ãƒã‚ã‚·ã®ã‚¿ã‚¤ãƒ—(_T)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:164
 msgid ""
@@ -1287,8 +1279,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:165
-msgid "Server _Address:"
-msgstr "ã‚µãƒ¼ãƒãƒ¼ã®ã‚¢ãƒ‰ãƒ¬ã‚¹(_A):"
+msgid "Server _Address"
+msgstr "ã‚µãƒ¼ãƒãƒ¼ã®ã‚¢ãƒ‰ãƒ¬ã‚¹(_A)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:166
 msgid ""
@@ -1297,8 +1289,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:168
-msgid "_Port:"
-msgstr "ãƒãƒ¼ãƒˆ(_P):"
+msgid "_Port"
+msgstr "ãƒãƒ¼ãƒˆ(_P)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:169
 msgid ""
@@ -1317,12 +1309,12 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:174
-msgid "Proxy _Username:"
-msgstr "ãƒ—ãƒã‚ã‚·ãƒ¦ãƒ¼ã‚¶ãƒ¼å(_U):"
+msgid "Proxy _Username"
+msgstr "ãƒ—ãƒã‚ã‚·ãƒ¦ãƒ¼ã‚¶ãƒ¼å(_U)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:175
-msgid "Proxy Passwor_d:"
-msgstr "ãƒ—ãƒã‚ã‚·ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰(_D):"
+msgid "Proxy Passwor_d"
+msgstr "ãƒ—ãƒã‚ã‚·ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰(_D)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:176
 msgid "HTTP/Socks proxy username passed to OpenVPN when prompted for it."
diff --git a/po/ka.po b/po/ka.po
index 541cb64..bac3be5 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -740,8 +740,8 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:13
 #, fuzzy
-msgid "_Gateway:"
-msgstr "_áƒ áƒáƒ‘áƒ˜áƒ¡ áƒžáƒáƒ áƒ¢áƒ˜:"
+msgid "_Gateway"
+msgstr "_áƒ áƒáƒ‘áƒ˜áƒ¡ áƒžáƒáƒ áƒ¢áƒ˜"
 
 #: ../properties/nm-openvpn-dialog.ui.h:14
 msgid ""
@@ -764,15 +764,10 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#: ../properties/nm-openvpn-dialog.ui.h:19
-#, fuzzy
-msgid "Password:"
-msgstr "_áƒžáƒáƒ áƒáƒšáƒ˜:"
-
 #: ../properties/nm-openvpn-dialog.ui.h:20
 #, fuzzy
-msgid "User name:"
-msgstr "áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒšáƒ˜áƒ¡ áƒ¡áƒáƒ®áƒ”áƒšáƒ˜:"
+msgid "User name"
+msgstr "áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒšáƒ˜áƒ¡ áƒ¡áƒáƒ®áƒ”áƒšáƒ˜"
 
 #: ../properties/nm-openvpn-dialog.ui.h:21
 msgid ""
@@ -789,23 +784,18 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:25
 #, fuzzy
-msgid "Remote IP Address:"
-msgstr "áƒ“áƒ˜áƒ¡áƒ¢áƒáƒœáƒªáƒ˜áƒ£áƒ áƒ˜ IP:"
+msgid "Remote IP Address"
+msgstr "áƒ“áƒ˜áƒ¡áƒ¢áƒáƒœáƒªáƒ˜áƒ£áƒ áƒ˜ IP"
 
 #: ../properties/nm-openvpn-dialog.ui.h:26
 #, fuzzy
-msgid "Local IP Address:"
-msgstr "áƒšáƒáƒ™áƒáƒšáƒ£áƒ áƒ˜ IP:"
+msgid "Local IP Address"
+msgstr "áƒšáƒáƒ™áƒáƒšáƒ£áƒ áƒ˜ IP"
 
 #: ../properties/nm-openvpn-dialog.ui.h:27
 #, fuzzy
-msgid "Key Direction:"
-msgstr "áƒ›áƒ˜áƒ›áƒáƒ áƒ—áƒ£áƒšáƒ”áƒ‘áƒ:"
-
-#: ../properties/nm-openvpn-dialog.ui.h:28
-#, fuzzy
-msgid "Static Key:"
-msgstr "áƒ–áƒ˜áƒáƒ áƒ˜ áƒ’áƒáƒ¡áƒáƒ¦áƒ”áƒ‘áƒ˜:"
+msgid "Key Direction"
+msgstr "áƒ›áƒ˜áƒ›áƒáƒ áƒ—áƒ£áƒšáƒ”áƒ‘áƒ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:29
 msgid ""
@@ -835,7 +825,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:38
-msgid "Type:"
+msgid "Type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:39
@@ -852,8 +842,8 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:43
 #, fuzzy
-msgid "Use custom gateway p_ort:"
-msgstr "_áƒ áƒáƒ‘áƒ˜áƒ¡ áƒžáƒáƒ áƒ¢áƒ˜:"
+msgid "Use custom gateway p_ort"
+msgstr "_áƒ áƒáƒ‘áƒ˜áƒ¡ áƒžáƒáƒ áƒ¢áƒ˜"
 
 #: ../properties/nm-openvpn-dialog.ui.h:44
 msgid ""
@@ -863,7 +853,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:46
-msgid "Use custom _renegotiation interval:"
+msgid "Use custom _renegotiation interval"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:47
@@ -874,7 +864,7 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:49
 #, fuzzy
-msgid "Data _compression:"
+msgid "Data _compression"
 msgstr "LZO-áƒ™áƒ£áƒ›áƒ¨áƒ•áƒ˜áƒ¡ áƒ’áƒáƒ›áƒáƒ§áƒ”áƒœáƒ”áƒ‘áƒ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:50
@@ -898,7 +888,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:56
-msgid "Set virtual _device type:"
+msgid "Set virtual _device type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:57
@@ -912,7 +902,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:60
-msgid " and _name:"
+msgid " and _name"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:61
@@ -923,7 +913,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:63
-msgid "Use custom tunnel Maximum Transmission _Unit (MTU):"
+msgid "Use custom tunnel Maximum Transmission _Unit (MTU)"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:64
@@ -934,7 +924,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:66
-msgid "Use custom UDP _fragment size:"
+msgid "Use custom UDP _fragment size"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:67
@@ -985,7 +975,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:81
-msgid "Specify pin_g interval:"
+msgid "Specify pin_g interval"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:82
@@ -996,7 +986,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:84
-msgid "Specify _exit or restart ping:"
+msgid "Specify _exit or restart ping"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:85
@@ -1027,7 +1017,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:93
-msgid "Specify max routes:"
+msgid "Specify max routes"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:94
@@ -1044,7 +1034,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:98
-msgid "Use custom _size of cipher key:"
+msgid "Use custom _size of cipher key"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:99
@@ -1063,11 +1053,11 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:103
 #, fuzzy
-msgid "Ci_pher:"
+msgid "Ci_pher"
 msgstr "áƒªáƒ˜áƒ¤áƒ áƒ˜: %s"
 
 #: ../properties/nm-openvpn-dialog.ui.h:104
-msgid "_HMAC Authentication:"
+msgid "_HMAC Authentication"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:105
@@ -1115,7 +1105,7 @@ msgid "Security"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:115
-msgid "_Subject Match:"
+msgid "_Subject Match"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:116
@@ -1128,8 +1118,8 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:120
 #, fuzzy
-msgid "Server _Certificate Check:"
-msgstr "áƒ¡áƒ”áƒ áƒ¢áƒ˜áƒ¤áƒ˜áƒ™áƒáƒ¢áƒ˜:"
+msgid "Server _Certificate Check"
+msgstr "áƒ¡áƒ”áƒ áƒ¢áƒ˜áƒ¤áƒ˜áƒ™áƒáƒ¢áƒ˜"
 
 #: ../properties/nm-openvpn-dialog.ui.h:121
 msgid ""
@@ -1159,7 +1149,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:133
-msgid "_Remote peer certificate TLS type:"
+msgid "_Remote peer certificate TLS type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:134
@@ -1180,7 +1170,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:138
-msgid "_Remote peer certificate nsCert designation:"
+msgid "_Remote peer certificate nsCert designation"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:139
@@ -1192,8 +1182,8 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:141
 #, fuzzy
-msgid "Key _Direction:"
-msgstr "áƒ›áƒ˜áƒ›áƒáƒ áƒ—áƒ£áƒšáƒ”áƒ‘áƒ:"
+msgid "Key _Direction"
+msgstr "áƒ›áƒ˜áƒ›áƒáƒ áƒ—áƒ£áƒšáƒ”áƒ‘áƒ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:142
 msgid ""
@@ -1213,11 +1203,11 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:147
-msgid "Key _File:"
+msgid "Key _File"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:148
-msgid "Mode:"
+msgid "Mode"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:149
@@ -1226,8 +1216,8 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:150
 #, fuzzy
-msgid "Extra Certificates:"
-msgstr "áƒ¡áƒ”áƒ áƒ¢áƒ˜áƒ¤áƒ˜áƒ™áƒáƒ¢áƒ˜:"
+msgid "Extra Certificates"
+msgstr "áƒ¡áƒ”áƒ áƒ¢áƒ˜áƒ¤áƒ˜áƒ™áƒáƒ¢áƒ˜"
 
 #: ../properties/nm-openvpn-dialog.ui.h:151
 msgid ""
@@ -1249,7 +1239,7 @@ msgid "TLS version control"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:156
-msgid "TLS _min version: "
+msgid "TLS _min version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:157
@@ -1261,7 +1251,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:158
-msgid "TLS ma_x version: "
+msgid "TLS ma_x version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:159
@@ -1282,7 +1272,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:163
-msgid "Proxy _Type:"
+msgid "Proxy _Type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:164
@@ -1293,7 +1283,7 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:165
 #, fuzzy
-msgid "Server _Address:"
+msgid "Server _Address"
 msgstr "_áƒ áƒáƒ‘áƒ˜áƒ¡ áƒ›áƒ˜áƒ¡áƒáƒ›áƒáƒ áƒ—áƒ˜"
 
 #: ../properties/nm-openvpn-dialog.ui.h:166
@@ -1304,7 +1294,7 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:168
 #, fuzzy
-msgid "_Port:"
+msgid "_Port"
 msgstr "áƒžáƒáƒ áƒ¢áƒ˜: %s"
 
 #: ../properties/nm-openvpn-dialog.ui.h:169
@@ -1325,13 +1315,13 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:174
 #, fuzzy
-msgid "Proxy _Username:"
-msgstr "_áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒ”áƒšáƒ˜:"
+msgid "Proxy _Username"
+msgstr "_áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒ”áƒšáƒ˜"
 
 #: ../properties/nm-openvpn-dialog.ui.h:175
 #, fuzzy
-msgid "Proxy Passwor_d:"
-msgstr "_áƒžáƒáƒ áƒáƒšáƒ˜:"
+msgid "Proxy Passwor_d"
+msgstr "_áƒžáƒáƒ áƒáƒšáƒ˜"
 
 #: ../properties/nm-openvpn-dialog.ui.h:176
 msgid "HTTP/Socks proxy username passed to OpenVPN when prompted for it."
@@ -1344,7 +1334,7 @@ msgstr ""
 #: ../properties/nm-openvpn-dialog.ui.h:178
 #, fuzzy
 msgid "_Show password"
-msgstr "_áƒžáƒáƒ áƒáƒšáƒ˜:"
+msgstr "_áƒžáƒáƒ áƒáƒšáƒ˜"
 
 #: ../properties/nm-openvpn-dialog.ui.h:179
 msgid "Proxies"
diff --git a/po/kn.po b/po/kn.po
index 01caacc..0f0bcce 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -744,8 +744,8 @@ msgid "General"
 msgstr "à²¸à²¾à²®à²¾à²¨à³à²¯"
 
 #: ../properties/nm-openvpn-dialog.ui.h:13
-msgid "_Gateway:"
-msgstr "à²—à³‡à²Ÿà³â€Œà²µà³‡(_G):"
+msgid "_Gateway"
+msgstr "à²—à³‡à²Ÿà³â€Œà²µà³‡(_G)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:14
 msgid ""
@@ -768,13 +768,9 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#: ../properties/nm-openvpn-dialog.ui.h:19
-msgid "Password:"
-msgstr "à²—à³à²ªà³à²¤à²ªà²¦:"
-
 #: ../properties/nm-openvpn-dialog.ui.h:20
-msgid "User name:"
-msgstr "à²¬à²³à²•à³†à²¦à²¾à²° à²¹à³†à²¸à²°à³:"
+msgid "User name"
+msgstr "à²¬à²³à²•à³†à²¦à²¾à²° à²¹à³†à²¸à²°à³"
 
 #: ../properties/nm-openvpn-dialog.ui.h:21
 msgid ""
@@ -790,21 +786,17 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:25
-msgid "Remote IP Address:"
-msgstr "à²¦à³‚à²°à²¸à³à²¥ IP à²µà²¿à²³à²¾à²¸:"
+msgid "Remote IP Address"
+msgstr "à²¦à³‚à²°à²¸à³à²¥ IP à²µà²¿à²³à²¾à²¸"
 
 #: ../properties/nm-openvpn-dialog.ui.h:26
-msgid "Local IP Address:"
-msgstr "à²¸à³à²¥à²³à³€à²¯ IP à²µà²¿à²³à²¾à²¸:"
+msgid "Local IP Address"
+msgstr "à²¸à³à²¥à²³à³€à²¯ IP à²µà²¿à²³à²¾à²¸"
 
 #: ../properties/nm-openvpn-dialog.ui.h:27
 #, fuzzy
-msgid "Key Direction:"
-msgstr "à²•à³€à²²à²¿ à²¦à²¿à²•à³à²•à³:"
-
-#: ../properties/nm-openvpn-dialog.ui.h:28
-msgid "Static Key:"
-msgstr "à²¸à³à²¥à²¿à²° à²•à³€à²²à²¿:"
+msgid "Key Direction"
+msgstr "à²•à³€à²²à²¿ à²¦à²¿à²•à³à²•à³"
 
 #: ../properties/nm-openvpn-dialog.ui.h:29
 msgid ""
@@ -839,8 +831,8 @@ msgstr ""
 "i>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:38
-msgid "Type:"
-msgstr "à²¬à²—à³†:"
+msgid "Type"
+msgstr "à²¬à²—à³†"
 
 #: ../properties/nm-openvpn-dialog.ui.h:39
 #, fuzzy
@@ -857,8 +849,8 @@ msgid "OpenVPN Advanced Options"
 msgstr "OpenVPN à²¸à³à²§à²¾à²°à²¿à²¤ à²†à²¯à³à²•à³†à²—à²³à³"
 
 #: ../properties/nm-openvpn-dialog.ui.h:43
-msgid "Use custom gateway p_ort:"
-msgstr "à²‡à²šà³à²›à³†à²¯ à²—à³‡à²Ÿà³â€Œà²µà³† à²¸à²‚à²ªà²°à³à²•à²¸à³à²¥à²¾à²¨à²µà²¨à³à²¨à³ à²¬à²³à²¸à³(_o):"
+msgid "Use custom gateway p_ort"
+msgstr "à²‡à²šà³à²›à³†à²¯ à²—à³‡à²Ÿà³â€Œà²µà³† à²¸à²‚à²ªà²°à³à²•à²¸à³à²¥à²¾à²¨à²µà²¨à³à²¨à³ à²¬à²³à²¸à³(_o)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:44
 msgid ""
@@ -868,8 +860,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:46
-msgid "Use custom _renegotiation interval:"
-msgstr "à²‡à²šà³à²›à³†à²¯ à²®à²°à³à²¸à²‚à²§à²¾à²¨ à²•à²¾à²²à²¾à²µà²§à²¿à²¯à²¨à³à²¨à³ à²¬à²³à²¸à³(_r):"
+msgid "Use custom _renegotiation interval"
+msgstr "à²‡à²šà³à²›à³†à²¯ à²®à²°à³à²¸à²‚à²§à²¾à²¨ à²•à²¾à²²à²¾à²µà²§à²¿à²¯à²¨à³à²¨à³ à²¬à²³à²¸à³(_r)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:47
 msgid ""
@@ -879,7 +871,7 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:49
 #, fuzzy
-msgid "Data _compression:"
+msgid "Data _compression"
 msgstr "L_ZO à²¦à²¤à³à²¤à²¾à²‚à²¶ à²¸à²‚à²•à³à²šà²¨à²µà²¨à³à²¨à³ à²¬à²³à²¸à³"
 
 #: ../properties/nm-openvpn-dialog.ui.h:50
@@ -901,7 +893,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:56
-msgid "Set virtual _device type:"
+msgid "Set virtual _device type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:57
@@ -915,7 +907,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:60
-msgid " and _name:"
+msgid " and _name"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:61
@@ -926,7 +918,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:63
-msgid "Use custom tunnel Maximum Transmission _Unit (MTU):"
+msgid "Use custom tunnel Maximum Transmission _Unit (MTU)"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:64
@@ -938,8 +930,8 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:66
 #, fuzzy
-msgid "Use custom UDP _fragment size:"
-msgstr "à²‡à²šà³à²›à³†à²¯ à²®à²°à³à²¸à²‚à²§à²¾à²¨ à²•à²¾à²²à²¾à²µà²§à²¿à²¯à²¨à³à²¨à³ à²¬à²³à²¸à³(_r):"
+msgid "Use custom UDP _fragment size"
+msgstr "à²‡à²šà³à²›à³†à²¯ à²®à²°à³à²¸à²‚à²§à²¾à²¨ à²•à²¾à²²à²¾à²µà²§à²¿à²¯à²¨à³à²¨à³ à²¬à²³à²¸à³(_r)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:67
 msgid ""
@@ -989,7 +981,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:81
-msgid "Specify pin_g interval:"
+msgid "Specify pin_g interval"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:82
@@ -1000,7 +992,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:84
-msgid "Specify _exit or restart ping:"
+msgid "Specify _exit or restart ping"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:85
@@ -1031,7 +1023,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:93
-msgid "Specify max routes:"
+msgid "Specify max routes"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:94
@@ -1048,7 +1040,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:98
-msgid "Use custom _size of cipher key:"
+msgid "Use custom _size of cipher key"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:99
@@ -1066,12 +1058,12 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:103
-msgid "Ci_pher:"
-msgstr "à²¸à²¿à²«à²°à³:"
+msgid "Ci_pher"
+msgstr "à²¸à²¿à²«à²°à³"
 
 #: ../properties/nm-openvpn-dialog.ui.h:104
-msgid "_HMAC Authentication:"
-msgstr "HMAC à²¦à³ƒà²¢à³€à²•à²°à²£:"
+msgid "_HMAC Authentication"
+msgstr "HMAC à²¦à³ƒà²¢à³€à²•à²°à²£"
 
 #: ../properties/nm-openvpn-dialog.ui.h:105
 msgid "Disable cipher _negotiation"
@@ -1118,7 +1110,7 @@ msgid "Security"
 msgstr "à²¸à³à²°à²•à³à²·à²¤à³†"
 
 #: ../properties/nm-openvpn-dialog.ui.h:115
-msgid "_Subject Match:"
+msgid "_Subject Match"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:116
@@ -1131,8 +1123,8 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:120
 #, fuzzy
-msgid "Server _Certificate Check:"
-msgstr "à²¬à²³à²•à³†à²¦à²¾à²° à²ªà³à²°à²®à²¾à²£à²ªà²¤à³à²°:"
+msgid "Server _Certificate Check"
+msgstr "à²¬à²³à²•à³†à²¦à²¾à²° à²ªà³à²°à²®à²¾à²£à²ªà²¤à³à²°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:121
 msgid ""
@@ -1162,7 +1154,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:133
-msgid "_Remote peer certificate TLS type:"
+msgid "_Remote peer certificate TLS type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:134
@@ -1183,7 +1175,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:138
-msgid "_Remote peer certificate nsCert designation:"
+msgid "_Remote peer certificate nsCert designation"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:139
@@ -1194,8 +1186,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:141
-msgid "Key _Direction:"
-msgstr "à²•à³€à²²à²¿ à²¦à²¿à²•à³à²•à³:"
+msgid "Key _Direction"
+msgstr "à²•à³€à²²à²¿ à²¦à²¿à²•à³à²•à³"
 
 #: ../properties/nm-openvpn-dialog.ui.h:142
 msgid ""
@@ -1220,11 +1212,11 @@ msgstr ""
 "i>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:147
-msgid "Key _File:"
-msgstr "à²•à³€à²²à²¿ à²•à²¡à²¤:"
+msgid "Key _File"
+msgstr "à²•à³€à²²à²¿ à²•à²¡à²¤"
 
 #: ../properties/nm-openvpn-dialog.ui.h:148
-msgid "Mode:"
+msgid "Mode"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:149
@@ -1234,8 +1226,8 @@ msgstr "à²¹à³†à²šà³à²šà³à²µà²°à²¿ TLS à²¦à³ƒà²¢à³€à²•à²°à²£à²µà²¨à³à²¨à³ à²¬
 
 #: ../properties/nm-openvpn-dialog.ui.h:150
 #, fuzzy
-msgid "Extra Certificates:"
-msgstr "à²¬à²³à²•à³†à²¦à²¾à²° à²ªà³à²°à²®à²¾à²£à²ªà²¤à³à²°:"
+msgid "Extra Certificates"
+msgstr "à²¬à²³à²•à³†à²¦à²¾à²° à²ªà³à²°à²®à²¾à²£à²ªà²¤à³à²°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:151
 msgid ""
@@ -1258,7 +1250,7 @@ msgid "TLS version control"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:156
-msgid "TLS _min version: "
+msgid "TLS _min version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:157
@@ -1270,7 +1262,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:158
-msgid "TLS ma_x version: "
+msgid "TLS ma_x version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:159
@@ -1290,7 +1282,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:163
-msgid "Proxy _Type:"
+msgid "Proxy _Type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:164
@@ -1301,8 +1293,8 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:165
 #, fuzzy
-msgid "Server _Address:"
-msgstr "à²¦à³‚à²°à²¸à³à²¥ IP à²µà²¿à²³à²¾à²¸:"
+msgid "Server _Address"
+msgstr "à²¦à³‚à²°à²¸à³à²¥ IP à²µà²¿à²³à²¾à²¸"
 
 #: ../properties/nm-openvpn-dialog.ui.h:166
 msgid ""
@@ -1311,7 +1303,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:168
-msgid "_Port:"
+msgid "_Port"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:169
@@ -1332,13 +1324,13 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:174
 #, fuzzy
-msgid "Proxy _Username:"
-msgstr "à²¬à²³à²•à³†à²¦à²¾à²°à²¹à³†à²¸à²°à³(_U):"
+msgid "Proxy _Username"
+msgstr "à²¬à²³à²•à³†à²¦à²¾à²°à²¹à³†à²¸à²°à³(_U)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:175
 #, fuzzy
-msgid "Proxy Passwor_d:"
-msgstr "à²—à³à²ªà³à²¤à²ªà²¦:"
+msgid "Proxy Passwor_d"
+msgstr "à²—à³à²ªà³à²¤à²ªà²¦"
 
 #: ../properties/nm-openvpn-dialog.ui.h:176
 msgid "HTTP/Socks proxy username passed to OpenVPN when prompted for it."
diff --git a/po/ko.po b/po/ko.po
index b4a18b1..03fafd6 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -743,8 +743,8 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:13
 #, fuzzy
-msgid "_Gateway:"
-msgstr "ê²Œì´íŠ¸ì›¨ì´ í¬íŠ¸(_G):"
+msgid "_Gateway"
+msgstr "ê²Œì´íŠ¸ì›¨ì´ í¬íŠ¸(_G)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:14
 msgid ""
@@ -766,17 +766,12 @@ msgstr ""
 #: ../properties/nm-openvpn-dialog.ui.h:18
 #, fuzzy
 msgid "User"
-msgstr "ì‚¬ìš©ìžì´ë¦„:"
-
-#: ../properties/nm-openvpn-dialog.ui.h:19
-#, fuzzy
-msgid "Password:"
-msgstr "ì•”í˜¸(_P):"
+msgstr "ì‚¬ìš©ìžì´ë¦„"
 
 #: ../properties/nm-openvpn-dialog.ui.h:20
 #, fuzzy
-msgid "User name:"
-msgstr "ì‚¬ìš©ìž ì´ë¦„(_U):"
+msgid "User name"
+msgstr "ì‚¬ìš©ìž ì´ë¦„(_U)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:21
 msgid ""
@@ -793,23 +788,18 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:25
 #, fuzzy
-msgid "Remote IP Address:"
-msgstr "ì›ê²© IP(_R):"
+msgid "Remote IP Address"
+msgstr "ì›ê²© IP(_R)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:26
 #, fuzzy
-msgid "Local IP Address:"
+msgid "Local IP Address"
 msgstr "ë¡œì»¬ IP:  %s"
 
 #: ../properties/nm-openvpn-dialog.ui.h:27
 #, fuzzy
-msgid "Key Direction:"
-msgstr "ë°©í–¥:"
-
-#: ../properties/nm-openvpn-dialog.ui.h:28
-#, fuzzy
-msgid "Static Key:"
-msgstr "ê³ ì • í‚¤"
+msgid "Key Direction"
+msgstr "ë°©í–¥"
 
 #: ../properties/nm-openvpn-dialog.ui.h:29
 msgid ""
@@ -839,7 +829,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:38
-msgid "Type:"
+msgid "Type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:39
@@ -857,8 +847,8 @@ msgstr "OpenVPN ê³ ê¸‰ ì˜µì…˜"
 
 #: ../properties/nm-openvpn-dialog.ui.h:43
 #, fuzzy
-msgid "Use custom gateway p_ort:"
-msgstr "ê²Œì´íŠ¸ì›¨ì´ í¬íŠ¸(_G):"
+msgid "Use custom gateway p_ort"
+msgstr "ê²Œì´íŠ¸ì›¨ì´ í¬íŠ¸(_G)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:44
 msgid ""
@@ -868,7 +858,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:46
-msgid "Use custom _renegotiation interval:"
+msgid "Use custom _renegotiation interval"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:47
@@ -879,7 +869,7 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:49
 #, fuzzy
-msgid "Data _compression:"
+msgid "Data _compression"
 msgstr "LZO ì••ì¶• ì‚¬ìš©(_Z)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:50
@@ -903,7 +893,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:56
-msgid "Set virtual _device type:"
+msgid "Set virtual _device type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:57
@@ -917,7 +907,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:60
-msgid " and _name:"
+msgid " and _name"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:61
@@ -928,7 +918,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:63
-msgid "Use custom tunnel Maximum Transmission _Unit (MTU):"
+msgid "Use custom tunnel Maximum Transmission _Unit (MTU)"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:64
@@ -939,7 +929,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:66
-msgid "Use custom UDP _fragment size:"
+msgid "Use custom UDP _fragment size"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:67
@@ -990,7 +980,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:81
-msgid "Specify pin_g interval:"
+msgid "Specify pin_g interval"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:82
@@ -1001,7 +991,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:84
-msgid "Specify _exit or restart ping:"
+msgid "Specify _exit or restart ping"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:85
@@ -1032,7 +1022,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:93
-msgid "Specify max routes:"
+msgid "Specify max routes"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:94
@@ -1049,7 +1039,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:98
-msgid "Use custom _size of cipher key:"
+msgid "Use custom _size of cipher key"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:99
@@ -1068,11 +1058,11 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:103
 #, fuzzy
-msgid "Ci_pher:"
+msgid "Ci_pher"
 msgstr "ì•”í˜¸í™”:  %s"
 
 #: ../properties/nm-openvpn-dialog.ui.h:104
-msgid "_HMAC Authentication:"
+msgid "_HMAC Authentication"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:105
@@ -1120,7 +1110,7 @@ msgid "Security"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:115
-msgid "_Subject Match:"
+msgid "_Subject Match"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:116
@@ -1133,8 +1123,8 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:120
 #, fuzzy
-msgid "Server _Certificate Check:"
-msgstr "ì¸ì¦ì„œ ì•”í˜¸:"
+msgid "Server _Certificate Check"
+msgstr "ì¸ì¦ì„œ ì•”í˜¸"
 
 #: ../properties/nm-openvpn-dialog.ui.h:121
 msgid ""
@@ -1164,7 +1154,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:133
-msgid "_Remote peer certificate TLS type:"
+msgid "_Remote peer certificate TLS type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:134
@@ -1185,7 +1175,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:138
-msgid "_Remote peer certificate nsCert designation:"
+msgid "_Remote peer certificate nsCert designation"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:139
@@ -1197,8 +1187,8 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:141
 #, fuzzy
-msgid "Key _Direction:"
-msgstr "ë°©í–¥:"
+msgid "Key _Direction"
+msgstr "ë°©í–¥"
 
 #: ../properties/nm-openvpn-dialog.ui.h:142
 msgid ""
@@ -1218,11 +1208,11 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:147
-msgid "Key _File:"
+msgid "Key _File"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:148
-msgid "Mode:"
+msgid "Mode"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:149
@@ -1231,8 +1221,8 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:150
 #, fuzzy
-msgid "Extra Certificates:"
-msgstr "ì¸ì¦ì„œ ì•”í˜¸:"
+msgid "Extra Certificates"
+msgstr "ì¸ì¦ì„œ ì•”í˜¸"
 
 #: ../properties/nm-openvpn-dialog.ui.h:151
 msgid ""
@@ -1254,7 +1244,7 @@ msgid "TLS version control"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:156
-msgid "TLS _min version: "
+msgid "TLS _min version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:157
@@ -1266,7 +1256,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:158
-msgid "TLS ma_x version: "
+msgid "TLS ma_x version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:159
@@ -1287,7 +1277,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:163
-msgid "Proxy _Type:"
+msgid "Proxy _Type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:164
@@ -1297,7 +1287,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:165
-msgid "Server _Address:"
+msgid "Server _Address"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:166
@@ -1308,7 +1298,7 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:168
 #, fuzzy
-msgid "_Port:"
+msgid "_Port"
 msgstr "í¬íŠ¸:  %s"
 
 #: ../properties/nm-openvpn-dialog.ui.h:169
@@ -1329,13 +1319,13 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:174
 #, fuzzy
-msgid "Proxy _Username:"
-msgstr "ì‚¬ìš©ìž ì´ë¦„(_U):"
+msgid "Proxy _Username"
+msgstr "ì‚¬ìš©ìž ì´ë¦„(_U)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:175
 #, fuzzy
-msgid "Proxy Passwor_d:"
-msgstr "ì•”í˜¸(_P):"
+msgid "Proxy Passwor_d"
+msgstr "ì•”í˜¸(_P)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:176
 msgid "HTTP/Socks proxy username passed to OpenVPN when prompted for it."
@@ -1348,7 +1338,7 @@ msgstr ""
 #: ../properties/nm-openvpn-dialog.ui.h:178
 #, fuzzy
 msgid "_Show password"
-msgstr "ì•”í˜¸(_P):"
+msgstr "ì•”í˜¸(_P)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:179
 msgid "Proxies"
diff --git a/po/lt.po b/po/lt.po
index cab766f..6a1170e 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -813,8 +813,8 @@ msgid "General"
 msgstr "Bendra"
 
 #: ../properties/nm-openvpn-dialog.ui.h:14
-msgid "_Gateway:"
-msgstr "_TinklÅ³ sietuvas:"
+msgid "_Gateway"
+msgstr "_TinklÅ³ sietuvas"
 
 #: ../properties/nm-openvpn-dialog.ui.h:15
 msgid ""
@@ -840,13 +840,9 @@ msgstr "CA"
 msgid "User"
 msgstr "Naudotojas"
 
-#: ../properties/nm-openvpn-dialog.ui.h:20
-msgid "Password:"
-msgstr "SlaptaÅ¾odis:"
-
 #: ../properties/nm-openvpn-dialog.ui.h:21
-msgid "User name:"
-msgstr "Naudotojo vardas:"
+msgid "User name"
+msgstr "Naudotojo vardas"
 
 #: ../properties/nm-openvpn-dialog.ui.h:22
 msgid ""
@@ -867,20 +863,16 @@ msgstr ""
 "konfig: auth-user-pass"
 
 #: ../properties/nm-openvpn-dialog.ui.h:26
-msgid "Remote IP Address:"
-msgstr "NutolÄ™s IP adresas:"
+msgid "Remote IP Address"
+msgstr "NutolÄ™s IP adresas"
 
 #: ../properties/nm-openvpn-dialog.ui.h:27
-msgid "Local IP Address:"
-msgstr "Vietinis IP adresas:"
+msgid "Local IP Address"
+msgstr "Vietinis IP adresas"
 
 #: ../properties/nm-openvpn-dialog.ui.h:28
-msgid "Key Direction:"
-msgstr "Rakto kryptis:"
-
-#: ../properties/nm-openvpn-dialog.ui.h:29
-msgid "Static Key:"
-msgstr "Statinis raktas:"
+msgid "Key Direction"
+msgstr "Rakto kryptis"
 
 #: ../properties/nm-openvpn-dialog.ui.h:30
 msgid ""
@@ -922,8 +914,8 @@ msgstr ""
 "konfig.: static <failas> [kryptis]"
 
 #: ../properties/nm-openvpn-dialog.ui.h:39
-msgid "Type:"
-msgstr "Tipas:"
+msgid "Type"
+msgstr "Tipas"
 
 #: ../properties/nm-openvpn-dialog.ui.h:40
 msgid "Select an authentication mode."
@@ -938,8 +930,8 @@ msgid "OpenVPN Advanced Options"
 msgstr "IÅ¡plÄ—stiniai OpenVPN parametrai"
 
 #: ../properties/nm-openvpn-dialog.ui.h:44
-msgid "Use custom gateway p_ort:"
-msgstr "Naudoti pasirinktinÄ¯ tinklÅ³ sietuvo _prievadÄ…:"
+msgid "Use custom gateway p_ort"
+msgstr "Naudoti pasirinktinÄ¯ tinklÅ³ sietuvo _prievadÄ…"
 
 #: ../properties/nm-openvpn-dialog.ui.h:45
 msgid ""
@@ -952,8 +944,8 @@ msgstr ""
 "konfig.: port"
 
 #: ../properties/nm-openvpn-dialog.ui.h:47
-msgid "Use custom _renegotiation interval:"
-msgstr "Naudoti pasirinktinÄ¯ pakartotinio jungimosi intervalÄ…:"
+msgid "Use custom _renegotiation interval"
+msgstr "Naudoti pasirinktinÄ¯ pakartotinio jungimosi intervalÄ…"
 
 #: ../properties/nm-openvpn-dialog.ui.h:48
 msgid ""
@@ -964,8 +956,8 @@ msgstr ""
 "konfig: reneg-sec"
 
 #: ../properties/nm-openvpn-dialog.ui.h:50
-msgid "Data _compression:"
-msgstr "duomenÅ³ _glaudinimas:"
+msgid "Data _compression"
+msgstr "duomenÅ³ _glaudinimas"
 
 #: ../properties/nm-openvpn-dialog.ui.h:51
 msgid ""
@@ -992,8 +984,8 @@ msgstr ""
 "konfig.: proto tcp-client | udp"
 
 #: ../properties/nm-openvpn-dialog.ui.h:57
-msgid "Set virtual _device type:"
-msgstr "Nustatyti virtualaus Ä¯_renginio tipÄ…:"
+msgid "Set virtual _device type"
+msgstr "Nustatyti virtualaus Ä¯_renginio tipÄ…"
 
 #: ../properties/nm-openvpn-dialog.ui.h:58
 msgid "Explicitly set virtual device type and name (TUN/TAP)."
@@ -1008,8 +1000,8 @@ msgstr ""
 "config: dev tap | tun"
 
 #: ../properties/nm-openvpn-dialog.ui.h:61
-msgid " and _name:"
-msgstr " ir _pavadinimÄ…:"
+msgid " and _name"
+msgstr " ir _pavadinimÄ…"
 
 #: ../properties/nm-openvpn-dialog.ui.h:62
 msgid ""
@@ -1022,8 +1014,8 @@ msgstr ""
 "konfig.: dev <name>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:64
-msgid "Use custom tunnel Maximum Transmission _Unit (MTU):"
-msgstr "Naudoti pasirinktinÄ¯ _tunelio didÅ¾iausiÄ… perdavimo blokÄ… (MTU):"
+msgid "Use custom tunnel Maximum Transmission _Unit (MTU)"
+msgstr "Naudoti pasirinktinÄ¯ _tunelio didÅ¾iausiÄ… perdavimo blokÄ… (MTU)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:65
 msgid ""
@@ -1035,8 +1027,8 @@ msgstr ""
 "konfig: tun-mtu"
 
 #: ../properties/nm-openvpn-dialog.ui.h:67
-msgid "Use custom UDP _fragment size:"
-msgstr "Naudoti pasirinktinÄ¯ UDP _fragmento dydÄ¯:"
+msgid "Use custom UDP _fragment size"
+msgstr "Naudoti pasirinktinÄ¯ UDP _fragmento dydÄ¯"
 
 #: ../properties/nm-openvpn-dialog.ui.h:68
 msgid ""
@@ -1110,8 +1102,8 @@ msgstr ""
 "config: tun-ipv6"
 
 #: ../properties/nm-openvpn-dialog.ui.h:85
-msgid "Specify pin_g interval:"
-msgstr "Nurodyti pin_g intervalÄ…:"
+msgid "Specify pin_g interval"
+msgstr "Nurodyti pin_g intervalÄ…"
 
 #: ../properties/nm-openvpn-dialog.ui.h:86
 msgid ""
@@ -1124,8 +1116,8 @@ msgstr ""
 "config: ping <n>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:88
-msgid "Specify _exit or restart ping:"
-msgstr "Nurodyti _iÅ¡Ä—jimo arba perleidimo ping:"
+msgid "Specify _exit or restart ping"
+msgstr "Nurodyti _iÅ¡Ä—jimo arba perleidimo ping"
 
 #: ../properties/nm-openvpn-dialog.ui.h:89
 msgid ""
@@ -1170,8 +1162,8 @@ msgstr ""
 "konfig.: float"
 
 #: ../properties/nm-openvpn-dialog.ui.h:97
-msgid "Specify max routes:"
-msgstr "Nurodykite didÅ¾iausiÄ… keliÅ³ skaiÄiÅ³:"
+msgid "Specify max routes"
+msgstr "Nurodykite didÅ¾iausiÄ… keliÅ³ skaiÄiÅ³"
 
 #: ../properties/nm-openvpn-dialog.ui.h:98
 msgid ""
@@ -1192,8 +1184,8 @@ msgstr ""
 "konfig: cipher"
 
 #: ../properties/nm-openvpn-dialog.ui.h:102
-msgid "Use custom _size of cipher key:"
-msgstr "Naudoti pasirinktinÄ¯ Å¡ifro rakto _dydÄ¯:"
+msgid "Use custom _size of cipher key"
+msgstr "Naudoti pasirinktinÄ¯ Å¡ifro rakto _dydÄ¯"
 
 #: ../properties/nm-openvpn-dialog.ui.h:103
 msgid ""
@@ -1216,12 +1208,12 @@ msgstr ""
 "konfig: auth"
 
 #: ../properties/nm-openvpn-dialog.ui.h:107
-msgid "Ci_pher:"
-msgstr "Å ifras:"
+msgid "Ci_pher"
+msgstr "Å ifras"
 
 #: ../properties/nm-openvpn-dialog.ui.h:108
-msgid "_HMAC Authentication:"
-msgstr "_HMAC tapatybÄ—s nustatymas:"
+msgid "_HMAC Authentication"
+msgstr "_HMAC tapatybÄ—s nustatymas"
 
 #: ../properties/nm-openvpn-dialog.ui.h:109
 msgid "Disable cipher _negotiation"
@@ -1276,8 +1268,8 @@ msgid "Security"
 msgstr "Saugumas"
 
 #: ../properties/nm-openvpn-dialog.ui.h:119
-msgid "_Subject Match:"
-msgstr "Subjekto atitikimas:"
+msgid "_Subject Match"
+msgstr "Subjekto atitikimas"
 
 #: ../properties/nm-openvpn-dialog.ui.h:120
 msgid ""
@@ -1293,8 +1285,8 @@ msgstr ""
 "config (legacy mode): tls-remote subject-or-name"
 
 #: ../properties/nm-openvpn-dialog.ui.h:124
-msgid "Server _Certificate Check:"
-msgstr "Serverio _liudijimas tikrinimas:"
+msgid "Server _Certificate Check"
+msgstr "Serverio _liudijimas tikrinimas"
 
 #: ../properties/nm-openvpn-dialog.ui.h:125
 msgid ""
@@ -1338,8 +1330,8 @@ msgstr ""
 "naudojimu ir iÅ¡plÄ—stiniu rakto naudojimu pagal RFC3280 TLS taisykles."
 
 #: ../properties/nm-openvpn-dialog.ui.h:137
-msgid "_Remote peer certificate TLS type:"
-msgstr "_Nutoliusio porininko liudijimo TLS tipas:"
+msgid "_Remote peer certificate TLS type"
+msgstr "_Nutoliusio porininko liudijimo TLS tipas"
 
 #: ../properties/nm-openvpn-dialog.ui.h:138
 msgid ""
@@ -1364,8 +1356,8 @@ msgstr ""
 "nsCertType."
 
 #: ../properties/nm-openvpn-dialog.ui.h:142
-msgid "_Remote peer certificate nsCert designation:"
-msgstr "_Nutoliusio porininko liudijimo nsCert:"
+msgid "_Remote peer certificate nsCert designation"
+msgstr "_Nutoliusio porininko liudijimo nsCert"
 
 #: ../properties/nm-openvpn-dialog.ui.h:143
 msgid ""
@@ -1378,8 +1370,8 @@ msgstr ""
 "config: ns-cert-type client|server"
 
 #: ../properties/nm-openvpn-dialog.ui.h:145
-msgid "Key _Direction:"
-msgstr "Rakto kryptis:"
+msgid "Key _Direction"
+msgstr "Rakto kryptis"
 
 #: ../properties/nm-openvpn-dialog.ui.h:146
 msgid ""
@@ -1409,20 +1401,20 @@ msgstr ""
 "konfig.: tls-auth <failas> [kryptis]"
 
 #: ../properties/nm-openvpn-dialog.ui.h:151
-msgid "Key _File:"
-msgstr "Rakto failas:"
+msgid "Key _File"
+msgstr "Rakto failas"
 
 #: ../properties/nm-openvpn-dialog.ui.h:152
-msgid "Mode:"
-msgstr "Veiksena:"
+msgid "Mode"
+msgstr "Veiksena"
 
 #: ../properties/nm-openvpn-dialog.ui.h:153
 msgid "Add an additional layer of encryption or HMAC authentication."
 msgstr "Papildomas Å¡ifravimo sluoksnis ar HMAC tapatybÄ—s nustatymas."
 
 #: ../properties/nm-openvpn-dialog.ui.h:154
-msgid "Extra Certificates:"
-msgstr "Papildomi liudijimai:"
+msgid "Extra Certificates"
+msgstr "Papildomi liudijimai"
 
 #: ../properties/nm-openvpn-dialog.ui.h:155
 msgid ""
@@ -1447,8 +1439,8 @@ msgid "TLS version control"
 msgstr "TLS versijos valdymas"
 
 #: ../properties/nm-openvpn-dialog.ui.h:160
-msgid "TLS _min version: "
-msgstr "TLS _min versija: "
+msgid "TLS _min version"
+msgstr "TLS _min versija"
 
 #: ../properties/nm-openvpn-dialog.ui.h:161
 msgid ""
@@ -1463,8 +1455,8 @@ msgstr ""
 "kuriÄ… palaiko vietinÄ— SSL realizacija."
 
 #: ../properties/nm-openvpn-dialog.ui.h:162
-msgid "TLS ma_x version: "
-msgstr "TLS ma_x versija: "
+msgid "TLS ma_x version"
+msgstr "TLS ma_x versija"
 
 #: ../properties/nm-openvpn-dialog.ui.h:163
 msgid ""
@@ -1487,8 +1479,8 @@ msgstr ""
 "konfig.: http-proxy arba socks-proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:167
-msgid "Proxy _Type:"
-msgstr "Ä®galiotojo serverio _tipas:"
+msgid "Proxy _Type"
+msgstr "Ä®galiotojo serverio _tipas"
 
 #: ../properties/nm-openvpn-dialog.ui.h:168
 msgid ""
@@ -1499,8 +1491,8 @@ msgstr ""
 "interneto per Ä¯galiotÄ…jÄ¯ serverÄ¯.</i>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:169
-msgid "Server _Address:"
-msgstr "Serverio adresas:"
+msgid "Server _Address"
+msgstr "Serverio adresas"
 
 #: ../properties/nm-openvpn-dialog.ui.h:170
 msgid ""
@@ -1511,8 +1503,8 @@ msgstr ""
 "konfig.: http-proxy arba socks-proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:172
-msgid "_Port:"
-msgstr "Prievadas:"
+msgid "_Port"
+msgstr "Prievadas"
 
 #: ../properties/nm-openvpn-dialog.ui.h:173
 msgid ""
@@ -1536,12 +1528,12 @@ msgstr ""
 "konfig.: http-proxy arba socks-proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:178
-msgid "Proxy _Username:"
-msgstr "Ä®galiotojo serverio naudotojo vardas:"
+msgid "Proxy _Username"
+msgstr "Ä®galiotojo serverio naudotojo vardas"
 
 #: ../properties/nm-openvpn-dialog.ui.h:179
-msgid "Proxy Passwor_d:"
-msgstr "Ä®galiotojo serverio slaptaÅ¾odis:"
+msgid "Proxy Passwor_d"
+msgstr "Ä®galiotojo serverio slaptaÅ¾odis"
 
 #: ../properties/nm-openvpn-dialog.ui.h:180
 msgid "HTTP/Socks proxy username passed to OpenVPN when prompted for it."
diff --git a/po/lv.po b/po/lv.po
index bd29314..5dc3fee 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -752,8 +752,8 @@ msgid "General"
 msgstr "VispÄrÄ“js"
 
 #: ../properties/nm-openvpn-dialog.ui.h:13
-msgid "_Gateway:"
-msgstr "_VÄrteja:"
+msgid "_Gateway"
+msgstr "_VÄrteja"
 
 #: ../properties/nm-openvpn-dialog.ui.h:14
 msgid ""
@@ -779,13 +779,9 @@ msgstr "CA"
 msgid "User"
 msgstr "LietotÄjs"
 
-#: ../properties/nm-openvpn-dialog.ui.h:19
-msgid "Password:"
-msgstr "Parole:"
-
 #: ../properties/nm-openvpn-dialog.ui.h:20
-msgid "User name:"
-msgstr "LietotÄjvÄrds:"
+msgid "User name"
+msgstr "LietotÄjvÄrds"
 
 #: ../properties/nm-openvpn-dialog.ui.h:21
 msgid ""
@@ -806,20 +802,16 @@ msgstr ""
 "config: auth-user-pass"
 
 #: ../properties/nm-openvpn-dialog.ui.h:25
-msgid "Remote IP Address:"
-msgstr "AttÄlinÄtÄ IP adrese:"
+msgid "Remote IP Address"
+msgstr "AttÄlinÄtÄ IP adrese"
 
 #: ../properties/nm-openvpn-dialog.ui.h:26
-msgid "Local IP Address:"
-msgstr "LokÄlÄ IP adrese:"
+msgid "Local IP Address"
+msgstr "LokÄlÄ IP adrese"
 
 #: ../properties/nm-openvpn-dialog.ui.h:27
-msgid "Key Direction:"
-msgstr "AtslÄ“gas virziens:"
-
-#: ../properties/nm-openvpn-dialog.ui.h:28
-msgid "Static Key:"
-msgstr "StatiskÄs atslÄ“gas:"
+msgid "Key Direction"
+msgstr "AtslÄ“gas virziens"
 
 #: ../properties/nm-openvpn-dialog.ui.h:29
 msgid ""
@@ -861,8 +853,8 @@ msgstr ""
 "config: static <datne> [virziens]"
 
 #: ../properties/nm-openvpn-dialog.ui.h:38
-msgid "Type:"
-msgstr "Tips:"
+msgid "Type"
+msgstr "Tips"
 
 #: ../properties/nm-openvpn-dialog.ui.h:39
 msgid "Select an authentication mode."
@@ -877,8 +869,8 @@ msgid "OpenVPN Advanced Options"
 msgstr "OpenVPN paplaÅ¡inÄtÄs opcijas"
 
 #: ../properties/nm-openvpn-dialog.ui.h:43
-msgid "Use custom gateway p_ort:"
-msgstr "Izmantot pielÄgotu vÄrtejas p_ortu: "
+msgid "Use custom gateway p_ort"
+msgstr "Izmantot pielÄgotu vÄrtejas p_ortu"
 
 #: ../properties/nm-openvpn-dialog.ui.h:44
 msgid ""
@@ -891,8 +883,8 @@ msgstr ""
 "config: port"
 
 #: ../properties/nm-openvpn-dialog.ui.h:46
-msgid "Use custom _renegotiation interval:"
-msgstr "Izmantot pielÄgotu atkÄ_rtotÄs vienoÅ¡anÄs intervÄlu:"
+msgid "Use custom _renegotiation interval"
+msgstr "Izmantot pielÄgotu atkÄ_rtotÄs vienoÅ¡anÄs intervÄlu"
 
 #: ../properties/nm-openvpn-dialog.ui.h:47
 msgid ""
@@ -904,7 +896,7 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:49
 #, fuzzy
-msgid "Data _compression:"
+msgid "Data _compression"
 msgstr "Lietot L_ZO datu kompresiju"
 
 #: ../properties/nm-openvpn-dialog.ui.h:50
@@ -931,8 +923,8 @@ msgstr ""
 "config: proto tcp-client | udp"
 
 #: ../properties/nm-openvpn-dialog.ui.h:56
-msgid "Set virtual _device type:"
-msgstr "IestatÄ«t virtuÄlÄs _ierÄ«ces tipu:"
+msgid "Set virtual _device type"
+msgstr "IestatÄ«t virtuÄlÄs _ierÄ«ces tipu"
 
 #: ../properties/nm-openvpn-dialog.ui.h:57
 msgid "Explicitly set virtual device type and name (TUN/TAP)."
@@ -947,8 +939,8 @@ msgstr ""
 "config: dev-type tun | tap"
 
 #: ../properties/nm-openvpn-dialog.ui.h:60
-msgid " and _name:"
-msgstr " un _nosaukums:"
+msgid " and _name"
+msgstr " un _nosaukums"
 
 #: ../properties/nm-openvpn-dialog.ui.h:61
 msgid ""
@@ -961,8 +953,8 @@ msgstr ""
 "config: dev <nosaukums>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:63
-msgid "Use custom tunnel Maximum Transmission _Unit (MTU):"
-msgstr "Izmantot pielÄgotu _tuneÄ¼a maksimÄlo pÄrraides bloku (MTU):"
+msgid "Use custom tunnel Maximum Transmission _Unit (MTU)"
+msgstr "Izmantot pielÄgotu _tuneÄ¼a maksimÄlo pÄrraides bloku (MTU)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:64
 msgid ""
@@ -975,8 +967,8 @@ msgstr ""
 "config: tun-mtu"
 
 #: ../properties/nm-openvpn-dialog.ui.h:66
-msgid "Use custom UDP _fragment size:"
-msgstr "Lietot pielÄgotu UDP _fragmenta izmÄ“ru:"
+msgid "Use custom UDP _fragment size"
+msgstr "Lietot pielÄgotu UDP _fragmenta izmÄ“ru"
 
 #: ../properties/nm-openvpn-dialog.ui.h:67
 msgid ""
@@ -1035,8 +1027,8 @@ msgstr ""
 "config: tun-ipv6"
 
 #: ../properties/nm-openvpn-dialog.ui.h:81
-msgid "Specify pin_g interval:"
-msgstr "NorÄdÄ«t pin_g intervÄlu:"
+msgid "Specify pin_g interval"
+msgstr "NorÄdÄ«t pin_g intervÄlu"
 
 #: ../properties/nm-openvpn-dialog.ui.h:82
 msgid ""
@@ -1049,8 +1041,8 @@ msgstr ""
 "config: ping <n>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:84
-msgid "Specify _exit or restart ping:"
-msgstr "NorÄdÄ«t izieÅ¡anas vai pÄrstartÄ“Å¡anas ping:"
+msgid "Specify _exit or restart ping"
+msgstr "NorÄdÄ«t izieÅ¡anas vai pÄrstartÄ“Å¡anas ping"
 
 #: ../properties/nm-openvpn-dialog.ui.h:85
 msgid ""
@@ -1095,8 +1087,8 @@ msgstr ""
 "config: float"
 
 #: ../properties/nm-openvpn-dialog.ui.h:93
-msgid "Specify max routes:"
-msgstr "NorÄdÄ«t maksimÄlos marÅ¡rutus:"
+msgid "Specify max routes"
+msgstr "NorÄdÄ«t maksimÄlos marÅ¡rutus"
 
 #: ../properties/nm-openvpn-dialog.ui.h:94
 msgid ""
@@ -1117,8 +1109,8 @@ msgstr ""
 "config: cipher"
 
 #: ../properties/nm-openvpn-dialog.ui.h:98
-msgid "Use custom _size of cipher key:"
-msgstr "Izmantot pielÄgotu Å¡ifrÄ“tÄja at_slÄ“gas garumu:"
+msgid "Use custom _size of cipher key"
+msgstr "Izmantot pielÄgotu Å¡ifrÄ“tÄja at_slÄ“gas garumu"
 
 #: ../properties/nm-openvpn-dialog.ui.h:99
 msgid ""
@@ -1141,12 +1133,12 @@ msgstr ""
 "config: auth"
 
 #: ../properties/nm-openvpn-dialog.ui.h:103
-msgid "Ci_pher:"
-msgstr "Å ifrs:"
+msgid "Ci_pher"
+msgstr "Å ifrs"
 
 #: ../properties/nm-openvpn-dialog.ui.h:104
-msgid "_HMAC Authentication:"
-msgstr "HMAC autentifikÄcija:"
+msgid "_HMAC Authentication"
+msgstr "HMAC autentifikÄcija"
 
 #: ../properties/nm-openvpn-dialog.ui.h:105
 msgid "Disable cipher _negotiation"
@@ -1193,8 +1185,8 @@ msgid "Security"
 msgstr "DroÅ¡Ä«ba"
 
 #: ../properties/nm-openvpn-dialog.ui.h:115
-msgid "_Subject Match:"
-msgstr "Subjekta atbilstÄ«ba:"
+msgid "_Subject Match"
+msgstr "Subjekta atbilstÄ«ba"
 
 #: ../properties/nm-openvpn-dialog.ui.h:116
 msgid ""
@@ -1210,8 +1202,8 @@ msgstr ""
 "config (mantojuma reÅ¾Ä«ms): tls-remote subject-or-name"
 
 #: ../properties/nm-openvpn-dialog.ui.h:120
-msgid "Server _Certificate Check:"
-msgstr "Servera _sertifikÄta pÄrbaude:"
+msgid "Server _Certificate Check"
+msgstr "Servera _sertifikÄta pÄrbaude"
 
 #: ../properties/nm-openvpn-dialog.ui.h:121
 msgid ""
@@ -1256,8 +1248,8 @@ msgstr ""
 "noteikumiem."
 
 #: ../properties/nm-openvpn-dialog.ui.h:133
-msgid "_Remote peer certificate TLS type:"
-msgstr "AttÄlinÄtais dalÄ«bnieku se_rtifikÄta TLS tips:"
+msgid "_Remote peer certificate TLS type"
+msgstr "AttÄlinÄtais dalÄ«bnieku se_rtifikÄta TLS tips"
 
 #: ../properties/nm-openvpn-dialog.ui.h:134
 msgid ""
@@ -1283,8 +1275,8 @@ msgstr ""
 "apzÄ«mÄ“jumu"
 
 #: ../properties/nm-openvpn-dialog.ui.h:138
-msgid "_Remote peer certificate nsCert designation:"
-msgstr "AttÄlinÄtais dalÄ«bnieku se_rtifikÄta nsCert apzÄ«mÄ“jums:"
+msgid "_Remote peer certificate nsCert designation"
+msgstr "AttÄlinÄtais dalÄ«bnieku se_rtifikÄta nsCert apzÄ«mÄ“jums"
 
 #: ../properties/nm-openvpn-dialog.ui.h:139
 msgid ""
@@ -1297,8 +1289,8 @@ msgstr ""
 "config: ns-cert-type client|server"
 
 #: ../properties/nm-openvpn-dialog.ui.h:141
-msgid "Key _Direction:"
-msgstr "AtslÄ“gas virziens:"
+msgid "Key _Direction"
+msgstr "AtslÄ“gas virziens"
 
 #: ../properties/nm-openvpn-dialog.ui.h:142
 msgid ""
@@ -1328,20 +1320,20 @@ msgstr ""
 "config: tls-auth <datne> [virziens]"
 
 #: ../properties/nm-openvpn-dialog.ui.h:147
-msgid "Key _File:"
-msgstr "AtslÄ“gas _datne:"
+msgid "Key _File"
+msgstr "AtslÄ“gas _datne"
 
 #: ../properties/nm-openvpn-dialog.ui.h:148
-msgid "Mode:"
-msgstr "ReÅ¾Ä«ms:"
+msgid "Mode"
+msgstr "ReÅ¾Ä«ms"
 
 #: ../properties/nm-openvpn-dialog.ui.h:149
 msgid "Add an additional layer of encryption or HMAC authentication."
 msgstr "Lietot papildu Å¡ifrÄ“Å¡anas slÄni vai HMAC autentifikÄciju."
 
 #: ../properties/nm-openvpn-dialog.ui.h:150
-msgid "Extra Certificates:"
-msgstr "Papildu sertifikÄti:"
+msgid "Extra Certificates"
+msgstr "Papildu sertifikÄti"
 
 #: ../properties/nm-openvpn-dialog.ui.h:151
 msgid ""
@@ -1366,7 +1358,7 @@ msgid "TLS version control"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:156
-msgid "TLS _min version: "
+msgid "TLS _min version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:157
@@ -1378,7 +1370,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:158
-msgid "TLS ma_x version: "
+msgid "TLS ma_x version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:159
@@ -1400,8 +1392,8 @@ msgstr ""
 "config: http-proxy vai socks-proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:163
-msgid "Proxy _Type:"
-msgstr "Starpnieka tips:"
+msgid "Proxy _Type"
+msgstr "Starpnieka tips"
 
 #: ../properties/nm-openvpn-dialog.ui.h:164
 msgid ""
@@ -1412,8 +1404,8 @@ msgstr ""
 "lai piekÄ¼Å«tu Internetam.</i>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:165
-msgid "Server _Address:"
-msgstr "Servera adrese:"
+msgid "Server _Address"
+msgstr "Servera adrese"
 
 #: ../properties/nm-openvpn-dialog.ui.h:166
 msgid ""
@@ -1424,8 +1416,8 @@ msgstr ""
 "config: http-proxy vai socks-proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:168
-msgid "_Port:"
-msgstr "Ports:"
+msgid "_Port"
+msgstr "Ports"
 
 #: ../properties/nm-openvpn-dialog.ui.h:169
 msgid ""
@@ -1449,12 +1441,12 @@ msgstr ""
 "config: http-proxy-retry vai socks-proxy-retry"
 
 #: ../properties/nm-openvpn-dialog.ui.h:174
-msgid "Proxy _Username:"
-msgstr "Starpnieka lietotÄjvÄrds:"
+msgid "Proxy _Username"
+msgstr "Starpnieka lietotÄjvÄrds"
 
 #: ../properties/nm-openvpn-dialog.ui.h:175
-msgid "Proxy Passwor_d:"
-msgstr "Starpnieka parole:"
+msgid "Proxy Passwor_d"
+msgstr "Starpnieka parole"
 
 #: ../properties/nm-openvpn-dialog.ui.h:176
 msgid "HTTP/Socks proxy username passed to OpenVPN when prompted for it."
diff --git a/po/mk.po b/po/mk.po
index 897b973..1d03fa7 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -748,8 +748,8 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:13
 #, fuzzy
-msgid "_Gateway:"
-msgstr "_ÐŸÐ¾Ñ€Ñ‚Ð° Ð½Ð° Ð¿Ñ€ÐµÐ¼Ð¸Ð½:"
+msgid "_Gateway"
+msgstr "_ÐŸÐ¾Ñ€Ñ‚Ð° Ð½Ð° Ð¿Ñ€ÐµÐ¼Ð¸Ð½"
 
 #: ../properties/nm-openvpn-dialog.ui.h:14
 msgid ""
@@ -772,15 +772,10 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#: ../properties/nm-openvpn-dialog.ui.h:19
-#, fuzzy
-msgid "Password:"
-msgstr "_Ð›Ð¾Ð·Ð¸Ð½ÐºÐ°:"
-
 #: ../properties/nm-openvpn-dialog.ui.h:20
 #, fuzzy
-msgid "User name:"
-msgstr "_ÐšÐ¾Ñ€Ð¸ÑÐ½Ð¸Ñ‡ÐºÐ¾ Ð¸Ð¼Ðµ:"
+msgid "User name"
+msgstr "_ÐšÐ¾Ñ€Ð¸ÑÐ½Ð¸Ñ‡ÐºÐ¾ Ð¸Ð¼Ðµ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:21
 msgid ""
@@ -797,22 +792,18 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:25
 #, fuzzy
-msgid "Remote IP Address:"
-msgstr "_ÐžÐ´Ð´Ð°Ð»ÐµÑ‡ÐµÐ½Ð° IP:"
+msgid "Remote IP Address"
+msgstr "_ÐžÐ´Ð´Ð°Ð»ÐµÑ‡ÐµÐ½Ð° IP"
 
 #: ../properties/nm-openvpn-dialog.ui.h:26
 #, fuzzy
-msgid "Local IP Address:"
+msgid "Local IP Address"
 msgstr "Ð›Ð¾ÐºÐ°Ð»Ð½Ð° IP:  %s"
 
 #: ../properties/nm-openvpn-dialog.ui.h:27
 #, fuzzy
-msgid "Key Direction:"
-msgstr "ÐÐ°ÑÐ¾ÐºÐ°:"
-
-#: ../properties/nm-openvpn-dialog.ui.h:28
-msgid "Static Key:"
-msgstr ""
+msgid "Key Direction"
+msgstr "ÐÐ°ÑÐ¾ÐºÐ°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:29
 msgid ""
@@ -842,7 +833,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:38
-msgid "Type:"
+msgid "Type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:39
@@ -860,8 +851,8 @@ msgstr "ÐÐ°Ð¿Ñ€ÐµÐ´Ð½Ð¸ Ð¾Ð¿Ñ†Ð¸Ð¸ Ð·Ð° OpenVPN"
 
 #: ../properties/nm-openvpn-dialog.ui.h:43
 #, fuzzy
-msgid "Use custom gateway p_ort:"
-msgstr "_ÐŸÐ¾Ñ€Ñ‚Ð° Ð½Ð° Ð¿Ñ€ÐµÐ¼Ð¸Ð½:"
+msgid "Use custom gateway p_ort"
+msgstr "_ÐŸÐ¾Ñ€Ñ‚Ð° Ð½Ð° Ð¿Ñ€ÐµÐ¼Ð¸Ð½"
 
 #: ../properties/nm-openvpn-dialog.ui.h:44
 msgid ""
@@ -871,7 +862,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:46
-msgid "Use custom _renegotiation interval:"
+msgid "Use custom _renegotiation interval"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:47
@@ -882,7 +873,7 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:49
 #, fuzzy
-msgid "Data _compression:"
+msgid "Data _compression"
 msgstr "ÐšÐ¾Ñ€Ð¸ÑÑ‚Ð¸ L_ZO ÐºÐ¾Ð¼Ð¿Ñ€ÐµÑÐ¸Ñ˜Ð°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:50
@@ -906,7 +897,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:56
-msgid "Set virtual _device type:"
+msgid "Set virtual _device type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:57
@@ -920,7 +911,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:60
-msgid " and _name:"
+msgid " and _name"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:61
@@ -931,7 +922,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:63
-msgid "Use custom tunnel Maximum Transmission _Unit (MTU):"
+msgid "Use custom tunnel Maximum Transmission _Unit (MTU)"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:64
@@ -942,7 +933,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:66
-msgid "Use custom UDP _fragment size:"
+msgid "Use custom UDP _fragment size"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:67
@@ -993,7 +984,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:81
-msgid "Specify pin_g interval:"
+msgid "Specify pin_g interval"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:82
@@ -1004,7 +995,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:84
-msgid "Specify _exit or restart ping:"
+msgid "Specify _exit or restart ping"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:85
@@ -1035,7 +1026,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:93
-msgid "Specify max routes:"
+msgid "Specify max routes"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:94
@@ -1052,7 +1043,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:98
-msgid "Use custom _size of cipher key:"
+msgid "Use custom _size of cipher key"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:99
@@ -1071,11 +1062,11 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:103
 #, fuzzy
-msgid "Ci_pher:"
+msgid "Ci_pher"
 msgstr "Ð¨Ð¸Ñ„Ñ€Ð°:  %s"
 
 #: ../properties/nm-openvpn-dialog.ui.h:104
-msgid "_HMAC Authentication:"
+msgid "_HMAC Authentication"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:105
@@ -1123,7 +1114,7 @@ msgid "Security"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:115
-msgid "_Subject Match:"
+msgid "_Subject Match"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:116
@@ -1136,8 +1127,8 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:120
 #, fuzzy
-msgid "Server _Certificate Check:"
-msgstr "Ð¡_ÐµÑ€Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚:"
+msgid "Server _Certificate Check"
+msgstr "Ð¡_ÐµÑ€Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚"
 
 #: ../properties/nm-openvpn-dialog.ui.h:121
 msgid ""
@@ -1167,7 +1158,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:133
-msgid "_Remote peer certificate TLS type:"
+msgid "_Remote peer certificate TLS type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:134
@@ -1188,7 +1179,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:138
-msgid "_Remote peer certificate nsCert designation:"
+msgid "_Remote peer certificate nsCert designation"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:139
@@ -1200,8 +1191,8 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:141
 #, fuzzy
-msgid "Key _Direction:"
-msgstr "ÐÐ°ÑÐ¾ÐºÐ°:"
+msgid "Key _Direction"
+msgstr "ÐÐ°ÑÐ¾ÐºÐ°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:142
 msgid ""
@@ -1221,11 +1212,11 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:147
-msgid "Key _File:"
+msgid "Key _File"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:148
-msgid "Mode:"
+msgid "Mode"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:149
@@ -1234,8 +1225,8 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:150
 #, fuzzy
-msgid "Extra Certificates:"
-msgstr "Ð¡_ÐµÑ€Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚:"
+msgid "Extra Certificates"
+msgstr "Ð¡_ÐµÑ€Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚"
 
 #: ../properties/nm-openvpn-dialog.ui.h:151
 msgid ""
@@ -1257,7 +1248,7 @@ msgid "TLS version control"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:156
-msgid "TLS _min version: "
+msgid "TLS _min version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:157
@@ -1269,7 +1260,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:158
-msgid "TLS ma_x version: "
+msgid "TLS ma_x version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:159
@@ -1290,7 +1281,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:163
-msgid "Proxy _Type:"
+msgid "Proxy _Type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:164
@@ -1300,7 +1291,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:165
-msgid "Server _Address:"
+msgid "Server _Address"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:166
@@ -1311,7 +1302,7 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:168
 #, fuzzy
-msgid "_Port:"
+msgid "_Port"
 msgstr "ÐŸÐ¾Ñ€Ñ‚Ð°:  %s"
 
 #: ../properties/nm-openvpn-dialog.ui.h:169
@@ -1332,13 +1323,13 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:174
 #, fuzzy
-msgid "Proxy _Username:"
-msgstr "_ÐšÐ¾Ñ€Ð¸ÑÐ½Ð¸Ñ‡ÐºÐ¾ Ð¸Ð¼Ðµ:"
+msgid "Proxy _Username"
+msgstr "_ÐšÐ¾Ñ€Ð¸ÑÐ½Ð¸Ñ‡ÐºÐ¾ Ð¸Ð¼Ðµ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:175
 #, fuzzy
-msgid "Proxy Passwor_d:"
-msgstr "_Ð›Ð¾Ð·Ð¸Ð½ÐºÐ°:"
+msgid "Proxy Passwor_d"
+msgstr "_Ð›Ð¾Ð·Ð¸Ð½ÐºÐ°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:176
 msgid "HTTP/Socks proxy username passed to OpenVPN when prompted for it."
@@ -1351,7 +1342,7 @@ msgstr ""
 #: ../properties/nm-openvpn-dialog.ui.h:178
 #, fuzzy
 msgid "_Show password"
-msgstr "_Ð›Ð¾Ð·Ð¸Ð½ÐºÐ°:"
+msgstr "_Ð›Ð¾Ð·Ð¸Ð½ÐºÐ°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:179
 msgid "Proxies"
diff --git a/po/mr.po b/po/mr.po
index a73b127..2ef52e3 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -743,8 +743,8 @@ msgid "General"
 msgstr "à¤¸à¤°à¥à¤µà¤¸à¤¾à¤§à¤¾à¤°à¤£"
 
 #: ../properties/nm-openvpn-dialog.ui.h:13
-msgid "_Gateway:"
-msgstr "à¤—à¥‡à¤Ÿà¤µà¥‡ (_G):"
+msgid "_Gateway"
+msgstr "à¤—à¥‡à¤Ÿà¤µà¥‡ (_G)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:14
 msgid ""
@@ -767,13 +767,9 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#: ../properties/nm-openvpn-dialog.ui.h:19
-msgid "Password:"
-msgstr "à¤ªà¤°à¤µà¤²à¥€à¤šà¤¾ à¤¶à¤¬à¥à¤¦:"
-
 #: ../properties/nm-openvpn-dialog.ui.h:20
-msgid "User name:"
-msgstr "à¤µà¤¾à¤ªà¤°à¤•à¤°à¥à¤¤à¤¾ à¤¨à¤¾à¤µ:"
+msgid "User name"
+msgstr "à¤µà¤¾à¤ªà¤°à¤•à¤°à¥à¤¤à¤¾ à¤¨à¤¾à¤µ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:21
 msgid ""
@@ -789,21 +785,17 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:25
-msgid "Remote IP Address:"
-msgstr "à¤¦à¥‚à¤°à¤¸à¥à¤¥ IP à¤ªà¤¤à¥à¤¤à¤¾:"
+msgid "Remote IP Address"
+msgstr "à¤¦à¥‚à¤°à¤¸à¥à¤¥ IP à¤ªà¤¤à¥à¤¤à¤¾"
 
 #: ../properties/nm-openvpn-dialog.ui.h:26
-msgid "Local IP Address:"
-msgstr "à¤¸à¥à¤¥à¤¾à¤¨à¥€à¤¯ IP à¤ªà¤¤à¥à¤¤à¤¾:"
+msgid "Local IP Address"
+msgstr "à¤¸à¥à¤¥à¤¾à¤¨à¥€à¤¯ IP à¤ªà¤¤à¥à¤¤à¤¾"
 
 #: ../properties/nm-openvpn-dialog.ui.h:27
 #, fuzzy
-msgid "Key Direction:"
-msgstr "à¤•à¤¿ à¤¦à¤¿à¤¶à¤¾:"
-
-#: ../properties/nm-openvpn-dialog.ui.h:28
-msgid "Static Key:"
-msgstr "à¤¸à¥à¤Ÿà¥…à¤Ÿà¥€à¤• à¤•à¤¿:"
+msgid "Key Direction"
+msgstr "à¤•à¤¿ à¤¦à¤¿à¤¶à¤¾"
 
 #: ../properties/nm-openvpn-dialog.ui.h:29
 msgid ""
@@ -837,8 +829,8 @@ msgstr ""
 "à¤¨à¤¿à¤¶à¥à¤šà¤¿à¤¤ à¤¨à¤¸à¤²à¥à¤¯à¤¾à¤¸, à¤¤à¥à¤®à¤šà¥à¤¯à¤¾ à¤ªà¥à¤°à¤£à¤¾à¤²à¥€ à¤ªà¥à¤°à¤¶à¤¾à¤¸à¤•à¤¾à¤¶à¥€ à¤¸à¤‚à¤ªà¤°à¥à¤• à¤•à¤°à¤¾.</i>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:38
-msgid "Type:"
-msgstr "à¤ªà¥à¤°à¤•à¤¾à¤°:"
+msgid "Type"
+msgstr "à¤ªà¥à¤°à¤•à¤¾à¤°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:39
 #, fuzzy
@@ -855,8 +847,8 @@ msgid "OpenVPN Advanced Options"
 msgstr "OpenVPN à¤ªà¥à¤°à¤—à¤¤ à¤ªà¤°à¥à¤¯à¤¾à¤¯"
 
 #: ../properties/nm-openvpn-dialog.ui.h:43
-msgid "Use custom gateway p_ort:"
-msgstr "à¤¸à¥à¤µà¤ªà¤¸à¤‚à¤¤ à¤—à¥‡à¤Ÿà¤µà¥‡ à¤ªà¥‹à¤°à¥à¤Ÿ à¤µà¤¾à¤ªà¤°à¤¾ (_o):"
+msgid "Use custom gateway p_ort"
+msgstr "à¤¸à¥à¤µà¤ªà¤¸à¤‚à¤¤ à¤—à¥‡à¤Ÿà¤µà¥‡ à¤ªà¥‹à¤°à¥à¤Ÿ à¤µà¤¾à¤ªà¤°à¤¾ (_o)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:44
 msgid ""
@@ -866,7 +858,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:46
-msgid "Use custom _renegotiation interval:"
+msgid "Use custom _renegotiation interval"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:47
@@ -877,7 +869,7 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:49
 #, fuzzy
-msgid "Data _compression:"
+msgid "Data _compression"
 msgstr "LZO à¤®à¤¾à¤¹à¤¿à¤¤à¥€ à¤¸à¤‚à¤•à¥‹à¤šà¤¨ à¤µà¤¾à¤ªà¤°à¤¾ (_Z)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:50
@@ -899,7 +891,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:56
-msgid "Set virtual _device type:"
+msgid "Set virtual _device type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:57
@@ -913,7 +905,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:60
-msgid " and _name:"
+msgid " and _name"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:61
@@ -924,7 +916,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:63
-msgid "Use custom tunnel Maximum Transmission _Unit (MTU):"
+msgid "Use custom tunnel Maximum Transmission _Unit (MTU)"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:64
@@ -935,7 +927,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:66
-msgid "Use custom UDP _fragment size:"
+msgid "Use custom UDP _fragment size"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:67
@@ -986,7 +978,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:81
-msgid "Specify pin_g interval:"
+msgid "Specify pin_g interval"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:82
@@ -997,7 +989,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:84
-msgid "Specify _exit or restart ping:"
+msgid "Specify _exit or restart ping"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:85
@@ -1028,7 +1020,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:93
-msgid "Specify max routes:"
+msgid "Specify max routes"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:94
@@ -1045,7 +1037,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:98
-msgid "Use custom _size of cipher key:"
+msgid "Use custom _size of cipher key"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:99
@@ -1063,12 +1055,12 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:103
-msgid "Ci_pher:"
-msgstr "à¤¸à¤¿à¤«à¤°:"
+msgid "Ci_pher"
+msgstr "à¤¸à¤¿à¤«à¤°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:104
-msgid "_HMAC Authentication:"
-msgstr "HMAC à¤“à¤³à¤– à¤ªà¤Ÿà¤µà¤¾:"
+msgid "_HMAC Authentication"
+msgstr "HMAC à¤“à¤³à¤– à¤ªà¤Ÿà¤µà¤¾"
 
 #: ../properties/nm-openvpn-dialog.ui.h:105
 msgid "Disable cipher _negotiation"
@@ -1115,7 +1107,7 @@ msgid "Security"
 msgstr "à¤¸à¥à¤°à¤•à¥à¤·à¤¾"
 
 #: ../properties/nm-openvpn-dialog.ui.h:115
-msgid "_Subject Match:"
+msgid "_Subject Match"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:116
@@ -1128,8 +1120,8 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:120
 #, fuzzy
-msgid "Server _Certificate Check:"
-msgstr "à¤µà¤¾à¤ªà¤°à¤•à¤°à¥à¤¤à¤¾ à¤ªà¥à¤°à¤®à¤¾à¤£à¤ªà¤¤à¥à¤°:"
+msgid "Server _Certificate Check"
+msgstr "à¤µà¤¾à¤ªà¤°à¤•à¤°à¥à¤¤à¤¾ à¤ªà¥à¤°à¤®à¤¾à¤£à¤ªà¤¤à¥à¤°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:121
 msgid ""
@@ -1159,7 +1151,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:133
-msgid "_Remote peer certificate TLS type:"
+msgid "_Remote peer certificate TLS type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:134
@@ -1180,7 +1172,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:138
-msgid "_Remote peer certificate nsCert designation:"
+msgid "_Remote peer certificate nsCert designation"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:139
@@ -1191,8 +1183,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:141
-msgid "Key _Direction:"
-msgstr "à¤•à¤¿ à¤¦à¤¿à¤¶à¤¾:"
+msgid "Key _Direction"
+msgstr "à¤•à¤¿ à¤¦à¤¿à¤¶à¤¾"
 
 #: ../properties/nm-openvpn-dialog.ui.h:142
 msgid ""
@@ -1216,11 +1208,11 @@ msgstr ""
 "à¤¨à¤¿à¤¶à¥à¤šà¤¿à¤¤ à¤¨à¤¸à¤²à¥à¤¯à¤¾à¤¸, à¤¤à¥à¤®à¤šà¥à¤¯à¤¾ à¤ªà¥à¤°à¤£à¤¾à¤²à¥€ à¤ªà¥à¤°à¤¶à¤¾à¤¸à¤•à¤¾à¤¶à¥€ à¤¸à¤‚à¤ªà¤°à¥à¤• à¤•à¤°à¤¾.</i>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:147
-msgid "Key _File:"
-msgstr "à¤•à¤¿ à¤«à¤¾à¤‡à¤²:"
+msgid "Key _File"
+msgstr "à¤•à¤¿ à¤«à¤¾à¤‡à¤²"
 
 #: ../properties/nm-openvpn-dialog.ui.h:148
-msgid "Mode:"
+msgid "Mode"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:149
@@ -1230,8 +1222,8 @@ msgstr "à¤…à¤—à¤¾à¤Š TLS à¤“à¤³à¤– à¤ªà¤Ÿà¤µà¤¾ à¤µà¤¾à¤ªà¤°à¤¾"
 
 #: ../properties/nm-openvpn-dialog.ui.h:150
 #, fuzzy
-msgid "Extra Certificates:"
-msgstr "à¤µà¤¾à¤ªà¤°à¤•à¤°à¥à¤¤à¤¾ à¤ªà¥à¤°à¤®à¤¾à¤£à¤ªà¤¤à¥à¤°:"
+msgid "Extra Certificates"
+msgstr "à¤µà¤¾à¤ªà¤°à¤•à¤°à¥à¤¤à¤¾ à¤ªà¥à¤°à¤®à¤¾à¤£à¤ªà¤¤à¥à¤°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:151
 msgid ""
@@ -1254,7 +1246,7 @@ msgid "TLS version control"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:156
-msgid "TLS _min version: "
+msgid "TLS _min version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:157
@@ -1266,7 +1258,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:158
-msgid "TLS ma_x version: "
+msgid "TLS ma_x version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:159
@@ -1286,7 +1278,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:163
-msgid "Proxy _Type:"
+msgid "Proxy _Type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:164
@@ -1297,8 +1289,8 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:165
 #, fuzzy
-msgid "Server _Address:"
-msgstr "à¤¦à¥‚à¤°à¤¸à¥à¤¥ IP à¤ªà¤¤à¥à¤¤à¤¾:"
+msgid "Server _Address"
+msgstr "à¤¦à¥‚à¤°à¤¸à¥à¤¥ IP à¤ªà¤¤à¥à¤¤à¤¾"
 
 #: ../properties/nm-openvpn-dialog.ui.h:166
 msgid ""
@@ -1307,7 +1299,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:168
-msgid "_Port:"
+msgid "_Port"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:169
@@ -1328,13 +1320,13 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:174
 #, fuzzy
-msgid "Proxy _Username:"
-msgstr "à¤µà¤¾à¤ªà¤°à¤•à¤°à¥à¤¤à¤¾ à¤¨à¤¾à¤µ (_U):"
+msgid "Proxy _Username"
+msgstr "à¤µà¤¾à¤ªà¤°à¤•à¤°à¥à¤¤à¤¾ à¤¨à¤¾à¤µ (_U)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:175
 #, fuzzy
-msgid "Proxy Passwor_d:"
-msgstr "à¤ªà¤°à¤µà¤²à¥€à¤šà¤¾ à¤¶à¤¬à¥à¤¦:"
+msgid "Proxy Passwor_d"
+msgstr "à¤ªà¤°à¤µà¤²à¥€à¤šà¤¾ à¤¶à¤¬à¥à¤¦"
 
 #: ../properties/nm-openvpn-dialog.ui.h:176
 msgid "HTTP/Socks proxy username passed to OpenVPN when prompted for it."
diff --git a/po/nb.po b/po/nb.po
index 6669b20..edb6b82 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -741,8 +741,8 @@ msgid "General"
 msgstr "Generelt"
 
 #: ../properties/nm-openvpn-dialog.ui.h:13
-msgid "_Gateway:"
-msgstr "_Portner:"
+msgid "_Gateway"
+msgstr "_Portner"
 
 #: ../properties/nm-openvpn-dialog.ui.h:14
 msgid ""
@@ -765,13 +765,9 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#: ../properties/nm-openvpn-dialog.ui.h:19
-msgid "Password:"
-msgstr "Passord:"
-
 #: ../properties/nm-openvpn-dialog.ui.h:20
-msgid "User name:"
-msgstr "Brukernavn:"
+msgid "User name"
+msgstr "Brukernavn"
 
 #: ../properties/nm-openvpn-dialog.ui.h:21
 msgid ""
@@ -787,20 +783,16 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:25
-msgid "Remote IP Address:"
-msgstr "Ekstern IP-adresse:"
+msgid "Remote IP Address"
+msgstr "Ekstern IP-adresse"
 
 #: ../properties/nm-openvpn-dialog.ui.h:26
-msgid "Local IP Address:"
-msgstr "Lokal IP-adresse:"
+msgid "Local IP Address"
+msgstr "Lokal IP-adresse"
 
 #: ../properties/nm-openvpn-dialog.ui.h:27
-msgid "Key Direction:"
-msgstr "NÃ¸kkelretning:"
-
-#: ../properties/nm-openvpn-dialog.ui.h:28
-msgid "Static Key:"
-msgstr "Statisk nÃ¸kkel:"
+msgid "Key Direction"
+msgstr "NÃ¸kkelretning"
 
 #: ../properties/nm-openvpn-dialog.ui.h:29
 msgid ""
@@ -830,8 +822,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:38
-msgid "Type:"
-msgstr "Type:"
+msgid "Type"
+msgstr "Type"
 
 #: ../properties/nm-openvpn-dialog.ui.h:39
 msgid "Select an authentication mode."
@@ -847,8 +839,8 @@ msgid "OpenVPN Advanced Options"
 msgstr "Avanserte alternativer for OpenVPN"
 
 #: ../properties/nm-openvpn-dialog.ui.h:43
-msgid "Use custom gateway p_ort:"
-msgstr "Bruk egendefinert p_ort for gateway:"
+msgid "Use custom gateway p_ort"
+msgstr "Bruk egendefinert p_ort for gateway"
 
 #: ../properties/nm-openvpn-dialog.ui.h:44
 msgid ""
@@ -858,7 +850,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:46
-msgid "Use custom _renegotiation interval:"
+msgid "Use custom _renegotiation interval"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:47
@@ -869,7 +861,7 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:49
 #, fuzzy
-msgid "Data _compression:"
+msgid "Data _compression"
 msgstr "Bruk L_ZO-datakomprimering"
 
 #: ../properties/nm-openvpn-dialog.ui.h:50
@@ -891,7 +883,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:56
-msgid "Set virtual _device type:"
+msgid "Set virtual _device type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:57
@@ -905,7 +897,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:60
-msgid " and _name:"
+msgid " and _name"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:61
@@ -916,7 +908,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:63
-msgid "Use custom tunnel Maximum Transmission _Unit (MTU):"
+msgid "Use custom tunnel Maximum Transmission _Unit (MTU)"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:64
@@ -927,8 +919,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:66
-msgid "Use custom UDP _fragment size:"
-msgstr "Bruk egendefinert _fragmentstÃ¸rrelse for UDP:"
+msgid "Use custom UDP _fragment size"
+msgstr "Bruk egendefinert _fragmentstÃ¸rrelse for UDP"
 
 #: ../properties/nm-openvpn-dialog.ui.h:67
 msgid ""
@@ -978,7 +970,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:81
-msgid "Specify pin_g interval:"
+msgid "Specify pin_g interval"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:82
@@ -989,7 +981,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:84
-msgid "Specify _exit or restart ping:"
+msgid "Specify _exit or restart ping"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:85
@@ -1020,7 +1012,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:93
-msgid "Specify max routes:"
+msgid "Specify max routes"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:94
@@ -1037,7 +1029,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:98
-msgid "Use custom _size of cipher key:"
+msgid "Use custom _size of cipher key"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:99
@@ -1055,11 +1047,11 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:103
-msgid "Ci_pher:"
-msgstr "Cipher:"
+msgid "Ci_pher"
+msgstr "Cipher"
 
 #: ../properties/nm-openvpn-dialog.ui.h:104
-msgid "_HMAC Authentication:"
+msgid "_HMAC Authentication"
 msgstr "HMAC-autentisering"
 
 #: ../properties/nm-openvpn-dialog.ui.h:105
@@ -1107,8 +1099,8 @@ msgid "Security"
 msgstr "Sikkerhet"
 
 #: ../properties/nm-openvpn-dialog.ui.h:115
-msgid "_Subject Match:"
-msgstr "EmnesÃ¸k:"
+msgid "_Subject Match"
+msgstr "EmnesÃ¸k"
 
 #: ../properties/nm-openvpn-dialog.ui.h:116
 msgid ""
@@ -1120,8 +1112,8 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:120
 #, fuzzy
-msgid "Server _Certificate Check:"
-msgstr "Brukersertifikat:"
+msgid "Server _Certificate Check"
+msgstr "Brukersertifikat"
 
 #: ../properties/nm-openvpn-dialog.ui.h:121
 msgid ""
@@ -1151,7 +1143,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:133
-msgid "_Remote peer certificate TLS type:"
+msgid "_Remote peer certificate TLS type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:134
@@ -1172,7 +1164,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:138
-msgid "_Remote peer certificate nsCert designation:"
+msgid "_Remote peer certificate nsCert designation"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:139
@@ -1183,8 +1175,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:141
-msgid "Key _Direction:"
-msgstr "NÃ¸kkelretning:"
+msgid "Key _Direction"
+msgstr "NÃ¸kkelretning"
 
 #: ../properties/nm-openvpn-dialog.ui.h:142
 msgid ""
@@ -1204,11 +1196,11 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:147
-msgid "Key _File:"
-msgstr "NÃ¸kkelfil:"
+msgid "Key _File"
+msgstr "NÃ¸kkelfil"
 
 #: ../properties/nm-openvpn-dialog.ui.h:148
-msgid "Mode:"
+msgid "Mode"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:149
@@ -1218,8 +1210,8 @@ msgstr "Bruk et ekstra lag med HMAC-autentisering."
 
 #: ../properties/nm-openvpn-dialog.ui.h:150
 #, fuzzy
-msgid "Extra Certificates:"
-msgstr "Brukersertifikat:"
+msgid "Extra Certificates"
+msgstr "Brukersertifikat"
 
 #: ../properties/nm-openvpn-dialog.ui.h:151
 msgid ""
@@ -1242,7 +1234,7 @@ msgid "TLS version control"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:156
-msgid "TLS _min version: "
+msgid "TLS _min version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:157
@@ -1254,7 +1246,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:158
-msgid "TLS ma_x version: "
+msgid "TLS ma_x version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:159
@@ -1274,8 +1266,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:163
-msgid "Proxy _Type:"
-msgstr "Type proxy:"
+msgid "Proxy _Type"
+msgstr "Type proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:164
 msgid ""
@@ -1284,8 +1276,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:165
-msgid "Server _Address:"
-msgstr "Tjeneradresse:"
+msgid "Server _Address"
+msgstr "Tjeneradresse"
 
 #: ../properties/nm-openvpn-dialog.ui.h:166
 msgid ""
@@ -1294,8 +1286,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:168
-msgid "_Port:"
-msgstr "Port:"
+msgid "_Port"
+msgstr "Port"
 
 #: ../properties/nm-openvpn-dialog.ui.h:169
 msgid ""
@@ -1314,12 +1306,12 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:174
-msgid "Proxy _Username:"
-msgstr "Brukernavn for proxy:"
+msgid "Proxy _Username"
+msgstr "Brukernavn for proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:175
-msgid "Proxy Passwor_d:"
-msgstr "Passord for proxy:"
+msgid "Proxy Passwor_d"
+msgstr "Passord for proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:176
 msgid "HTTP/Socks proxy username passed to OpenVPN when prompted for it."
diff --git a/po/nl.po b/po/nl.po
index 9b4822e..1323fe7 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -818,8 +818,8 @@ msgid "General"
 msgstr "Algemeen"
 
 #: ../properties/nm-openvpn-dialog.ui.h:14
-msgid "_Gateway:"
-msgstr "_Gateway:"
+msgid "_Gateway"
+msgstr "_Gateway"
 
 #: ../properties/nm-openvpn-dialog.ui.h:15
 msgid ""
@@ -845,13 +845,9 @@ msgstr "CA"
 msgid "User"
 msgstr "Gebruiker"
 
-#: ../properties/nm-openvpn-dialog.ui.h:20
-msgid "Password:"
-msgstr "Wachtwoord:"
-
 #: ../properties/nm-openvpn-dialog.ui.h:21
-msgid "User name:"
-msgstr "Gebruikersnaam:"
+msgid "User name"
+msgstr "Gebruikersnaam"
 
 #: ../properties/nm-openvpn-dialog.ui.h:22
 msgid ""
@@ -873,20 +869,16 @@ msgstr ""
 "config: auth-user-pass"
 
 #: ../properties/nm-openvpn-dialog.ui.h:26
-msgid "Remote IP Address:"
-msgstr "IP-adres op afstand:"
+msgid "Remote IP Address"
+msgstr "IP-adres op afstand"
 
 #: ../properties/nm-openvpn-dialog.ui.h:27
-msgid "Local IP Address:"
-msgstr "Lokaal IP-adres:"
+msgid "Local IP Address"
+msgstr "Lokaal IP-adres"
 
 #: ../properties/nm-openvpn-dialog.ui.h:28
-msgid "Key Direction:"
-msgstr "Sleutelrichting:"
-
-#: ../properties/nm-openvpn-dialog.ui.h:29
-msgid "Static Key:"
-msgstr "Statische sleutel:"
+msgid "Key Direction"
+msgstr "Sleutelrichting"
 
 #: ../properties/nm-openvpn-dialog.ui.h:30
 msgid ""
@@ -929,8 +921,8 @@ msgstr ""
 "configuratie: static <bestand> [richting]"
 
 #: ../properties/nm-openvpn-dialog.ui.h:39
-msgid "Type:"
-msgstr "Type:"
+msgid "Type"
+msgstr "Type"
 
 #: ../properties/nm-openvpn-dialog.ui.h:40
 msgid "Select an authentication mode."
@@ -945,8 +937,8 @@ msgid "OpenVPN Advanced Options"
 msgstr "Geavanceerde opties voor OpenVPN"
 
 #: ../properties/nm-openvpn-dialog.ui.h:44
-msgid "Use custom gateway p_ort:"
-msgstr "Aangepaste gateway-_poort:"
+msgid "Use custom gateway p_ort"
+msgstr "Aangepaste gateway-_poort"
 
 #: ../properties/nm-openvpn-dialog.ui.h:45
 msgid ""
@@ -958,8 +950,8 @@ msgstr ""
 "configuratie: port"
 
 #: ../properties/nm-openvpn-dialog.ui.h:47
-msgid "Use custom _renegotiation interval:"
-msgstr "Aangepast interval voor _heronderhandeling gebruiken:"
+msgid "Use custom _renegotiation interval"
+msgstr "Aangepast interval voor _heronderhandeling gebruiken"
 
 #: ../properties/nm-openvpn-dialog.ui.h:48
 msgid ""
@@ -970,8 +962,8 @@ msgstr ""
 "configuratie: reneg-sec"
 
 #: ../properties/nm-openvpn-dialog.ui.h:50
-msgid "Data _compression:"
-msgstr "Data_compressie gebruiken:"
+msgid "Data _compression"
+msgstr "Data_compressie gebruiken"
 
 #: ../properties/nm-openvpn-dialog.ui.h:51
 msgid ""
@@ -998,8 +990,8 @@ msgstr ""
 "configuratie: proto tcp-client | udp"
 
 #: ../properties/nm-openvpn-dialog.ui.h:57
-msgid "Set virtual _device type:"
-msgstr "Stel virtueel a_pparaatstype in:"
+msgid "Set virtual _device type"
+msgstr "Stel virtueel a_pparaatstype in"
 
 #: ../properties/nm-openvpn-dialog.ui.h:58
 msgid "Explicitly set virtual device type and name (TUN/TAP)."
@@ -1015,8 +1007,8 @@ msgstr ""
 "config: dev-type tun | tap"
 
 #: ../properties/nm-openvpn-dialog.ui.h:61
-msgid " and _name:"
-msgstr " en _naam:"
+msgid " and _name"
+msgstr " en _naam"
 
 #: ../properties/nm-openvpn-dialog.ui.h:62
 msgid ""
@@ -1029,7 +1021,7 @@ msgstr ""
 "configuratie: dev <naam>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:64
-msgid "Use custom tunnel Maximum Transmission _Unit (MTU):"
+msgid "Use custom tunnel Maximum Transmission _Unit (MTU)"
 msgstr ""
 "Aangepaste MT_U (maximale transmissie-eenheid) voor de tunnel gebruiken:"
 
@@ -1044,8 +1036,8 @@ msgstr ""
 "configuratie: tun-mtu"
 
 #: ../properties/nm-openvpn-dialog.ui.h:67
-msgid "Use custom UDP _fragment size:"
-msgstr "Aangepaste UDP-_fragmentgrootte gebruiken:"
+msgid "Use custom UDP _fragment size"
+msgstr "Aangepaste UDP-_fragmentgrootte gebruiken"
 
 #: ../properties/nm-openvpn-dialog.ui.h:68
 msgid ""
@@ -1119,8 +1111,8 @@ msgstr ""
 "configuratie: tun-ipv6"
 
 #: ../properties/nm-openvpn-dialog.ui.h:85
-msgid "Specify pin_g interval:"
-msgstr "Geef pin_ginterval op:"
+msgid "Specify pin_g interval"
+msgstr "Geef pin_ginterval op"
 
 #: ../properties/nm-openvpn-dialog.ui.h:86
 msgid ""
@@ -1133,8 +1125,8 @@ msgstr ""
 "configuratie: ping <n>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:88
-msgid "Specify _exit or restart ping:"
-msgstr "Geef ping van afsluit_en of herstarten op:"
+msgid "Specify _exit or restart ping"
+msgstr "Geef ping van afsluit_en of herstarten op"
 
 #: ../properties/nm-openvpn-dialog.ui.h:89
 msgid ""
@@ -1181,8 +1173,8 @@ msgstr ""
 "configuratie: float"
 
 #: ../properties/nm-openvpn-dialog.ui.h:97
-msgid "Specify max routes:"
-msgstr "Geef maximaal aantal routes op:"
+msgid "Specify max routes"
+msgstr "Geef maximaal aantal routes op"
 
 #: ../properties/nm-openvpn-dialog.ui.h:98
 msgid ""
@@ -1203,8 +1195,8 @@ msgstr ""
 "configuratie: cipher"
 
 #: ../properties/nm-openvpn-dialog.ui.h:102
-msgid "Use custom _size of cipher key:"
-msgstr "Aangepa_ste grootte van ciphersleutel gebruiken:"
+msgid "Use custom _size of cipher key"
+msgstr "Aangepa_ste grootte van ciphersleutel gebruiken"
 
 #: ../properties/nm-openvpn-dialog.ui.h:103
 msgid ""
@@ -1228,12 +1220,12 @@ msgstr ""
 "configuratie: auth"
 
 #: ../properties/nm-openvpn-dialog.ui.h:107
-msgid "Ci_pher:"
-msgstr "Ver_cijfering:"
+msgid "Ci_pher"
+msgstr "Ver_cijfering"
 
 #: ../properties/nm-openvpn-dialog.ui.h:108
-msgid "_HMAC Authentication:"
-msgstr "_HMAC-authenticatie:"
+msgid "_HMAC Authentication"
+msgstr "_HMAC-authenticatie"
 
 #: ../properties/nm-openvpn-dialog.ui.h:109
 msgid "Disable cipher _negotiation"
@@ -1288,8 +1280,8 @@ msgid "Security"
 msgstr "Beveiliging"
 
 #: ../properties/nm-openvpn-dialog.ui.h:119
-msgid "_Subject Match:"
-msgstr "Overeenkom_st met onderwerp:"
+msgid "_Subject Match"
+msgstr "Overeenkom_st met onderwerp"
 
 #: ../properties/nm-openvpn-dialog.ui.h:120
 msgid ""
@@ -1305,8 +1297,8 @@ msgstr ""
 "configuratie (legacy-modus): tls-remote onderwerp-of-naam"
 
 #: ../properties/nm-openvpn-dialog.ui.h:124
-msgid "Server _Certificate Check:"
-msgstr "Server_certificaatcontrole:"
+msgid "Server _Certificate Check"
+msgstr "Server_certificaatcontrole"
 
 #: ../properties/nm-openvpn-dialog.ui.h:125
 msgid ""
@@ -1351,8 +1343,8 @@ msgstr ""
 "sleutelgebruik en uitgebreid sleutelgebruik gebaseerd op RFC3280-TLS-regels."
 
 #: ../properties/nm-openvpn-dialog.ui.h:137
-msgid "_Remote peer certificate TLS type:"
-msgstr "TLS-type van certificaat van exte_rne peer:"
+msgid "_Remote peer certificate TLS type"
+msgstr "TLS-type van certificaat van exte_rne peer"
 
 #: ../properties/nm-openvpn-dialog.ui.h:138
 msgid ""
@@ -1378,8 +1370,8 @@ msgstr ""
 "nsCertType-toewijzing."
 
 #: ../properties/nm-openvpn-dialog.ui.h:142
-msgid "_Remote peer certificate nsCert designation:"
-msgstr "Exte_rne nsCert-toewijzing van peercertificaat:"
+msgid "_Remote peer certificate nsCert designation"
+msgstr "Exte_rne nsCert-toewijzing van peercertificaat"
 
 #: ../properties/nm-openvpn-dialog.ui.h:143
 msgid ""
@@ -1392,8 +1384,8 @@ msgstr ""
 "configuratie: ns-cert-type client|server"
 
 #: ../properties/nm-openvpn-dialog.ui.h:145
-msgid "Key _Direction:"
-msgstr "Sleutel_richting:"
+msgid "Key _Direction"
+msgstr "Sleutel_richting"
 
 #: ../properties/nm-openvpn-dialog.ui.h:146
 msgid ""
@@ -1423,20 +1415,20 @@ msgstr ""
 "configuratie: tls-auth <bestand> [richting]"
 
 #: ../properties/nm-openvpn-dialog.ui.h:151
-msgid "Key _File:"
-msgstr "_Sleutelbestand:"
+msgid "Key _File"
+msgstr "_Sleutelbestand"
 
 #: ../properties/nm-openvpn-dialog.ui.h:152
-msgid "Mode:"
-msgstr "Modus:"
+msgid "Mode"
+msgstr "Modus"
 
 #: ../properties/nm-openvpn-dialog.ui.h:153
 msgid "Add an additional layer of encryption or HMAC authentication."
 msgstr "Voeg een extra laag met versleuteling of HMAC-authenticatie toe."
 
 #: ../properties/nm-openvpn-dialog.ui.h:154
-msgid "Extra Certificates:"
-msgstr "Extra certificaten:"
+msgid "Extra Certificates"
+msgstr "Extra certificaten"
 
 #: ../properties/nm-openvpn-dialog.ui.h:155
 msgid ""
@@ -1461,8 +1453,8 @@ msgid "TLS version control"
 msgstr "TLS-versiebeheer"
 
 #: ../properties/nm-openvpn-dialog.ui.h:160
-msgid "TLS _min version: "
-msgstr "TLS-_minimumversie: "
+msgid "TLS _min version"
+msgstr "TLS-_minimumversie"
 
 #: ../properties/nm-openvpn-dialog.ui.h:161
 msgid ""
@@ -1478,8 +1470,8 @@ msgstr ""
 "SSL-implementatie wordt ondersteund."
 
 #: ../properties/nm-openvpn-dialog.ui.h:162
-msgid "TLS ma_x version: "
-msgstr "TLS-ma_ximumversie: "
+msgid "TLS ma_x version"
+msgstr "TLS-ma_ximumversie"
 
 #: ../properties/nm-openvpn-dialog.ui.h:163
 msgid ""
@@ -1503,8 +1495,8 @@ msgstr ""
 "configuratie: http-proxy of socks-proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:167
-msgid "Proxy _Type:"
-msgstr "Proxy-_type:"
+msgid "Proxy _Type"
+msgstr "Proxy-_type"
 
 #: ../properties/nm-openvpn-dialog.ui.h:168
 msgid ""
@@ -1515,8 +1507,8 @@ msgstr ""
 "internettoegang.</i>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:169
-msgid "Server _Address:"
-msgstr "Server_adres:"
+msgid "Server _Address"
+msgstr "Server_adres"
 
 #: ../properties/nm-openvpn-dialog.ui.h:170
 msgid ""
@@ -1527,8 +1519,8 @@ msgstr ""
 "configuratie: http-proxy of socks-proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:172
-msgid "_Port:"
-msgstr "_Poort:"
+msgid "_Port"
+msgstr "_Poort"
 
 #: ../properties/nm-openvpn-dialog.ui.h:173
 msgid ""
@@ -1551,12 +1543,12 @@ msgstr ""
 "configuratie: http-proxy-retry of socks-proxy-retry"
 
 #: ../properties/nm-openvpn-dialog.ui.h:178
-msgid "Proxy _Username:"
-msgstr "Gebr_uikersnaam voor proxy:"
+msgid "Proxy _Username"
+msgstr "Gebr_uikersnaam voor proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:179
-msgid "Proxy Passwor_d:"
-msgstr "Proxywachtwoor_d:"
+msgid "Proxy Passwor_d"
+msgstr "Proxywachtwoor_d"
 
 #: ../properties/nm-openvpn-dialog.ui.h:180
 msgid "HTTP/Socks proxy username passed to OpenVPN when prompted for it."
diff --git a/po/pa.po b/po/pa.po
index c1344d6..1421aea 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -742,8 +742,8 @@ msgid "General"
 msgstr "à¨†à¨®"
 
 #: ../properties/nm-openvpn-dialog.ui.h:13
-msgid "_Gateway:"
-msgstr "à¨—à©‡à¨Ÿà¨µà©‡(_G):"
+msgid "_Gateway"
+msgstr "à¨—à©‡à¨Ÿà¨µà©‡(_G)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:14
 msgid ""
@@ -766,13 +766,9 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#: ../properties/nm-openvpn-dialog.ui.h:19
-msgid "Password:"
-msgstr "à¨ªà¨¾à¨¸à¨µà¨°à¨¡:"
-
 #: ../properties/nm-openvpn-dialog.ui.h:20
-msgid "User name:"
-msgstr "à¨¯à©‚à¨œà¨¼à¨° à¨¨à¨¾à¨‚:"
+msgid "User name"
+msgstr "à¨¯à©‚à¨œà¨¼à¨° à¨¨à¨¾à¨‚"
 
 #: ../properties/nm-openvpn-dialog.ui.h:21
 msgid ""
@@ -793,20 +789,16 @@ msgstr ""
 "à¨¸à©°à¨°à¨šà¨¨à¨¾: auth-user-pass"
 
 #: ../properties/nm-openvpn-dialog.ui.h:25
-msgid "Remote IP Address:"
-msgstr "à¨°à¨¿à¨®à©‹à¨Ÿ IP à¨à¨¡à¨°à©ˆà©±à¨¸:"
+msgid "Remote IP Address"
+msgstr "à¨°à¨¿à¨®à©‹à¨Ÿ IP à¨à¨¡à¨°à©ˆà©±à¨¸"
 
 #: ../properties/nm-openvpn-dialog.ui.h:26
-msgid "Local IP Address:"
-msgstr "à¨²à©‹à¨•à¨² IP à¨à¨¡à¨°à©ˆà©±à¨¸:"
+msgid "Local IP Address"
+msgstr "à¨²à©‹à¨•à¨² IP à¨à¨¡à¨°à©ˆà©±à¨¸"
 
 #: ../properties/nm-openvpn-dialog.ui.h:27
-msgid "Key Direction:"
-msgstr "à¨•à©à©°à¨œà©€ à¨¦à¨¿à¨¸à¨¼à¨¾:"
-
-#: ../properties/nm-openvpn-dialog.ui.h:28
-msgid "Static Key:"
-msgstr "à¨¸à¨Ÿà©‡à¨Ÿà¨¿à¨• à¨•à©à©°à¨œà©€:"
+msgid "Key Direction"
+msgstr "à¨•à©à©°à¨œà©€ à¨¦à¨¿à¨¸à¨¼à¨¾"
 
 #: ../properties/nm-openvpn-dialog.ui.h:29
 msgid ""
@@ -842,8 +834,8 @@ msgstr ""
 "à¨¯à¨•à©€à¨¨à©€ à¨¨à¨¹à©€à¨‚ à¨¹à©‹ à¨¤à¨¾à¨‚ à¨†à¨ªà¨£à©‡ à¨ªà¨°à¨¸à¨¼à¨¾à¨¸à¨¼à¨• à¨¨à¨¾à¨² à¨¸à©°à¨ªà¨°à¨• à¨•à¨°à©‹à¥¤</i>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:38
-msgid "Type:"
-msgstr "à¨Ÿà¨¾à¨ˆà¨ª:"
+msgid "Type"
+msgstr "à¨Ÿà¨¾à¨ˆà¨ª"
 
 #: ../properties/nm-openvpn-dialog.ui.h:39
 msgid "Select an authentication mode."
@@ -859,8 +851,8 @@ msgid "OpenVPN Advanced Options"
 msgstr "OpenVPN à¨®à¨¾à¨¹à¨° à¨šà©‹à¨£à¨¾à¨‚"
 
 #: ../properties/nm-openvpn-dialog.ui.h:43
-msgid "Use custom gateway p_ort:"
-msgstr "à¨•à¨¸à¨Ÿà¨® à¨—à©‡à¨Ÿà¨µà©‡ à¨ªà©‹à¨°à¨Ÿ à¨µà¨°à¨¤à©‹à¨‚(_o):"
+msgid "Use custom gateway p_ort"
+msgstr "à¨•à¨¸à¨Ÿà¨® à¨—à©‡à¨Ÿà¨µà©‡ à¨ªà©‹à¨°à¨Ÿ à¨µà¨°à¨¤à©‹à¨‚(_o)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:44
 msgid ""
@@ -870,8 +862,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:46
-msgid "Use custom _renegotiation interval:"
-msgstr "à¨ªà¨¸à©°à¨¦à©€à¨¦à¨¾ à¨°à©€à¨¨à©ˆà¨—à©‹à¨¸à¨¼à©€à¨à¨¸à¨¼à¨¨ à¨…à©°à¨¤à¨°à¨¾à¨² à¨µà¨°à¨¤à©‹à¨‚(_r):"
+msgid "Use custom _renegotiation interval"
+msgstr "à¨ªà¨¸à©°à¨¦à©€à¨¦à¨¾ à¨°à©€à¨¨à©ˆà¨—à©‹à¨¸à¨¼à©€à¨à¨¸à¨¼à¨¨ à¨…à©°à¨¤à¨°à¨¾à¨² à¨µà¨°à¨¤à©‹à¨‚(_r)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:47
 msgid ""
@@ -881,7 +873,7 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:49
 #, fuzzy
-msgid "Data _compression:"
+msgid "Data _compression"
 msgstr "L_ZO à¨¡à¨¾à¨Ÿà¨¾ à¨•à©°à¨ªà¨°à©ˆà¨¸à¨¼à¨¨ à¨µà¨°à¨¤à©‹à¨‚"
 
 #: ../properties/nm-openvpn-dialog.ui.h:50
@@ -903,7 +895,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:56
-msgid "Set virtual _device type:"
+msgid "Set virtual _device type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:57
@@ -917,7 +909,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:60
-msgid " and _name:"
+msgid " and _name"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:61
@@ -928,7 +920,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:63
-msgid "Use custom tunnel Maximum Transmission _Unit (MTU):"
+msgid "Use custom tunnel Maximum Transmission _Unit (MTU)"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:64
@@ -939,8 +931,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:66
-msgid "Use custom UDP _fragment size:"
-msgstr "à¨ªà¨¸à©°à¨¦à©€à¨¦à¨¾ à¨°à©€à¨¨à©ˆà¨—à©‹à¨¸à¨¼à©€à¨à¨¸à¨¼à¨¨ à¨…à©°à¨¤à¨°à¨¾à¨² à¨µà¨°à¨¤à©‹à¨‚(_r):"
+msgid "Use custom UDP _fragment size"
+msgstr "à¨ªà¨¸à©°à¨¦à©€à¨¦à¨¾ à¨°à©€à¨¨à©ˆà¨—à©‹à¨¸à¨¼à©€à¨à¨¸à¨¼à¨¨ à¨…à©°à¨¤à¨°à¨¾à¨² à¨µà¨°à¨¤à©‹à¨‚(_r)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:67
 msgid ""
@@ -990,7 +982,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:81
-msgid "Specify pin_g interval:"
+msgid "Specify pin_g interval"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:82
@@ -1001,7 +993,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:84
-msgid "Specify _exit or restart ping:"
+msgid "Specify _exit or restart ping"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:85
@@ -1032,7 +1024,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:93
-msgid "Specify max routes:"
+msgid "Specify max routes"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:94
@@ -1049,7 +1041,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:98
-msgid "Use custom _size of cipher key:"
+msgid "Use custom _size of cipher key"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:99
@@ -1067,12 +1059,12 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:103
-msgid "Ci_pher:"
-msgstr "à¨¸à©€à©žà¨°(_p):"
+msgid "Ci_pher"
+msgstr "à¨¸à©€à©žà¨°(_p)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:104
-msgid "_HMAC Authentication:"
-msgstr "_HMAC à¨ªà¨°à¨®à¨¾à¨£à¨•à¨¿à¨¤à¨¾:"
+msgid "_HMAC Authentication"
+msgstr "_HMAC à¨ªà¨°à¨®à¨¾à¨£à¨•à¨¿à¨¤à¨¾"
 
 #: ../properties/nm-openvpn-dialog.ui.h:105
 msgid "Disable cipher _negotiation"
@@ -1119,8 +1111,8 @@ msgid "Security"
 msgstr "à¨¸à©à¨°à©±à¨–à¨¿à¨†"
 
 #: ../properties/nm-openvpn-dialog.ui.h:115
-msgid "_Subject Match:"
-msgstr "à¨µà¨¿à¨¶à¨¾ à¨®à©‡à¨²(_S):"
+msgid "_Subject Match"
+msgstr "à¨µà¨¿à¨¶à¨¾ à¨®à©‡à¨²(_S)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:116
 msgid ""
@@ -1132,8 +1124,8 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:120
 #, fuzzy
-msgid "Server _Certificate Check:"
-msgstr "à¨¯à©‚à¨œà¨¼à¨° à¨¸à¨°à¨Ÿà©€à¨«à¨¿à¨•à©‡à¨Ÿ:"
+msgid "Server _Certificate Check"
+msgstr "à¨¯à©‚à¨œà¨¼à¨° à¨¸à¨°à¨Ÿà©€à¨«à¨¿à¨•à©‡à¨Ÿ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:121
 msgid ""
@@ -1163,7 +1155,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:133
-msgid "_Remote peer certificate TLS type:"
+msgid "_Remote peer certificate TLS type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:134
@@ -1184,7 +1176,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:138
-msgid "_Remote peer certificate nsCert designation:"
+msgid "_Remote peer certificate nsCert designation"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:139
@@ -1195,7 +1187,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:141
-msgid "Key _Direction:"
+msgid "Key _Direction"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:142
@@ -1220,11 +1212,11 @@ msgstr ""
 "à¨¯à¨•à©€à¨¨à©€ à¨¨à¨¹à©€à¨‚ à¨¹à©‹ à¨¤à¨¾à¨‚ à¨†à¨ªà¨£à©‡ à¨ªà¨°à¨¸à¨¼à¨¾à¨¸à¨¼à¨• à¨¨à¨¾à¨² à¨¸à©°à¨ªà¨°à¨• à¨•à¨°à©‹à¥¤</i>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:147
-msgid "Key _File:"
-msgstr "à¨•à©à©°à¨œà©€ à¨«à¨¾à¨‡à¨²(_F):"
+msgid "Key _File"
+msgstr "à¨•à©à©°à¨œà©€ à¨«à¨¾à¨‡à¨²(_F)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:148
-msgid "Mode:"
+msgid "Mode"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:149
@@ -1233,8 +1225,8 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:150
 #, fuzzy
-msgid "Extra Certificates:"
-msgstr "à¨¯à©‚à¨œà¨¼à¨° à¨¸à¨°à¨Ÿà©€à¨«à¨¿à¨•à©‡à¨Ÿ:"
+msgid "Extra Certificates"
+msgstr "à¨¯à©‚à¨œà¨¼à¨° à¨¸à¨°à¨Ÿà©€à¨«à¨¿à¨•à©‡à¨Ÿ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:151
 msgid ""
@@ -1256,7 +1248,7 @@ msgid "TLS version control"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:156
-msgid "TLS _min version: "
+msgid "TLS _min version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:157
@@ -1268,7 +1260,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:158
-msgid "TLS ma_x version: "
+msgid "TLS ma_x version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:159
@@ -1288,8 +1280,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:163
-msgid "Proxy _Type:"
-msgstr "à¨ªà¨°à¨¾à¨•à¨¸à©€ à¨•à¨¿à¨¸à¨®(_t):"
+msgid "Proxy _Type"
+msgstr "à¨ªà¨°à¨¾à¨•à¨¸à©€ à¨•à¨¿à¨¸à¨®(_t)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:164
 msgid ""
@@ -1299,8 +1291,8 @@ msgstr ""
 "<i>à¨‡à¨¹ à¨šà©‹à¨£ à¨•à¨°à©‹, à¨œà©‡ à¨¤à©à¨¹à¨¾à¨¡à©‡ à¨¸à©°à¨—à¨ à¨¨ à¨µà¨¿à©±à¨š à¨‡à©°à¨Ÿà¨°à¨¨à©ˆà©±à¨Ÿ à¨µà¨°à¨¤à¨£ à¨²à¨ˆ à¨ªà¨°à¨¾à¨•à¨¸à©€ à¨¸à¨°à¨µà¨° à¨µà¨°à¨¤à¨£ à¨¦à©€ à¨²à©‹à©œ à¨¹à©ˆà¥¤</i>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:165
-msgid "Server _Address:"
-msgstr "à¨¸à¨°à¨µà¨° à¨à¨¡à¨°à©ˆà©±à¨¸(_A):"
+msgid "Server _Address"
+msgstr "à¨¸à¨°à¨µà¨° à¨à¨¡à¨°à©ˆà©±à¨¸(_A)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:166
 msgid ""
@@ -1309,8 +1301,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:168
-msgid "_Port:"
-msgstr "à¨ªà©‹à¨°à¨Ÿ(_P):"
+msgid "_Port"
+msgstr "à¨ªà©‹à¨°à¨Ÿ(_P)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:169
 msgid ""
@@ -1329,12 +1321,12 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:174
-msgid "Proxy _Username:"
-msgstr "à¨ªà¨°à¨¾à¨•à¨¸à©€ à¨¯à©‚à¨œà¨¼à¨° à¨¨à¨¾à¨‚(_U):"
+msgid "Proxy _Username"
+msgstr "à¨ªà¨°à¨¾à¨•à¨¸à©€ à¨¯à©‚à¨œà¨¼à¨° à¨¨à¨¾à¨‚(_U)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:175
-msgid "Proxy Passwor_d:"
-msgstr "à¨ªà¨°à¨¾à¨¸à¨•à©€ à¨ªà¨¾à¨¸à¨µà¨°à¨¡(_d):"
+msgid "Proxy Passwor_d"
+msgstr "à¨ªà¨°à¨¾à¨¸à¨•à©€ à¨ªà¨¾à¨¸à¨µà¨°à¨¡(_d)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:176
 msgid "HTTP/Socks proxy username passed to OpenVPN when prompted for it."
diff --git a/po/pl.po b/po/pl.po
index f3cba95..ac390d2 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -813,8 +813,8 @@ msgid "General"
 msgstr "OgÃ³lne"
 
 #: ../properties/nm-openvpn-dialog.ui.h:14
-msgid "_Gateway:"
-msgstr "_Brama:"
+msgid "_Gateway"
+msgstr "_Brama"
 
 #: ../properties/nm-openvpn-dialog.ui.h:15
 msgid ""
@@ -840,13 +840,9 @@ msgstr "CA"
 msgid "User"
 msgstr "UÅ¼ytkownik"
 
-#: ../properties/nm-openvpn-dialog.ui.h:20
-msgid "Password:"
-msgstr "HasÅ‚o:"
-
 #: ../properties/nm-openvpn-dialog.ui.h:21
-msgid "User name:"
-msgstr "Nazwa uÅ¼ytkownika:"
+msgid "User name"
+msgstr "Nazwa uÅ¼ytkownika"
 
 #: ../properties/nm-openvpn-dialog.ui.h:22
 msgid ""
@@ -868,20 +864,16 @@ msgstr ""
 "konfiguracja: auth-user-pass"
 
 #: ../properties/nm-openvpn-dialog.ui.h:26
-msgid "Remote IP Address:"
-msgstr "Zdalny adres IP:"
+msgid "Remote IP Address"
+msgstr "Zdalny adres IP"
 
 #: ../properties/nm-openvpn-dialog.ui.h:27
-msgid "Local IP Address:"
-msgstr "Lokalny adres IP:"
+msgid "Local IP Address"
+msgstr "Lokalny adres IP"
 
 #: ../properties/nm-openvpn-dialog.ui.h:28
-msgid "Key Direction:"
-msgstr "Kierunek klucza:"
-
-#: ../properties/nm-openvpn-dialog.ui.h:29
-msgid "Static Key:"
-msgstr "Klucz statyczny:"
+msgid "Key Direction"
+msgstr "Kierunek klucza"
 
 #: ../properties/nm-openvpn-dialog.ui.h:30
 msgid ""
@@ -924,8 +916,8 @@ msgstr ""
 "konfiguracja: static <plik> [kierunek]"
 
 #: ../properties/nm-openvpn-dialog.ui.h:39
-msgid "Type:"
-msgstr "Typ:"
+msgid "Type"
+msgstr "Typ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:40
 msgid "Select an authentication mode."
@@ -940,8 +932,8 @@ msgid "OpenVPN Advanced Options"
 msgstr "Zaawansowane opcje OpenVPN"
 
 #: ../properties/nm-openvpn-dialog.ui.h:44
-msgid "Use custom gateway p_ort:"
-msgstr "WÅ‚asny port bra_my:"
+msgid "Use custom gateway p_ort"
+msgstr "WÅ‚asny port bra_my"
 
 #: ../properties/nm-openvpn-dialog.ui.h:45
 msgid ""
@@ -954,8 +946,8 @@ msgstr ""
 "konfiguracja: port"
 
 #: ../properties/nm-openvpn-dialog.ui.h:47
-msgid "Use custom _renegotiation interval:"
-msgstr "WÅ‚asny czas miÄ™dzy ponownymi _negocjacjami:"
+msgid "Use custom _renegotiation interval"
+msgstr "WÅ‚asny czas miÄ™dzy ponownymi _negocjacjami"
 
 #: ../properties/nm-openvpn-dialog.ui.h:48
 msgid ""
@@ -966,8 +958,8 @@ msgstr ""
 "konfiguracja: reneg-sec"
 
 #: ../properties/nm-openvpn-dialog.ui.h:50
-msgid "Data _compression:"
-msgstr "_Kompresja danych:"
+msgid "Data _compression"
+msgstr "_Kompresja danych"
 
 #: ../properties/nm-openvpn-dialog.ui.h:51
 msgid ""
@@ -993,8 +985,8 @@ msgstr ""
 "konfiguracja: proto tcp-client | udp"
 
 #: ../properties/nm-openvpn-dialog.ui.h:57
-msgid "Set virtual _device type:"
-msgstr "Ustawienie typu urzÄ…_dzenia wirtualnego:"
+msgid "Set virtual _device type"
+msgstr "Ustawienie typu urzÄ…_dzenia wirtualnego"
 
 #: ../properties/nm-openvpn-dialog.ui.h:58
 msgid "Explicitly set virtual device type and name (TUN/TAP)."
@@ -1009,8 +1001,8 @@ msgstr ""
 "konfiguracja: dev-type tun | tap"
 
 #: ../properties/nm-openvpn-dialog.ui.h:61
-msgid " and _name:"
-msgstr " iÂ _nazwa:"
+msgid " and _name"
+msgstr " iÂ _nazwa"
 
 #: ../properties/nm-openvpn-dialog.ui.h:62
 msgid ""
@@ -1023,8 +1015,8 @@ msgstr ""
 "konfiguracja: dev <nazwa>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:64
-msgid "Use custom tunnel Maximum Transmission _Unit (MTU):"
-msgstr "WÅ‚asne MT_U tunelu:"
+msgid "Use custom tunnel Maximum Transmission _Unit (MTU)"
+msgstr "WÅ‚asne MT_U tunelu"
 
 #: ../properties/nm-openvpn-dialog.ui.h:65
 msgid ""
@@ -1036,8 +1028,8 @@ msgstr ""
 "konfiguracja: tun-mtu"
 
 #: ../properties/nm-openvpn-dialog.ui.h:67
-msgid "Use custom UDP _fragment size:"
-msgstr "WÅ‚asny rozmiar f_ragmentu UDP:"
+msgid "Use custom UDP _fragment size"
+msgstr "WÅ‚asny rozmiar f_ragmentu UDP"
 
 #: ../properties/nm-openvpn-dialog.ui.h:68
 msgid ""
@@ -1112,8 +1104,8 @@ msgstr ""
 "konfiguracja: tun-ipv6"
 
 #: ../properties/nm-openvpn-dialog.ui.h:85
-msgid "Specify pin_g interval:"
-msgstr "Czas miÄ™dzy sygnaÅ‚ami pin_g:"
+msgid "Specify pin_g interval"
+msgstr "Czas miÄ™dzy sygnaÅ‚ami pin_g"
 
 #: ../properties/nm-openvpn-dialog.ui.h:86
 msgid ""
@@ -1127,8 +1119,8 @@ msgstr ""
 "konfiguracja: ping <n>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:88
-msgid "Specify _exit or restart ping:"
-msgstr "ZakoÅ„cz_enie iÂ ponowne uruchomienie sygnaÅ‚u ping:"
+msgid "Specify _exit or restart ping"
+msgstr "ZakoÅ„cz_enie iÂ ponowne uruchomienie sygnaÅ‚u ping"
 
 #: ../properties/nm-openvpn-dialog.ui.h:89
 msgid ""
@@ -1174,8 +1166,8 @@ msgstr ""
 "konfiguracja: float"
 
 #: ../properties/nm-openvpn-dialog.ui.h:97
-msgid "Specify max routes:"
-msgstr "Maksymalna liczba tras:"
+msgid "Specify max routes"
+msgstr "Maksymalna liczba tras"
 
 #: ../properties/nm-openvpn-dialog.ui.h:98
 msgid ""
@@ -1196,8 +1188,8 @@ msgstr ""
 "konfiguracja: cipher"
 
 #: ../properties/nm-openvpn-dialog.ui.h:102
-msgid "Use custom _size of cipher key:"
-msgstr "WÅ‚asny _rozmiar klucza szyfrowania:"
+msgid "Use custom _size of cipher key"
+msgstr "WÅ‚asny _rozmiar klucza szyfrowania"
 
 #: ../properties/nm-openvpn-dialog.ui.h:103
 msgid ""
@@ -1220,12 +1212,12 @@ msgstr ""
 "konfiguracja: auth"
 
 #: ../properties/nm-openvpn-dialog.ui.h:107
-msgid "Ci_pher:"
-msgstr "_Szyfr:"
+msgid "Ci_pher"
+msgstr "_Szyfr"
 
 #: ../properties/nm-openvpn-dialog.ui.h:108
-msgid "_HMAC Authentication:"
-msgstr "Uwierzytelnianie _HMAC:"
+msgid "_HMAC Authentication"
+msgstr "Uwierzytelnianie _HMAC"
 
 #: ../properties/nm-openvpn-dialog.ui.h:109
 msgid "Disable cipher _negotiation"
@@ -1280,8 +1272,8 @@ msgid "Security"
 msgstr "Zabezpieczenia"
 
 #: ../properties/nm-openvpn-dialog.ui.h:119
-msgid "_Subject Match:"
-msgstr "Temat _dopasowania:"
+msgid "_Subject Match"
+msgstr "Temat _dopasowania"
 
 #: ../properties/nm-openvpn-dialog.ui.h:120
 msgid ""
@@ -1297,8 +1289,8 @@ msgstr ""
 "konfiguracja (tryb przestarzaÅ‚y): tls-remote temat-lub-nazwa"
 
 #: ../properties/nm-openvpn-dialog.ui.h:124
-msgid "Server _Certificate Check:"
-msgstr "Sprawdzanie _certyfikatu serwera:"
+msgid "Server _Certificate Check"
+msgstr "Sprawdzanie _certyfikatu serwera"
 
 #: ../properties/nm-openvpn-dialog.ui.h:125
 msgid ""
@@ -1344,8 +1336,8 @@ msgstr ""
 "RFC3280."
 
 #: ../properties/nm-openvpn-dialog.ui.h:137
-msgid "_Remote peer certificate TLS type:"
-msgstr "Typ TLS certyfikatu _zdalnego partnera:"
+msgid "_Remote peer certificate TLS type"
+msgstr "Typ TLS certyfikatu _zdalnego partnera"
 
 #: ../properties/nm-openvpn-dialog.ui.h:138
 msgid ""
@@ -1372,8 +1364,8 @@ msgstr ""
 "nsCertType."
 
 #: ../properties/nm-openvpn-dialog.ui.h:142
-msgid "_Remote peer certificate nsCert designation:"
-msgstr "OkreÅ›lenie nsCertType certyfikatu _zdalnego partnera:"
+msgid "_Remote peer certificate nsCert designation"
+msgstr "OkreÅ›lenie nsCertType certyfikatu _zdalnego partnera"
 
 #: ../properties/nm-openvpn-dialog.ui.h:143
 msgid ""
@@ -1386,8 +1378,8 @@ msgstr ""
 "konfiguracja: ns-cert-type client|server"
 
 #: ../properties/nm-openvpn-dialog.ui.h:145
-msgid "Key _Direction:"
-msgstr "_Kierunek klucza:"
+msgid "Key _Direction"
+msgstr "_Kierunek klucza"
 
 #: ../properties/nm-openvpn-dialog.ui.h:146
 msgid ""
@@ -1417,20 +1409,20 @@ msgstr ""
 "konfiguracja: tls-auth <plik> [kierunek]"
 
 #: ../properties/nm-openvpn-dialog.ui.h:151
-msgid "Key _File:"
-msgstr "_Plik klucza:"
+msgid "Key _File"
+msgstr "_Plik klucza"
 
 #: ../properties/nm-openvpn-dialog.ui.h:152
-msgid "Mode:"
-msgstr "Tryb:"
+msgid "Mode"
+msgstr "Tryb"
 
 #: ../properties/nm-openvpn-dialog.ui.h:153
 msgid "Add an additional layer of encryption or HMAC authentication."
 msgstr "Dodaje dodatkowÄ… warstwÄ™ szyfrowania lub uwierzytelniania HMAC."
 
 #: ../properties/nm-openvpn-dialog.ui.h:154
-msgid "Extra Certificates:"
-msgstr "Dodatkowe certyfikaty:"
+msgid "Extra Certificates"
+msgstr "Dodatkowe certyfikaty"
 
 #: ../properties/nm-openvpn-dialog.ui.h:155
 msgid ""
@@ -1455,8 +1447,8 @@ msgid "TLS version control"
 msgstr "Kontrola wersji TLS"
 
 #: ../properties/nm-openvpn-dialog.ui.h:160
-msgid "TLS _min version: "
-msgstr "_Minimalna wersja TLS: "
+msgid "TLS _min version"
+msgstr "_Minimalna wersja TLS"
 
 #: ../properties/nm-openvpn-dialog.ui.h:161
 msgid ""
@@ -1471,8 +1463,8 @@ msgstr ""
 "tylko najwyÅ¼sza wersja TLS obsÅ‚ugiwana przez lokalnÄ… implementacjÄ™ SSL."
 
 #: ../properties/nm-openvpn-dialog.ui.h:162
-msgid "TLS ma_x version: "
-msgstr "Ma_ksymalna wersja TLS: "
+msgid "TLS ma_x version"
+msgstr "Ma_ksymalna wersja TLS"
 
 #: ../properties/nm-openvpn-dialog.ui.h:163
 msgid ""
@@ -1495,8 +1487,8 @@ msgstr ""
 "konfiguracja: http-proxy lub socks-proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:167
-msgid "Proxy _Type:"
-msgstr "_Typ poÅ›rednika:"
+msgid "Proxy _Type"
+msgstr "_Typ poÅ›rednika"
 
 #: ../properties/nm-openvpn-dialog.ui.h:168
 msgid ""
@@ -1507,8 +1499,8 @@ msgstr ""
 "poÅ›rednika do dostÄ™pu do Internetu.</i>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:169
-msgid "Server _Address:"
-msgstr "_Adres serwera:"
+msgid "Server _Address"
+msgstr "_Adres serwera"
 
 #: ../properties/nm-openvpn-dialog.ui.h:170
 msgid ""
@@ -1519,8 +1511,8 @@ msgstr ""
 "konfiguracja: http-proxy lub socks-proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:172
-msgid "_Port:"
-msgstr "_Port:"
+msgid "_Port"
+msgstr "_Port"
 
 #: ../properties/nm-openvpn-dialog.ui.h:173
 msgid ""
@@ -1544,12 +1536,12 @@ msgstr ""
 "konfiguracja: http-proxy-retry lub socks-proxy-retry"
 
 #: ../properties/nm-openvpn-dialog.ui.h:178
-msgid "Proxy _Username:"
-msgstr "Nazwa _uÅ¼ytkownika poÅ›rednika:"
+msgid "Proxy _Username"
+msgstr "Nazwa _uÅ¼ytkownika poÅ›rednika"
 
 #: ../properties/nm-openvpn-dialog.ui.h:179
-msgid "Proxy Passwor_d:"
-msgstr "_HasÅ‚o poÅ›rednika:"
+msgid "Proxy Passwor_d"
+msgstr "_HasÅ‚o poÅ›rednika"
 
 #: ../properties/nm-openvpn-dialog.ui.h:180
 msgid "HTTP/Socks proxy username passed to OpenVPN when prompted for it."
diff --git a/po/ps.po b/po/ps.po
index 1f4c3dd..2bad660 100644
--- a/po/ps.po
+++ b/po/ps.po
@@ -739,7 +739,7 @@ msgid "General"
 msgstr "Ù¼ÙˆÙ„ÙŠØ²"
 
 #: ../properties/nm-openvpn-dialog.ui.h:13
-msgid "_Gateway:"
+msgid "_Gateway"
 msgstr ":_ÙˆØ±Ù„Ø§Ø±"
 
 #: ../properties/nm-openvpn-dialog.ui.h:14
@@ -763,13 +763,8 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#: ../properties/nm-openvpn-dialog.ui.h:19
-#, fuzzy
-msgid "Password:"
-msgstr ":ØªÛØ±Ù†ÙˆÙŠÛ_"
-
 #: ../properties/nm-openvpn-dialog.ui.h:20
-msgid "User name:"
+msgid "User name"
 msgstr ":Ú©Ø§Ø±Ù† Ù†ÙˆÙ…"
 
 #: ../properties/nm-openvpn-dialog.ui.h:21
@@ -786,22 +781,18 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:25
-msgid "Remote IP Address:"
+msgid "Remote IP Address"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:26
-msgid "Local IP Address:"
+msgid "Local IP Address"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:27
 #, fuzzy
-msgid "Key Direction:"
+msgid "Key Direction"
 msgstr ":Ú©ÙŠÙ„Û Ù„ÙˆØ±"
 
-#: ../properties/nm-openvpn-dialog.ui.h:28
-msgid "Static Key:"
-msgstr ":ÙˆÙ„Ø§Ú“Ù‡ Ú©ÙŠÙ„Û"
-
 #: ../properties/nm-openvpn-dialog.ui.h:29
 msgid ""
 "Pre-shared file for Static Key encryption mode (non-TLS).\n"
@@ -830,7 +821,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:38
-msgid "Type:"
+msgid "Type"
 msgstr ":Ú‰ÙˆÙ„"
 
 #: ../properties/nm-openvpn-dialog.ui.h:39
@@ -847,7 +838,7 @@ msgid "OpenVPN Advanced Options"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:43
-msgid "Use custom gateway p_ort:"
+msgid "Use custom gateway p_ort"
 msgstr ":Ø¯ÙˆØ¯ÙŠØ²Û ÙˆØ±Ù„Ø§Ø±Û Ø¯Ø±_Ø´Ù„ Ú©Ø§Ø±ÙˆÙ„"
 
 #: ../properties/nm-openvpn-dialog.ui.h:44
@@ -858,7 +849,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:46
-msgid "Use custom _renegotiation interval:"
+msgid "Use custom _renegotiation interval"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:47
@@ -869,7 +860,7 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:49
 #, fuzzy
-msgid "Data _compression:"
+msgid "Data _compression"
 msgstr "Ø§ÙˆÙ…ØªÙˆÚ© Ø²ÛØ±Ù†Ù‡ Ú©Ø§Ø±ÙˆÙ„ L_ZO"
 
 #: ../properties/nm-openvpn-dialog.ui.h:50
@@ -891,7 +882,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:56
-msgid "Set virtual _device type:"
+msgid "Set virtual _device type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:57
@@ -905,7 +896,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:60
-msgid " and _name:"
+msgid " and _name"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:61
@@ -916,7 +907,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:63
-msgid "Use custom tunnel Maximum Transmission _Unit (MTU):"
+msgid "Use custom tunnel Maximum Transmission _Unit (MTU)"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:64
@@ -927,7 +918,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:66
-msgid "Use custom UDP _fragment size:"
+msgid "Use custom UDP _fragment size"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:67
@@ -978,7 +969,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:81
-msgid "Specify pin_g interval:"
+msgid "Specify pin_g interval"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:82
@@ -989,7 +980,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:84
-msgid "Specify _exit or restart ping:"
+msgid "Specify _exit or restart ping"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:85
@@ -1020,7 +1011,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:93
-msgid "Specify max routes:"
+msgid "Specify max routes"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:94
@@ -1037,7 +1028,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:98
-msgid "Use custom _size of cipher key:"
+msgid "Use custom _size of cipher key"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:99
@@ -1055,12 +1046,12 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:103
-msgid "Ci_pher:"
-msgstr "Ù¼Ú©ÛŒ:"
+msgid "Ci_pher"
+msgstr "Ù¼Ú©ÛŒ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:104
 #, fuzzy
-msgid "_HMAC Authentication:"
+msgid "_HMAC Authentication"
 msgstr "<b>Ú©Ø±ÙˆÙ†Ù‡</b>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:105
@@ -1108,7 +1099,7 @@ msgid "Security"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:115
-msgid "_Subject Match:"
+msgid "_Subject Match"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:116
@@ -1121,7 +1112,7 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:120
 #, fuzzy
-msgid "Server _Certificate Check:"
+msgid "Server _Certificate Check"
 msgstr ":Ú©Ø§Ø±Ù† Ø¨Ø±ÛÙ„ÙŠÚ©"
 
 #: ../properties/nm-openvpn-dialog.ui.h:121
@@ -1152,7 +1143,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:133
-msgid "_Remote peer certificate TLS type:"
+msgid "_Remote peer certificate TLS type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:134
@@ -1173,7 +1164,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:138
-msgid "_Remote peer certificate nsCert designation:"
+msgid "_Remote peer certificate nsCert designation"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:139
@@ -1184,7 +1175,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:141
-msgid "Key _Direction:"
+msgid "Key _Direction"
 msgstr ":Ú©ÙŠÙ„Û Ù„ÙˆØ±"
 
 #: ../properties/nm-openvpn-dialog.ui.h:142
@@ -1205,11 +1196,11 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:147
-msgid "Key _File:"
+msgid "Key _File"
 msgstr ":Ú©ÙŠÙ„ÙŠ Ø¯ÙˆØªÙ†Ù‡"
 
 #: ../properties/nm-openvpn-dialog.ui.h:148
-msgid "Mode:"
+msgid "Mode"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:149
@@ -1219,7 +1210,7 @@ msgstr "Ú©Ø±ÙˆÙ†Ù‡ Ú©Ø§Ø±ÙˆÙ„ TLS Ø²ÙŠØ§ØªÙŠ "
 
 #: ../properties/nm-openvpn-dialog.ui.h:150
 #, fuzzy
-msgid "Extra Certificates:"
+msgid "Extra Certificates"
 msgstr ":Ú©Ø§Ø±Ù† Ø¨Ø±ÛÙ„ÙŠÚ©"
 
 #: ../properties/nm-openvpn-dialog.ui.h:151
@@ -1243,7 +1234,7 @@ msgid "TLS version control"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:156
-msgid "TLS _min version: "
+msgid "TLS _min version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:157
@@ -1255,7 +1246,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:158
-msgid "TLS ma_x version: "
+msgid "TLS ma_x version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:159
@@ -1276,7 +1267,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:163
-msgid "Proxy _Type:"
+msgid "Proxy _Type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:164
@@ -1286,7 +1277,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:165
-msgid "Server _Address:"
+msgid "Server _Address"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:166
@@ -1296,7 +1287,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:168
-msgid "_Port:"
+msgid "_Port"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:169
@@ -1317,12 +1308,12 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:174
 #, fuzzy
-msgid "Proxy _Username:"
+msgid "Proxy _Username"
 msgstr ":Ú©Ø§Ø±Ù†Ù†ÙˆÙ…_"
 
 #: ../properties/nm-openvpn-dialog.ui.h:175
 #, fuzzy
-msgid "Proxy Passwor_d:"
+msgid "Proxy Passwor_d"
 msgstr ":ØªÛØ±Ù†ÙˆÙŠÛ_"
 
 #: ../properties/nm-openvpn-dialog.ui.h:176
diff --git a/po/pt.po b/po/pt.po
index c2a5318..3127b63 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -752,8 +752,8 @@ msgid "General"
 msgstr "Geral"
 
 #: ../properties/nm-openvpn-dialog.ui.h:13
-msgid "_Gateway:"
-msgstr "_Gateway:"
+msgid "_Gateway"
+msgstr "_Gateway"
 
 #: ../properties/nm-openvpn-dialog.ui.h:14
 msgid ""
@@ -780,13 +780,9 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#: ../properties/nm-openvpn-dialog.ui.h:19
-msgid "Password:"
-msgstr "Senha:"
-
 #: ../properties/nm-openvpn-dialog.ui.h:20
-msgid "User name:"
-msgstr "Nome de utilizador:"
+msgid "User name"
+msgstr "Nome de utilizador"
 
 #: ../properties/nm-openvpn-dialog.ui.h:21
 msgid ""
@@ -807,20 +803,16 @@ msgstr ""
 "config: auth-user-pass"
 
 #: ../properties/nm-openvpn-dialog.ui.h:25
-msgid "Remote IP Address:"
-msgstr "EndereÃ§o IP remoto:"
+msgid "Remote IP Address"
+msgstr "EndereÃ§o IP remoto"
 
 #: ../properties/nm-openvpn-dialog.ui.h:26
-msgid "Local IP Address:"
-msgstr "EndereÃ§o IP local:"
+msgid "Local IP Address"
+msgstr "EndereÃ§o IP local"
 
 #: ../properties/nm-openvpn-dialog.ui.h:27
-msgid "Key Direction:"
-msgstr "DirecÃ§Ã£o da chave:"
-
-#: ../properties/nm-openvpn-dialog.ui.h:28
-msgid "Static Key:"
-msgstr "Chave estÃ¡tica:"
+msgid "Key Direction"
+msgstr "DirecÃ§Ã£o da chave"
 
 #: ../properties/nm-openvpn-dialog.ui.h:29
 msgid ""
@@ -863,8 +855,8 @@ msgstr ""
 "config: static <files> [direÃ§Ã£o]"
 
 #: ../properties/nm-openvpn-dialog.ui.h:38
-msgid "Type:"
-msgstr "Tipo:"
+msgid "Type"
+msgstr "Tipo"
 
 #: ../properties/nm-openvpn-dialog.ui.h:39
 msgid "Select an authentication mode."
@@ -880,8 +872,8 @@ msgid "OpenVPN Advanced Options"
 msgstr "OpÃ§Ãµes avanÃ§adas do OpenVPN"
 
 #: ../properties/nm-openvpn-dialog.ui.h:43
-msgid "Use custom gateway p_ort:"
-msgstr "Usar p_Orta de gateway personalizada:"
+msgid "Use custom gateway p_ort"
+msgstr "Usar p_Orta de gateway personalizada"
 
 #: ../properties/nm-openvpn-dialog.ui.h:44
 msgid ""
@@ -894,8 +886,8 @@ msgstr ""
 "config: port"
 
 #: ../properties/nm-openvpn-dialog.ui.h:46
-msgid "Use custom _renegotiation interval:"
-msgstr "Usar intervalo de _RenegociaÃ§Ã£o personalizado:"
+msgid "Use custom _renegotiation interval"
+msgstr "Usar intervalo de _RenegociaÃ§Ã£o personalizado"
 
 #: ../properties/nm-openvpn-dialog.ui.h:47
 msgid ""
@@ -907,7 +899,7 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:49
 #, fuzzy
-msgid "Data _compression:"
+msgid "Data _compression"
 msgstr "Usar compressÃ£o L_ZO"
 
 #: ../properties/nm-openvpn-dialog.ui.h:50
@@ -935,8 +927,8 @@ msgstr ""
 "config: proto tcp-client | udp"
 
 #: ../properties/nm-openvpn-dialog.ui.h:56
-msgid "Set virtual _device type:"
-msgstr "_Definir tipo de dispositivo virtual:"
+msgid "Set virtual _device type"
+msgstr "_Definir tipo de dispositivo virtual"
 
 #: ../properties/nm-openvpn-dialog.ui.h:57
 msgid "Explicitly set virtual device type and name (TUN/TAP)."
@@ -951,8 +943,8 @@ msgstr ""
 "config: dev-type tun | tap"
 
 #: ../properties/nm-openvpn-dialog.ui.h:60
-msgid " and _name:"
-msgstr " e _Nome:"
+msgid " and _name"
+msgstr " e _Nome"
 
 #: ../properties/nm-openvpn-dialog.ui.h:61
 #, fuzzy
@@ -966,8 +958,8 @@ msgstr ""
 "config: dev <nome>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:63
-msgid "Use custom tunnel Maximum Transmission _Unit (MTU):"
-msgstr "Usar Unidade MÃ¡xima de TransmissÃ£o (MTU) do _TÃºnel personalizada:"
+msgid "Use custom tunnel Maximum Transmission _Unit (MTU)"
+msgstr "Usar Unidade MÃ¡xima de TransmissÃ£o (MTU) do _TÃºnel personalizada"
 
 #: ../properties/nm-openvpn-dialog.ui.h:64
 msgid ""
@@ -980,8 +972,8 @@ msgstr ""
 "config: tun-mtu"
 
 #: ../properties/nm-openvpn-dialog.ui.h:66
-msgid "Use custom UDP _fragment size:"
-msgstr "Usar tamanho de _fragmento UDP personalizado:"
+msgid "Use custom UDP _fragment size"
+msgstr "Usar tamanho de _fragmento UDP personalizado"
 
 #: ../properties/nm-openvpn-dialog.ui.h:67
 msgid ""
@@ -1038,8 +1030,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:81
-msgid "Specify pin_g interval:"
-msgstr "Espcificar intervalo de pin_G:"
+msgid "Specify pin_g interval"
+msgstr "Espcificar intervalo de pin_G"
 
 #: ../properties/nm-openvpn-dialog.ui.h:82
 msgid ""
@@ -1052,8 +1044,8 @@ msgstr ""
 "config: ping <n>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:84
-msgid "Specify _exit or restart ping:"
-msgstr "Especificar ping de _SaÃda ou reinÃcio:"
+msgid "Specify _exit or restart ping"
+msgstr "Especificar ping de _SaÃda ou reinÃcio"
 
 #: ../properties/nm-openvpn-dialog.ui.h:85
 msgid ""
@@ -1100,7 +1092,7 @@ msgstr ""
 "config: float"
 
 #: ../properties/nm-openvpn-dialog.ui.h:93
-msgid "Specify max routes:"
+msgid "Specify max routes"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:94
@@ -1120,8 +1112,8 @@ msgstr ""
 "config: cipher"
 
 #: ../properties/nm-openvpn-dialog.ui.h:98
-msgid "Use custom _size of cipher key:"
-msgstr "Usar tamanho personalizado da chave de cifra:"
+msgid "Use custom _size of cipher key"
+msgstr "Usar tamanho personalizado da chave de cifra"
 
 #: ../properties/nm-openvpn-dialog.ui.h:99
 msgid ""
@@ -1144,12 +1136,12 @@ msgstr ""
 "config: auth"
 
 #: ../properties/nm-openvpn-dialog.ui.h:103
-msgid "Ci_pher:"
-msgstr "Ci_Fra:"
+msgid "Ci_pher"
+msgstr "Ci_Fra"
 
 #: ../properties/nm-openvpn-dialog.ui.h:104
-msgid "_HMAC Authentication:"
-msgstr "AutenticaÃ§Ã£o _HMAC:"
+msgid "_HMAC Authentication"
+msgstr "AutenticaÃ§Ã£o _HMAC"
 
 #: ../properties/nm-openvpn-dialog.ui.h:105
 msgid "Disable cipher _negotiation"
@@ -1196,8 +1188,8 @@ msgid "Security"
 msgstr "SeguranÃ§a"
 
 #: ../properties/nm-openvpn-dialog.ui.h:115
-msgid "_Subject Match:"
-msgstr "_CorrespondÃªncia de assunto:"
+msgid "_Subject Match"
+msgstr "_CorrespondÃªncia de assunto"
 
 #: ../properties/nm-openvpn-dialog.ui.h:116
 msgid ""
@@ -1209,8 +1201,8 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:120
 #, fuzzy
-msgid "Server _Certificate Check:"
-msgstr "Certificado do utilizador:"
+msgid "Server _Certificate Check"
+msgstr "Certificado do utilizador"
 
 #: ../properties/nm-openvpn-dialog.ui.h:121
 msgid ""
@@ -1242,8 +1234,8 @@ msgstr ""
 "e uso estendido de chave baseado em regras TLS RFC3280."
 
 #: ../properties/nm-openvpn-dialog.ui.h:133
-msgid "_Remote peer certificate TLS type:"
-msgstr "Tipo TLS do certificado do par _Remoto:"
+msgid "_Remote peer certificate TLS type"
+msgstr "Tipo TLS do certificado do par _Remoto"
 
 #: ../properties/nm-openvpn-dialog.ui.h:134
 msgid ""
@@ -1271,8 +1263,8 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:138
 #, fuzzy
-msgid "_Remote peer certificate nsCert designation:"
-msgstr "Tipo TLS do certificado do par _Remoto:"
+msgid "_Remote peer certificate nsCert designation"
+msgstr "Tipo TLS do certificado do par _Remoto"
 
 #: ../properties/nm-openvpn-dialog.ui.h:139
 #, fuzzy
@@ -1286,8 +1278,8 @@ msgstr ""
 "config: remote-cert-tls cliente|servidor"
 
 #: ../properties/nm-openvpn-dialog.ui.h:141
-msgid "Key _Direction:"
-msgstr "_DireÃ§Ã£o da chave:"
+msgid "Key _Direction"
+msgstr "_DireÃ§Ã£o da chave"
 
 #: ../properties/nm-openvpn-dialog.ui.h:142
 #, fuzzy
@@ -1318,11 +1310,11 @@ msgstr ""
 "config: tls-auth <file> [direction]"
 
 #: ../properties/nm-openvpn-dialog.ui.h:147
-msgid "Key _File:"
-msgstr "Ficheiro da chave:"
+msgid "Key _File"
+msgstr "Ficheiro da chave"
 
 #: ../properties/nm-openvpn-dialog.ui.h:148
-msgid "Mode:"
+msgid "Mode"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:149
@@ -1332,8 +1324,8 @@ msgstr "Adicionar uma camada adicional de autenticaÃ§Ã£o HMAC."
 
 #: ../properties/nm-openvpn-dialog.ui.h:150
 #, fuzzy
-msgid "Extra Certificates:"
-msgstr "Certificado do utilizador:"
+msgid "Extra Certificates"
+msgstr "Certificado do utilizador"
 
 #: ../properties/nm-openvpn-dialog.ui.h:151
 msgid ""
@@ -1356,7 +1348,7 @@ msgid "TLS version control"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:156
-msgid "TLS _min version: "
+msgid "TLS _min version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:157
@@ -1368,7 +1360,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:158
-msgid "TLS ma_x version: "
+msgid "TLS ma_x version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:159
@@ -1390,8 +1382,8 @@ msgstr ""
 "config: http-proxy ou socks-proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:163
-msgid "Proxy _Type:"
-msgstr "_Tipo de proxy:"
+msgid "Proxy _Type"
+msgstr "_Tipo de proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:164
 msgid ""
@@ -1402,8 +1394,8 @@ msgstr ""
 "proxy para aceder Ã  Internet.</i>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:165
-msgid "Server _Address:"
-msgstr "_EndereÃ§o do servidor:"
+msgid "Server _Address"
+msgstr "_EndereÃ§o do servidor"
 
 #: ../properties/nm-openvpn-dialog.ui.h:166
 msgid ""
@@ -1414,8 +1406,8 @@ msgstr ""
 "config: http-proxy ou socks-proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:168
-msgid "_Port:"
-msgstr "_Porta:"
+msgid "_Port"
+msgstr "_Porta"
 
 #: ../properties/nm-openvpn-dialog.ui.h:169
 msgid ""
@@ -1438,12 +1430,12 @@ msgstr ""
 "config: http-proxy-retry ou socks-proxy-retry"
 
 #: ../properties/nm-openvpn-dialog.ui.h:174
-msgid "Proxy _Username:"
-msgstr "Utilizador do proxy:"
+msgid "Proxy _Username"
+msgstr "Utilizador do proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:175
-msgid "Proxy Passwor_d:"
-msgstr "Senha do proxy:"
+msgid "Proxy Passwor_d"
+msgstr "Senha do proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:176
 msgid "HTTP/Socks proxy username passed to OpenVPN when prompted for it."
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 3c79eff..d73ade5 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -823,8 +823,8 @@ msgid "General"
 msgstr "Geral"
 
 #: ../properties/nm-openvpn-dialog.ui.h:14
-msgid "_Gateway:"
-msgstr "_Gateway:"
+msgid "_Gateway"
+msgstr "_Gateway"
 
 #: ../properties/nm-openvpn-dialog.ui.h:15
 msgid ""
@@ -850,13 +850,9 @@ msgstr "AC"
 msgid "User"
 msgstr "UsuÃ¡rio"
 
-#: ../properties/nm-openvpn-dialog.ui.h:20
-msgid "Password:"
-msgstr "Senha:"
-
 #: ../properties/nm-openvpn-dialog.ui.h:21
-msgid "User name:"
-msgstr "Nome de usuÃ¡rio:"
+msgid "User name"
+msgstr "Nome de usuÃ¡rio"
 
 #: ../properties/nm-openvpn-dialog.ui.h:22
 msgid ""
@@ -877,20 +873,16 @@ msgstr ""
 "config: auth-user-pass"
 
 #: ../properties/nm-openvpn-dialog.ui.h:26
-msgid "Remote IP Address:"
-msgstr "EndereÃ§o IP remoto:"
+msgid "Remote IP Address"
+msgstr "EndereÃ§o IP remoto"
 
 #: ../properties/nm-openvpn-dialog.ui.h:27
-msgid "Local IP Address:"
-msgstr "EndereÃ§o IP local:"
+msgid "Local IP Address"
+msgstr "EndereÃ§o IP local"
 
 #: ../properties/nm-openvpn-dialog.ui.h:28
-msgid "Key Direction:"
-msgstr "DireÃ§Ã£o da chave:"
-
-#: ../properties/nm-openvpn-dialog.ui.h:29
-msgid "Static Key:"
-msgstr "Chave estÃ¡tica:"
+msgid "Key Direction"
+msgstr "DireÃ§Ã£o da chave"
 
 #: ../properties/nm-openvpn-dialog.ui.h:30
 msgid ""
@@ -933,8 +925,8 @@ msgstr ""
 "config: static <arquivo> [direÃ§Ã£o]"
 
 #: ../properties/nm-openvpn-dialog.ui.h:39
-msgid "Type:"
-msgstr "Tipo:"
+msgid "Type"
+msgstr "Tipo"
 
 #: ../properties/nm-openvpn-dialog.ui.h:40
 msgid "Select an authentication mode."
@@ -949,8 +941,8 @@ msgid "OpenVPN Advanced Options"
 msgstr "OpÃ§Ãµes avanÃ§adas do OpenVPN"
 
 #: ../properties/nm-openvpn-dialog.ui.h:44
-msgid "Use custom gateway p_ort:"
-msgstr "Usar porta de _gateway personalizada:"
+msgid "Use custom gateway p_ort"
+msgstr "Usar porta de _gateway personalizada"
 
 #: ../properties/nm-openvpn-dialog.ui.h:45
 msgid ""
@@ -963,8 +955,8 @@ msgstr ""
 "config: port"
 
 #: ../properties/nm-openvpn-dialog.ui.h:47
-msgid "Use custom _renegotiation interval:"
-msgstr "Usar intervalo personalizado de _renegociaÃ§Ã£o:"
+msgid "Use custom _renegotiation interval"
+msgstr "Usar intervalo personalizado de _renegociaÃ§Ã£o"
 
 #: ../properties/nm-openvpn-dialog.ui.h:48
 msgid ""
@@ -976,8 +968,8 @@ msgstr ""
 "config: reneg-sec"
 
 #: ../properties/nm-openvpn-dialog.ui.h:50
-msgid "Data _compression:"
-msgstr "_CompressÃ£o de dados:"
+msgid "Data _compression"
+msgstr "_CompressÃ£o de dados"
 
 #: ../properties/nm-openvpn-dialog.ui.h:51
 msgid ""
@@ -1004,8 +996,8 @@ msgstr ""
 "config: proto tcp-client | udp"
 
 #: ../properties/nm-openvpn-dialog.ui.h:57
-msgid "Set virtual _device type:"
-msgstr "Definir o tipo de _dispositivo virtual:"
+msgid "Set virtual _device type"
+msgstr "Definir o tipo de _dispositivo virtual"
 
 #: ../properties/nm-openvpn-dialog.ui.h:58
 msgid "Explicitly set virtual device type and name (TUN/TAP)."
@@ -1021,8 +1013,8 @@ msgstr ""
 "config: dev-type tap | tun"
 
 #: ../properties/nm-openvpn-dialog.ui.h:61
-msgid " and _name:"
-msgstr " e _nome:"
+msgid " and _name"
+msgstr " e _nome"
 
 #: ../properties/nm-openvpn-dialog.ui.h:62
 msgid ""
@@ -1035,8 +1027,8 @@ msgstr ""
 "config: dev <nome>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:64
-msgid "Use custom tunnel Maximum Transmission _Unit (MTU):"
-msgstr "Usar a _unidade mÃ¡xima de transferÃªncia (MTU) do tÃºnel personalizada:"
+msgid "Use custom tunnel Maximum Transmission _Unit (MTU)"
+msgstr "Usar a _unidade mÃ¡xima de transferÃªncia (MTU) do tÃºnel personalizada"
 
 #: ../properties/nm-openvpn-dialog.ui.h:65
 msgid ""
@@ -1049,8 +1041,8 @@ msgstr ""
 "config: tun-mtu"
 
 #: ../properties/nm-openvpn-dialog.ui.h:67
-msgid "Use custom UDP _fragment size:"
-msgstr "Usar tamanho de _fragmento UDP personalizado:"
+msgid "Use custom UDP _fragment size"
+msgstr "Usar tamanho de _fragmento UDP personalizado"
 
 #: ../properties/nm-openvpn-dialog.ui.h:68
 msgid ""
@@ -1123,8 +1115,8 @@ msgstr ""
 "config: tun-ipv6"
 
 #: ../properties/nm-openvpn-dialog.ui.h:85
-msgid "Specify pin_g interval:"
-msgstr "Especificar intervalo do pin_g:"
+msgid "Specify pin_g interval"
+msgstr "Especificar intervalo do pin_g"
 
 #: ../properties/nm-openvpn-dialog.ui.h:86
 msgid ""
@@ -1137,8 +1129,8 @@ msgstr ""
 "config: ping <n>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:88
-msgid "Specify _exit or restart ping:"
-msgstr "_Especificar saÃda ou reinÃcio do ping:"
+msgid "Specify _exit or restart ping"
+msgstr "_Especificar saÃda ou reinÃcio do ping"
 
 #: ../properties/nm-openvpn-dialog.ui.h:89
 msgid ""
@@ -1185,8 +1177,8 @@ msgstr ""
 "config: float"
 
 #: ../properties/nm-openvpn-dialog.ui.h:97
-msgid "Specify max routes:"
-msgstr "Especificar mÃ¡ximo de rotas:"
+msgid "Specify max routes"
+msgstr "Especificar mÃ¡ximo de rotas"
 
 #: ../properties/nm-openvpn-dialog.ui.h:98
 msgid ""
@@ -1207,8 +1199,8 @@ msgstr ""
 "config: cipher"
 
 #: ../properties/nm-openvpn-dialog.ui.h:102
-msgid "Use custom _size of cipher key:"
-msgstr "Usar tamanho _personalizado para a chave de cifra:"
+msgid "Use custom _size of cipher key"
+msgstr "Usar tamanho _personalizado para a chave de cifra"
 
 #: ../properties/nm-openvpn-dialog.ui.h:103
 msgid ""
@@ -1231,12 +1223,12 @@ msgstr ""
 "config: auth"
 
 #: ../properties/nm-openvpn-dialog.ui.h:107
-msgid "Ci_pher:"
-msgstr "Cifra_gem:"
+msgid "Ci_pher"
+msgstr "Cifra_gem"
 
 #: ../properties/nm-openvpn-dialog.ui.h:108
-msgid "_HMAC Authentication:"
-msgstr "AutenticaÃ§Ã£o _HMAC:"
+msgid "_HMAC Authentication"
+msgstr "AutenticaÃ§Ã£o _HMAC"
 
 #: ../properties/nm-openvpn-dialog.ui.h:109
 msgid "Disable cipher _negotiation"
@@ -1291,8 +1283,8 @@ msgid "Security"
 msgstr "SeguranÃ§a"
 
 #: ../properties/nm-openvpn-dialog.ui.h:119
-msgid "_Subject Match:"
-msgstr "Corresponder _sujeito:"
+msgid "_Subject Match"
+msgstr "Corresponder _sujeito"
 
 #: ../properties/nm-openvpn-dialog.ui.h:120
 msgid ""
@@ -1307,8 +1299,8 @@ msgstr ""
 "config (modo antigo): tls-remote sujeito-ou-nome"
 
 #: ../properties/nm-openvpn-dialog.ui.h:124
-msgid "Server _Certificate Check:"
-msgstr "Verificar _certificado do servidor:"
+msgid "Server _Certificate Check"
+msgstr "Verificar _certificado do servidor"
 
 #: ../properties/nm-openvpn-dialog.ui.h:125
 msgid ""
@@ -1353,8 +1345,8 @@ msgstr ""
 "explÃcito e estendido baseado nas regras TLS do RFC3280."
 
 #: ../properties/nm-openvpn-dialog.ui.h:137
-msgid "_Remote peer certificate TLS type:"
-msgstr "Tipo de TLS do certificado do par _remoto:"
+msgid "_Remote peer certificate TLS type"
+msgstr "Tipo de TLS do certificado do par _remoto"
 
 #: ../properties/nm-openvpn-dialog.ui.h:138
 msgid ""
@@ -1379,8 +1371,8 @@ msgstr ""
 "nsCertType explÃcita."
 
 #: ../properties/nm-openvpn-dialog.ui.h:142
-msgid "_Remote peer certificate nsCert designation:"
-msgstr "DesignaÃ§Ã£o nsCert do certificado do par _remoto:"
+msgid "_Remote peer certificate nsCert designation"
+msgstr "DesignaÃ§Ã£o nsCert do certificado do par _remoto"
 
 #: ../properties/nm-openvpn-dialog.ui.h:143
 msgid ""
@@ -1393,8 +1385,8 @@ msgstr ""
 "config: ns-cert-type client|server"
 
 #: ../properties/nm-openvpn-dialog.ui.h:145
-msgid "Key _Direction:"
-msgstr "_DireÃ§Ã£o da chave:"
+msgid "Key _Direction"
+msgstr "_DireÃ§Ã£o da chave"
 
 #: ../properties/nm-openvpn-dialog.ui.h:146
 msgid ""
@@ -1424,20 +1416,20 @@ msgstr ""
 "config: tls-auth <arquivo> [direÃ§Ã£o]"
 
 #: ../properties/nm-openvpn-dialog.ui.h:151
-msgid "Key _File:"
-msgstr "Ar_quivo de chave:"
+msgid "Key _File"
+msgstr "Ar_quivo de chave"
 
 #: ../properties/nm-openvpn-dialog.ui.h:152
-msgid "Mode:"
-msgstr "Modo:"
+msgid "Mode"
+msgstr "Modo"
 
 #: ../properties/nm-openvpn-dialog.ui.h:153
 msgid "Add an additional layer of encryption or HMAC authentication."
 msgstr "Adiciona uma camada adicional de criptografia ou autenticaÃ§Ã£o HMAC."
 
 #: ../properties/nm-openvpn-dialog.ui.h:154
-msgid "Extra Certificates:"
-msgstr "Certificados extras:"
+msgid "Extra Certificates"
+msgstr "Certificados extras"
 
 #: ../properties/nm-openvpn-dialog.ui.h:155
 msgid ""
@@ -1462,8 +1454,8 @@ msgid "TLS version control"
 msgstr "Controle da versÃ£o do TLS"
 
 #: ../properties/nm-openvpn-dialog.ui.h:160
-msgid "TLS _min version: "
-msgstr "VersÃ£o _mÃnima do TLS: "
+msgid "TLS _min version"
+msgstr "VersÃ£o _mÃnima do TLS"
 
 #: ../properties/nm-openvpn-dialog.ui.h:161
 msgid ""
@@ -1478,8 +1470,8 @@ msgstr ""
 "mais alta do TLS suportada pela implementaÃ§Ã£o SSL local."
 
 #: ../properties/nm-openvpn-dialog.ui.h:162
-msgid "TLS ma_x version: "
-msgstr "VersÃ£o mÃ¡_xima do TLS: "
+msgid "TLS ma_x version"
+msgstr "VersÃ£o mÃ¡_xima do TLS"
 
 #: ../properties/nm-openvpn-dialog.ui.h:163
 msgid ""
@@ -1502,8 +1494,8 @@ msgstr ""
 "config: http-proxy ou socks-proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:167
-msgid "Proxy _Type:"
-msgstr "_Tipo de proxy:"
+msgid "Proxy _Type"
+msgstr "_Tipo de proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:168
 msgid ""
@@ -1514,8 +1506,8 @@ msgstr ""
 "para acessar a Internet.</i>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:169
-msgid "Server _Address:"
-msgstr "_EndereÃ§o do servidor:"
+msgid "Server _Address"
+msgstr "_EndereÃ§o do servidor"
 
 #: ../properties/nm-openvpn-dialog.ui.h:170
 msgid ""
@@ -1526,8 +1518,8 @@ msgstr ""
 "config: http-proxy ou socks-proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:172
-msgid "_Port:"
-msgstr "_Porta:"
+msgid "_Port"
+msgstr "_Porta"
 
 #: ../properties/nm-openvpn-dialog.ui.h:173
 msgid ""
@@ -1551,12 +1543,12 @@ msgstr ""
 "config: http-proxy-retry ou socks-proxy-retry"
 
 #: ../properties/nm-openvpn-dialog.ui.h:178
-msgid "Proxy _Username:"
-msgstr "Nome de _usuÃ¡rio do proxy:"
+msgid "Proxy _Username"
+msgstr "Nome de _usuÃ¡rio do proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:179
-msgid "Proxy Passwor_d:"
-msgstr "Senha _do proxy:"
+msgid "Proxy Passwor_d"
+msgstr "Senha _do proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:180
 msgid "HTTP/Socks proxy username passed to OpenVPN when prompted for it."
diff --git a/po/ro.po b/po/ro.po
index efa6097..e2291b5 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -744,8 +744,8 @@ msgid "General"
 msgstr "Generale"
 
 #: ../properties/nm-openvpn-dialog.ui.h:13
-msgid "_Gateway:"
-msgstr "_Gateway:"
+msgid "_Gateway"
+msgstr "_Gateway"
 
 #: ../properties/nm-openvpn-dialog.ui.h:14
 msgid ""
@@ -768,13 +768,9 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#: ../properties/nm-openvpn-dialog.ui.h:19
-msgid "Password:"
-msgstr "ParolÄƒ:"
-
 #: ../properties/nm-openvpn-dialog.ui.h:20
-msgid "User name:"
-msgstr "Nume de utilizator:"
+msgid "User name"
+msgstr "Nume de utilizator"
 
 #: ../properties/nm-openvpn-dialog.ui.h:21
 msgid ""
@@ -790,20 +786,16 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:25
-msgid "Remote IP Address:"
-msgstr "AdresÄƒ IP de la distanÈ›Äƒ:"
+msgid "Remote IP Address"
+msgstr "AdresÄƒ IP de la distanÈ›Äƒ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:26
-msgid "Local IP Address:"
-msgstr "AdresÄƒ IP localÄƒ:"
+msgid "Local IP Address"
+msgstr "AdresÄƒ IP localÄƒ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:27
-msgid "Key Direction:"
-msgstr "DirecÈ›ia cheii:"
-
-#: ../properties/nm-openvpn-dialog.ui.h:28
-msgid "Static Key:"
-msgstr "Cheie staticÄƒ:"
+msgid "Key Direction"
+msgstr "DirecÈ›ia cheii"
 
 #: ../properties/nm-openvpn-dialog.ui.h:29
 msgid ""
@@ -838,8 +830,8 @@ msgstr ""
 "sÄƒ folosiÈ›i, contactaÈ›i administratorul de sistem.</i>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:38
-msgid "Type:"
-msgstr "Tip:"
+msgid "Type"
+msgstr "Tip"
 
 #: ../properties/nm-openvpn-dialog.ui.h:39
 #, fuzzy
@@ -856,8 +848,8 @@ msgid "OpenVPN Advanced Options"
 msgstr "OpÈ›iuni avansate OpenVPN"
 
 #: ../properties/nm-openvpn-dialog.ui.h:43
-msgid "Use custom gateway p_ort:"
-msgstr "FoloseÈ™te un p_ort gateway specific:"
+msgid "Use custom gateway p_ort"
+msgstr "FoloseÈ™te un p_ort gateway specific"
 
 #: ../properties/nm-openvpn-dialog.ui.h:44
 msgid ""
@@ -867,8 +859,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:46
-msgid "Use custom _renegotiation interval:"
-msgstr "FoloseÈ™te un interval de _renegociere specific:"
+msgid "Use custom _renegotiation interval"
+msgstr "FoloseÈ™te un interval de _renegociere specific"
 
 #: ../properties/nm-openvpn-dialog.ui.h:47
 msgid ""
@@ -878,7 +870,7 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:49
 #, fuzzy
-msgid "Data _compression:"
+msgid "Data _compression"
 msgstr "FoloseÈ™te compresia datelor de tip L_ZO"
 
 #: ../properties/nm-openvpn-dialog.ui.h:50
@@ -900,7 +892,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:56
-msgid "Set virtual _device type:"
+msgid "Set virtual _device type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:57
@@ -914,7 +906,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:60
-msgid " and _name:"
+msgid " and _name"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:61
@@ -926,7 +918,7 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:63
 #, fuzzy
-msgid "Use custom tunnel Maximum Transmission _Unit (MTU):"
+msgid "Use custom tunnel Maximum Transmission _Unit (MTU)"
 msgstr ""
 "FoloseÈ™te o unitate maximÄƒ de transmisie personalizatÄƒ a _tunelului (MTU):"
 
@@ -938,8 +930,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:66
-msgid "Use custom UDP _fragment size:"
-msgstr "FoloseÈ™te o dimensiune specificÄƒ a _fragmentului UDP:"
+msgid "Use custom UDP _fragment size"
+msgstr "FoloseÈ™te o dimensiune specificÄƒ a _fragmentului UDP"
 
 #: ../properties/nm-openvpn-dialog.ui.h:67
 msgid ""
@@ -991,7 +983,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:81
-msgid "Specify pin_g interval:"
+msgid "Specify pin_g interval"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:82
@@ -1002,7 +994,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:84
-msgid "Specify _exit or restart ping:"
+msgid "Specify _exit or restart ping"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:85
@@ -1033,7 +1025,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:93
-msgid "Specify max routes:"
+msgid "Specify max routes"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:94
@@ -1050,7 +1042,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:98
-msgid "Use custom _size of cipher key:"
+msgid "Use custom _size of cipher key"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:99
@@ -1069,13 +1061,13 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:103
 #, fuzzy
-msgid "Ci_pher:"
-msgstr "Cifru:"
+msgid "Ci_pher"
+msgstr "Cifru"
 
 #: ../properties/nm-openvpn-dialog.ui.h:104
 #, fuzzy
-msgid "_HMAC Authentication:"
-msgstr "Autentificare HMAC:"
+msgid "_HMAC Authentication"
+msgstr "Autentificare HMAC"
 
 #: ../properties/nm-openvpn-dialog.ui.h:105
 msgid "Disable cipher _negotiation"
@@ -1123,8 +1115,8 @@ msgstr "Securitate"
 
 #: ../properties/nm-openvpn-dialog.ui.h:115
 #, fuzzy
-msgid "_Subject Match:"
-msgstr "Potrivire subiect:"
+msgid "_Subject Match"
+msgstr "Potrivire subiect"
 
 #: ../properties/nm-openvpn-dialog.ui.h:116
 msgid ""
@@ -1136,8 +1128,8 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:120
 #, fuzzy
-msgid "Server _Certificate Check:"
-msgstr "Certificat utilizator:"
+msgid "Server _Certificate Check"
+msgstr "Certificat utilizator"
 
 #: ../properties/nm-openvpn-dialog.ui.h:121
 msgid ""
@@ -1167,7 +1159,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:133
-msgid "_Remote peer certificate TLS type:"
+msgid "_Remote peer certificate TLS type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:134
@@ -1188,7 +1180,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:138
-msgid "_Remote peer certificate nsCert designation:"
+msgid "_Remote peer certificate nsCert designation"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:139
@@ -1200,8 +1192,8 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:141
 #, fuzzy
-msgid "Key _Direction:"
-msgstr "DirecÈ›ia cheii:"
+msgid "Key _Direction"
+msgstr "DirecÈ›ia cheii"
 
 #: ../properties/nm-openvpn-dialog.ui.h:142
 msgid ""
@@ -1227,11 +1219,11 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:147
 #, fuzzy
-msgid "Key _File:"
-msgstr "FiÈ™ierul cheii:"
+msgid "Key _File"
+msgstr "FiÈ™ierul cheii"
 
 #: ../properties/nm-openvpn-dialog.ui.h:148
-msgid "Mode:"
+msgid "Mode"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:149
@@ -1241,8 +1233,8 @@ msgstr "FoloseÈ™te autentificarea TLS adiÈ›ionalÄƒ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:150
 #, fuzzy
-msgid "Extra Certificates:"
-msgstr "Certificat utilizator:"
+msgid "Extra Certificates"
+msgstr "Certificat utilizator"
 
 #: ../properties/nm-openvpn-dialog.ui.h:151
 msgid ""
@@ -1265,7 +1257,7 @@ msgid "TLS version control"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:156
-msgid "TLS _min version: "
+msgid "TLS _min version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:157
@@ -1277,7 +1269,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:158
-msgid "TLS ma_x version: "
+msgid "TLS ma_x version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:159
@@ -1297,7 +1289,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:163
-msgid "Proxy _Type:"
+msgid "Proxy _Type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:164
@@ -1308,8 +1300,8 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:165
 #, fuzzy
-msgid "Server _Address:"
-msgstr "AdresÄƒ IP de la distanÈ›Äƒ:"
+msgid "Server _Address"
+msgstr "AdresÄƒ IP de la distanÈ›Äƒ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:166
 msgid ""
@@ -1318,7 +1310,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:168
-msgid "_Port:"
+msgid "_Port"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:169
@@ -1339,13 +1331,13 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:174
 #, fuzzy
-msgid "Proxy _Username:"
-msgstr "N_ume utilizator:"
+msgid "Proxy _Username"
+msgstr "N_ume utilizator"
 
 #: ../properties/nm-openvpn-dialog.ui.h:175
 #, fuzzy
-msgid "Proxy Passwor_d:"
-msgstr "ParolÄƒ:"
+msgid "Proxy Passwor_d"
+msgstr "ParolÄƒ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:176
 msgid "HTTP/Socks proxy username passed to OpenVPN when prompted for it."
diff --git a/po/ru.po b/po/ru.po
index 6ead853..d8a4940 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -825,8 +825,8 @@ msgid "General"
 msgstr "ÐžÐ±Ñ‰Ð¸Ðµ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:14
-msgid "_Gateway:"
-msgstr "_Ð¨Ð»ÑŽÐ·:"
+msgid "_Gateway"
+msgstr "_Ð¨Ð»ÑŽÐ·"
 
 #: ../properties/nm-openvpn-dialog.ui.h:15
 msgid ""
@@ -852,13 +852,9 @@ msgstr "CA"
 msgid "User"
 msgstr "ÐŸÐ¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒ"
 
-#: ../properties/nm-openvpn-dialog.ui.h:20
-msgid "Password:"
-msgstr "ÐŸÐ°Ñ€Ð¾Ð»ÑŒ:"
-
 #: ../properties/nm-openvpn-dialog.ui.h:21
-msgid "User name:"
-msgstr "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ:"
+msgid "User name"
+msgstr "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:22
 msgid ""
@@ -879,20 +875,16 @@ msgstr ""
 "config: auth-user-pass"
 
 #: ../properties/nm-openvpn-dialog.ui.h:26
-msgid "Remote IP Address:"
-msgstr "Ð£Ð´Ð°Ð»Ñ‘Ð½Ð½Ñ‹Ð¹ IP-Ð°Ð´Ñ€ÐµÑ:"
+msgid "Remote IP Address"
+msgstr "Ð£Ð´Ð°Ð»Ñ‘Ð½Ð½Ñ‹Ð¹ IP-Ð°Ð´Ñ€ÐµÑ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:27
-msgid "Local IP Address:"
-msgstr "Ð›Ð¾ÐºÐ°Ð»ÑŒÐ½Ñ‹Ð¹ IP-Ð°Ð´Ñ€ÐµÑ:"
+msgid "Local IP Address"
+msgstr "Ð›Ð¾ÐºÐ°Ð»ÑŒÐ½Ñ‹Ð¹ IP-Ð°Ð´Ñ€ÐµÑ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:28
-msgid "Key Direction:"
-msgstr "ÐÐ°Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ðµ ÐºÐ»ÑŽÑ‡Ð°:"
-
-#: ../properties/nm-openvpn-dialog.ui.h:29
-msgid "Static Key:"
-msgstr "Ð¡Ñ‚Ð°Ñ‚Ð¸Ñ‡ÐµÑÐºÐ¸Ð¹ ÐºÐ»ÑŽÑ‡:"
+msgid "Key Direction"
+msgstr "ÐÐ°Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ðµ ÐºÐ»ÑŽÑ‡Ð°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:30
 msgid ""
@@ -935,8 +927,8 @@ msgstr ""
 "config: static <file> [direction]"
 
 #: ../properties/nm-openvpn-dialog.ui.h:39
-msgid "Type:"
-msgstr "Ð¢Ð¸Ð¿:"
+msgid "Type"
+msgstr "Ð¢Ð¸Ð¿"
 
 #: ../properties/nm-openvpn-dialog.ui.h:40
 msgid "Select an authentication mode."
@@ -951,8 +943,8 @@ msgid "OpenVPN Advanced Options"
 msgstr "Ð”Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ðµ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñ‹ OpenVPN"
 
 #: ../properties/nm-openvpn-dialog.ui.h:44
-msgid "Use custom gateway p_ort:"
-msgstr "Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ Ð´Ñ€ÑƒÐ³Ð¾Ð¹ _Ð¿Ð¾Ñ€Ñ‚ ÑˆÐ»ÑŽÐ·Ð°:"
+msgid "Use custom gateway p_ort"
+msgstr "Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ Ð´Ñ€ÑƒÐ³Ð¾Ð¹ _Ð¿Ð¾Ñ€Ñ‚ ÑˆÐ»ÑŽÐ·Ð°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:45
 msgid ""
@@ -965,8 +957,8 @@ msgstr ""
 "config: port"
 
 #: ../properties/nm-openvpn-dialog.ui.h:47
-msgid "Use custom _renegotiation interval:"
-msgstr "Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ Ð½ÐµÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ñ‹Ð¹ Ð¸Ð½Ñ‚ÐµÑ€Ð²Ð°Ð» _Ð¿ÐµÑ€ÐµÑÐ¾Ð³Ð»Ð°ÑÐ¾Ð²Ð°Ð½Ð¸Ñ:"
+msgid "Use custom _renegotiation interval"
+msgstr "Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ Ð½ÐµÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ñ‹Ð¹ Ð¸Ð½Ñ‚ÐµÑ€Ð²Ð°Ð» _Ð¿ÐµÑ€ÐµÑÐ¾Ð³Ð»Ð°ÑÐ¾Ð²Ð°Ð½Ð¸Ñ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:48
 msgid ""
@@ -977,8 +969,8 @@ msgstr ""
 "config: reneg-sec"
 
 #: ../properties/nm-openvpn-dialog.ui.h:50
-msgid "Data _compression:"
-msgstr "Ð¡Ð¶Ð°Ñ‚Ð¸Ðµ _Ð´Ð°Ð½Ð½Ñ‹Ñ…:"
+msgid "Data _compression"
+msgstr "Ð¡Ð¶Ð°Ñ‚Ð¸Ðµ _Ð´Ð°Ð½Ð½Ñ‹Ñ…"
 
 #: ../properties/nm-openvpn-dialog.ui.h:51
 msgid ""
@@ -1005,8 +997,8 @@ msgstr ""
 "config: proto tcp-client | udp"
 
 #: ../properties/nm-openvpn-dialog.ui.h:57
-msgid "Set virtual _device type:"
-msgstr "Ð—Ð°Ð´Ð°Ñ‚ÑŒ Ñ‚Ð¸Ð¿ Ð²Ð¸Ñ€Ñ‚ÑƒÐ°Ð»ÑŒÐ½Ð¾Ð³Ð¾ _ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ð°:"
+msgid "Set virtual _device type"
+msgstr "Ð—Ð°Ð´Ð°Ñ‚ÑŒ Ñ‚Ð¸Ð¿ Ð²Ð¸Ñ€Ñ‚ÑƒÐ°Ð»ÑŒÐ½Ð¾Ð³Ð¾ _ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ð°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:58
 msgid "Explicitly set virtual device type and name (TUN/TAP)."
@@ -1021,8 +1013,8 @@ msgstr ""
 "config: dev-type tun | tap"
 
 #: ../properties/nm-openvpn-dialog.ui.h:61
-msgid " and _name:"
-msgstr " Ð¸ _Ð¸Ð¼Ñ:"
+msgid " and _name"
+msgstr " Ð¸ _Ð¸Ð¼Ñ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:62
 msgid ""
@@ -1035,7 +1027,7 @@ msgstr ""
 "config: dev <name>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:64
-msgid "Use custom tunnel Maximum Transmission _Unit (MTU):"
+msgid "Use custom tunnel Maximum Transmission _Unit (MTU)"
 msgstr ""
 "Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ Ð½ÐµÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ñ‹Ð¹ Ð¼Ð°ÐºÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ñ‹Ð¹ Ñ€Ð°Ð·Ð¼ÐµÑ€ ÑÐ»ÐµÐ¼ÐµÐ½Ñ‚Ð° Ð¿ÐµÑ€ÐµÐ´Ð°Ñ‡Ð¸ (MTU):"
 
@@ -1049,8 +1041,8 @@ msgstr ""
 "config: tun-mtu"
 
 #: ../properties/nm-openvpn-dialog.ui.h:67
-msgid "Use custom UDP _fragment size:"
-msgstr "Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ Ð½ÐµÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ñ‹Ð¹ Ñ€Ð°Ð·Ð¼ÐµÑ€ _Ñ„Ñ€Ð°Ð³Ð¼ÐµÐ½Ñ‚Ð° UDP:"
+msgid "Use custom UDP _fragment size"
+msgstr "Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ Ð½ÐµÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ñ‹Ð¹ Ñ€Ð°Ð·Ð¼ÐµÑ€ _Ñ„Ñ€Ð°Ð³Ð¼ÐµÐ½Ñ‚Ð° UDP"
 
 #: ../properties/nm-openvpn-dialog.ui.h:68
 msgid ""
@@ -1125,8 +1117,8 @@ msgstr ""
 "config: tun-ipv6"
 
 #: ../properties/nm-openvpn-dialog.ui.h:85
-msgid "Specify pin_g interval:"
-msgstr "ÐŸÐµÑ€Ð¸Ð¾Ð´Ð¸Ñ‡Ð½Ð¾ÑÑ‚ÑŒ Ð¿Ñ€Ð¾Ð²ÐµÑ€Ð¾Ñ‡Ð½Ñ‹Ñ… Ð¿Ð°ÐºÐµÑ‚Ð¾Ð² (ping):"
+msgid "Specify pin_g interval"
+msgstr "ÐŸÐµÑ€Ð¸Ð¾Ð´Ð¸Ñ‡Ð½Ð¾ÑÑ‚ÑŒ Ð¿Ñ€Ð¾Ð²ÐµÑ€Ð¾Ñ‡Ð½Ñ‹Ñ… Ð¿Ð°ÐºÐµÑ‚Ð¾Ð² (ping)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:86
 msgid ""
@@ -1139,8 +1131,8 @@ msgstr ""
 "config: ping <n>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:88
-msgid "Specify _exit or restart ping:"
-msgstr "Ð’Ñ‹Ñ…Ð¾Ð´ Ð¸Ð»Ð¸ Ð¿ÐµÑ€ÐµÐ·Ð°Ð¿ÑƒÑÐº Ð¿Ð¾ ping:"
+msgid "Specify _exit or restart ping"
+msgstr "Ð’Ñ‹Ñ…Ð¾Ð´ Ð¸Ð»Ð¸ Ð¿ÐµÑ€ÐµÐ·Ð°Ð¿ÑƒÑÐº Ð¿Ð¾ ping"
 
 #: ../properties/nm-openvpn-dialog.ui.h:89
 msgid ""
@@ -1190,8 +1182,8 @@ msgstr ""
 "config: float"
 
 #: ../properties/nm-openvpn-dialog.ui.h:97
-msgid "Specify max routes:"
-msgstr "ÐœÐ°ÐºÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð¾Ðµ Ñ‡Ð¸ÑÐ»Ð¾ Ð¼Ð°Ñ€ÑˆÑ€ÑƒÑ‚Ð¾Ð²:"
+msgid "Specify max routes"
+msgstr "ÐœÐ°ÐºÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð¾Ðµ Ñ‡Ð¸ÑÐ»Ð¾ Ð¼Ð°Ñ€ÑˆÑ€ÑƒÑ‚Ð¾Ð²"
 
 #: ../properties/nm-openvpn-dialog.ui.h:98
 msgid ""
@@ -1211,8 +1203,8 @@ msgstr ""
 "config: cipher"
 
 #: ../properties/nm-openvpn-dialog.ui.h:102
-msgid "Use custom _size of cipher key:"
-msgstr "Ð—Ð°Ð´Ð°Ñ‚ÑŒ _Ð´Ð»Ð¸Ð½Ñƒ ÐºÐ»ÑŽÑ‡Ð°:"
+msgid "Use custom _size of cipher key"
+msgstr "Ð—Ð°Ð´Ð°Ñ‚ÑŒ _Ð´Ð»Ð¸Ð½Ñƒ ÐºÐ»ÑŽÑ‡Ð°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:103
 msgid ""
@@ -1235,12 +1227,12 @@ msgstr ""
 "config: auth"
 
 #: ../properties/nm-openvpn-dialog.ui.h:107
-msgid "Ci_pher:"
-msgstr "Ð¨Ð¸Ñ„Ñ€:"
+msgid "Ci_pher"
+msgstr "Ð¨Ð¸Ñ„Ñ€"
 
 #: ../properties/nm-openvpn-dialog.ui.h:108
-msgid "_HMAC Authentication:"
-msgstr "ÐÑƒ_Ñ‚ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñ HMAC:"
+msgid "_HMAC Authentication"
+msgstr "ÐÑƒ_Ñ‚ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñ HMAC"
 
 #: ../properties/nm-openvpn-dialog.ui.h:109
 msgid "Disable cipher _negotiation"
@@ -1296,8 +1288,8 @@ msgid "Security"
 msgstr "Ð‘ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑ‚ÑŒ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:119
-msgid "_Subject Match:"
-msgstr "Ð¡Ð¾Ð²Ð¿Ð°Ð´ÐµÐ½Ð¸Ðµ _Ð¾Ð±ÑŠÐµÐºÑ‚Ð°:"
+msgid "_Subject Match"
+msgstr "Ð¡Ð¾Ð²Ð¿Ð°Ð´ÐµÐ½Ð¸Ðµ _Ð¾Ð±ÑŠÐµÐºÑ‚Ð°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:120
 msgid ""
@@ -1312,8 +1304,8 @@ msgstr ""
 "config (legacy mode): tls-remote subject-or-name"
 
 #: ../properties/nm-openvpn-dialog.ui.h:124
-msgid "Server _Certificate Check:"
-msgstr "ÐŸÑ€Ð¾Ð²ÐµÑ€ÐºÐ° _ÑÐµÑ€Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚Ð° ÑÐµÑ€Ð²ÐµÑ€Ð°:"
+msgid "Server _Certificate Check"
+msgstr "ÐŸÑ€Ð¾Ð²ÐµÑ€ÐºÐ° _ÑÐµÑ€Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚Ð° ÑÐµÑ€Ð²ÐµÑ€Ð°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:125
 msgid ""
@@ -1357,8 +1349,8 @@ msgstr ""
 "ÐºÐ»ÑŽÑ‡Ð° Ð¸ Ñ€Ð°ÑÑˆÐ¸Ñ€ÐµÐ½Ð½Ð¾Ðµ Ð½Ð°Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ðµ ÐºÐ»ÑŽÑ‡Ð° ÑÐ¾Ð³Ð»Ð°ÑÐ½Ð¾ RFC 3280."
 
 #: ../properties/nm-openvpn-dialog.ui.h:137
-msgid "_Remote peer certificate TLS type:"
-msgstr "Ð¢Ð¸Ð¿ TLS ÑÐµÑ€Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚Ð° _ÑƒÐ´Ð°Ð»Ñ‘Ð½Ð½Ð¾Ð³Ð¾ Ñ…Ð¾ÑÑ‚Ð°:"
+msgid "_Remote peer certificate TLS type"
+msgstr "Ð¢Ð¸Ð¿ TLS ÑÐµÑ€Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚Ð° _ÑƒÐ´Ð°Ð»Ñ‘Ð½Ð½Ð¾Ð³Ð¾ Ñ…Ð¾ÑÑ‚Ð°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:138
 msgid ""
@@ -1383,8 +1375,8 @@ msgstr ""
 "nsCertType."
 
 #: ../properties/nm-openvpn-dialog.ui.h:142
-msgid "_Remote peer certificate nsCert designation:"
-msgstr "nsCert Ñƒ ÑÐµÑ€Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚Ð° _ÑƒÐ´Ð°Ð»Ñ‘Ð½Ð½Ð¾Ð³Ð¾ Ñ…Ð¾ÑÑ‚Ð°:"
+msgid "_Remote peer certificate nsCert designation"
+msgstr "nsCert Ñƒ ÑÐµÑ€Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚Ð° _ÑƒÐ´Ð°Ð»Ñ‘Ð½Ð½Ð¾Ð³Ð¾ Ñ…Ð¾ÑÑ‚Ð°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:143
 msgid ""
@@ -1397,8 +1389,8 @@ msgstr ""
 "config: ns-cert-type client|server"
 
 #: ../properties/nm-openvpn-dialog.ui.h:145
-msgid "Key _Direction:"
-msgstr "_ÐÐ°Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ðµ ÐºÐ»ÑŽÑ‡Ð°:"
+msgid "Key _Direction"
+msgstr "_ÐÐ°Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ðµ ÐºÐ»ÑŽÑ‡Ð°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:146
 msgid ""
@@ -1428,12 +1420,12 @@ msgstr ""
 "config: tls-auth <file> [direction]"
 
 #: ../properties/nm-openvpn-dialog.ui.h:151
-msgid "Key _File:"
-msgstr "Ð¤Ð°Ð¹Ð» ÐºÐ»ÑŽÑ‡Ð°:"
+msgid "Key _File"
+msgstr "Ð¤Ð°Ð¹Ð» ÐºÐ»ÑŽÑ‡Ð°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:152
-msgid "Mode:"
-msgstr "Ð ÐµÐ¶Ð¸Ð¼:"
+msgid "Mode"
+msgstr "Ð ÐµÐ¶Ð¸Ð¼"
 
 #: ../properties/nm-openvpn-dialog.ui.h:153
 msgid "Add an additional layer of encryption or HMAC authentication."
@@ -1441,8 +1433,8 @@ msgstr ""
 "Ð”Ð¾Ð±Ð°Ð²Ð¸Ñ‚ÑŒ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ð¹ ÑƒÑ€Ð¾Ð²ÐµÐ½ÑŒ ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¸Ð»Ð¸ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐºÑƒ Ð¿Ð¾Ð´Ð»Ð¸Ð½Ð½Ð¾ÑÑ‚Ð¸ HMAC."
 
 #: ../properties/nm-openvpn-dialog.ui.h:154
-msgid "Extra Certificates:"
-msgstr "Ð”Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ðµ ÑÐµÑ€Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚Ñ‹:"
+msgid "Extra Certificates"
+msgstr "Ð”Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ðµ ÑÐµÑ€Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚Ñ‹"
 
 #: ../properties/nm-openvpn-dialog.ui.h:155
 msgid ""
@@ -1468,8 +1460,8 @@ msgid "TLS version control"
 msgstr "ÐšÐ¾Ð½Ñ‚Ñ€Ð¾Ð»ÑŒ Ð²ÐµÑ€ÑÐ¸Ð¹ TLS"
 
 #: ../properties/nm-openvpn-dialog.ui.h:160
-msgid "TLS _min version: "
-msgstr "ÐœÐ¸Ð½Ð¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ _Ð²ÐµÑ€ÑÐ¸Ñ TLS : "
+msgid "TLS _min version"
+msgstr "ÐœÐ¸Ð½Ð¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ _Ð²ÐµÑ€ÑÐ¸Ñ TLS "
 
 #: ../properties/nm-openvpn-dialog.ui.h:161
 msgid ""
@@ -1487,8 +1479,8 @@ msgstr ""
 "TLS, Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶Ð¸Ð²Ð°ÐµÐ¼Ð°Ñ Ð»Ð¾ÐºÐ°Ð»ÑŒÐ½Ð¾Ð¹ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¾Ð¹ SSL."
 
 #: ../properties/nm-openvpn-dialog.ui.h:162
-msgid "TLS ma_x version: "
-msgstr "ÐœÐ°ÐºÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ Ð²ÐµÑ€ÑÐ¸Ñ TLS: "
+msgid "TLS ma_x version"
+msgstr "ÐœÐ°ÐºÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ Ð²ÐµÑ€ÑÐ¸Ñ TLS"
 
 #: ../properties/nm-openvpn-dialog.ui.h:163
 msgid ""
@@ -1511,8 +1503,8 @@ msgstr ""
 "config: http-proxy or socks-proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:167
-msgid "Proxy _Type:"
-msgstr "_Ð¢Ð¸Ð¿ Ð¿Ñ€Ð¾ÐºÑÐ¸:"
+msgid "Proxy _Type"
+msgstr "_Ð¢Ð¸Ð¿ Ð¿Ñ€Ð¾ÐºÑÐ¸"
 
 #: ../properties/nm-openvpn-dialog.ui.h:168
 msgid ""
@@ -1523,8 +1515,8 @@ msgstr ""
 "Ð¿Ñ€Ð¾ÐºÑÐ¸-ÑÐµÑ€Ð²ÐµÑ€ Ð´Ð»Ñ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð° Ðº Ð˜Ð½Ñ‚ÐµÑ€Ð½ÐµÑ‚.</i>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:169
-msgid "Server _Address:"
-msgstr "_ÐÐ´Ñ€ÐµÑ ÑÐµÑ€Ð²ÐµÑ€Ð°:"
+msgid "Server _Address"
+msgstr "_ÐÐ´Ñ€ÐµÑ ÑÐµÑ€Ð²ÐµÑ€Ð°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:170
 msgid ""
@@ -1535,8 +1527,8 @@ msgstr ""
 "config: http-proxy or socks-proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:172
-msgid "_Port:"
-msgstr "_ÐŸÐ¾Ñ€Ñ‚:"
+msgid "_Port"
+msgstr "_ÐŸÐ¾Ñ€Ñ‚"
 
 #: ../properties/nm-openvpn-dialog.ui.h:173
 msgid ""
@@ -1560,12 +1552,12 @@ msgstr ""
 "config: http-proxy-retry or socks-proxy-retry"
 
 #: ../properties/nm-openvpn-dialog.ui.h:178
-msgid "Proxy _Username:"
-msgstr "_Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¿Ñ€Ð¾ÐºÑÐ¸:"
+msgid "Proxy _Username"
+msgstr "_Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¿Ñ€Ð¾ÐºÑÐ¸"
 
 #: ../properties/nm-openvpn-dialog.ui.h:179
-msgid "Proxy Passwor_d:"
-msgstr "ÐŸ_Ð°Ñ€Ð¾Ð»ÑŒ Ð¿Ñ€Ð¾ÐºÑÐ¸:"
+msgid "Proxy Passwor_d"
+msgstr "ÐŸ_Ð°Ñ€Ð¾Ð»ÑŒ Ð¿Ñ€Ð¾ÐºÑÐ¸"
 
 #: ../properties/nm-openvpn-dialog.ui.h:180
 msgid "HTTP/Socks proxy username passed to OpenVPN when prompted for it."
diff --git a/po/sk.po b/po/sk.po
index 5a33fd6..f55551c 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -736,8 +736,8 @@ msgid "General"
 msgstr "VÅ¡eobecnÃ©"
 
 #: ../properties/nm-openvpn-dialog.ui.h:13
-msgid "_Gateway:"
-msgstr "_BrÃ¡na:"
+msgid "_Gateway"
+msgstr "_BrÃ¡na"
 
 #: ../properties/nm-openvpn-dialog.ui.h:14
 msgid ""
@@ -759,13 +759,9 @@ msgstr "CA"
 msgid "User"
 msgstr "PouÅ¾ÃvateÄ¾skÃ½"
 
-#: ../properties/nm-openvpn-dialog.ui.h:19
-msgid "Password:"
-msgstr "Heslo:"
-
 #: ../properties/nm-openvpn-dialog.ui.h:20
-msgid "User name:"
-msgstr "Meno pouÅ¾ÃvateÄ¾a:"
+msgid "User name"
+msgstr "Meno pouÅ¾ÃvateÄ¾a"
 
 #: ../properties/nm-openvpn-dialog.ui.h:21
 msgid ""
@@ -781,21 +777,17 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:25
-msgid "Remote IP Address:"
-msgstr "VzdialenÃ¡ adresa IP:"
+msgid "Remote IP Address"
+msgstr "VzdialenÃ¡ adresa IP"
 
 #: ../properties/nm-openvpn-dialog.ui.h:26
-msgid "Local IP Address:"
-msgstr "Miestna adresa IP:"
+msgid "Local IP Address"
+msgstr "Miestna adresa IP"
 
 #: ../properties/nm-openvpn-dialog.ui.h:27
-msgid "Key Direction:"
+msgid "Key Direction"
 msgstr ""
 
-#: ../properties/nm-openvpn-dialog.ui.h:28
-msgid "Static Key:"
-msgstr "StatickÃ½ kÄ¾ÃºÄ:"
-
 #: ../properties/nm-openvpn-dialog.ui.h:29
 msgid ""
 "Pre-shared file for Static Key encryption mode (non-TLS).\n"
@@ -824,7 +816,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:38
-msgid "Type:"
+msgid "Type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:39
@@ -840,7 +832,7 @@ msgid "OpenVPN Advanced Options"
 msgstr "RozÅ¡ÃrenÃ© voÄ¾by OpenVPN"
 
 #: ../properties/nm-openvpn-dialog.ui.h:43
-msgid "Use custom gateway p_ort:"
+msgid "Use custom gateway p_ort"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:44
@@ -851,7 +843,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:46
-msgid "Use custom _renegotiation interval:"
+msgid "Use custom _renegotiation interval"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:47
@@ -861,8 +853,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:49
-msgid "Data _compression:"
-msgstr "_Kompresia Ãºdajov:"
+msgid "Data _compression"
+msgstr "_Kompresia Ãºdajov"
 
 #: ../properties/nm-openvpn-dialog.ui.h:50
 #, fuzzy
@@ -884,7 +876,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:56
-msgid "Set virtual _device type:"
+msgid "Set virtual _device type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:57
@@ -898,7 +890,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:60
-msgid " and _name:"
+msgid " and _name"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:61
@@ -909,7 +901,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:63
-msgid "Use custom tunnel Maximum Transmission _Unit (MTU):"
+msgid "Use custom tunnel Maximum Transmission _Unit (MTU)"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:64
@@ -920,7 +912,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:66
-msgid "Use custom UDP _fragment size:"
+msgid "Use custom UDP _fragment size"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:67
@@ -971,7 +963,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:81
-msgid "Specify pin_g interval:"
+msgid "Specify pin_g interval"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:82
@@ -982,7 +974,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:84
-msgid "Specify _exit or restart ping:"
+msgid "Specify _exit or restart ping"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:85
@@ -1013,7 +1005,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:93
-msgid "Specify max routes:"
+msgid "Specify max routes"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:94
@@ -1030,7 +1022,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:98
-msgid "Use custom _size of cipher key:"
+msgid "Use custom _size of cipher key"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:99
@@ -1048,12 +1040,12 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:103
-msgid "Ci_pher:"
-msgstr "Ci_fra:"
+msgid "Ci_pher"
+msgstr "Ci_fra"
 
 #: ../properties/nm-openvpn-dialog.ui.h:104
-msgid "_HMAC Authentication:"
-msgstr "Overenie totoÅ¾nosti _HMAC:"
+msgid "_HMAC Authentication"
+msgstr "Overenie totoÅ¾nosti _HMAC"
 
 #: ../properties/nm-openvpn-dialog.ui.h:105
 msgid "Disable cipher _negotiation"
@@ -1100,7 +1092,7 @@ msgid "Security"
 msgstr "ZabezpeÄenie"
 
 #: ../properties/nm-openvpn-dialog.ui.h:115
-msgid "_Subject Match:"
+msgid "_Subject Match"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:116
@@ -1112,8 +1104,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:120
-msgid "Server _Certificate Check:"
-msgstr "Kontrola _certifikÃ¡tu servera:"
+msgid "Server _Certificate Check"
+msgstr "Kontrola _certifikÃ¡tu servera"
 
 #: ../properties/nm-openvpn-dialog.ui.h:121
 msgid ""
@@ -1143,7 +1135,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:133
-msgid "_Remote peer certificate TLS type:"
+msgid "_Remote peer certificate TLS type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:134
@@ -1164,7 +1156,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:138
-msgid "_Remote peer certificate nsCert designation:"
+msgid "_Remote peer certificate nsCert designation"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:139
@@ -1175,7 +1167,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:141
-msgid "Key _Direction:"
+msgid "Key _Direction"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:142
@@ -1196,20 +1188,20 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:147
-msgid "Key _File:"
-msgstr "SÃºbor _kÄ¾ÃºÄa:"
+msgid "Key _File"
+msgstr "SÃºbor _kÄ¾ÃºÄa"
 
 #: ../properties/nm-openvpn-dialog.ui.h:148
-msgid "Mode:"
-msgstr "ReÅ¾im:"
+msgid "Mode"
+msgstr "ReÅ¾im"
 
 #: ../properties/nm-openvpn-dialog.ui.h:149
 msgid "Add an additional layer of encryption or HMAC authentication."
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:150
-msgid "Extra Certificates:"
-msgstr "CertifikÃ¡ty navyÅ¡e:"
+msgid "Extra Certificates"
+msgstr "CertifikÃ¡ty navyÅ¡e"
 
 #: ../properties/nm-openvpn-dialog.ui.h:151
 msgid ""
@@ -1231,8 +1223,8 @@ msgid "TLS version control"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:156
-msgid "TLS _min version: "
-msgstr "_Min. verzia TLS: "
+msgid "TLS _min version"
+msgstr "_Min. verzia TLS"
 
 #: ../properties/nm-openvpn-dialog.ui.h:157
 msgid ""
@@ -1243,7 +1235,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:158
-msgid "TLS ma_x version: "
+msgid "TLS ma_x version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:159
@@ -1263,8 +1255,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:163
-msgid "Proxy _Type:"
-msgstr "_Typ proxy:"
+msgid "Proxy _Type"
+msgstr "_Typ proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:164
 msgid ""
@@ -1275,8 +1267,8 @@ msgstr ""
 "server proxy.</i>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:165
-msgid "Server _Address:"
-msgstr "_Adresa servera:"
+msgid "Server _Address"
+msgstr "_Adresa servera"
 
 #: ../properties/nm-openvpn-dialog.ui.h:166
 msgid ""
@@ -1285,8 +1277,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:168
-msgid "_Port:"
-msgstr "_Port:"
+msgid "_Port"
+msgstr "_Port"
 
 #: ../properties/nm-openvpn-dialog.ui.h:169
 msgid ""
@@ -1305,12 +1297,12 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:174
-msgid "Proxy _Username:"
-msgstr "Meno po_uÅ¾ÃvateÄ¾a proxy:"
+msgid "Proxy _Username"
+msgstr "Meno po_uÅ¾ÃvateÄ¾a proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:175
-msgid "Proxy Passwor_d:"
-msgstr "_Heslo proxy:"
+msgid "Proxy Passwor_d"
+msgstr "_Heslo proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:176
 msgid "HTTP/Socks proxy username passed to OpenVPN when prompted for it."
diff --git a/po/sl.po b/po/sl.po
index 6f13517..c2d06a7 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -793,8 +793,8 @@ msgid "General"
 msgstr "SploÅ¡no"
 
 #: ../properties/nm-openvpn-dialog.ui.h:14
-msgid "_Gateway:"
-msgstr "_Prehod:"
+msgid "_Gateway"
+msgstr "_Prehod"
 
 #: ../properties/nm-openvpn-dialog.ui.h:15
 #, fuzzy
@@ -826,13 +826,9 @@ msgstr ""
 msgid "User"
 msgstr "Uporabnik"
 
-#: ../properties/nm-openvpn-dialog.ui.h:20
-msgid "Password:"
-msgstr "Geslo:"
-
 #: ../properties/nm-openvpn-dialog.ui.h:21
-msgid "User name:"
-msgstr "UporabniÅ¡ko ime:"
+msgid "User name"
+msgstr "UporabniÅ¡ko ime"
 
 #: ../properties/nm-openvpn-dialog.ui.h:22
 msgid ""
@@ -856,20 +852,16 @@ msgstr ""
 "Nastavitev: auth-user-pass"
 
 #: ../properties/nm-openvpn-dialog.ui.h:26
-msgid "Remote IP Address:"
-msgstr "Oddaljeni naslov IP:"
+msgid "Remote IP Address"
+msgstr "Oddaljeni naslov IP"
 
 #: ../properties/nm-openvpn-dialog.ui.h:27
-msgid "Local IP Address:"
-msgstr "Krajevni naslov IP:"
+msgid "Local IP Address"
+msgstr "Krajevni naslov IP"
 
 #: ../properties/nm-openvpn-dialog.ui.h:28
-msgid "Key Direction:"
-msgstr "Smer kljuÄa:"
-
-#: ../properties/nm-openvpn-dialog.ui.h:29
-msgid "Static Key:"
-msgstr "Stalni kljuÄ:"
+msgid "Key Direction"
+msgstr "Smer kljuÄa"
 
 #: ../properties/nm-openvpn-dialog.ui.h:30
 msgid ""
@@ -916,8 +908,8 @@ msgstr ""
 "stopite v stik s skrbnikom.</i>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:39
-msgid "Type:"
-msgstr "Vrsta:"
+msgid "Type"
+msgstr "Vrsta"
 
 #: ../properties/nm-openvpn-dialog.ui.h:40
 msgid "Select an authentication mode."
@@ -932,8 +924,8 @@ msgid "OpenVPN Advanced Options"
 msgstr "Napredne OpenVPN moÅ¾nosti"
 
 #: ../properties/nm-openvpn-dialog.ui.h:44
-msgid "Use custom gateway p_ort:"
-msgstr "Uporabi _vrata prehoda po meri:"
+msgid "Use custom gateway p_ort"
+msgstr "Uporabi _vrata prehoda po meri"
 
 #: ../properties/nm-openvpn-dialog.ui.h:45
 #, fuzzy
@@ -949,8 +941,8 @@ msgstr ""
 "Nastavitev: vrata"
 
 #: ../properties/nm-openvpn-dialog.ui.h:47
-msgid "Use custom _renegotiation interval:"
-msgstr "Uporabi Äasovni razmik _pogajanja po meri:"
+msgid "Use custom _renegotiation interval"
+msgstr "Uporabi Äasovni razmik _pogajanja po meri"
 
 #: ../properties/nm-openvpn-dialog.ui.h:48
 msgid ""
@@ -961,7 +953,7 @@ msgstr ""
 "Nastavitev: reneg-sec"
 
 #: ../properties/nm-openvpn-dialog.ui.h:50
-msgid "Data _compression:"
+msgid "Data _compression"
 msgstr "_Stiskanje podatkov"
 
 #: ../properties/nm-openvpn-dialog.ui.h:51
@@ -991,8 +983,8 @@ msgstr ""
 "Nastavitev: proto tcp-client | udp"
 
 #: ../properties/nm-openvpn-dialog.ui.h:57
-msgid "Set virtual _device type:"
-msgstr "Nastavi vrsto navidezne _naprave:"
+msgid "Set virtual _device type"
+msgstr "Nastavi vrsto navidezne _naprave"
 
 #: ../properties/nm-openvpn-dialog.ui.h:58
 msgid "Explicitly set virtual device type and name (TUN/TAP)."
@@ -1005,8 +997,8 @@ msgid ""
 msgstr "Nastavitev: dev-type tap | tun"
 
 #: ../properties/nm-openvpn-dialog.ui.h:61
-msgid " and _name:"
-msgstr " in _ime:"
+msgid " and _name"
+msgstr " in _ime"
 
 #: ../properties/nm-openvpn-dialog.ui.h:62
 #, fuzzy
@@ -1024,8 +1016,8 @@ msgstr ""
 "Nastavitev: dev <ime>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:64
-msgid "Use custom tunnel Maximum Transmission _Unit (MTU):"
-msgstr "Uporabi enoto najveÄjega _prenosa tuneliranja (MTU):"
+msgid "Use custom tunnel Maximum Transmission _Unit (MTU)"
+msgstr "Uporabi enoto najveÄjega _prenosa tuneliranja (MTU)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:65
 msgid ""
@@ -1038,8 +1030,8 @@ msgstr ""
 "Nastavitev: tun-mtu"
 
 #: ../properties/nm-openvpn-dialog.ui.h:67
-msgid "Use custom UDP _fragment size:"
-msgstr "Uporabi velikost paketov UDP po meri:"
+msgid "Use custom UDP _fragment size"
+msgstr "Uporabi velikost paketov UDP po meri"
 
 #: ../properties/nm-openvpn-dialog.ui.h:68
 msgid ""
@@ -1106,7 +1098,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:85
-msgid "Specify pin_g interval:"
+msgid "Specify pin_g interval"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:86
@@ -1117,7 +1109,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:88
-msgid "Specify _exit or restart ping:"
+msgid "Specify _exit or restart ping"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:89
@@ -1148,7 +1140,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:97
-msgid "Specify max routes:"
+msgid "Specify max routes"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:98
@@ -1168,8 +1160,8 @@ msgstr ""
 "Nastavitev: cipher"
 
 #: ../properties/nm-openvpn-dialog.ui.h:102
-msgid "Use custom _size of cipher key:"
-msgstr "Uporabi veli_kost Å¡ifrirnega kljuÄa po meri:"
+msgid "Use custom _size of cipher key"
+msgstr "Uporabi veli_kost Å¡ifrirnega kljuÄa po meri"
 
 #: ../properties/nm-openvpn-dialog.ui.h:103
 msgid ""
@@ -1192,12 +1184,12 @@ msgstr ""
 "Nastavitev: auth"
 
 #: ../properties/nm-openvpn-dialog.ui.h:107
-msgid "Ci_pher:"
-msgstr "_Cifra:"
+msgid "Ci_pher"
+msgstr "_Cifra"
 
 #: ../properties/nm-openvpn-dialog.ui.h:108
-msgid "_HMAC Authentication:"
-msgstr "Overitev _HMAC:"
+msgid "_HMAC Authentication"
+msgstr "Overitev _HMAC"
 
 #: ../properties/nm-openvpn-dialog.ui.h:109
 msgid "Disable cipher _negotiation"
@@ -1244,8 +1236,8 @@ msgid "Security"
 msgstr "Varnost"
 
 #: ../properties/nm-openvpn-dialog.ui.h:119
-msgid "_Subject Match:"
-msgstr "Skladnost _zadeve:"
+msgid "_Subject Match"
+msgstr "Skladnost _zadeve"
 
 #: ../properties/nm-openvpn-dialog.ui.h:120
 msgid ""
@@ -1258,8 +1250,8 @@ msgstr ""
 #: ../properties/nm-openvpn-dialog.ui.h:124
 #, fuzzy
 #| msgid "User Certificate:"
-msgid "Server _Certificate Check:"
-msgstr "UporabniÅ¡ko potrdilo:"
+msgid "Server _Certificate Check"
+msgstr "UporabniÅ¡ko potrdilo"
 
 #: ../properties/nm-openvpn-dialog.ui.h:125
 msgid ""
@@ -1291,8 +1283,8 @@ msgstr ""
 "osnovi pravil RFC3280 TLS."
 
 #: ../properties/nm-openvpn-dialog.ui.h:137
-msgid "_Remote peer certificate TLS type:"
-msgstr "Vrsta _oddaljenega potrdila TLS soleÅ¾nika:"
+msgid "_Remote peer certificate TLS type"
+msgstr "Vrsta _oddaljenega potrdila TLS soleÅ¾nika"
 
 #: ../properties/nm-openvpn-dialog.ui.h:138
 msgid ""
@@ -1325,8 +1317,8 @@ msgstr ""
 #: ../properties/nm-openvpn-dialog.ui.h:142
 #, fuzzy
 #| msgid "_Remote peer certificate TLS type:"
-msgid "_Remote peer certificate nsCert designation:"
-msgstr "Vrsta _oddaljenega potrdila TLS soleÅ¾nika:"
+msgid "_Remote peer certificate nsCert designation"
+msgstr "Vrsta _oddaljenega potrdila TLS soleÅ¾nika"
 
 #: ../properties/nm-openvpn-dialog.ui.h:143
 #, fuzzy
@@ -1344,8 +1336,8 @@ msgstr ""
 "Nastavitev: remote-cert-tls client|server"
 
 #: ../properties/nm-openvpn-dialog.ui.h:145
-msgid "Key _Direction:"
-msgstr "_Smer kljuÄa:"
+msgid "Key _Direction"
+msgstr "_Smer kljuÄa"
 
 #: ../properties/nm-openvpn-dialog.ui.h:146
 #, fuzzy
@@ -1384,11 +1376,11 @@ msgstr ""
 "stopite v stik s skrbnikom.</i>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:151
-msgid "Key _File:"
-msgstr "Datoteka _kljuÄa:"
+msgid "Key _File"
+msgstr "Datoteka _kljuÄa"
 
 #: ../properties/nm-openvpn-dialog.ui.h:152
-msgid "Mode:"
+msgid "Mode"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:153
@@ -1398,8 +1390,8 @@ msgid "Add an additional layer of encryption or HMAC authentication."
 msgstr "Dodaj dodatno  zaÅ¡Äito z overjanjem HMAC."
 
 #: ../properties/nm-openvpn-dialog.ui.h:154
-msgid "Extra Certificates:"
-msgstr "Dodatna potrdila:"
+msgid "Extra Certificates"
+msgstr "Dodatna potrdila"
 
 #: ../properties/nm-openvpn-dialog.ui.h:155
 msgid ""
@@ -1423,7 +1415,7 @@ msgid "TLS version control"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:160
-msgid "TLS _min version: "
+msgid "TLS _min version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:161
@@ -1435,7 +1427,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:162
-msgid "TLS ma_x version: "
+msgid "TLS ma_x version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:163
@@ -1457,8 +1449,8 @@ msgstr ""
 "Nastavitev: http-proxy ali socks-proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:167
-msgid "Proxy _Type:"
-msgstr "_Vrsta posredniÅ¡kega streÅ¾nika:"
+msgid "Proxy _Type"
+msgstr "_Vrsta posredniÅ¡kega streÅ¾nika"
 
 #: ../properties/nm-openvpn-dialog.ui.h:168
 msgid ""
@@ -1469,8 +1461,8 @@ msgstr ""
 "posredniÅ¡kega streÅ¾nika.</i>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:169
-msgid "Server _Address:"
-msgstr "Naslov _streÅ¾nika:"
+msgid "Server _Address"
+msgstr "Naslov _streÅ¾nika"
 
 #: ../properties/nm-openvpn-dialog.ui.h:170
 msgid ""
@@ -1482,8 +1474,8 @@ msgstr ""
 "Nastavitev: http-proxy ali socks-proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:172
-msgid "_Port:"
-msgstr "_Vrata:"
+msgid "_Port"
+msgstr "_Vrata"
 
 #: ../properties/nm-openvpn-dialog.ui.h:173
 msgid ""
@@ -1508,12 +1500,12 @@ msgstr ""
 "Nastavitev: http-proxy-retry ali socks-proxy-retry"
 
 #: ../properties/nm-openvpn-dialog.ui.h:178
-msgid "Proxy _Username:"
-msgstr "_UporabniÅ¡ko ime posredniÅ¡kega streÅ¾nika:"
+msgid "Proxy _Username"
+msgstr "_UporabniÅ¡ko ime posredniÅ¡kega streÅ¾nika"
 
 #: ../properties/nm-openvpn-dialog.ui.h:179
-msgid "Proxy Passwor_d:"
-msgstr "Geslo _posredniÅ¡kega streÅ¾nika:"
+msgid "Proxy Passwor_d"
+msgstr "Geslo _posredniÅ¡kega streÅ¾nika"
 
 #: ../properties/nm-openvpn-dialog.ui.h:180
 msgid "HTTP/Socks proxy username passed to OpenVPN when prompted for it."
diff --git a/po/sr.po b/po/sr.po
index 9ea52f6..4b379c6 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -806,8 +806,8 @@ msgid "General"
 msgstr "ÐžÐ¿ÑˆÑ‚Ðµ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:14
-msgid "_Gateway:"
-msgstr "_ÐœÑ€ÐµÐ¶Ð½Ð¸ Ð¿Ñ€Ð¾Ð»Ð°Ð·:"
+msgid "_Gateway"
+msgstr "_ÐœÑ€ÐµÐ¶Ð½Ð¸ Ð¿Ñ€Ð¾Ð»Ð°Ð·"
 
 #: ../properties/nm-openvpn-dialog.ui.h:15
 msgid ""
@@ -833,13 +833,9 @@ msgstr "Ð˜Ð·Ð´Ð°Ð²Ð°Ñ‡ ÑƒÐ²ÐµÑ€ÐµÑšÐ°"
 msgid "User"
 msgstr "ÐšÐ¾Ñ€Ð¸ÑÐ½Ð¸Ðº"
 
-#: ../properties/nm-openvpn-dialog.ui.h:20
-msgid "Password:"
-msgstr "Ð›Ð¾Ð·Ð¸Ð½ÐºÐ°:"
-
 #: ../properties/nm-openvpn-dialog.ui.h:21
-msgid "User name:"
-msgstr "ÐšÐ¾Ñ€Ð¸ÑÐ½Ð¸Ñ‡ÐºÐ¾ Ð¸Ð¼Ðµ:"
+msgid "User name"
+msgstr "ÐšÐ¾Ñ€Ð¸ÑÐ½Ð¸Ñ‡ÐºÐ¾ Ð¸Ð¼Ðµ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:22
 msgid ""
@@ -860,20 +856,16 @@ msgstr ""
 "Ð¿Ð¾Ð´ÐµÑˆÐ°Ð²Ð°ÑšÐµ: â€žauth-user-passâ€œ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:26
-msgid "Remote IP Address:"
-msgstr "Ð£Ð´Ð°Ñ™ÐµÐ½Ð° Ð˜ÐŸ Ð°Ð´Ñ€ÐµÑÐ°:"
+msgid "Remote IP Address"
+msgstr "Ð£Ð´Ð°Ñ™ÐµÐ½Ð° Ð˜ÐŸ Ð°Ð´Ñ€ÐµÑÐ°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:27
-msgid "Local IP Address:"
-msgstr "ÐœÐµÑÐ½Ð° Ð˜ÐŸ Ð°Ð´Ñ€ÐµÑÐ°:"
+msgid "Local IP Address"
+msgstr "ÐœÐµÑÐ½Ð° Ð˜ÐŸ Ð°Ð´Ñ€ÐµÑÐ°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:28
-msgid "Key Direction:"
-msgstr "Ð£ÑÐ¼ÐµÑ€ÐµÑšÐµ ÐºÑ™ÑƒÑ‡Ð°:"
-
-#: ../properties/nm-openvpn-dialog.ui.h:29
-msgid "Static Key:"
-msgstr "Ð¡Ñ‚Ð°Ñ‚Ð¸Ñ‡ÐºÐ¸ ÐºÑ™ÑƒÑ‡:"
+msgid "Key Direction"
+msgstr "Ð£ÑÐ¼ÐµÑ€ÐµÑšÐµ ÐºÑ™ÑƒÑ‡Ð°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:30
 msgid ""
@@ -915,8 +907,8 @@ msgstr ""
 "Ð¿Ð¾Ð´ÐµÑˆÐ°Ð²Ð°ÑšÐµ: static <Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ°> [ÑƒÑÐ¼ÐµÑ€ÐµÑšÐµ]"
 
 #: ../properties/nm-openvpn-dialog.ui.h:39
-msgid "Type:"
-msgstr "Ð’Ñ€ÑÑ‚Ð°:"
+msgid "Type"
+msgstr "Ð’Ñ€ÑÑ‚Ð°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:40
 msgid "Select an authentication mode."
@@ -931,8 +923,8 @@ msgid "OpenVPN Advanced Options"
 msgstr "ÐÐ°Ð¿Ñ€ÐµÐ´Ð½Ðµ Ð¾Ð¿Ñ†Ð¸Ñ˜Ðµ Ð·Ð° ÐžÐ¿ÐµÐ½Ð’ÐŸÐ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:44
-msgid "Use custom gateway p_ort:"
-msgstr "ÐšÐ¾Ñ€Ð¸ÑÑ‚Ð¸ Ð¿Ñ€Ð¾Ð¸Ð·Ð²Ð¾Ñ™Ð½Ð¸ _Ð¿Ñ€Ð¸ÐºÑ™ÑƒÑ‡Ð½Ð¸Ðº Ð¼Ñ€ÐµÐ¶Ð½Ð¾Ð³ Ð¿Ñ€Ð¾Ð»Ð°Ð·Ð°:"
+msgid "Use custom gateway p_ort"
+msgstr "ÐšÐ¾Ñ€Ð¸ÑÑ‚Ð¸ Ð¿Ñ€Ð¾Ð¸Ð·Ð²Ð¾Ñ™Ð½Ð¸ _Ð¿Ñ€Ð¸ÐºÑ™ÑƒÑ‡Ð½Ð¸Ðº Ð¼Ñ€ÐµÐ¶Ð½Ð¾Ð³ Ð¿Ñ€Ð¾Ð»Ð°Ð·Ð°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:45
 msgid ""
@@ -945,8 +937,8 @@ msgstr ""
 "Ð¿Ð¾Ð´ÐµÑˆÐ°Ð²Ð°ÑšÐµ: port"
 
 #: ../properties/nm-openvpn-dialog.ui.h:47
-msgid "Use custom _renegotiation interval:"
-msgstr "ÐšÐ¾Ñ€Ð¸ÑÑ‚Ð¸ Ð¿Ñ€Ð¾Ð¸Ð·Ð²Ð¾Ñ™Ð°Ð½ Ð¿ÐµÑ€Ð¸Ð¾Ð´ Ð¿Ð¾Ð½Ð¾Ð²Ð½Ð¾Ð³ _Ð¿Ñ€ÐµÐ³Ð¾Ð²Ð°Ñ€Ð°ÑšÐ°:"
+msgid "Use custom _renegotiation interval"
+msgstr "ÐšÐ¾Ñ€Ð¸ÑÑ‚Ð¸ Ð¿Ñ€Ð¾Ð¸Ð·Ð²Ð¾Ñ™Ð°Ð½ Ð¿ÐµÑ€Ð¸Ð¾Ð´ Ð¿Ð¾Ð½Ð¾Ð²Ð½Ð¾Ð³ _Ð¿Ñ€ÐµÐ³Ð¾Ð²Ð°Ñ€Ð°ÑšÐ°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:48
 msgid ""
@@ -957,8 +949,8 @@ msgstr ""
 "Ð¿Ð¾Ð´ÐµÑˆÐ°Ð²Ð°ÑšÐµ: reneg-sec"
 
 #: ../properties/nm-openvpn-dialog.ui.h:50
-msgid "Data _compression:"
-msgstr "Ð—Ð°Ð¿Ð°ÐºÐ¸Ð²Ð°ÑšÐµ _Ð¿Ð¾Ð´Ð°Ñ‚Ð°ÐºÐ°:"
+msgid "Data _compression"
+msgstr "Ð—Ð°Ð¿Ð°ÐºÐ¸Ð²Ð°ÑšÐµ _Ð¿Ð¾Ð´Ð°Ñ‚Ð°ÐºÐ°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:51
 msgid ""
@@ -985,8 +977,8 @@ msgstr ""
 "Ð¿Ð¾Ð´ÐµÑˆÐ°Ð²Ð°ÑšÐµ: proto tcp-client | udp"
 
 #: ../properties/nm-openvpn-dialog.ui.h:57
-msgid "Set virtual _device type:"
-msgstr "ÐŸÐ¾Ð´ÐµÑÐ¸ Ð²Ñ€ÑÑ‚Ñƒ Ð²Ð¸Ñ€Ñ‚ÑƒÐµÐ»Ð½Ð¾Ð³ _ÑƒÑ€ÐµÑ’Ð°Ñ˜Ð°:"
+msgid "Set virtual _device type"
+msgstr "ÐŸÐ¾Ð´ÐµÑÐ¸ Ð²Ñ€ÑÑ‚Ñƒ Ð²Ð¸Ñ€Ñ‚ÑƒÐµÐ»Ð½Ð¾Ð³ _ÑƒÑ€ÐµÑ’Ð°Ñ˜Ð°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:58
 msgid "Explicitly set virtual device type and name (TUN/TAP)."
@@ -1001,8 +993,8 @@ msgstr ""
 "Ð¿Ð¾Ð´ÐµÑˆÐ°Ð²Ð°ÑšÐµ: dev-type tun | tap"
 
 #: ../properties/nm-openvpn-dialog.ui.h:61
-msgid " and _name:"
-msgstr " Ð¸ _Ð½Ð°Ð·Ð¸Ð²:"
+msgid " and _name"
+msgstr " Ð¸ _Ð½Ð°Ð·Ð¸Ð²"
 
 #: ../properties/nm-openvpn-dialog.ui.h:62
 msgid ""
@@ -1015,8 +1007,8 @@ msgstr ""
 "Ð¿Ð¾Ð´ÐµÑˆÐ°Ð²Ð°ÑšÐµ: dev <Ð½Ð°Ð·Ð¸Ð²>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:64
-msgid "Use custom tunnel Maximum Transmission _Unit (MTU):"
-msgstr "ÐšÐ¾Ñ€Ð¸ÑÑ‚Ð¸ _Ñ˜ÐµÐ´Ð¸Ð½Ð¸Ñ†Ñƒ Ð½Ð°Ñ˜Ð²ÐµÑ›ÐµÐ³ Ð¿Ñ€ÐµÐ½Ð¾ÑÐ° (ÐœÐ¢Ð£) Ð¿Ñ€Ð¾Ð¸Ð·Ð²Ð¾Ñ™Ð½Ð¾Ð³ ÐºÐ°Ð½Ð°Ð»Ð°:"
+msgid "Use custom tunnel Maximum Transmission _Unit (MTU)"
+msgstr "ÐšÐ¾Ñ€Ð¸ÑÑ‚Ð¸ _Ñ˜ÐµÐ´Ð¸Ð½Ð¸Ñ†Ñƒ Ð½Ð°Ñ˜Ð²ÐµÑ›ÐµÐ³ Ð¿Ñ€ÐµÐ½Ð¾ÑÐ° (ÐœÐ¢Ð£) Ð¿Ñ€Ð¾Ð¸Ð·Ð²Ð¾Ñ™Ð½Ð¾Ð³ ÐºÐ°Ð½Ð°Ð»Ð°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:65
 msgid ""
@@ -1029,8 +1021,8 @@ msgstr ""
 "Ð¿Ð¾Ð´ÐµÑˆÐ°Ð²Ð°ÑšÐµ: tun-mtu"
 
 #: ../properties/nm-openvpn-dialog.ui.h:67
-msgid "Use custom UDP _fragment size:"
-msgstr "ÐšÐ¾Ñ€Ð¸ÑÑ‚Ð¸ Ð²ÐµÐ»Ð¸Ñ‡Ð¸Ð½Ñƒ _Ð¾Ð´Ð»Ð¾Ð¼ÐºÐ° Ð¿Ñ€Ð¾Ð¸Ð·Ð²Ð¾Ñ™Ð½Ð¾Ð³ Ð£Ð”ÐŸ-Ð°:"
+msgid "Use custom UDP _fragment size"
+msgstr "ÐšÐ¾Ñ€Ð¸ÑÑ‚Ð¸ Ð²ÐµÐ»Ð¸Ñ‡Ð¸Ð½Ñƒ _Ð¾Ð´Ð»Ð¾Ð¼ÐºÐ° Ð¿Ñ€Ð¾Ð¸Ð·Ð²Ð¾Ñ™Ð½Ð¾Ð³ Ð£Ð”ÐŸ-Ð°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:68
 msgid ""
@@ -1104,8 +1096,8 @@ msgstr ""
 "Ð¿Ð¾Ð´ÐµÑˆÐ°Ð²Ð°ÑšÐµ: tun-ipv6"
 
 #: ../properties/nm-openvpn-dialog.ui.h:85
-msgid "Specify pin_g interval:"
-msgstr "ÐÐ°Ð²ÐµÐ´Ð¸ Ð¸Ð½Ñ‚ÐµÑ€Ð²Ð°Ð» _Ð¿Ð¸Ð½Ð³Ð°:"
+msgid "Specify pin_g interval"
+msgstr "ÐÐ°Ð²ÐµÐ´Ð¸ Ð¸Ð½Ñ‚ÐµÑ€Ð²Ð°Ð» _Ð¿Ð¸Ð½Ð³Ð°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:86
 msgid ""
@@ -1118,8 +1110,8 @@ msgstr ""
 "Ð¿Ð¾Ð´ÐµÑˆÐ°Ð²Ð°ÑšÐµ: ping <n>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:88
-msgid "Specify _exit or restart ping:"
-msgstr "ÐÐ°Ð²ÐµÐ´Ð¸ Ð¿Ð¸Ð½Ð³ _Ð¸Ð·Ð»Ð°ÑÐºÐ° Ð¸Ð»Ð¸ Ð¿Ð¾Ð½Ð¾Ð²Ð½Ð¾Ð³ Ð¿Ð¾ÐºÑ€ÐµÑ‚Ð°ÑšÐ°:"
+msgid "Specify _exit or restart ping"
+msgstr "ÐÐ°Ð²ÐµÐ´Ð¸ Ð¿Ð¸Ð½Ð³ _Ð¸Ð·Ð»Ð°ÑÐºÐ° Ð¸Ð»Ð¸ Ð¿Ð¾Ð½Ð¾Ð²Ð½Ð¾Ð³ Ð¿Ð¾ÐºÑ€ÐµÑ‚Ð°ÑšÐ°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:89
 msgid ""
@@ -1164,8 +1156,8 @@ msgstr ""
 "Ð¿Ð¾Ð´ÐµÑˆÐ°Ð²Ð°ÑšÐµ: float"
 
 #: ../properties/nm-openvpn-dialog.ui.h:97
-msgid "Specify max routes:"
-msgstr "ÐÐ°Ð²ÐµÐ´Ð¸Ñ‚Ðµ Ð½Ð°Ñ˜Ð²Ð¸ÑˆÐµ Ñ€ÑƒÑ‚Ðµ:"
+msgid "Specify max routes"
+msgstr "ÐÐ°Ð²ÐµÐ´Ð¸Ñ‚Ðµ Ð½Ð°Ñ˜Ð²Ð¸ÑˆÐµ Ñ€ÑƒÑ‚Ðµ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:98
 msgid ""
@@ -1186,8 +1178,8 @@ msgstr ""
 "Ð¿Ð¾Ð´ÐµÑˆÐ°Ð²Ð°ÑšÐµ: cipher"
 
 #: ../properties/nm-openvpn-dialog.ui.h:102
-msgid "Use custom _size of cipher key:"
-msgstr "ÐšÐ¾Ñ€Ð¸ÑÑ‚Ð¸ Ð¿Ñ€Ð¾Ð¸Ð·Ð²Ð¾Ñ™Ð½Ñƒ _Ð²ÐµÐ»Ð¸Ñ‡Ð¸Ð½Ñƒ ÐºÑ™ÑƒÑ‡Ð° ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°ÑšÐ°:"
+msgid "Use custom _size of cipher key"
+msgstr "ÐšÐ¾Ñ€Ð¸ÑÑ‚Ð¸ Ð¿Ñ€Ð¾Ð¸Ð·Ð²Ð¾Ñ™Ð½Ñƒ _Ð²ÐµÐ»Ð¸Ñ‡Ð¸Ð½Ñƒ ÐºÑ™ÑƒÑ‡Ð° ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°ÑšÐ°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:103
 msgid ""
@@ -1210,12 +1202,12 @@ msgstr ""
 "Ð¿Ð¾Ð´ÐµÑˆÐ°Ð²Ð°ÑšÐµ: auth"
 
 #: ../properties/nm-openvpn-dialog.ui.h:107
-msgid "Ci_pher:"
-msgstr "_Ð¨Ð¸Ñ„Ñ€Ð°:"
+msgid "Ci_pher"
+msgstr "_Ð¨Ð¸Ñ„Ñ€Ð°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:108
-msgid "_HMAC Authentication:"
-msgstr "_Ð¥ÐœÐÐ¦ Ð¿Ð¾Ñ‚Ð²Ñ€Ñ’Ð¸Ð²Ð°ÑšÐµ Ð¸Ð´ÐµÐ½Ñ‚Ð¸Ñ‚ÐµÑ‚Ð°:"
+msgid "_HMAC Authentication"
+msgstr "_Ð¥ÐœÐÐ¦ Ð¿Ð¾Ñ‚Ð²Ñ€Ñ’Ð¸Ð²Ð°ÑšÐµ Ð¸Ð´ÐµÐ½Ñ‚Ð¸Ñ‚ÐµÑ‚Ð°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:109
 msgid "Disable cipher _negotiation"
@@ -1270,8 +1262,8 @@ msgid "Security"
 msgstr "Ð‘ÐµÐ·Ð±ÐµÐ´Ð½Ð¾ÑÑ‚"
 
 #: ../properties/nm-openvpn-dialog.ui.h:119
-msgid "_Subject Match:"
-msgstr "_ÐŸÐ¾ÐºÐ»Ð°Ð¿Ð°ÑšÐµ Ð½Ð°ÑÐ»Ð¾Ð²Ð°:"
+msgid "_Subject Match"
+msgstr "_ÐŸÐ¾ÐºÐ»Ð°Ð¿Ð°ÑšÐµ Ð½Ð°ÑÐ»Ð¾Ð²Ð°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:120
 msgid ""
@@ -1286,8 +1278,8 @@ msgstr ""
 "Ð¿Ð¾Ð´ÐµÑˆÐ°Ð²Ð°ÑšÐµ (ÑÑ‚Ð°Ñ€Ð¸ Ñ€ÐµÐ¶Ð¸Ð¼): tls-remote ÑÑƒÐ±Ñ˜ÐµÐºÐ°Ñ‚-Ð¸Ð»Ð¸-Ð½Ð°Ð·Ð¸Ð²"
 
 #: ../properties/nm-openvpn-dialog.ui.h:124
-msgid "Server _Certificate Check:"
-msgstr "ÐŸÑ€Ð¾Ð²ÐµÑ€Ð° _ÑƒÐ²ÐµÑ€ÐµÑšÐ° ÑÐµÑ€Ð²ÐµÑ€Ð°:"
+msgid "Server _Certificate Check"
+msgstr "ÐŸÑ€Ð¾Ð²ÐµÑ€Ð° _ÑƒÐ²ÐµÑ€ÐµÑšÐ° ÑÐµÑ€Ð²ÐµÑ€Ð°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:125
 msgid ""
@@ -1331,8 +1323,8 @@ msgstr ""
 "ÐºÐ¾Ñ€Ð¸ÑˆÑ›ÐµÑšÐµÐ¼ Ð¿Ñ€Ð¾ÑˆÐ¸Ñ€ÐµÐ½Ð¾Ð³ ÐºÑ™ÑƒÑ‡Ð° Ð·Ð°ÑÐ½Ð¾Ð²Ð°Ð½Ð¾Ð³ Ð½Ð° Ð Ð¤Ð¦3280 Ð¢Ð›Ð¡ Ð¿Ñ€Ð°Ð²Ð¸Ð»Ð¸Ð¼Ð°."
 
 #: ../properties/nm-openvpn-dialog.ui.h:137
-msgid "_Remote peer certificate TLS type:"
-msgstr "_Ð’Ñ€ÑÑ‚Ð° Ð¢Ð›Ð¡ ÑƒÐ²ÐµÑ€ÐµÑšÐ° ÑƒÐ´Ð°Ñ™ÐµÐ½Ð¾Ð³ Ð¿Ð°Ñ€ÑšÐ°ÐºÐ°:"
+msgid "_Remote peer certificate TLS type"
+msgstr "_Ð’Ñ€ÑÑ‚Ð° Ð¢Ð›Ð¡ ÑƒÐ²ÐµÑ€ÐµÑšÐ° ÑƒÐ´Ð°Ñ™ÐµÐ½Ð¾Ð³ Ð¿Ð°Ñ€ÑšÐ°ÐºÐ°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:138
 msgid ""
@@ -1356,8 +1348,8 @@ msgstr ""
 "Ð—Ð°Ñ…Ñ‚ÐµÐ²Ð°Ñ˜ Ð´Ð° ÑƒÐ²ÐµÑ€ÐµÑšÐµ Ð¿Ð°Ñ€ÑšÐ°ÐºÐ° Ð±ÑƒÐ´Ðµ Ð¿Ð¾Ñ‚Ð¿Ð¸ÑÐ°Ð½ ÑÐ° Ð¸Ð·Ñ€Ð¸Ñ‡Ð¸Ñ‚Ð¾Ð¼ nsCertType Ð¾Ð·Ð½Ð°ÐºÐ¾Ð¼."
 
 #: ../properties/nm-openvpn-dialog.ui.h:142
-msgid "_Remote peer certificate nsCert designation:"
-msgstr "ÐžÐ·Ð½Ð°ÐºÐ° nsCert ÑƒÐ²Ðµ_Ñ€ÐµÑšÐ° ÑƒÐ´Ð°Ñ™ÐµÐ½Ð¾Ð³ Ð¿Ð°Ñ€ÑšÐ°ÐºÐ°:"
+msgid "_Remote peer certificate nsCert designation"
+msgstr "ÐžÐ·Ð½Ð°ÐºÐ° nsCert ÑƒÐ²Ðµ_Ñ€ÐµÑšÐ° ÑƒÐ´Ð°Ñ™ÐµÐ½Ð¾Ð³ Ð¿Ð°Ñ€ÑšÐ°ÐºÐ°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:143
 msgid ""
@@ -1370,8 +1362,8 @@ msgstr ""
 "Ð¿Ð¾Ð´ÐµÑˆÐ°Ð²Ð°ÑšÐµ: ns-cert-type client|server"
 
 #: ../properties/nm-openvpn-dialog.ui.h:145
-msgid "Key _Direction:"
-msgstr "_Ð£ÑÐ¼ÐµÑ€ÐµÑšÐµ ÐºÑ™ÑƒÑ‡Ð°:"
+msgid "Key _Direction"
+msgstr "_Ð£ÑÐ¼ÐµÑ€ÐµÑšÐµ ÐºÑ™ÑƒÑ‡Ð°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:146
 msgid ""
@@ -1401,20 +1393,20 @@ msgstr ""
 "Ð¿Ð¾Ð´ÐµÑˆÐ°Ð²Ð°ÑšÐµ: tls-auth <Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ°> [ÑƒÑÐ¼ÐµÑ€ÐµÑšÐµ]"
 
 #: ../properties/nm-openvpn-dialog.ui.h:151
-msgid "Key _File:"
-msgstr "_Ð”Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ° ÐºÑ™ÑƒÑ‡Ð°:"
+msgid "Key _File"
+msgstr "_Ð”Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ° ÐºÑ™ÑƒÑ‡Ð°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:152
-msgid "Mode:"
-msgstr "Ð ÐµÐ¶Ð¸Ð¼:"
+msgid "Mode"
+msgstr "Ð ÐµÐ¶Ð¸Ð¼"
 
 #: ../properties/nm-openvpn-dialog.ui.h:153
 msgid "Add an additional layer of encryption or HMAC authentication."
 msgstr "Ð”Ð¾Ð´Ð°Ñ˜Ñ‚Ðµ Ð´Ð¾Ð¿ÑƒÐ½ÑÐºÐ¸ ÑÐ»Ð¾Ñ˜ ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°ÑšÐ° Ð¸Ð»Ð¸ Ð¥ÐœÐÐ¦ Ð¿Ð¾Ñ‚Ð²Ñ€Ð´Ðµ Ð¸Ð´ÐµÐ½Ñ‚Ð¸Ñ‚ÐµÑ‚Ð°."
 
 #: ../properties/nm-openvpn-dialog.ui.h:154
-msgid "Extra Certificates:"
-msgstr "Ð”Ð¾Ð´Ð°Ñ‚Ð½Ð¸ ÑÐµÑ€Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚Ð¸:"
+msgid "Extra Certificates"
+msgstr "Ð”Ð¾Ð´Ð°Ñ‚Ð½Ð¸ ÑÐµÑ€Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚Ð¸"
 
 #: ../properties/nm-openvpn-dialog.ui.h:155
 msgid ""
@@ -1439,8 +1431,8 @@ msgid "TLS version control"
 msgstr "ÐšÐ¾Ð½Ñ‚Ñ€Ð¾Ð»Ð° Ð¢Ð›Ð¡ Ð¸Ð·Ð´Ð°ÑšÐ°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:160
-msgid "TLS _min version: "
-msgstr "ÐÐ°Ñ˜_Ð¼Ð°ÑšÐµ Ð¢Ð›Ð¡ Ð¸Ð·Ð´Ð°ÑšÐµ: "
+msgid "TLS _min version"
+msgstr "ÐÐ°Ñ˜_Ð¼Ð°ÑšÐµ Ð¢Ð›Ð¡ Ð¸Ð·Ð´Ð°ÑšÐµ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:161
 msgid ""
@@ -1455,8 +1447,8 @@ msgstr ""
 "Ð¿Ð¾Ð´Ñ€Ð¶Ð°Ð½Ð¾ Ð»Ð¾ÐºÐ°Ð»Ð½Ð¾Ð¼ Ð¡Ð¡Ð› Ð¿Ñ€Ð¸Ð¼ÐµÐ½Ð¾Ð¼."
 
 #: ../properties/nm-openvpn-dialog.ui.h:162
-msgid "TLS ma_x version: "
-msgstr "ÐÐ°Ñ˜_Ð²ÐµÑ›Ðµ Ð¢Ð›Ð¡ Ð¸Ð·Ð´Ð°ÑšÐµ: "
+msgid "TLS ma_x version"
+msgstr "ÐÐ°Ñ˜_Ð²ÐµÑ›Ðµ Ð¢Ð›Ð¡ Ð¸Ð·Ð´Ð°ÑšÐµ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:163
 msgid ""
@@ -1479,8 +1471,8 @@ msgstr ""
 "Ð¿Ð¾Ð´ÐµÑˆÐ°Ð²Ð°ÑšÐµ: â€žhttp-proxyâ€œ Ð¸Ð»Ð¸ â€žsocks-proxyâ€œ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:167
-msgid "Proxy _Type:"
-msgstr "Ð’Ñ€ÑÑ‚Ð° _Ð¿Ð¾ÑÑ€ÐµÐ´Ð½Ð¸ÐºÐ°:"
+msgid "Proxy _Type"
+msgstr "Ð’Ñ€ÑÑ‚Ð° _Ð¿Ð¾ÑÑ€ÐµÐ´Ð½Ð¸ÐºÐ°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:168
 msgid ""
@@ -1491,8 +1483,8 @@ msgstr ""
 "ÑÐµÑ€Ð²ÐµÑ€Ð° Ð·Ð° Ð¿Ñ€Ð¸ÑÑ‚ÑƒÐ¿Ð°ÑšÐµ Ð˜Ð½Ñ‚ÐµÑ€Ð½ÐµÑ‚Ñƒ.</i>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:169
-msgid "Server _Address:"
-msgstr "_ÐÐ´Ñ€ÐµÑÐ° ÑÐµÑ€Ð²ÐµÑ€Ð°:"
+msgid "Server _Address"
+msgstr "_ÐÐ´Ñ€ÐµÑÐ° ÑÐµÑ€Ð²ÐµÑ€Ð°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:170
 msgid ""
@@ -1503,8 +1495,8 @@ msgstr ""
 "Ð¿Ð¾Ð´ÐµÑˆÐ°Ð²Ð°ÑšÐµ: http-proxyâ€œ Ð¸Ð»Ð¸ â€žsocks-proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:172
-msgid "_Port:"
-msgstr "_ÐŸÑ€Ð¸ÐºÑ™ÑƒÑ‡Ð½Ð¸Ðº:"
+msgid "_Port"
+msgstr "_ÐŸÑ€Ð¸ÐºÑ™ÑƒÑ‡Ð½Ð¸Ðº"
 
 #: ../properties/nm-openvpn-dialog.ui.h:173
 msgid ""
@@ -1528,12 +1520,12 @@ msgstr ""
 "Ð¿Ð¾Ð´ÐµÑˆÐ°Ð²Ð°ÑšÐµ: â€žhttp-proxy-retryâ€œ Ð¸Ð»Ð¸ â€žsocks-proxy-retryâ€œ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:178
-msgid "Proxy _Username:"
-msgstr "ÐšÐ¾Ñ€Ð¸ÑÐ½Ð¸Ñ‡ÐºÐ¾ _Ð¸Ð¼Ðµ Ð·Ð° Ð¿Ð¾ÑÑ€ÐµÐ´Ð½Ð¸ÐºÐ°:"
+msgid "Proxy _Username"
+msgstr "ÐšÐ¾Ñ€Ð¸ÑÐ½Ð¸Ñ‡ÐºÐ¾ _Ð¸Ð¼Ðµ Ð·Ð° Ð¿Ð¾ÑÑ€ÐµÐ´Ð½Ð¸ÐºÐ°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:179
-msgid "Proxy Passwor_d:"
-msgstr "Ð›Ð¾Ð·Ð¸Ð½ÐºÐ° _Ð¿Ð¾ÑÑ€ÐµÐ´Ð½Ð¸ÐºÐ°:"
+msgid "Proxy Passwor_d"
+msgstr "Ð›Ð¾Ð·Ð¸Ð½ÐºÐ° _Ð¿Ð¾ÑÑ€ÐµÐ´Ð½Ð¸ÐºÐ°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:180
 msgid "HTTP/Socks proxy username passed to OpenVPN when prompted for it."
diff --git a/po/sr latin po b/po/sr latin po
index f05dab9..ff4953d 100644
--- a/po/sr latin po
+++ b/po/sr latin po
@@ -755,8 +755,8 @@ msgid "General"
 msgstr "OpÅ¡te"
 
 #: ../properties/nm-openvpn-dialog.ui.h:13
-msgid "_Gateway:"
-msgstr "_MreÅ¾ni prolaz:"
+msgid "_Gateway"
+msgstr "_MreÅ¾ni prolaz"
 
 #: ../properties/nm-openvpn-dialog.ui.h:14
 msgid ""
@@ -782,13 +782,9 @@ msgstr "IzdavaÄ uverenja"
 msgid "User"
 msgstr "Korisnik"
 
-#: ../properties/nm-openvpn-dialog.ui.h:19
-msgid "Password:"
-msgstr "Lozinka:"
-
 #: ../properties/nm-openvpn-dialog.ui.h:20
-msgid "User name:"
-msgstr "KorisniÄko ime:"
+msgid "User name"
+msgstr "KorisniÄko ime"
 
 #: ../properties/nm-openvpn-dialog.ui.h:21
 msgid ""
@@ -809,20 +805,16 @@ msgstr ""
 "podeÅ¡avanje: â€žauth-user-passâ€œ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:25
-msgid "Remote IP Address:"
-msgstr "Udaljena IP adresa:"
+msgid "Remote IP Address"
+msgstr "Udaljena IP adresa"
 
 #: ../properties/nm-openvpn-dialog.ui.h:26
-msgid "Local IP Address:"
-msgstr "Mesna IP adresa:"
+msgid "Local IP Address"
+msgstr "Mesna IP adresa"
 
 #: ../properties/nm-openvpn-dialog.ui.h:27
-msgid "Key Direction:"
-msgstr "Usmerenje kljuÄa:"
-
-#: ../properties/nm-openvpn-dialog.ui.h:28
-msgid "Static Key:"
-msgstr "StatiÄki kljuÄ:"
+msgid "Key Direction"
+msgstr "Usmerenje kljuÄa"
 
 #: ../properties/nm-openvpn-dialog.ui.h:29
 msgid ""
@@ -864,8 +856,8 @@ msgstr ""
 "podeÅ¡avanje: â€žstatic <datoteka> [usmerenje]â€œ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:38
-msgid "Type:"
-msgstr "Vrsta:"
+msgid "Type"
+msgstr "Vrsta"
 
 #: ../properties/nm-openvpn-dialog.ui.h:39
 msgid "Select an authentication mode."
@@ -880,8 +872,8 @@ msgid "OpenVPN Advanced Options"
 msgstr "Napredne opcije za OpenVPN"
 
 #: ../properties/nm-openvpn-dialog.ui.h:43
-msgid "Use custom gateway p_ort:"
-msgstr "Koristi proizvoljni _prikljuÄnik mreÅ¾nog prolaza:"
+msgid "Use custom gateway p_ort"
+msgstr "Koristi proizvoljni _prikljuÄnik mreÅ¾nog prolaza"
 
 #: ../properties/nm-openvpn-dialog.ui.h:44
 msgid ""
@@ -894,8 +886,8 @@ msgstr ""
 "podeÅ¡avanje: â€žportâ€œ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:46
-msgid "Use custom _renegotiation interval:"
-msgstr "Koristi proizvoljan period ponovnog _pregovaranja:"
+msgid "Use custom _renegotiation interval"
+msgstr "Koristi proizvoljan period ponovnog _pregovaranja"
 
 #: ../properties/nm-openvpn-dialog.ui.h:47
 msgid ""
@@ -907,7 +899,7 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:49
 #, fuzzy
-msgid "Data _compression:"
+msgid "Data _compression"
 msgstr "Koristi _LZO saÅ¾imanje podataka"
 
 #: ../properties/nm-openvpn-dialog.ui.h:50
@@ -935,8 +927,8 @@ msgstr ""
 "podeÅ¡avanje: â€žproto tcp-client | udpâ€œ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:56
-msgid "Set virtual _device type:"
-msgstr "Podesi vrstu virtuelnog _ureÄ‘aja:"
+msgid "Set virtual _device type"
+msgstr "Podesi vrstu virtuelnog _ureÄ‘aja"
 
 #: ../properties/nm-openvpn-dialog.ui.h:57
 msgid "Explicitly set virtual device type and name (TUN/TAP)."
@@ -951,8 +943,8 @@ msgstr ""
 "podeÅ¡avanje: â€ždev-type tun | tapâ€œ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:60
-msgid " and _name:"
-msgstr " i _naziv:"
+msgid " and _name"
+msgstr " i _naziv"
 
 #: ../properties/nm-openvpn-dialog.ui.h:61
 msgid ""
@@ -965,8 +957,8 @@ msgstr ""
 "podeÅ¡avanje: dev â€ž<naziv>â€œ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:63
-msgid "Use custom tunnel Maximum Transmission _Unit (MTU):"
-msgstr "Koristi _jedinicu najveÄ‡eg prenosa (MTU) proizvoljnog kanala:"
+msgid "Use custom tunnel Maximum Transmission _Unit (MTU)"
+msgstr "Koristi _jedinicu najveÄ‡eg prenosa (MTU) proizvoljnog kanala"
 
 #: ../properties/nm-openvpn-dialog.ui.h:64
 msgid ""
@@ -979,8 +971,8 @@ msgstr ""
 "podeÅ¡avanje: â€žtun-mtuâ€œ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:66
-msgid "Use custom UDP _fragment size:"
-msgstr "Koristi veliÄinu _odlomka proizvoljnog UDP-a:"
+msgid "Use custom UDP _fragment size"
+msgstr "Koristi veliÄinu _odlomka proizvoljnog UDP-a"
 
 #: ../properties/nm-openvpn-dialog.ui.h:67
 msgid ""
@@ -1039,8 +1031,8 @@ msgstr ""
 "podeÅ¡avanje: tun-ipv6"
 
 #: ../properties/nm-openvpn-dialog.ui.h:81
-msgid "Specify pin_g interval:"
-msgstr "Navedi interval _pinga:"
+msgid "Specify pin_g interval"
+msgstr "Navedi interval _pinga"
 
 #: ../properties/nm-openvpn-dialog.ui.h:82
 msgid ""
@@ -1053,8 +1045,8 @@ msgstr ""
 "podeÅ¡avanje: â€žping <n>â€œ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:84
-msgid "Specify _exit or restart ping:"
-msgstr "Navedi ping _izlaska ili ponovnog pokretanja:"
+msgid "Specify _exit or restart ping"
+msgstr "Navedi ping _izlaska ili ponovnog pokretanja"
 
 #: ../properties/nm-openvpn-dialog.ui.h:85
 msgid ""
@@ -1100,8 +1092,8 @@ msgstr ""
 "podeÅ¡avanje: â€žfloatâ€œ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:93
-msgid "Specify max routes:"
-msgstr "Navedite najviÅ¡e rute:"
+msgid "Specify max routes"
+msgstr "Navedite najviÅ¡e rute"
 
 #: ../properties/nm-openvpn-dialog.ui.h:94
 msgid ""
@@ -1122,8 +1114,8 @@ msgstr ""
 "podeÅ¡avanje: â€žcipherâ€œ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:98
-msgid "Use custom _size of cipher key:"
-msgstr "Koristi proizvoljnu _veliÄinu kljuÄa Å¡ifrovanja:"
+msgid "Use custom _size of cipher key"
+msgstr "Koristi proizvoljnu _veliÄinu kljuÄa Å¡ifrovanja"
 
 #: ../properties/nm-openvpn-dialog.ui.h:99
 msgid ""
@@ -1146,12 +1138,12 @@ msgstr ""
 "podeÅ¡avanje: â€žauthâ€œ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:103
-msgid "Ci_pher:"
-msgstr "_Å ifra:"
+msgid "Ci_pher"
+msgstr "_Å ifra"
 
 #: ../properties/nm-openvpn-dialog.ui.h:104
-msgid "_HMAC Authentication:"
-msgstr "_HMAC potvrÄ‘ivanje identiteta:"
+msgid "_HMAC Authentication"
+msgstr "_HMAC potvrÄ‘ivanje identiteta"
 
 #: ../properties/nm-openvpn-dialog.ui.h:105
 msgid "Disable cipher _negotiation"
@@ -1198,8 +1190,8 @@ msgid "Security"
 msgstr "Bezbednost"
 
 #: ../properties/nm-openvpn-dialog.ui.h:115
-msgid "_Subject Match:"
-msgstr "_Poklapanje naslova:"
+msgid "_Subject Match"
+msgstr "_Poklapanje naslova"
 
 #: ../properties/nm-openvpn-dialog.ui.h:116
 msgid ""
@@ -1214,8 +1206,8 @@ msgstr ""
 "podeÅ¡avanje (stari reÅ¾im): tls-remote subjekat-ili-naziv"
 
 #: ../properties/nm-openvpn-dialog.ui.h:120
-msgid "Server _Certificate Check:"
-msgstr "Provera _uverenja servera:"
+msgid "Server _Certificate Check"
+msgstr "Provera _uverenja servera"
 
 #: ../properties/nm-openvpn-dialog.ui.h:121
 msgid ""
@@ -1259,8 +1251,8 @@ msgstr ""
 "i koriÅ¡Ä‡enjem proÅ¡irenog kljuÄa zasnovanog na RFC3280 TLS pravilima."
 
 #: ../properties/nm-openvpn-dialog.ui.h:133
-msgid "_Remote peer certificate TLS type:"
-msgstr "_Vrsta TLS uverenja udaljenog parnjaka:"
+msgid "_Remote peer certificate TLS type"
+msgstr "_Vrsta TLS uverenja udaljenog parnjaka"
 
 #: ../properties/nm-openvpn-dialog.ui.h:134
 msgid ""
@@ -1284,8 +1276,8 @@ msgstr ""
 "Zahtevaj da uverenje parnjaka bude potpisan sa izriÄitom nsCertType oznakom."
 
 #: ../properties/nm-openvpn-dialog.ui.h:138
-msgid "_Remote peer certificate nsCert designation:"
-msgstr "Oznaka nsCert uve_renja udaljenog parnjaka:"
+msgid "_Remote peer certificate nsCert designation"
+msgstr "Oznaka nsCert uve_renja udaljenog parnjaka"
 
 #: ../properties/nm-openvpn-dialog.ui.h:139
 msgid ""
@@ -1298,8 +1290,8 @@ msgstr ""
 "podeÅ¡avanje: â€žns-cert-type client|serverâ€œ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:141
-msgid "Key _Direction:"
-msgstr "_Usmerenje kljuÄa:"
+msgid "Key _Direction"
+msgstr "_Usmerenje kljuÄa"
 
 #: ../properties/nm-openvpn-dialog.ui.h:142
 #, fuzzy
@@ -1329,12 +1321,12 @@ msgstr ""
 "podeÅ¡avanje: â€žtls-auth <datoteka> [usmerenje]â€œ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:147
-msgid "Key _File:"
-msgstr "_Datoteka kljuÄa:"
+msgid "Key _File"
+msgstr "_Datoteka kljuÄa"
 
 #: ../properties/nm-openvpn-dialog.ui.h:148
 #, fuzzy
-msgid "Mode:"
+msgid "Mode"
 msgstr "ReÅ¾im"
 
 #: ../properties/nm-openvpn-dialog.ui.h:149
@@ -1343,8 +1335,8 @@ msgstr "Dodajte dopunski sloj Å¡ifrovanja ili HMAC potvrde identiteta."
 
 #: ../properties/nm-openvpn-dialog.ui.h:150
 #, fuzzy
-msgid "Extra Certificates:"
-msgstr "KorisniÄko uverenje:"
+msgid "Extra Certificates"
+msgstr "KorisniÄko uverenje"
 
 #: ../properties/nm-openvpn-dialog.ui.h:151
 msgid ""
@@ -1366,7 +1358,7 @@ msgid "TLS version control"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:156
-msgid "TLS _min version: "
+msgid "TLS _min version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:157
@@ -1378,7 +1370,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:158
-msgid "TLS ma_x version: "
+msgid "TLS ma_x version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:159
@@ -1400,8 +1392,8 @@ msgstr ""
 "podeÅ¡avanje: â€žhttp-proxyâ€œ ili â€žsocks-proxyâ€œ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:163
-msgid "Proxy _Type:"
-msgstr "Vrsta _posrednika:"
+msgid "Proxy _Type"
+msgstr "Vrsta _posrednika"
 
 #: ../properties/nm-openvpn-dialog.ui.h:164
 msgid ""
@@ -1412,8 +1404,8 @@ msgstr ""
 "servera za pristupanje Internetu.</i>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:165
-msgid "Server _Address:"
-msgstr "_Adresa servera:"
+msgid "Server _Address"
+msgstr "_Adresa servera"
 
 #: ../properties/nm-openvpn-dialog.ui.h:166
 msgid ""
@@ -1424,8 +1416,8 @@ msgstr ""
 "podeÅ¡avanje: â€žhttp-proxyâ€œ ili â€žsocks-proxyâ€œ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:168
-msgid "_Port:"
-msgstr "_PrikljuÄnik:"
+msgid "_Port"
+msgstr "_PrikljuÄnik"
 
 #: ../properties/nm-openvpn-dialog.ui.h:169
 msgid ""
@@ -1449,12 +1441,12 @@ msgstr ""
 "podeÅ¡avanje: â€žhttp-proxy-retryâ€œ ili â€žsocks-proxy-retryâ€œ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:174
-msgid "Proxy _Username:"
-msgstr "KorisniÄko _ime za posrednika:"
+msgid "Proxy _Username"
+msgstr "KorisniÄko _ime za posrednika"
 
 #: ../properties/nm-openvpn-dialog.ui.h:175
-msgid "Proxy Passwor_d:"
-msgstr "Lozinka _posrednika:"
+msgid "Proxy Passwor_d"
+msgstr "Lozinka _posrednika"
 
 #: ../properties/nm-openvpn-dialog.ui.h:176
 msgid "HTTP/Socks proxy username passed to OpenVPN when prompted for it."
diff --git a/po/sv.po b/po/sv.po
index e6da32c..0bc1a27 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -804,8 +804,8 @@ msgid "General"
 msgstr "AllmÃ¤nt"
 
 #: ../properties/nm-openvpn-dialog.ui.h:14
-msgid "_Gateway:"
-msgstr "_Gateway:"
+msgid "_Gateway"
+msgstr "_Gateway"
 
 #: ../properties/nm-openvpn-dialog.ui.h:15
 msgid ""
@@ -831,13 +831,9 @@ msgstr "CA"
 msgid "User"
 msgstr "AnvÃ¤ndare"
 
-#: ../properties/nm-openvpn-dialog.ui.h:20
-msgid "Password:"
-msgstr "LÃ¶senord:"
-
 #: ../properties/nm-openvpn-dialog.ui.h:21
-msgid "User name:"
-msgstr "AnvÃ¤ndarnamn:"
+msgid "User name"
+msgstr "AnvÃ¤ndarnamn"
 
 #: ../properties/nm-openvpn-dialog.ui.h:22
 msgid ""
@@ -858,20 +854,16 @@ msgstr ""
 "konfig: auth-user-pass"
 
 #: ../properties/nm-openvpn-dialog.ui.h:26
-msgid "Remote IP Address:"
-msgstr "FjÃ¤rr-IP-adress:"
+msgid "Remote IP Address"
+msgstr "FjÃ¤rr-IP-adress"
 
 #: ../properties/nm-openvpn-dialog.ui.h:27
-msgid "Local IP Address:"
-msgstr "Lokal IP-adress:"
+msgid "Local IP Address"
+msgstr "Lokal IP-adress"
 
 #: ../properties/nm-openvpn-dialog.ui.h:28
-msgid "Key Direction:"
-msgstr "Nyckelriktning:"
-
-#: ../properties/nm-openvpn-dialog.ui.h:29
-msgid "Static Key:"
-msgstr "Statisk nyckel:"
+msgid "Key Direction"
+msgstr "Nyckelriktning"
 
 #: ../properties/nm-openvpn-dialog.ui.h:30
 msgid ""
@@ -913,8 +905,8 @@ msgstr ""
 "konfig: static <fil> [riktning]"
 
 #: ../properties/nm-openvpn-dialog.ui.h:39
-msgid "Type:"
-msgstr "Typ:"
+msgid "Type"
+msgstr "Typ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:40
 msgid "Select an authentication mode."
@@ -929,8 +921,8 @@ msgid "OpenVPN Advanced Options"
 msgstr "Avancerade alternativ fÃ¶r OpenVPN"
 
 #: ../properties/nm-openvpn-dialog.ui.h:44
-msgid "Use custom gateway p_ort:"
-msgstr "AnvÃ¤nd anpassad gatewayp_ort:"
+msgid "Use custom gateway p_ort"
+msgstr "AnvÃ¤nd anpassad gatewayp_ort"
 
 #: ../properties/nm-openvpn-dialog.ui.h:45
 msgid ""
@@ -943,8 +935,8 @@ msgstr ""
 "konfig: port"
 
 #: ../properties/nm-openvpn-dialog.ui.h:47
-msgid "Use custom _renegotiation interval:"
-msgstr "AnvÃ¤nd anpassat intervall fÃ¶r _omfÃ¶rhandling:"
+msgid "Use custom _renegotiation interval"
+msgstr "AnvÃ¤nd anpassat intervall fÃ¶r _omfÃ¶rhandling"
 
 #: ../properties/nm-openvpn-dialog.ui.h:48
 msgid ""
@@ -955,8 +947,8 @@ msgstr ""
 "konfig: reneg-sec"
 
 #: ../properties/nm-openvpn-dialog.ui.h:50
-msgid "Data _compression:"
-msgstr "Data_komprimering:"
+msgid "Data _compression"
+msgstr "Data_komprimering"
 
 #: ../properties/nm-openvpn-dialog.ui.h:51
 msgid ""
@@ -983,8 +975,8 @@ msgstr ""
 "konfig: proto tcp-client | udp"
 
 #: ../properties/nm-openvpn-dialog.ui.h:57
-msgid "Set virtual _device type:"
-msgstr "SÃ¤tt virtuell _enhetstyp:"
+msgid "Set virtual _device type"
+msgstr "SÃ¤tt virtuell _enhetstyp"
 
 #: ../properties/nm-openvpn-dialog.ui.h:58
 msgid "Explicitly set virtual device type and name (TUN/TAP)."
@@ -999,8 +991,8 @@ msgstr ""
 "konfig: dev-type tun | tap"
 
 #: ../properties/nm-openvpn-dialog.ui.h:61
-msgid " and _name:"
-msgstr " och _namn:"
+msgid " and _name"
+msgstr " och _namn"
 
 #: ../properties/nm-openvpn-dialog.ui.h:62
 msgid ""
@@ -1013,8 +1005,8 @@ msgstr ""
 "konfig: dev <namn>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:64
-msgid "Use custom tunnel Maximum Transmission _Unit (MTU):"
-msgstr "AnvÃ¤nd anpassad Maximum Transmission Unit (MTU) fÃ¶r _tunneln:"
+msgid "Use custom tunnel Maximum Transmission _Unit (MTU)"
+msgstr "AnvÃ¤nd anpassad Maximum Transmission Unit (MTU) fÃ¶r _tunneln"
 
 #: ../properties/nm-openvpn-dialog.ui.h:65
 msgid ""
@@ -1027,8 +1019,8 @@ msgstr ""
 "konfig: tun-mtu"
 
 #: ../properties/nm-openvpn-dialog.ui.h:67
-msgid "Use custom UDP _fragment size:"
-msgstr "AnvÃ¤nd anpassad storlek pÃ¥ UDP-_fragment:"
+msgid "Use custom UDP _fragment size"
+msgstr "AnvÃ¤nd anpassad storlek pÃ¥ UDP-_fragment"
 
 #: ../properties/nm-openvpn-dialog.ui.h:68
 msgid ""
@@ -1102,8 +1094,8 @@ msgstr ""
 "konfig: tun-ipv6"
 
 #: ../properties/nm-openvpn-dialog.ui.h:85
-msgid "Specify pin_g interval:"
-msgstr "Ange pin_g-intervall:"
+msgid "Specify pin_g interval"
+msgstr "Ange pin_g-intervall"
 
 #: ../properties/nm-openvpn-dialog.ui.h:86
 msgid ""
@@ -1116,8 +1108,8 @@ msgstr ""
 "konfig: ping <n>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:88
-msgid "Specify _exit or restart ping:"
-msgstr "Ange _exit eller starta om ping:"
+msgid "Specify _exit or restart ping"
+msgstr "Ange _exit eller starta om ping"
 
 #: ../properties/nm-openvpn-dialog.ui.h:89
 msgid ""
@@ -1162,8 +1154,8 @@ msgstr ""
 "konfig: float"
 
 #: ../properties/nm-openvpn-dialog.ui.h:97
-msgid "Specify max routes:"
-msgstr "Ange hÃ¶gsta antal rutter:"
+msgid "Specify max routes"
+msgstr "Ange hÃ¶gsta antal rutter"
 
 #: ../properties/nm-openvpn-dialog.ui.h:98
 msgid ""
@@ -1184,8 +1176,8 @@ msgstr ""
 "konfig: cipher"
 
 #: ../properties/nm-openvpn-dialog.ui.h:102
-msgid "Use custom _size of cipher key:"
-msgstr "AnvÃ¤nd anpassad _storlek pÃ¥ chiffernyckel:"
+msgid "Use custom _size of cipher key"
+msgstr "AnvÃ¤nd anpassad _storlek pÃ¥ chiffernyckel"
 
 #: ../properties/nm-openvpn-dialog.ui.h:103
 msgid ""
@@ -1208,12 +1200,12 @@ msgstr ""
 "konfig: auth"
 
 #: ../properties/nm-openvpn-dialog.ui.h:107
-msgid "Ci_pher:"
-msgstr "Chi_ffer:"
+msgid "Ci_pher"
+msgstr "Chi_ffer"
 
 #: ../properties/nm-openvpn-dialog.ui.h:108
-msgid "_HMAC Authentication:"
-msgstr "_HMAC-autentisering:"
+msgid "_HMAC Authentication"
+msgstr "_HMAC-autentisering"
 
 #: ../properties/nm-openvpn-dialog.ui.h:109
 msgid "Disable cipher _negotiation"
@@ -1268,8 +1260,8 @@ msgid "Security"
 msgstr "SÃ¤kerhet"
 
 #: ../properties/nm-openvpn-dialog.ui.h:119
-msgid "_Subject Match:"
-msgstr "Matc_ha fÃ¶ljande:"
+msgid "_Subject Match"
+msgstr "Matc_ha fÃ¶ljande"
 
 # TODO: ev. <> kring Ã¤mne-eller-namn
 #: ../properties/nm-openvpn-dialog.ui.h:120
@@ -1285,8 +1277,8 @@ msgstr ""
 "konfig (fÃ¶rÃ¥ldrat lÃ¤ge): tls-remote Ã¤mne-eller-namn"
 
 #: ../properties/nm-openvpn-dialog.ui.h:124
-msgid "Server _Certificate Check:"
-msgstr "Server_certifikatkontroll:"
+msgid "Server _Certificate Check"
+msgstr "Server_certifikatkontroll"
 
 # TODO: ev. <> kring Ã¤mne-eller-namn
 #: ../properties/nm-openvpn-dialog.ui.h:125
@@ -1331,8 +1323,8 @@ msgstr ""
 "och en utÃ¶kad nyckelanvÃ¤ndning baserad pÃ¥ regler fÃ¶r RFC3280 TLS."
 
 #: ../properties/nm-openvpn-dialog.ui.h:137
-msgid "_Remote peer certificate TLS type:"
-msgstr "_AvlÃ¤gsen TLS-typ fÃ¶r motpartscertifikat:"
+msgid "_Remote peer certificate TLS type"
+msgstr "_AvlÃ¤gsen TLS-typ fÃ¶r motpartscertifikat"
 
 #: ../properties/nm-openvpn-dialog.ui.h:138
 msgid ""
@@ -1357,8 +1349,8 @@ msgstr ""
 "angivning."
 
 #: ../properties/nm-openvpn-dialog.ui.h:142
-msgid "_Remote peer certificate nsCert designation:"
-msgstr "nsCert-angivning fÃ¶_r avlÃ¤gset motpartscertifikat:"
+msgid "_Remote peer certificate nsCert designation"
+msgstr "nsCert-angivning fÃ¶_r avlÃ¤gset motpartscertifikat"
 
 #: ../properties/nm-openvpn-dialog.ui.h:143
 msgid ""
@@ -1371,8 +1363,8 @@ msgstr ""
 "konfig: ns-cert-type client|server"
 
 #: ../properties/nm-openvpn-dialog.ui.h:145
-msgid "Key _Direction:"
-msgstr "Nyckel_riktning:"
+msgid "Key _Direction"
+msgstr "Nyckel_riktning"
 
 #: ../properties/nm-openvpn-dialog.ui.h:146
 msgid ""
@@ -1402,12 +1394,12 @@ msgstr ""
 "konfig: tls-auth <fil> [direction]"
 
 #: ../properties/nm-openvpn-dialog.ui.h:151
-msgid "Key _File:"
-msgstr "Nyckel_fil:"
+msgid "Key _File"
+msgstr "Nyckel_fil"
 
 #: ../properties/nm-openvpn-dialog.ui.h:152
-msgid "Mode:"
-msgstr "LÃ¤ge:"
+msgid "Mode"
+msgstr "LÃ¤ge"
 
 #: ../properties/nm-openvpn-dialog.ui.h:153
 msgid "Add an additional layer of encryption or HMAC authentication."
@@ -1415,8 +1407,8 @@ msgstr ""
 "LÃ¤gg till ett ytterligare lager av kryptering eller HMAC-autentisering."
 
 #: ../properties/nm-openvpn-dialog.ui.h:154
-msgid "Extra Certificates:"
-msgstr "Extracertifikat:"
+msgid "Extra Certificates"
+msgstr "Extracertifikat"
 
 #: ../properties/nm-openvpn-dialog.ui.h:155
 msgid ""
@@ -1442,8 +1434,8 @@ msgid "TLS version control"
 msgstr "TLS-versionskontroll"
 
 #: ../properties/nm-openvpn-dialog.ui.h:160
-msgid "TLS _min version: "
-msgstr "_LÃ¤gsta TLS-version: "
+msgid "TLS _min version"
+msgstr "_LÃ¤gsta TLS-version"
 
 #: ../properties/nm-openvpn-dialog.ui.h:161
 msgid ""
@@ -1458,8 +1450,8 @@ msgstr ""
 "den hÃ¶gsta TLS-versionen som stÃ¶ds av den lokala SSL-implementationen."
 
 #: ../properties/nm-openvpn-dialog.ui.h:162
-msgid "TLS ma_x version: "
-msgstr "_HÃ¶gsta TLS-version: "
+msgid "TLS ma_x version"
+msgstr "_HÃ¶gsta TLS-version"
 
 #: ../properties/nm-openvpn-dialog.ui.h:163
 msgid ""
@@ -1483,8 +1475,8 @@ msgstr ""
 "konfig: http-proxy eller socks-proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:167
-msgid "Proxy _Type:"
-msgstr "Proxy_typ:"
+msgid "Proxy _Type"
+msgstr "Proxy_typ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:168
 msgid ""
@@ -1495,8 +1487,8 @@ msgstr ""
 "anvÃ¤nds fÃ¶r att komma Ã¥t internet.</i>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:169
-msgid "Server _Address:"
-msgstr "Server_adress:"
+msgid "Server _Address"
+msgstr "Server_adress"
 
 #: ../properties/nm-openvpn-dialog.ui.h:170
 msgid ""
@@ -1507,8 +1499,8 @@ msgstr ""
 "konfig: http-proxy eller socks-proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:172
-msgid "_Port:"
-msgstr "_Port:"
+msgid "_Port"
+msgstr "_Port"
 
 #: ../properties/nm-openvpn-dialog.ui.h:173
 msgid ""
@@ -1532,12 +1524,12 @@ msgstr ""
 "konfig: http-proxy-retry eller socks-proxy-retry"
 
 #: ../properties/nm-openvpn-dialog.ui.h:178
-msgid "Proxy _Username:"
-msgstr "AnvÃ¤nda_rnamn fÃ¶r proxy:"
+msgid "Proxy _Username"
+msgstr "AnvÃ¤nda_rnamn fÃ¶r proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:179
-msgid "Proxy Passwor_d:"
-msgstr "LÃ¶senor_d fÃ¶r proxy:"
+msgid "Proxy Passwor_d"
+msgstr "LÃ¶senor_d fÃ¶r proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:180
 msgid "HTTP/Socks proxy username passed to OpenVPN when prompted for it."
diff --git a/po/ta.po b/po/ta.po
index ee6a1d6..4f13218 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -748,8 +748,8 @@ msgid "General"
 msgstr "à®ªà¯Šà®¤à¯"
 
 #: ../properties/nm-openvpn-dialog.ui.h:13
-msgid "_Gateway:"
-msgstr "à®•à¯‡à®Ÿà¯à®µà¯‡ (_G):"
+msgid "_Gateway"
+msgstr "à®•à¯‡à®Ÿà¯à®µà¯‡ (_G)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:14
 msgid ""
@@ -772,13 +772,9 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#: ../properties/nm-openvpn-dialog.ui.h:19
-msgid "Password:"
-msgstr "à®•à®Ÿà®µà¯à®šà¯à®šà¯Šà®²à¯:"
-
 #: ../properties/nm-openvpn-dialog.ui.h:20
-msgid "User name:"
-msgstr "à®ªà®¯à®©à®°à¯ à®ªà¯†à®¯à®°à¯:"
+msgid "User name"
+msgstr "à®ªà®¯à®©à®°à¯ à®ªà¯†à®¯à®°à¯"
 
 #: ../properties/nm-openvpn-dialog.ui.h:21
 msgid ""
@@ -794,21 +790,17 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:25
-msgid "Remote IP Address:"
-msgstr "à®¤à¯Šà®²à¯ˆ IP à®®à¯à®•à®µà®°à®¿:"
+msgid "Remote IP Address"
+msgstr "à®¤à¯Šà®²à¯ˆ IP à®®à¯à®•à®µà®°à®¿"
 
 #: ../properties/nm-openvpn-dialog.ui.h:26
-msgid "Local IP Address:"
-msgstr "à®‰à®³à¯à®³à®®à¯ˆ IP à®®à¯à®•à®µà®°à®¿:"
+msgid "Local IP Address"
+msgstr "à®‰à®³à¯à®³à®®à¯ˆ IP à®®à¯à®•à®µà®°à®¿"
 
 #: ../properties/nm-openvpn-dialog.ui.h:27
 #, fuzzy
-msgid "Key Direction:"
-msgstr "à®µà®¿à®šà¯ˆ à®¤à®¿à®šà¯ˆ:"
-
-#: ../properties/nm-openvpn-dialog.ui.h:28
-msgid "Static Key:"
-msgstr "à®¨à®¿à®²à¯ˆà®¯à®¾à®© à®µà®¿à®šà¯ˆ:"
+msgid "Key Direction"
+msgstr "à®µà®¿à®šà¯ˆ à®¤à®¿à®šà¯ˆ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:29
 msgid ""
@@ -843,8 +835,8 @@ msgstr ""
 "à®•à¯Šà®³à¯à®³à®µà¯à®®à¯.</i>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:38
-msgid "Type:"
-msgstr "à®µà®•à¯ˆ:"
+msgid "Type"
+msgstr "à®µà®•à¯ˆ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:39
 #, fuzzy
@@ -861,8 +853,8 @@ msgid "OpenVPN Advanced Options"
 msgstr "à®¤à®¿à®±à®¨à¯à®¤VPN à®•à¯‚à®Ÿà¯à®¤à®²à¯ à®µà®¿à®°à¯à®ªà¯à®ªà®™à¯à®•à®³à¯"
 
 #: ../properties/nm-openvpn-dialog.ui.h:43
-msgid "Use custom gateway p_ort:"
-msgstr "à®¤à®©à®¿à®ªà®¯à®©à¯ à®•à¯‡à®Ÿà¯à®µà¯‡ à®¤à¯à®±à¯ˆà®¯à¯ˆà®ªà¯ à®ªà®¯à®©à¯à®ªà®Ÿà¯à®¤à¯à®¤à¯ (_o):"
+msgid "Use custom gateway p_ort"
+msgstr "à®¤à®©à®¿à®ªà®¯à®©à¯ à®•à¯‡à®Ÿà¯à®µà¯‡ à®¤à¯à®±à¯ˆà®¯à¯ˆà®ªà¯ à®ªà®¯à®©à¯à®ªà®Ÿà¯à®¤à¯à®¤à¯ (_o)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:44
 msgid ""
@@ -872,8 +864,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:46
-msgid "Use custom _renegotiation interval:"
-msgstr "à®¤à®©à®¿à®ªà®¯à®©à¯ à®®à®±à¯à®•à¯à®±à¯ˆà®¤à¯à®¤à®²à¯ à®‡à®Ÿà¯ˆà®µà¯†à®±à®¿à®¯à¯ˆ à®ªà®¯à®©à¯à®ªà®Ÿà¯à®¤à¯à®¤à¯ (_r):"
+msgid "Use custom _renegotiation interval"
+msgstr "à®¤à®©à®¿à®ªà®¯à®©à¯ à®®à®±à¯à®•à¯à®±à¯ˆà®¤à¯à®¤à®²à¯ à®‡à®Ÿà¯ˆà®µà¯†à®±à®¿à®¯à¯ˆ à®ªà®¯à®©à¯à®ªà®Ÿà¯à®¤à¯à®¤à¯ (_r)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:47
 msgid ""
@@ -883,7 +875,7 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:49
 #, fuzzy
-msgid "Data _compression:"
+msgid "Data _compression"
 msgstr "L_ZO à®¤à®°à®µà¯ à®•à¯à®±à¯à®•à¯à®•à®¤à¯à®¤à¯ˆ à®ªà®¯à®©à¯à®ªà®Ÿà¯à®¤à¯à®¤à¯"
 
 #: ../properties/nm-openvpn-dialog.ui.h:50
@@ -905,7 +897,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:56
-msgid "Set virtual _device type:"
+msgid "Set virtual _device type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:57
@@ -919,7 +911,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:60
-msgid " and _name:"
+msgid " and _name"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:61
@@ -930,7 +922,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:63
-msgid "Use custom tunnel Maximum Transmission _Unit (MTU):"
+msgid "Use custom tunnel Maximum Transmission _Unit (MTU)"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:64
@@ -942,8 +934,8 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:66
 #, fuzzy
-msgid "Use custom UDP _fragment size:"
-msgstr "à®¤à®©à®¿à®ªà®¯à®©à¯ à®®à®±à¯à®•à¯à®±à¯ˆà®¤à¯à®¤à®²à¯ à®‡à®Ÿà¯ˆà®µà¯†à®±à®¿à®¯à¯ˆ à®ªà®¯à®©à¯à®ªà®Ÿà¯à®¤à¯à®¤à¯ (_r):"
+msgid "Use custom UDP _fragment size"
+msgstr "à®¤à®©à®¿à®ªà®¯à®©à¯ à®®à®±à¯à®•à¯à®±à¯ˆà®¤à¯à®¤à®²à¯ à®‡à®Ÿà¯ˆà®µà¯†à®±à®¿à®¯à¯ˆ à®ªà®¯à®©à¯à®ªà®Ÿà¯à®¤à¯à®¤à¯ (_r)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:67
 msgid ""
@@ -993,7 +985,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:81
-msgid "Specify pin_g interval:"
+msgid "Specify pin_g interval"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:82
@@ -1004,7 +996,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:84
-msgid "Specify _exit or restart ping:"
+msgid "Specify _exit or restart ping"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:85
@@ -1035,7 +1027,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:93
-msgid "Specify max routes:"
+msgid "Specify max routes"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:94
@@ -1052,7 +1044,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:98
-msgid "Use custom _size of cipher key:"
+msgid "Use custom _size of cipher key"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:99
@@ -1070,12 +1062,12 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:103
-msgid "Ci_pher:"
-msgstr "à®šà®¿à®ªà¯à®ªà®°à¯:"
+msgid "Ci_pher"
+msgstr "à®šà®¿à®ªà¯à®ªà®°à¯"
 
 #: ../properties/nm-openvpn-dialog.ui.h:104
-msgid "_HMAC Authentication:"
-msgstr "HMAC à®…à®™à¯à®•à¯€à®•à®¾à®°à®®à¯:"
+msgid "_HMAC Authentication"
+msgstr "HMAC à®…à®™à¯à®•à¯€à®•à®¾à®°à®®à¯"
 
 #: ../properties/nm-openvpn-dialog.ui.h:105
 msgid "Disable cipher _negotiation"
@@ -1122,7 +1114,7 @@ msgid "Security"
 msgstr "à®ªà®¾à®¤à¯à®•à®¾à®ªà¯à®ªà¯"
 
 #: ../properties/nm-openvpn-dialog.ui.h:115
-msgid "_Subject Match:"
+msgid "_Subject Match"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:116
@@ -1135,8 +1127,8 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:120
 #, fuzzy
-msgid "Server _Certificate Check:"
-msgstr "à®ªà®¯à®©à®°à¯ à®šà®¾à®©à¯à®±à®¿à®¤à®´à¯:"
+msgid "Server _Certificate Check"
+msgstr "à®ªà®¯à®©à®°à¯ à®šà®¾à®©à¯à®±à®¿à®¤à®´à¯"
 
 #: ../properties/nm-openvpn-dialog.ui.h:121
 msgid ""
@@ -1166,7 +1158,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:133
-msgid "_Remote peer certificate TLS type:"
+msgid "_Remote peer certificate TLS type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:134
@@ -1187,7 +1179,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:138
-msgid "_Remote peer certificate nsCert designation:"
+msgid "_Remote peer certificate nsCert designation"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:139
@@ -1198,8 +1190,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:141
-msgid "Key _Direction:"
-msgstr "à®µà®¿à®šà¯ˆ à®¤à®¿à®šà¯ˆ:"
+msgid "Key _Direction"
+msgstr "à®µà®¿à®šà¯ˆ à®¤à®¿à®šà¯ˆ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:142
 msgid ""
@@ -1224,11 +1216,11 @@ msgstr ""
 "à®•à¯Šà®³à¯à®³à®µà¯à®®à¯.</i>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:147
-msgid "Key _File:"
-msgstr "à®µà®¿à®šà¯ˆ à®•à¯‹à®ªà¯à®ªà¯:"
+msgid "Key _File"
+msgstr "à®µà®¿à®šà¯ˆ à®•à¯‹à®ªà¯à®ªà¯"
 
 #: ../properties/nm-openvpn-dialog.ui.h:148
-msgid "Mode:"
+msgid "Mode"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:149
@@ -1238,8 +1230,8 @@ msgstr "à®•à¯‚à®Ÿà¯à®¤à®²à¯ TLS à®…à®™à¯à®•à¯€à®•à®¾à®°à®¤à¯à®¤à¯ˆ à®ªà®¯à®©
 
 #: ../properties/nm-openvpn-dialog.ui.h:150
 #, fuzzy
-msgid "Extra Certificates:"
-msgstr "à®ªà®¯à®©à®°à¯ à®šà®¾à®©à¯à®±à®¿à®¤à®´à¯:"
+msgid "Extra Certificates"
+msgstr "à®ªà®¯à®©à®°à¯ à®šà®¾à®©à¯à®±à®¿à®¤à®´à¯"
 
 #: ../properties/nm-openvpn-dialog.ui.h:151
 msgid ""
@@ -1262,7 +1254,7 @@ msgid "TLS version control"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:156
-msgid "TLS _min version: "
+msgid "TLS _min version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:157
@@ -1274,7 +1266,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:158
-msgid "TLS ma_x version: "
+msgid "TLS ma_x version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:159
@@ -1294,7 +1286,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:163
-msgid "Proxy _Type:"
+msgid "Proxy _Type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:164
@@ -1305,8 +1297,8 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:165
 #, fuzzy
-msgid "Server _Address:"
-msgstr "à®¤à¯Šà®²à¯ˆ IP à®®à¯à®•à®µà®°à®¿:"
+msgid "Server _Address"
+msgstr "à®¤à¯Šà®²à¯ˆ IP à®®à¯à®•à®µà®°à®¿"
 
 #: ../properties/nm-openvpn-dialog.ui.h:166
 msgid ""
@@ -1315,7 +1307,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:168
-msgid "_Port:"
+msgid "_Port"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:169
@@ -1336,13 +1328,13 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:174
 #, fuzzy
-msgid "Proxy _Username:"
-msgstr "(_U) à®ªà®¯à®©à®°à¯ à®ªà¯†à®¯à®°à¯:"
+msgid "Proxy _Username"
+msgstr "(_U) à®ªà®¯à®©à®°à¯ à®ªà¯†à®¯à®°à¯"
 
 #: ../properties/nm-openvpn-dialog.ui.h:175
 #, fuzzy
-msgid "Proxy Passwor_d:"
-msgstr "à®•à®Ÿà®µà¯à®šà¯à®šà¯Šà®²à¯:"
+msgid "Proxy Passwor_d"
+msgstr "à®•à®Ÿà®µà¯à®šà¯à®šà¯Šà®²à¯"
 
 #: ../properties/nm-openvpn-dialog.ui.h:176
 msgid "HTTP/Socks proxy username passed to OpenVPN when prompted for it."
diff --git a/po/te.po b/po/te.po
index 773b518..0f060f8 100644
--- a/po/te.po
+++ b/po/te.po
@@ -746,8 +746,8 @@ msgid "General"
 msgstr "à°¸à°¾à°¦à°¾à°°à°£"
 
 #: ../properties/nm-openvpn-dialog.ui.h:13
-msgid "_Gateway:"
-msgstr "à°—à±‡à°Ÿà±â€Œà°µà±‡ (_G):"
+msgid "_Gateway"
+msgstr "à°—à±‡à°Ÿà±â€Œà°µà±‡ (_G)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:14
 msgid ""
@@ -770,13 +770,9 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#: ../properties/nm-openvpn-dialog.ui.h:19
-msgid "Password:"
-msgstr "à°¸à°‚à°•à±‡à°¤à°ªà°¦à°®à±:"
-
 #: ../properties/nm-openvpn-dialog.ui.h:20
-msgid "User name:"
-msgstr "à°µà°¿à°¨à°¿à°¯à±‹à°—à°¦à°¾à°°à°¿ à°¨à°¾à°®à°®à±:"
+msgid "User name"
+msgstr "à°µà°¿à°¨à°¿à°¯à±‹à°—à°¦à°¾à°°à°¿ à°¨à°¾à°®à°®à±"
 
 #: ../properties/nm-openvpn-dialog.ui.h:21
 msgid ""
@@ -792,21 +788,17 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:25
-msgid "Remote IP Address:"
-msgstr "à°¦à±‚à°°à°¸à±à°¥ IP à°šà°¿à°°à±à°¨à°¾à°®à°¾:"
+msgid "Remote IP Address"
+msgstr "à°¦à±‚à°°à°¸à±à°¥ IP à°šà°¿à°°à±à°¨à°¾à°®à°¾"
 
 #: ../properties/nm-openvpn-dialog.ui.h:26
-msgid "Local IP Address:"
-msgstr "à°¸à±à°¥à°¾à°¨à°¿à°• IP à°šà°¿à°°à±à°¨à°¾à°®à°¾:"
+msgid "Local IP Address"
+msgstr "à°¸à±à°¥à°¾à°¨à°¿à°• IP à°šà°¿à°°à±à°¨à°¾à°®à°¾"
 
 #: ../properties/nm-openvpn-dialog.ui.h:27
 #, fuzzy
-msgid "Key Direction:"
-msgstr "à°•à±€ à°¦à°¿à°¶:"
-
-#: ../properties/nm-openvpn-dialog.ui.h:28
-msgid "Static Key:"
-msgstr "à°¸à±à°Ÿà°¾à°Ÿà°¿à°•à± à°•à±€:"
+msgid "Key Direction"
+msgstr "à°•à±€ à°¦à°¿à°¶"
 
 #: ../properties/nm-openvpn-dialog.ui.h:29
 msgid ""
@@ -840,8 +832,8 @@ msgstr ""
 "à°®à±€à°•à± à°–à°šà±à°šà°¿à°¤à°‚à°—à°¾ à°¤à±†à°²à°¿à°¯à°•à±à°‚à°Ÿà±‡, à°®à±€ à°¸à°¿à°¸à±à°Ÿà°®à± à°¨à°¿à°°à±à°µà°¹à°£à°¾à°§à°¿à°•à°¾à°°à°¿à°¨à°¿ à°¸à°‚à°ªà±à°°à°¦à°¿à°‚à°šà°‚à°¡à°¿.</i>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:38
-msgid "Type:"
-msgstr "à°°à°•à°®à±:"
+msgid "Type"
+msgstr "à°°à°•à°®à±"
 
 #: ../properties/nm-openvpn-dialog.ui.h:39
 #, fuzzy
@@ -858,8 +850,8 @@ msgid "OpenVPN Advanced Options"
 msgstr "OpenVPN à°…à°§à±à°¨à°¾à°¤à°¨ à°à°šà±à°šà°¿à°•à°®à±à°²à±"
 
 #: ../properties/nm-openvpn-dialog.ui.h:43
-msgid "Use custom gateway p_ort:"
-msgstr "à°®à°²à°šà±à°•à±Šà°¨à°¿à°¨ à°—à±‡à°Ÿà±â€Œà°µà±‡ à°ªà±‹à°°à±à°Ÿà± à°µà±à°ªà°¯à±‹à°—à°¿à°‚à°šà±à°®à± (_o):"
+msgid "Use custom gateway p_ort"
+msgstr "à°®à°²à°šà±à°•à±Šà°¨à°¿à°¨ à°—à±‡à°Ÿà±â€Œà°µà±‡ à°ªà±‹à°°à±à°Ÿà± à°µà±à°ªà°¯à±‹à°—à°¿à°‚à°šà±à°®à± (_o)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:44
 msgid ""
@@ -869,8 +861,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:46
-msgid "Use custom _renegotiation interval:"
-msgstr "à°®à°²à°šà±à°•à±Šà°¨à°¿à°¨ à°…à°šà°°à±à°šà°¨à±€à°¯ à°µà°¿à°°à°¾à°®à°‚à°¨à± à°µà±à°ªà°¯à±‹à°—à°¿à°‚à°šà±à°®à± (_r):"
+msgid "Use custom _renegotiation interval"
+msgstr "à°®à°²à°šà±à°•à±Šà°¨à°¿à°¨ à°…à°šà°°à±à°šà°¨à±€à°¯ à°µà°¿à°°à°¾à°®à°‚à°¨à± à°µà±à°ªà°¯à±‹à°—à°¿à°‚à°šà±à°®à± (_r)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:47
 msgid ""
@@ -880,7 +872,7 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:49
 #, fuzzy
-msgid "Data _compression:"
+msgid "Data _compression"
 msgstr "L_ZO à°¡à°¾à°Ÿà°¾ à°•à±à°¦à°¿à°‚à°ªà±à°¨à± à°µà±à°ªà°¯à±‹à°—à°¿à°‚à°šà±à°®à±"
 
 #: ../properties/nm-openvpn-dialog.ui.h:50
@@ -902,7 +894,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:56
-msgid "Set virtual _device type:"
+msgid "Set virtual _device type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:57
@@ -916,7 +908,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:60
-msgid " and _name:"
+msgid " and _name"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:61
@@ -927,7 +919,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:63
-msgid "Use custom tunnel Maximum Transmission _Unit (MTU):"
+msgid "Use custom tunnel Maximum Transmission _Unit (MTU)"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:64
@@ -939,8 +931,8 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:66
 #, fuzzy
-msgid "Use custom UDP _fragment size:"
-msgstr "à°®à°²à°šà±à°•à±Šà°¨à°¿à°¨ à°…à°šà°°à±à°šà°¨à±€à°¯ à°µà°¿à°°à°¾à°®à°‚à°¨à± à°µà±à°ªà°¯à±‹à°—à°¿à°‚à°šà±à°®à± (_r):"
+msgid "Use custom UDP _fragment size"
+msgstr "à°®à°²à°šà±à°•à±Šà°¨à°¿à°¨ à°…à°šà°°à±à°šà°¨à±€à°¯ à°µà°¿à°°à°¾à°®à°‚à°¨à± à°µà±à°ªà°¯à±‹à°—à°¿à°‚à°šà±à°®à± (_r)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:67
 msgid ""
@@ -990,7 +982,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:81
-msgid "Specify pin_g interval:"
+msgid "Specify pin_g interval"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:82
@@ -1001,7 +993,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:84
-msgid "Specify _exit or restart ping:"
+msgid "Specify _exit or restart ping"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:85
@@ -1032,7 +1024,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:93
-msgid "Specify max routes:"
+msgid "Specify max routes"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:94
@@ -1049,7 +1041,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:98
-msgid "Use custom _size of cipher key:"
+msgid "Use custom _size of cipher key"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:99
@@ -1067,12 +1059,12 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:103
-msgid "Ci_pher:"
-msgstr "à°¸à±ˆà°«à°°à±:"
+msgid "Ci_pher"
+msgstr "à°¸à±ˆà°«à°°à±"
 
 #: ../properties/nm-openvpn-dialog.ui.h:104
-msgid "_HMAC Authentication:"
-msgstr "HMAC à°¦à±ƒà°µà±€à°•à°°à°£à°®à±:"
+msgid "_HMAC Authentication"
+msgstr "HMAC à°¦à±ƒà°µà±€à°•à°°à°£à°®à±"
 
 #: ../properties/nm-openvpn-dialog.ui.h:105
 msgid "Disable cipher _negotiation"
@@ -1119,7 +1111,7 @@ msgid "Security"
 msgstr "à°°à°•à±à°·à°£"
 
 #: ../properties/nm-openvpn-dialog.ui.h:115
-msgid "_Subject Match:"
+msgid "_Subject Match"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:116
@@ -1132,8 +1124,8 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:120
 #, fuzzy
-msgid "Server _Certificate Check:"
-msgstr "à°µà°¿à°¨à°¿à°¯à±‹à°—à°¦à°¾à°°à°¿ à°¦à±ƒà°µà±€à°•à°°à°£à°ªà°¤à±à°°à°®à±:"
+msgid "Server _Certificate Check"
+msgstr "à°µà°¿à°¨à°¿à°¯à±‹à°—à°¦à°¾à°°à°¿ à°¦à±ƒà°µà±€à°•à°°à°£à°ªà°¤à±à°°à°®à±"
 
 #: ../properties/nm-openvpn-dialog.ui.h:121
 msgid ""
@@ -1163,7 +1155,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:133
-msgid "_Remote peer certificate TLS type:"
+msgid "_Remote peer certificate TLS type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:134
@@ -1184,7 +1176,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:138
-msgid "_Remote peer certificate nsCert designation:"
+msgid "_Remote peer certificate nsCert designation"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:139
@@ -1195,8 +1187,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:141
-msgid "Key _Direction:"
-msgstr "à°•à±€ à°¦à°¿à°¶:"
+msgid "Key _Direction"
+msgstr "à°•à±€ à°¦à°¿à°¶"
 
 #: ../properties/nm-openvpn-dialog.ui.h:142
 msgid ""
@@ -1220,11 +1212,11 @@ msgstr ""
 "à°®à±€à°•à± à°–à°šà±à°šà°¿à°¤à°‚à°—à°¾ à°¤à±†à°²à°¿à°¯à°•à±à°‚à°Ÿà±‡, à°®à±€ à°¸à°¿à°¸à±à°Ÿà°®à± à°¨à°¿à°°à±à°µà°¹à°£à°¾à°§à°¿à°•à°¾à°°à°¿à°¨à°¿ à°¸à°‚à°ªà±à°°à°¦à°¿à°‚à°šà°‚à°¡à°¿.</i>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:147
-msgid "Key _File:"
-msgstr "à°•à±€ à°¦à°¸à±à°¤à±à°°à°®à±:"
+msgid "Key _File"
+msgstr "à°•à±€ à°¦à°¸à±à°¤à±à°°à°®à±"
 
 #: ../properties/nm-openvpn-dialog.ui.h:148
-msgid "Mode:"
+msgid "Mode"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:149
@@ -1234,8 +1226,8 @@ msgstr "à°…à°¦à°¨à°ªà± TLS à°¦à±ƒà°µà±€à°•à°°à°£à°®à± à°µà±à°ªà°¯à±‹à°—à°¿à°‚
 
 #: ../properties/nm-openvpn-dialog.ui.h:150
 #, fuzzy
-msgid "Extra Certificates:"
-msgstr "à°µà°¿à°¨à°¿à°¯à±‹à°—à°¦à°¾à°°à°¿ à°¦à±ƒà°µà±€à°•à°°à°£à°ªà°¤à±à°°à°®à±:"
+msgid "Extra Certificates"
+msgstr "à°µà°¿à°¨à°¿à°¯à±‹à°—à°¦à°¾à°°à°¿ à°¦à±ƒà°µà±€à°•à°°à°£à°ªà°¤à±à°°à°®à±"
 
 #: ../properties/nm-openvpn-dialog.ui.h:151
 msgid ""
@@ -1258,7 +1250,7 @@ msgid "TLS version control"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:156
-msgid "TLS _min version: "
+msgid "TLS _min version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:157
@@ -1270,7 +1262,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:158
-msgid "TLS ma_x version: "
+msgid "TLS ma_x version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:159
@@ -1290,7 +1282,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:163
-msgid "Proxy _Type:"
+msgid "Proxy _Type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:164
@@ -1301,8 +1293,8 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:165
 #, fuzzy
-msgid "Server _Address:"
-msgstr "à°¦à±‚à°°à°¸à±à°¥ IP à°šà°¿à°°à±à°¨à°¾à°®à°¾:"
+msgid "Server _Address"
+msgstr "à°¦à±‚à°°à°¸à±à°¥ IP à°šà°¿à°°à±à°¨à°¾à°®à°¾"
 
 #: ../properties/nm-openvpn-dialog.ui.h:166
 msgid ""
@@ -1311,7 +1303,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:168
-msgid "_Port:"
+msgid "_Port"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:169
@@ -1332,13 +1324,13 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:174
 #, fuzzy
-msgid "Proxy _Username:"
-msgstr "à°µà°¿à°¨à°¿à°¯à±‹à°—à°¦à°¾à°°à°¿à°¨à°¾à°®à°®à± (_U):"
+msgid "Proxy _Username"
+msgstr "à°µà°¿à°¨à°¿à°¯à±‹à°—à°¦à°¾à°°à°¿à°¨à°¾à°®à°®à± (_U)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:175
 #, fuzzy
-msgid "Proxy Passwor_d:"
-msgstr "à°¸à°‚à°•à±‡à°¤à°ªà°¦à°®à±:"
+msgid "Proxy Passwor_d"
+msgstr "à°¸à°‚à°•à±‡à°¤à°ªà°¦à°®à±"
 
 #: ../properties/nm-openvpn-dialog.ui.h:176
 msgid "HTTP/Socks proxy username passed to OpenVPN when prompted for it."
diff --git a/po/th.po b/po/th.po
index 8574c82..978505e 100644
--- a/po/th.po
+++ b/po/th.po
@@ -740,8 +740,8 @@ msgid "General"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:13
-msgid "_Gateway:"
-msgstr "à¹€_à¸à¸•à¹€à¸§à¸¢à¹Œ:"
+msgid "_Gateway"
+msgstr "à¹€_à¸à¸•à¹€à¸§à¸¢à¹Œ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:14
 msgid ""
@@ -764,15 +764,10 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#: ../properties/nm-openvpn-dialog.ui.h:19
-#, fuzzy
-msgid "Password:"
-msgstr "_à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™:"
-
 #: ../properties/nm-openvpn-dialog.ui.h:20
 #, fuzzy
-msgid "User name:"
-msgstr "à¸Šà¸·à¹ˆà¸à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰:"
+msgid "User name"
+msgstr "à¸Šà¸·à¹ˆà¸à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰"
 
 #: ../properties/nm-openvpn-dialog.ui.h:21
 msgid ""
@@ -789,23 +784,18 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:25
 #, fuzzy
-msgid "Remote IP Address:"
-msgstr "IP à¸à¸±à¹ˆà¸‡à¹‚à¸™à¹‰à¸™:"
+msgid "Remote IP Address"
+msgstr "IP à¸à¸±à¹ˆà¸‡à¹‚à¸™à¹‰à¸™"
 
 #: ../properties/nm-openvpn-dialog.ui.h:26
 #, fuzzy
-msgid "Local IP Address:"
-msgstr "IP à¸à¸±à¹ˆà¸‡à¸™à¸µà¹‰:"
+msgid "Local IP Address"
+msgstr "IP à¸à¸±à¹ˆà¸‡à¸™à¸µà¹‰"
 
 #: ../properties/nm-openvpn-dialog.ui.h:27
 #, fuzzy
-msgid "Key Direction:"
-msgstr "à¸—à¸´à¸¨à¸—à¸²à¸‡:"
-
-#: ../properties/nm-openvpn-dialog.ui.h:28
-#, fuzzy
-msgid "Static Key:"
-msgstr "à¸à¸¸à¸à¹à¸ˆà¸£à¹ˆà¸§à¸¡:"
+msgid "Key Direction"
+msgstr "à¸—à¸´à¸¨à¸—à¸²à¸‡"
 
 #: ../properties/nm-openvpn-dialog.ui.h:29
 msgid ""
@@ -835,7 +825,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:38
-msgid "Type:"
+msgid "Type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:39
@@ -851,7 +841,7 @@ msgid "OpenVPN Advanced Options"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:43
-msgid "Use custom gateway p_ort:"
+msgid "Use custom gateway p_ort"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:44
@@ -862,7 +852,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:46
-msgid "Use custom _renegotiation interval:"
+msgid "Use custom _renegotiation interval"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:47
@@ -873,7 +863,7 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:49
 #, fuzzy
-msgid "Data _compression:"
+msgid "Data _compression"
 msgstr "à¹ƒà¸Šà¹‰à¸à¸²à¸£à¸šà¸µà¸šà¸šà¸à¸±à¸” LZO"
 
 #: ../properties/nm-openvpn-dialog.ui.h:50
@@ -897,7 +887,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:56
-msgid "Set virtual _device type:"
+msgid "Set virtual _device type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:57
@@ -911,7 +901,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:60
-msgid " and _name:"
+msgid " and _name"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:61
@@ -922,7 +912,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:63
-msgid "Use custom tunnel Maximum Transmission _Unit (MTU):"
+msgid "Use custom tunnel Maximum Transmission _Unit (MTU)"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:64
@@ -933,7 +923,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:66
-msgid "Use custom UDP _fragment size:"
+msgid "Use custom UDP _fragment size"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:67
@@ -984,7 +974,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:81
-msgid "Specify pin_g interval:"
+msgid "Specify pin_g interval"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:82
@@ -995,7 +985,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:84
-msgid "Specify _exit or restart ping:"
+msgid "Specify _exit or restart ping"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:85
@@ -1026,7 +1016,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:93
-msgid "Specify max routes:"
+msgid "Specify max routes"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:94
@@ -1043,7 +1033,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:98
-msgid "Use custom _size of cipher key:"
+msgid "Use custom _size of cipher key"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:99
@@ -1062,11 +1052,11 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:103
 #, fuzzy
-msgid "Ci_pher:"
+msgid "Ci_pher"
 msgstr "à¸£à¸«à¸±à¸ªà¸¥à¸±à¸š:  %s"
 
 #: ../properties/nm-openvpn-dialog.ui.h:104
-msgid "_HMAC Authentication:"
+msgid "_HMAC Authentication"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:105
@@ -1114,7 +1104,7 @@ msgid "Security"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:115
-msgid "_Subject Match:"
+msgid "_Subject Match"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:116
@@ -1127,8 +1117,8 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:120
 #, fuzzy
-msgid "Server _Certificate Check:"
-msgstr "à¹ƒà¸šà¸£à¸±à¸šà¸£à¸à¸‡:"
+msgid "Server _Certificate Check"
+msgstr "à¹ƒà¸šà¸£à¸±à¸šà¸£à¸à¸‡"
 
 #: ../properties/nm-openvpn-dialog.ui.h:121
 msgid ""
@@ -1158,7 +1148,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:133
-msgid "_Remote peer certificate TLS type:"
+msgid "_Remote peer certificate TLS type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:134
@@ -1179,7 +1169,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:138
-msgid "_Remote peer certificate nsCert designation:"
+msgid "_Remote peer certificate nsCert designation"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:139
@@ -1191,8 +1181,8 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:141
 #, fuzzy
-msgid "Key _Direction:"
-msgstr "à¸—à¸´à¸¨à¸—à¸²à¸‡:"
+msgid "Key _Direction"
+msgstr "à¸—à¸´à¸¨à¸—à¸²à¸‡"
 
 #: ../properties/nm-openvpn-dialog.ui.h:142
 msgid ""
@@ -1212,11 +1202,11 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:147
-msgid "Key _File:"
+msgid "Key _File"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:148
-msgid "Mode:"
+msgid "Mode"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:149
@@ -1225,8 +1215,8 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:150
 #, fuzzy
-msgid "Extra Certificates:"
-msgstr "à¹ƒà¸šà¸£à¸±à¸šà¸£à¸à¸‡:"
+msgid "Extra Certificates"
+msgstr "à¹ƒà¸šà¸£à¸±à¸šà¸£à¸à¸‡"
 
 #: ../properties/nm-openvpn-dialog.ui.h:151
 msgid ""
@@ -1248,7 +1238,7 @@ msgid "TLS version control"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:156
-msgid "TLS _min version: "
+msgid "TLS _min version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:157
@@ -1260,7 +1250,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:158
-msgid "TLS ma_x version: "
+msgid "TLS ma_x version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:159
@@ -1281,7 +1271,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:163
-msgid "Proxy _Type:"
+msgid "Proxy _Type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:164
@@ -1291,7 +1281,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:165
-msgid "Server _Address:"
+msgid "Server _Address"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:166
@@ -1301,7 +1291,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:168
-msgid "_Port:"
+msgid "_Port"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:169
@@ -1322,13 +1312,13 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:174
 #, fuzzy
-msgid "Proxy _Username:"
-msgstr "_à¸Šà¸·à¹ˆà¸à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰:"
+msgid "Proxy _Username"
+msgstr "_à¸Šà¸·à¹ˆà¸à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰"
 
 #: ../properties/nm-openvpn-dialog.ui.h:175
 #, fuzzy
-msgid "Proxy Passwor_d:"
-msgstr "_à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™:"
+msgid "Proxy Passwor_d"
+msgstr "_à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™"
 
 #: ../properties/nm-openvpn-dialog.ui.h:176
 msgid "HTTP/Socks proxy username passed to OpenVPN when prompted for it."
@@ -1341,7 +1331,7 @@ msgstr ""
 #: ../properties/nm-openvpn-dialog.ui.h:178
 #, fuzzy
 msgid "_Show password"
-msgstr "_à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™:"
+msgstr "_à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™"
 
 #: ../properties/nm-openvpn-dialog.ui.h:179
 msgid "Proxies"
diff --git a/po/tr.po b/po/tr.po
index 88310fc..7bce57f 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -854,8 +854,8 @@ msgid "General"
 msgstr "Genel"
 
 #: ../properties/nm-openvpn-dialog.ui.h:14
-msgid "_Gateway:"
-msgstr "_AÄŸ geÃ§idi:"
+msgid "_Gateway"
+msgstr "_AÄŸ geÃ§idi"
 
 # Host kelimesi istemci olarak Ã§evrilmiÅŸ. birden fazla istence cÃ¼mlesine dikkat!
 #: ../properties/nm-openvpn-dialog.ui.h:15
@@ -882,13 +882,9 @@ msgstr "CA"
 msgid "User"
 msgstr "KullanÄ±cÄ±"
 
-#: ../properties/nm-openvpn-dialog.ui.h:20
-msgid "Password:"
-msgstr "Parola:"
-
 #: ../properties/nm-openvpn-dialog.ui.h:21
-msgid "User name:"
-msgstr "KullanÄ±cÄ± adÄ±:"
+msgid "User name"
+msgstr "KullanÄ±cÄ± adÄ±"
 
 #: ../properties/nm-openvpn-dialog.ui.h:22
 msgid ""
@@ -909,20 +905,16 @@ msgstr ""
 "yapÄ±landÄ±rma: auth-user-pass"
 
 #: ../properties/nm-openvpn-dialog.ui.h:26
-msgid "Remote IP Address:"
-msgstr "Uzak IP Adresi:"
+msgid "Remote IP Address"
+msgstr "Uzak IP Adresi"
 
 #: ../properties/nm-openvpn-dialog.ui.h:27
-msgid "Local IP Address:"
-msgstr "Yerel IP Adresi:"
+msgid "Local IP Address"
+msgstr "Yerel IP Adresi"
 
 #: ../properties/nm-openvpn-dialog.ui.h:28
-msgid "Key Direction:"
-msgstr "Anahtar YÃ¶nÃ¼:"
-
-#: ../properties/nm-openvpn-dialog.ui.h:29
-msgid "Static Key:"
-msgstr "Sabit Anahtar:"
+msgid "Key Direction"
+msgstr "Anahtar YÃ¶nÃ¼"
 
 #: ../properties/nm-openvpn-dialog.ui.h:30
 msgid ""
@@ -963,8 +955,8 @@ msgstr ""
 "yapÄ±landÄ±rma: static <dosya> [yÃ¶n]"
 
 #: ../properties/nm-openvpn-dialog.ui.h:39
-msgid "Type:"
-msgstr "TÃ¼r:"
+msgid "Type"
+msgstr "TÃ¼r"
 
 #: ../properties/nm-openvpn-dialog.ui.h:40
 msgid "Select an authentication mode."
@@ -979,8 +971,8 @@ msgid "OpenVPN Advanced Options"
 msgstr "OpenVPN GeliÅŸmiÅŸ SeÃ§enekleri"
 
 #: ../properties/nm-openvpn-dialog.ui.h:44
-msgid "Use custom gateway p_ort:"
-msgstr "Ã–zel aÄŸ geÃ§idi baÄŸlantÄ± n_oktasÄ± kullan:"
+msgid "Use custom gateway p_ort"
+msgstr "Ã–zel aÄŸ geÃ§idi baÄŸlantÄ± n_oktasÄ± kullan"
 
 #: ../properties/nm-openvpn-dialog.ui.h:45
 msgid ""
@@ -993,8 +985,8 @@ msgstr ""
 "yapÄ±landÄ±rma: port"
 
 #: ../properties/nm-openvpn-dialog.ui.h:47
-msgid "Use custom _renegotiation interval:"
-msgstr "Ã–zel _gÃ¶rÃ¼ÅŸme aralÄ±ÄŸÄ± kullan:"
+msgid "Use custom _renegotiation interval"
+msgstr "Ã–zel _gÃ¶rÃ¼ÅŸme aralÄ±ÄŸÄ± kullan"
 
 #: ../properties/nm-openvpn-dialog.ui.h:48
 msgid ""
@@ -1005,8 +997,8 @@ msgstr ""
 "yapÄ±landÄ±rma: reneg-sec"
 
 #: ../properties/nm-openvpn-dialog.ui.h:50
-msgid "Data _compression:"
-msgstr "Veri _sÄ±kÄ±ÅŸtÄ±rma:"
+msgid "Data _compression"
+msgstr "Veri _sÄ±kÄ±ÅŸtÄ±rma"
 
 #: ../properties/nm-openvpn-dialog.ui.h:51
 msgid ""
@@ -1033,8 +1025,8 @@ msgstr ""
 "yapÄ±landÄ±rma: proto tcp-client | udp"
 
 #: ../properties/nm-openvpn-dialog.ui.h:57
-msgid "Set virtual _device type:"
-msgstr "Sanal _aygÄ±t tÃ¼rÃ¼nÃ¼ ayarla:"
+msgid "Set virtual _device type"
+msgstr "Sanal _aygÄ±t tÃ¼rÃ¼nÃ¼ ayarla"
 
 #: ../properties/nm-openvpn-dialog.ui.h:58
 msgid "Explicitly set virtual device type and name (TUN/TAP)."
@@ -1049,8 +1041,8 @@ msgstr ""
 "yapÄ±landÄ±rma: dev-type tun | tap"
 
 #: ../properties/nm-openvpn-dialog.ui.h:61
-msgid " and _name:"
-msgstr " ve _adÄ±:"
+msgid " and _name"
+msgstr " ve _adÄ±"
 
 #: ../properties/nm-openvpn-dialog.ui.h:62
 msgid ""
@@ -1062,8 +1054,8 @@ msgstr ""
 "yapÄ±landÄ±rma: dev <isim>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:64
-msgid "Use custom tunnel Maximum Transmission _Unit (MTU):"
-msgstr "Ã–zel t_Ã¼nel En Ã‡ok AktarÄ±m Birimi (MTU) kullan:"
+msgid "Use custom tunnel Maximum Transmission _Unit (MTU)"
+msgstr "Ã–zel t_Ã¼nel En Ã‡ok AktarÄ±m Birimi (MTU) kullan"
 
 #: ../properties/nm-openvpn-dialog.ui.h:65
 msgid ""
@@ -1076,8 +1068,8 @@ msgstr ""
 "yapÄ±landÄ±rma: tun-mtu"
 
 #: ../properties/nm-openvpn-dialog.ui.h:67
-msgid "Use custom UDP _fragment size:"
-msgstr "Ã–zel UDP _parÃ§a boyutu kullan:"
+msgid "Use custom UDP _fragment size"
+msgstr "Ã–zel UDP _parÃ§a boyutu kullan"
 
 #: ../properties/nm-openvpn-dialog.ui.h:68
 msgid ""
@@ -1150,8 +1142,8 @@ msgstr ""
 "yapÄ±landÄ±rma: tun-ipv6"
 
 #: ../properties/nm-openvpn-dialog.ui.h:85
-msgid "Specify pin_g interval:"
-msgstr "Ping yineleme aralÄ±ÄŸÄ± belirle:"
+msgid "Specify pin_g interval"
+msgstr "Ping yineleme aralÄ±ÄŸÄ± belirle"
 
 #: ../properties/nm-openvpn-dialog.ui.h:86
 msgid ""
@@ -1164,8 +1156,8 @@ msgstr ""
 "yapÄ±landÄ±rma: ping <n>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:88
-msgid "Specify _exit or restart ping:"
-msgstr "_Ã‡Ä±kÄ±ÅŸ veya yeniden ping seÃ§eneÄŸini belirle:"
+msgid "Specify _exit or restart ping"
+msgstr "_Ã‡Ä±kÄ±ÅŸ veya yeniden ping seÃ§eneÄŸini belirle"
 
 #: ../properties/nm-openvpn-dialog.ui.h:89
 msgid ""
@@ -1212,8 +1204,8 @@ msgstr ""
 "yapÄ±landÄ±rma: float"
 
 #: ../properties/nm-openvpn-dialog.ui.h:97
-msgid "Specify max routes:"
-msgstr "Azami yÃ¶nlendirmeyi belirle:"
+msgid "Specify max routes"
+msgstr "Azami yÃ¶nlendirmeyi belirle"
 
 #: ../properties/nm-openvpn-dialog.ui.h:98
 msgid ""
@@ -1234,8 +1226,8 @@ msgstr ""
 "yapÄ±landÄ±rma: cipher"
 
 #: ../properties/nm-openvpn-dialog.ui.h:102
-msgid "Use custom _size of cipher key:"
-msgstr "Ã–zel _boyutlu ÅŸifreleme anahtarÄ± kullan:"
+msgid "Use custom _size of cipher key"
+msgstr "Ã–zel _boyutlu ÅŸifreleme anahtarÄ± kullan"
 
 #: ../properties/nm-openvpn-dialog.ui.h:103
 msgid ""
@@ -1258,12 +1250,12 @@ msgstr ""
 "yapÄ±landÄ±rma: auth"
 
 #: ../properties/nm-openvpn-dialog.ui.h:107
-msgid "Ci_pher:"
-msgstr "Åži_freleme:"
+msgid "Ci_pher"
+msgstr "Åži_freleme"
 
 #: ../properties/nm-openvpn-dialog.ui.h:108
-msgid "_HMAC Authentication:"
-msgstr "_HMAC Kimlik DoÄŸrulamasÄ±:"
+msgid "_HMAC Authentication"
+msgstr "_HMAC Kimlik DoÄŸrulamasÄ±"
 
 #: ../properties/nm-openvpn-dialog.ui.h:109
 msgid "Disable cipher _negotiation"
@@ -1318,8 +1310,8 @@ msgid "Security"
 msgstr "GÃ¼venlik"
 
 #: ../properties/nm-openvpn-dialog.ui.h:119
-msgid "_Subject Match:"
-msgstr "_Konu EÅŸleÅŸmesi:"
+msgid "_Subject Match"
+msgstr "_Konu EÅŸleÅŸmesi"
 
 #: ../properties/nm-openvpn-dialog.ui.h:120
 msgid ""
@@ -1335,8 +1327,8 @@ msgstr ""
 "yapÄ±landÄ±rma (eski kip): tls-remote subject-or-name"
 
 #: ../properties/nm-openvpn-dialog.ui.h:124
-msgid "Server _Certificate Check:"
-msgstr "Sunucu _Sertifika Denetimi:"
+msgid "Server _Certificate Check"
+msgstr "Sunucu _Sertifika Denetimi"
 
 #: ../properties/nm-openvpn-dialog.ui.h:125
 msgid ""
@@ -1380,8 +1372,8 @@ msgstr ""
 "dayanan geniÅŸletilmiÅŸ anahtar kullanÄ±mÄ± ile imzalanmÄ±ÅŸ olmasÄ±nÄ± gerektir."
 
 #: ../properties/nm-openvpn-dialog.ui.h:137
-msgid "_Remote peer certificate TLS type:"
-msgstr "_Uzak uÃ§ sertifikasÄ± TLS tÃ¼rÃ¼:"
+msgid "_Remote peer certificate TLS type"
+msgstr "_Uzak uÃ§ sertifikasÄ± TLS tÃ¼rÃ¼"
 
 #: ../properties/nm-openvpn-dialog.ui.h:138
 msgid ""
@@ -1405,8 +1397,8 @@ msgstr ""
 "UÃ§ sertifikasÄ±nÄ±n aÃ§Ä±k nsCertType atamasÄ± ile imzalanmÄ±ÅŸ olmasÄ±nÄ± gerektir."
 
 #: ../properties/nm-openvpn-dialog.ui.h:142
-msgid "_Remote peer certificate nsCert designation:"
-msgstr "_Uzak uÃ§ sertifikasÄ± nsCert atamasÄ±:"
+msgid "_Remote peer certificate nsCert designation"
+msgstr "_Uzak uÃ§ sertifikasÄ± nsCert atamasÄ±"
 
 #: ../properties/nm-openvpn-dialog.ui.h:143
 msgid ""
@@ -1418,8 +1410,8 @@ msgstr ""
 "yapÄ±landÄ±rma: ns-cert-type client|server"
 
 #: ../properties/nm-openvpn-dialog.ui.h:145
-msgid "Key _Direction:"
-msgstr "Anahtar _YÃ¶nÃ¼:"
+msgid "Key _Direction"
+msgstr "Anahtar _YÃ¶nÃ¼"
 
 #: ../properties/nm-openvpn-dialog.ui.h:146
 msgid ""
@@ -1448,20 +1440,20 @@ msgstr ""
 "yapÄ±landÄ±rma: tls-auth <dosya> [yÃ¶n]"
 
 #: ../properties/nm-openvpn-dialog.ui.h:151
-msgid "Key _File:"
-msgstr "Anahtar _DosyasÄ±:"
+msgid "Key _File"
+msgstr "Anahtar _DosyasÄ±"
 
 #: ../properties/nm-openvpn-dialog.ui.h:152
-msgid "Mode:"
-msgstr "Kip:"
+msgid "Mode"
+msgstr "Kip"
 
 #: ../properties/nm-openvpn-dialog.ui.h:153
 msgid "Add an additional layer of encryption or HMAC authentication."
 msgstr "Ek ÅŸifreleme veya HMAC kimlik doÄŸrulamasÄ± katmanÄ± ekle."
 
 #: ../properties/nm-openvpn-dialog.ui.h:154
-msgid "Extra Certificates:"
-msgstr "Ek Sertifikalar:"
+msgid "Extra Certificates"
+msgstr "Ek Sertifikalar"
 
 #: ../properties/nm-openvpn-dialog.ui.h:155
 msgid ""
@@ -1486,8 +1478,8 @@ msgid "TLS version control"
 msgstr "TLS sÃ¼rÃ¼m denetimi"
 
 #: ../properties/nm-openvpn-dialog.ui.h:160
-msgid "TLS _min version: "
-msgstr "TLS _asgari sÃ¼rÃ¼m: "
+msgid "TLS _min version"
+msgstr "TLS _asgari sÃ¼rÃ¼m"
 
 #: ../properties/nm-openvpn-dialog.ui.h:161
 msgid ""
@@ -1502,8 +1494,8 @@ msgstr ""
 "uyarlamasÄ±nca desteklenen en yÃ¼ksek TLS sÃ¼rÃ¼mÃ¼nÃ¼ kabul edeceÄŸiz."
 
 #: ../properties/nm-openvpn-dialog.ui.h:162
-msgid "TLS ma_x version: "
-msgstr "TLS _azami sÃ¼rÃ¼m: "
+msgid "TLS ma_x version"
+msgstr "TLS _azami sÃ¼rÃ¼m"
 
 #: ../properties/nm-openvpn-dialog.ui.h:163
 msgid ""
@@ -1526,8 +1518,8 @@ msgstr ""
 "yapÄ±landÄ±rma: http-proxy veya socks-proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:167
-msgid "Proxy _Type:"
-msgstr "Vekil Sunucu _TÃ¼rÃ¼:"
+msgid "Proxy _Type"
+msgstr "Vekil Sunucu _TÃ¼rÃ¼"
 
 #: ../properties/nm-openvpn-dialog.ui.h:168
 msgid ""
@@ -1538,8 +1530,8 @@ msgstr ""
 "gerektiriyorsa bu seÃ§eneÄŸi seÃ§in.</i>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:169
-msgid "Server _Address:"
-msgstr "Sunucu _Adresi:"
+msgid "Server _Address"
+msgstr "Sunucu _Adresi"
 
 #: ../properties/nm-openvpn-dialog.ui.h:170
 msgid ""
@@ -1550,8 +1542,8 @@ msgstr ""
 "yapÄ±landÄ±rma: http-proxy veya socks-proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:172
-msgid "_Port:"
-msgstr "_BaÄŸlantÄ± NoktasÄ±:"
+msgid "_Port"
+msgstr "_BaÄŸlantÄ± NoktasÄ±"
 
 #: ../properties/nm-openvpn-dialog.ui.h:173
 msgid ""
@@ -1575,12 +1567,12 @@ msgstr ""
 "yapÄ±landÄ±rma: http-proxy-retry veya socks-proxy-retry"
 
 #: ../properties/nm-openvpn-dialog.ui.h:178
-msgid "Proxy _Username:"
-msgstr "Vekil _Sunucu KullanÄ±cÄ± AdÄ±:"
+msgid "Proxy _Username"
+msgstr "Vekil _Sunucu KullanÄ±cÄ± AdÄ±"
 
 #: ../properties/nm-openvpn-dialog.ui.h:179
-msgid "Proxy Passwor_d:"
-msgstr "Vekil Sunucu _ParolasÄ±:"
+msgid "Proxy Passwor_d"
+msgstr "Vekil Sunucu _ParolasÄ±"
 
 #: ../properties/nm-openvpn-dialog.ui.h:180
 msgid "HTTP/Socks proxy username passed to OpenVPN when prompted for it."
diff --git a/po/ug.po b/po/ug.po
index c8a05db..3190347 100644
--- a/po/ug.po
+++ b/po/ug.po
@@ -737,7 +737,7 @@ msgid "General"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:13
-msgid "_Gateway:"
+msgid "_Gateway"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:14
@@ -761,15 +761,10 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#: ../properties/nm-openvpn-dialog.ui.h:19
-#, fuzzy
-msgid "Password:"
-msgstr "Ø¦Ù‰Ù…(_P):"
-
 #: ../properties/nm-openvpn-dialog.ui.h:20
 #, fuzzy
-msgid "User name:"
-msgstr "Ø¦Ù‰Ø´Ù„Û•ØªÙƒÛˆÚ†Ù‰ Ø¦Ø§ØªÙ‰(_U):"
+msgid "User name"
+msgstr "Ø¦Ù‰Ø´Ù„Û•ØªÙƒÛˆÚ†Ù‰ Ø¦Ø§ØªÙ‰(_U)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:21
 msgid ""
@@ -785,22 +780,17 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:25
-msgid "Remote IP Address:"
+msgid "Remote IP Address"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:26
-msgid "Local IP Address:"
+msgid "Local IP Address"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:27
-msgid "Key Direction:"
+msgid "Key Direction"
 msgstr ""
 
-#: ../properties/nm-openvpn-dialog.ui.h:28
-#, fuzzy
-msgid "Static Key:"
-msgstr "ØªÙ‰Ù†Ú† Ø¦Ø§Ú†Ù‚Û‡Ú†"
-
 #: ../properties/nm-openvpn-dialog.ui.h:29
 msgid ""
 "Pre-shared file for Static Key encryption mode (non-TLS).\n"
@@ -829,7 +819,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:38
-msgid "Type:"
+msgid "Type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:39
@@ -845,7 +835,7 @@ msgid "OpenVPN Advanced Options"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:43
-msgid "Use custom gateway p_ort:"
+msgid "Use custom gateway p_ort"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:44
@@ -856,7 +846,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:46
-msgid "Use custom _renegotiation interval:"
+msgid "Use custom _renegotiation interval"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:47
@@ -866,7 +856,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:49
-msgid "Data _compression:"
+msgid "Data _compression"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:50
@@ -888,7 +878,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:56
-msgid "Set virtual _device type:"
+msgid "Set virtual _device type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:57
@@ -902,7 +892,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:60
-msgid " and _name:"
+msgid " and _name"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:61
@@ -913,7 +903,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:63
-msgid "Use custom tunnel Maximum Transmission _Unit (MTU):"
+msgid "Use custom tunnel Maximum Transmission _Unit (MTU)"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:64
@@ -924,7 +914,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:66
-msgid "Use custom UDP _fragment size:"
+msgid "Use custom UDP _fragment size"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:67
@@ -975,7 +965,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:81
-msgid "Specify pin_g interval:"
+msgid "Specify pin_g interval"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:82
@@ -986,7 +976,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:84
-msgid "Specify _exit or restart ping:"
+msgid "Specify _exit or restart ping"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:85
@@ -1017,7 +1007,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:93
-msgid "Specify max routes:"
+msgid "Specify max routes"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:94
@@ -1034,7 +1024,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:98
-msgid "Use custom _size of cipher key:"
+msgid "Use custom _size of cipher key"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:99
@@ -1052,11 +1042,11 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:103
-msgid "Ci_pher:"
+msgid "Ci_pher"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:104
-msgid "_HMAC Authentication:"
+msgid "_HMAC Authentication"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:105
@@ -1104,7 +1094,7 @@ msgid "Security"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:115
-msgid "_Subject Match:"
+msgid "_Subject Match"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:116
@@ -1117,8 +1107,8 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:120
 #, fuzzy
-msgid "Server _Certificate Check:"
-msgstr "Ú¯Û‡Û‹Ø§Ú¾Ù†Ø§Ù…Û• Ø¦Ù‰Ù…Ù‰:"
+msgid "Server _Certificate Check"
+msgstr "Ú¯Û‡Û‹Ø§Ú¾Ù†Ø§Ù…Û• Ø¦Ù‰Ù…Ù‰"
 
 #: ../properties/nm-openvpn-dialog.ui.h:121
 msgid ""
@@ -1148,7 +1138,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:133
-msgid "_Remote peer certificate TLS type:"
+msgid "_Remote peer certificate TLS type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:134
@@ -1169,7 +1159,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:138
-msgid "_Remote peer certificate nsCert designation:"
+msgid "_Remote peer certificate nsCert designation"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:139
@@ -1180,7 +1170,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:141
-msgid "Key _Direction:"
+msgid "Key _Direction"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:142
@@ -1201,11 +1191,11 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:147
-msgid "Key _File:"
+msgid "Key _File"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:148
-msgid "Mode:"
+msgid "Mode"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:149
@@ -1214,8 +1204,8 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:150
 #, fuzzy
-msgid "Extra Certificates:"
-msgstr "Ú¯Û‡Û‹Ø§Ú¾Ù†Ø§Ù…Û• Ø¦Ù‰Ù…Ù‰:"
+msgid "Extra Certificates"
+msgstr "Ú¯Û‡Û‹Ø§Ú¾Ù†Ø§Ù…Û• Ø¦Ù‰Ù…Ù‰"
 
 #: ../properties/nm-openvpn-dialog.ui.h:151
 msgid ""
@@ -1237,7 +1227,7 @@ msgid "TLS version control"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:156
-msgid "TLS _min version: "
+msgid "TLS _min version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:157
@@ -1249,7 +1239,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:158
-msgid "TLS ma_x version: "
+msgid "TLS ma_x version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:159
@@ -1270,7 +1260,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:163
-msgid "Proxy _Type:"
+msgid "Proxy _Type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:164
@@ -1280,7 +1270,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:165
-msgid "Server _Address:"
+msgid "Server _Address"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:166
@@ -1290,7 +1280,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:168
-msgid "_Port:"
+msgid "_Port"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:169
@@ -1311,13 +1301,13 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:174
 #, fuzzy
-msgid "Proxy _Username:"
-msgstr "Ø¦Ù‰Ø´Ù„Û•ØªÙƒÛˆÚ†Ù‰ Ø¦Ø§ØªÙ‰(_U):"
+msgid "Proxy _Username"
+msgstr "Ø¦Ù‰Ø´Ù„Û•ØªÙƒÛˆÚ†Ù‰ Ø¦Ø§ØªÙ‰(_U)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:175
 #, fuzzy
-msgid "Proxy Passwor_d:"
-msgstr "Ø¦Ù‰Ù…(_P):"
+msgid "Proxy Passwor_d"
+msgstr "Ø¦Ù‰Ù…(_P)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:176
 msgid "HTTP/Socks proxy username passed to OpenVPN when prompted for it."
@@ -1330,7 +1320,7 @@ msgstr ""
 #: ../properties/nm-openvpn-dialog.ui.h:178
 #, fuzzy
 msgid "_Show password"
-msgstr "Ø¦Ù‰Ù…(_P):"
+msgstr "Ø¦Ù‰Ù…(_P)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:179
 msgid "Proxies"
diff --git a/po/uk.po b/po/uk.po
index e5bb468..b738000 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -819,8 +819,8 @@ msgid "General"
 msgstr "Ð—Ð°Ð³Ð°Ð»ÑŒÐ½Ðµ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:14
-msgid "_Gateway:"
-msgstr "_Ð¨Ð»ÑŽÐ·:"
+msgid "_Gateway"
+msgstr "_Ð¨Ð»ÑŽÐ·"
 
 #: ../properties/nm-openvpn-dialog.ui.h:15
 msgid ""
@@ -846,13 +846,9 @@ msgstr "CA"
 msgid "User"
 msgstr "ÐšÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡"
 
-#: ../properties/nm-openvpn-dialog.ui.h:20
-msgid "Password:"
-msgstr "ÐŸÐ°Ñ€Ð¾Ð»ÑŒ:"
-
 #: ../properties/nm-openvpn-dialog.ui.h:21
-msgid "User name:"
-msgstr "ÐšÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡:"
+msgid "User name"
+msgstr "ÐšÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡"
 
 #: ../properties/nm-openvpn-dialog.ui.h:22
 msgid ""
@@ -874,20 +870,16 @@ msgstr ""
 "Ð¤Ð°Ð¹Ð» Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½ÑŒ: auth-user-pass"
 
 #: ../properties/nm-openvpn-dialog.ui.h:26
-msgid "Remote IP Address:"
-msgstr "Ð’Ñ–Ð´Ð´Ð°Ð»ÐµÐ½Ð° Ð°Ð´Ñ€ÐµÑÐ° IP:"
+msgid "Remote IP Address"
+msgstr "Ð’Ñ–Ð´Ð´Ð°Ð»ÐµÐ½Ð° Ð°Ð´Ñ€ÐµÑÐ° IP"
 
 #: ../properties/nm-openvpn-dialog.ui.h:27
-msgid "Local IP Address:"
-msgstr "Ð›Ð¾ÐºÐ°Ð»ÑŒÐ½Ð° Ð°Ð´Ñ€ÐµÑÐ° IP:"
+msgid "Local IP Address"
+msgstr "Ð›Ð¾ÐºÐ°Ð»ÑŒÐ½Ð° Ð°Ð´Ñ€ÐµÑÐ° IP"
 
 #: ../properties/nm-openvpn-dialog.ui.h:28
-msgid "Key Direction:"
-msgstr "ÐÐ°Ð¿Ñ€ÑÐ¼ ÐºÐ»ÑŽÑ‡Ð°:"
-
-#: ../properties/nm-openvpn-dialog.ui.h:29
-msgid "Static Key:"
-msgstr "Ð¡Ñ‚Ð°Ñ‚Ð¸Ñ‡Ð½Ð¸Ð¹ ÐºÐ»ÑŽÑ‡:"
+msgid "Key Direction"
+msgstr "ÐÐ°Ð¿Ñ€ÑÐ¼ ÐºÐ»ÑŽÑ‡Ð°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:30
 msgid ""
@@ -930,8 +922,8 @@ msgstr ""
 "Ð¤Ð°Ð¹Ð» Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½ÑŒ: static <file> [Ð½Ð°Ð¿Ñ€ÑÐ¼Ð¾Ðº]"
 
 #: ../properties/nm-openvpn-dialog.ui.h:39
-msgid "Type:"
-msgstr "Ð¢Ð¸Ð¿:"
+msgid "Type"
+msgstr "Ð¢Ð¸Ð¿"
 
 #: ../properties/nm-openvpn-dialog.ui.h:40
 msgid "Select an authentication mode."
@@ -946,8 +938,8 @@ msgid "OpenVPN Advanced Options"
 msgstr "Ð”Ð¾Ð´Ð°Ñ‚ÐºÐ¾Ð²Ñ– Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð¸ OpenVPN"
 
 #: ../properties/nm-openvpn-dialog.ui.h:44
-msgid "Use custom gateway p_ort:"
-msgstr "Ð’Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¾Ð²ÑƒÐ²Ð°Ñ‚Ð¸ Ñ–Ð½ÑˆÐ¸Ð¹ _Ð¿Ð¾Ñ€Ñ‚ ÑˆÐ»ÑŽÐ·Ñƒ:"
+msgid "Use custom gateway p_ort"
+msgstr "Ð’Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¾Ð²ÑƒÐ²Ð°Ñ‚Ð¸ Ñ–Ð½ÑˆÐ¸Ð¹ _Ð¿Ð¾Ñ€Ñ‚ ÑˆÐ»ÑŽÐ·Ñƒ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:45
 msgid ""
@@ -960,8 +952,8 @@ msgstr ""
 "Ð¤Ð°Ð¹Ð» Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½ÑŒ: port"
 
 #: ../properties/nm-openvpn-dialog.ui.h:47
-msgid "Use custom _renegotiation interval:"
-msgstr "Ð’Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¾Ð²ÑƒÐ²Ð°Ñ‚Ð¸ Ð²Ð»Ð°ÑÐ½Ð¸Ð¹ _Ð¿Ð¾Ð²Ñ‚Ð¾Ñ€Ð½Ð¸Ñ… Ð¿ÐµÑ€ÐµÐ³Ð¾Ð²Ð¾Ñ€Ñ–Ð² Ñ–Ð½Ñ‚ÐµÑ€Ð²Ð°Ð»:"
+msgid "Use custom _renegotiation interval"
+msgstr "Ð’Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¾Ð²ÑƒÐ²Ð°Ñ‚Ð¸ Ð²Ð»Ð°ÑÐ½Ð¸Ð¹ _Ð¿Ð¾Ð²Ñ‚Ð¾Ñ€Ð½Ð¸Ñ… Ð¿ÐµÑ€ÐµÐ³Ð¾Ð²Ð¾Ñ€Ñ–Ð² Ñ–Ð½Ñ‚ÐµÑ€Ð²Ð°Ð»"
 
 #: ../properties/nm-openvpn-dialog.ui.h:48
 msgid ""
@@ -972,8 +964,8 @@ msgstr ""
 "Ð¤Ð°Ð¹Ð» Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½ÑŒ: reneg-sec"
 
 #: ../properties/nm-openvpn-dialog.ui.h:50
-msgid "Data _compression:"
-msgstr "Ð¡_Ñ‚Ð¸ÑÐºÐ°Ð½Ð½Ñ Ð´Ð°Ð½Ð¸Ñ…:"
+msgid "Data _compression"
+msgstr "Ð¡_Ñ‚Ð¸ÑÐºÐ°Ð½Ð½Ñ Ð´Ð°Ð½Ð¸Ñ…"
 
 #: ../properties/nm-openvpn-dialog.ui.h:51
 msgid ""
@@ -1000,8 +992,8 @@ msgstr ""
 "Ð¤Ð°Ð¹Ð» Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½ÑŒ: proto tcp-client | udp"
 
 #: ../properties/nm-openvpn-dialog.ui.h:57
-msgid "Set virtual _device type:"
-msgstr "Ð’ÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ Ñ‚Ð¸Ð¿ Ð²Ñ–_Ñ€Ñ‚ÑƒÐ°Ð»ÑŒÐ½Ð¾Ð³Ð¾ Ð¿Ñ€Ð¸ÑÑ‚Ñ€Ð¾ÑŽ:"
+msgid "Set virtual _device type"
+msgstr "Ð’ÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ Ñ‚Ð¸Ð¿ Ð²Ñ–_Ñ€Ñ‚ÑƒÐ°Ð»ÑŒÐ½Ð¾Ð³Ð¾ Ð¿Ñ€Ð¸ÑÑ‚Ñ€Ð¾ÑŽ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:58
 msgid "Explicitly set virtual device type and name (TUN/TAP)."
@@ -1016,8 +1008,8 @@ msgstr ""
 "Ð¤Ð°Ð¹Ð» Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½ÑŒ: dev-type tun | tap"
 
 #: ../properties/nm-openvpn-dialog.ui.h:61
-msgid " and _name:"
-msgstr " Ñ– _Ð½Ð°Ð·Ð²Ð°:"
+msgid " and _name"
+msgstr " Ñ– _Ð½Ð°Ð·Ð²Ð°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:62
 msgid ""
@@ -1030,7 +1022,7 @@ msgstr ""
 "Ð¤Ð°Ð¹Ð» Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½ÑŒ: dev <name>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:64
-msgid "Use custom tunnel Maximum Transmission _Unit (MTU):"
+msgid "Use custom tunnel Maximum Transmission _Unit (MTU)"
 msgstr ""
 "Ð’Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¾Ð²ÑƒÐ²Ð°Ñ‚Ð¸ Ð½ÐµÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ð¸Ð¹ Ð¼Ð°ÐºÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð¸Ð¹ _Ñ€Ð¾Ð·Ð¼Ñ–Ñ€ ÐµÐ»ÐµÐ¼ÐµÐ½Ñ‚Ñƒ Ð¿ÐµÑ€ÐµÐ´Ð°Ñ‡Ñ– (MTU):"
 
@@ -1045,8 +1037,8 @@ msgstr ""
 "Ð¤Ð°Ð¹Ð» Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½ÑŒ: tun-mtu"
 
 #: ../properties/nm-openvpn-dialog.ui.h:67
-msgid "Use custom UDP _fragment size:"
-msgstr "Ð’Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¾Ð²ÑƒÐ²Ð°Ñ‚Ð¸ Ð½ÐµÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ð¸Ð¹ Ñ€Ð¾Ð·Ð¼Ñ–Ñ€ _Ñ„Ñ€Ð°Ð³Ð¼ÐµÐ½Ñ‚Ñƒ UDP:"
+msgid "Use custom UDP _fragment size"
+msgstr "Ð’Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¾Ð²ÑƒÐ²Ð°Ñ‚Ð¸ Ð½ÐµÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ð¸Ð¹ Ñ€Ð¾Ð·Ð¼Ñ–Ñ€ _Ñ„Ñ€Ð°Ð³Ð¼ÐµÐ½Ñ‚Ñƒ UDP"
 
 #: ../properties/nm-openvpn-dialog.ui.h:68
 msgid ""
@@ -1121,8 +1113,8 @@ msgstr ""
 "Ð¤Ð°Ð¹Ð» Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½ÑŒ: tun-ipv6"
 
 #: ../properties/nm-openvpn-dialog.ui.h:85
-msgid "Specify pin_g interval:"
-msgstr "Ð’ÐºÐ°Ð·Ð°Ñ‚Ð¸ Ñ–Ð½Ñ‚ÐµÑ€Ð²Ð°Ð» Ð¼Ñ–Ð¶ Ñ–_Ð¼Ð¿ÑƒÐ»ÑŒÑÐ°Ð¼Ð¸:"
+msgid "Specify pin_g interval"
+msgstr "Ð’ÐºÐ°Ð·Ð°Ñ‚Ð¸ Ñ–Ð½Ñ‚ÐµÑ€Ð²Ð°Ð» Ð¼Ñ–Ð¶ Ñ–_Ð¼Ð¿ÑƒÐ»ÑŒÑÐ°Ð¼Ð¸"
 
 #: ../properties/nm-openvpn-dialog.ui.h:86
 msgid ""
@@ -1135,8 +1127,8 @@ msgstr ""
 "Ð¤Ð°Ð¹Ð» Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½ÑŒ: ping <n>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:88
-msgid "Specify _exit or restart ping:"
-msgstr "Ð’ÐºÐ°Ð·Ð°Ñ‚Ð¸ Ñ–Ð¼Ð¿ÑƒÐ»ÑŒÑ Ð²Ð¸_Ñ…Ð¾Ð´Ñƒ Ð°Ð±Ð¾ Ð¿ÐµÑ€ÐµÐ·Ð°Ð¿ÑƒÑÐºÑƒ:"
+msgid "Specify _exit or restart ping"
+msgstr "Ð’ÐºÐ°Ð·Ð°Ñ‚Ð¸ Ñ–Ð¼Ð¿ÑƒÐ»ÑŒÑ Ð²Ð¸_Ñ…Ð¾Ð´Ñƒ Ð°Ð±Ð¾ Ð¿ÐµÑ€ÐµÐ·Ð°Ð¿ÑƒÑÐºÑƒ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:89
 msgid ""
@@ -1185,8 +1177,8 @@ msgstr ""
 "Ð¤Ð°Ð¹Ð» Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½ÑŒ: float"
 
 #: ../properties/nm-openvpn-dialog.ui.h:97
-msgid "Specify max routes:"
-msgstr "Ð’ÐºÐ°Ð·Ð°Ñ‚Ð¸ Ð¼Ð°ÐºÑ. Ðº-Ñ‚ÑŒ Ð¼Ð°Ñ€ÑˆÑ€ÑƒÑ‚Ñ–Ð²:"
+msgid "Specify max routes"
+msgstr "Ð’ÐºÐ°Ð·Ð°Ñ‚Ð¸ Ð¼Ð°ÐºÑ. Ðº-Ñ‚ÑŒ Ð¼Ð°Ñ€ÑˆÑ€ÑƒÑ‚Ñ–Ð²"
 
 #: ../properties/nm-openvpn-dialog.ui.h:98
 msgid ""
@@ -1207,8 +1199,8 @@ msgstr ""
 "Ð¤Ð°Ð¹Ð» Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½ÑŒ: cipher"
 
 #: ../properties/nm-openvpn-dialog.ui.h:102
-msgid "Use custom _size of cipher key:"
-msgstr "ÐÐµÑ‚Ð¸Ð¿Ð¾Ð²Ð¸Ð¹ _Ñ€Ð¾Ð·Ð¼Ñ–Ñ€ ÐºÐ»ÑŽÑ‡Ð° ÑˆÐ¸Ñ„Ñ€ÑƒÐ²Ð°Ð½Ð½Ñ:"
+msgid "Use custom _size of cipher key"
+msgstr "ÐÐµÑ‚Ð¸Ð¿Ð¾Ð²Ð¸Ð¹ _Ñ€Ð¾Ð·Ð¼Ñ–Ñ€ ÐºÐ»ÑŽÑ‡Ð° ÑˆÐ¸Ñ„Ñ€ÑƒÐ²Ð°Ð½Ð½Ñ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:103
 msgid ""
@@ -1231,12 +1223,12 @@ msgstr ""
 "Ð¤Ð°Ð¹Ð» Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½ÑŒ: auth"
 
 #: ../properties/nm-openvpn-dialog.ui.h:107
-msgid "Ci_pher:"
-msgstr "Ð¨Ð¸Ñ„Ñ€:"
+msgid "Ci_pher"
+msgstr "Ð¨Ð¸Ñ„Ñ€"
 
 #: ../properties/nm-openvpn-dialog.ui.h:108
-msgid "_HMAC Authentication:"
-msgstr "_Ð Ð¾Ð·Ð¿Ñ–Ð·Ð½Ð°Ð²Ð°Ð½Ð½Ñ HMAC:"
+msgid "_HMAC Authentication"
+msgstr "_Ð Ð¾Ð·Ð¿Ñ–Ð·Ð½Ð°Ð²Ð°Ð½Ð½Ñ HMAC"
 
 #: ../properties/nm-openvpn-dialog.ui.h:109
 msgid "Disable cipher _negotiation"
@@ -1291,8 +1283,8 @@ msgid "Security"
 msgstr "Ð‘ÐµÐ·Ð¿ÐµÐºÐ°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:119
-msgid "_Subject Match:"
-msgstr "ÐžÐ±'Ñ”ÐºÑ‚ Ð·Ð±Ñ–Ð³Ñƒ:"
+msgid "_Subject Match"
+msgstr "ÐžÐ±'Ñ”ÐºÑ‚ Ð·Ð±Ñ–Ð³Ñƒ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:120
 msgid ""
@@ -1307,8 +1299,8 @@ msgstr ""
 "Ð¤Ð°Ð¹Ð» Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½ÑŒ (Ñ€ÐµÐ¶Ð¸Ð¼ Ð·Ð°ÑÑ‚Ð°Ñ€Ñ–Ð»Ð¾Ð³Ð¾ ÐºÐ¾Ð´Ñƒ): tls-remote subject-or-name"
 
 #: ../properties/nm-openvpn-dialog.ui.h:124
-msgid "Server _Certificate Check:"
-msgstr "ÐŸÐµÑ€Ðµ_Ð²Ñ–Ñ€ÐºÐ° ÑÐµÑ€Ñ‚Ð¸Ñ„Ñ–ÐºÐ°Ñ‚Ð° ÑÐµÑ€Ð²ÐµÑ€Ð°:"
+msgid "Server _Certificate Check"
+msgstr "ÐŸÐµÑ€Ðµ_Ð²Ñ–Ñ€ÐºÐ° ÑÐµÑ€Ñ‚Ð¸Ñ„Ñ–ÐºÐ°Ñ‚Ð° ÑÐµÑ€Ð²ÐµÑ€Ð°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:125
 msgid ""
@@ -1354,8 +1346,8 @@ msgstr ""
 "RFC3280."
 
 #: ../properties/nm-openvpn-dialog.ui.h:137
-msgid "_Remote peer certificate TLS type:"
-msgstr "Ð¢Ð¸Ð¿ TLS ÑÐµÑ€Ñ‚Ð¸Ñ„Ñ–ÐºÐ°Ñ‚Ð° Ð²_Ñ–Ð´Ð´Ð°Ð»ÐµÐ½Ð¾Ð³Ð¾ ÑÐµÑ€Ð²ÐµÑ€Ð°:"
+msgid "_Remote peer certificate TLS type"
+msgstr "Ð¢Ð¸Ð¿ TLS ÑÐµÑ€Ñ‚Ð¸Ñ„Ñ–ÐºÐ°Ñ‚Ð° Ð²_Ñ–Ð´Ð´Ð°Ð»ÐµÐ½Ð¾Ð³Ð¾ ÑÐµÑ€Ð²ÐµÑ€Ð°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:138
 msgid ""
@@ -1381,8 +1373,8 @@ msgstr ""
 "nsCertTypeÂ»"
 
 #: ../properties/nm-openvpn-dialog.ui.h:142
-msgid "_Remote peer certificate nsCert designation:"
-msgstr "ÐŸÑ–_Ð´Ð¿Ð¸Ñ nsCert ÑÐµÑ€Ñ‚Ð¸Ñ„Ñ–ÐºÐ°Ñ‚Ð° Ð²Ñ–Ð´Ð´Ð°Ð»ÐµÐ½Ð¾Ð³Ð¾ Ð²ÑƒÐ·Ð»Ð°:"
+msgid "_Remote peer certificate nsCert designation"
+msgstr "ÐŸÑ–_Ð´Ð¿Ð¸Ñ nsCert ÑÐµÑ€Ñ‚Ð¸Ñ„Ñ–ÐºÐ°Ñ‚Ð° Ð²Ñ–Ð´Ð´Ð°Ð»ÐµÐ½Ð¾Ð³Ð¾ Ð²ÑƒÐ·Ð»Ð°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:143
 msgid ""
@@ -1395,8 +1387,8 @@ msgstr ""
 "Ð¤Ð°Ð¹Ð» Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½ÑŒ: ns-cert-type client|server"
 
 #: ../properties/nm-openvpn-dialog.ui.h:145
-msgid "Key _Direction:"
-msgstr "ÐÐ°Ð¿Ñ€ÑÐ¼Ð¾Ðº ÐºÐ»ÑŽÑ‡Ð°:"
+msgid "Key _Direction"
+msgstr "ÐÐ°Ð¿Ñ€ÑÐ¼Ð¾Ðº ÐºÐ»ÑŽÑ‡Ð°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:146
 msgid ""
@@ -1427,20 +1419,20 @@ msgstr ""
 "Ð¤Ð°Ð¹Ð» Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½ÑŒ: tls-auth <file> [Ð½Ð°Ð¿Ñ€ÑÐ¼Ð¾Ðº]"
 
 #: ../properties/nm-openvpn-dialog.ui.h:151
-msgid "Key _File:"
-msgstr "Ð¤Ð°Ð¹Ð» ÐºÐ»ÑŽÑ‡Ð°:"
+msgid "Key _File"
+msgstr "Ð¤Ð°Ð¹Ð» ÐºÐ»ÑŽÑ‡Ð°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:152
-msgid "Mode:"
-msgstr "Ð ÐµÐ¶Ð¸Ð¼:"
+msgid "Mode"
+msgstr "Ð ÐµÐ¶Ð¸Ð¼"
 
 #: ../properties/nm-openvpn-dialog.ui.h:153
 msgid "Add an additional layer of encryption or HMAC authentication."
 msgstr "Ð”Ð¾Ð´Ð°Ñ‚Ð¸ ÑˆÐ°Ñ€ ÑˆÐ¸Ñ„Ñ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð°Ð±Ð¾ Ñ€Ð¾Ð·Ð¿Ñ–Ð·Ð½Ð°Ð²Ð°Ð½Ð½Ñ HMAC."
 
 #: ../properties/nm-openvpn-dialog.ui.h:154
-msgid "Extra Certificates:"
-msgstr "Ð”Ð¾Ð´Ð°Ñ‚ÐºÐ¾Ð²Ñ– ÑÐµÑ€Ñ‚Ð¸Ñ„Ñ–ÐºÐ°Ñ‚Ð¸:"
+msgid "Extra Certificates"
+msgstr "Ð”Ð¾Ð´Ð°Ñ‚ÐºÐ¾Ð²Ñ– ÑÐµÑ€Ñ‚Ð¸Ñ„Ñ–ÐºÐ°Ñ‚Ð¸"
 
 #: ../properties/nm-openvpn-dialog.ui.h:155
 msgid ""
@@ -1466,8 +1458,8 @@ msgid "TLS version control"
 msgstr "ÐšÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð²ÐµÑ€ÑÑ–Ñ”ÑŽ TLS"
 
 #: ../properties/nm-openvpn-dialog.ui.h:160
-msgid "TLS _min version: "
-msgstr "_ÐœÑ–Ð½. Ð²ÐµÑ€ÑÑ–Ñ TLS: "
+msgid "TLS _min version"
+msgstr "_ÐœÑ–Ð½. Ð²ÐµÑ€ÑÑ–Ñ TLS"
 
 #: ../properties/nm-openvpn-dialog.ui.h:161
 msgid ""
@@ -1483,8 +1475,8 @@ msgstr ""
 "SSL."
 
 #: ../properties/nm-openvpn-dialog.ui.h:162
-msgid "TLS ma_x version: "
-msgstr "Ðœ_Ð°ÐºÑ. Ð²ÐµÑ€ÑÑ–Ñ TLS: "
+msgid "TLS ma_x version"
+msgstr "Ðœ_Ð°ÐºÑ. Ð²ÐµÑ€ÑÑ–Ñ TLS"
 
 #: ../properties/nm-openvpn-dialog.ui.h:163
 msgid ""
@@ -1508,8 +1500,8 @@ msgstr ""
 "Ð¤Ð°Ð¹Ð» Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½ÑŒ: http-proxy Ð°Ð±Ð¾ socks-proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:167
-msgid "Proxy _Type:"
-msgstr "Ð¢Ð¸Ð¿ Ð¿Ñ€Ð¾ÐºÑÑ–-ÑÐµÑ€Ð²ÐµÑ€Ð°:"
+msgid "Proxy _Type"
+msgstr "Ð¢Ð¸Ð¿ Ð¿Ñ€Ð¾ÐºÑÑ–-ÑÐµÑ€Ð²ÐµÑ€Ð°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:168
 msgid ""
@@ -1520,8 +1512,8 @@ msgstr ""
 "Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¾Ð²ÑƒÑ”Ñ‚ÑŒÑÑ Ð¿Ñ€Ð¾ÐºÑÑ–-ÑÐµÑ€Ð²ÐµÑ€.</i>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:169
-msgid "Server _Address:"
-msgstr "ÐÐ´Ñ€ÐµÑÐ° ÑÐµÑ€Ð²ÐµÑ€Ð°:"
+msgid "Server _Address"
+msgstr "ÐÐ´Ñ€ÐµÑÐ° ÑÐµÑ€Ð²ÐµÑ€Ð°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:170
 msgid ""
@@ -1532,8 +1524,8 @@ msgstr ""
 "Ð¤Ð°Ð¹Ð» Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½ÑŒ: http-proxy Ð°Ð±Ð¾ socks-proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:172
-msgid "_Port:"
-msgstr "ÐŸÐ¾Ñ€Ñ‚:"
+msgid "_Port"
+msgstr "ÐŸÐ¾Ñ€Ñ‚"
 
 #: ../properties/nm-openvpn-dialog.ui.h:173
 msgid ""
@@ -1557,12 +1549,12 @@ msgstr ""
 "Ð¤Ð°Ð¹Ð» Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½ÑŒ: http-proxy-retry Ð°Ð±Ð¾ socks-proxy-retry"
 
 #: ../properties/nm-openvpn-dialog.ui.h:178
-msgid "Proxy _Username:"
-msgstr "ÐšÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡ Ð½Ð° Ð¿Ñ€Ð¾ÐºÑÑ–-ÑÐµÑ€Ð²ÐµÑ€Ñ–:"
+msgid "Proxy _Username"
+msgstr "ÐšÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡ Ð½Ð° Ð¿Ñ€Ð¾ÐºÑÑ–-ÑÐµÑ€Ð²ÐµÑ€Ñ–"
 
 #: ../properties/nm-openvpn-dialog.ui.h:179
-msgid "Proxy Passwor_d:"
-msgstr "ÐŸÐ°Ñ€Ð¾Ð»ÑŒ Ð¿Ñ€Ð¾ÐºÑÑ–-ÑÐµÑ€Ð²ÐµÑ€Ð°:"
+msgid "Proxy Passwor_d"
+msgstr "ÐŸÐ°Ñ€Ð¾Ð»ÑŒ Ð¿Ñ€Ð¾ÐºÑÑ–-ÑÐµÑ€Ð²ÐµÑ€Ð°"
 
 #: ../properties/nm-openvpn-dialog.ui.h:180
 msgid "HTTP/Socks proxy username passed to OpenVPN when prompted for it."
diff --git a/po/vi.po b/po/vi.po
index 32be378..206a1da 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -743,8 +743,8 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:13
 #, fuzzy
-msgid "_Gateway:"
-msgstr "Cá»•n_g lÃ  cá»•ng ra:"
+msgid "_Gateway"
+msgstr "Cá»•n_g lÃ  cá»•ng ra"
 
 #: ../properties/nm-openvpn-dialog.ui.h:14
 msgid ""
@@ -767,15 +767,10 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#: ../properties/nm-openvpn-dialog.ui.h:19
-#, fuzzy
-msgid "Password:"
-msgstr "_Máºt kháº©u :"
-
 #: ../properties/nm-openvpn-dialog.ui.h:20
 #, fuzzy
-msgid "User name:"
-msgstr "_TÃªn ngÆ°á»i dÃ¹ng:"
+msgid "User name"
+msgstr "_TÃªn ngÆ°á»i dÃ¹ng"
 
 #: ../properties/nm-openvpn-dialog.ui.h:21
 msgid ""
@@ -792,22 +787,18 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:25
 #, fuzzy
-msgid "Remote IP Address:"
-msgstr "IP á»Ÿ _xa:"
+msgid "Remote IP Address"
+msgstr "IP á»Ÿ _xa"
 
 #: ../properties/nm-openvpn-dialog.ui.h:26
 #, fuzzy
-msgid "Local IP Address:"
+msgid "Local IP Address"
 msgstr "IP cá»¥c bá»™ : %s"
 
 #: ../properties/nm-openvpn-dialog.ui.h:27
 #, fuzzy
-msgid "Key Direction:"
-msgstr "HÆ°á»›ng:"
-
-#: ../properties/nm-openvpn-dialog.ui.h:28
-msgid "Static Key:"
-msgstr ""
+msgid "Key Direction"
+msgstr "HÆ°á»›ng"
 
 #: ../properties/nm-openvpn-dialog.ui.h:29
 msgid ""
@@ -837,7 +828,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:38
-msgid "Type:"
+msgid "Type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:39
@@ -855,8 +846,8 @@ msgstr "TÃ¹y chá»n cáº¥p cao OpenVPN"
 
 #: ../properties/nm-openvpn-dialog.ui.h:43
 #, fuzzy
-msgid "Use custom gateway p_ort:"
-msgstr "Cá»•n_g lÃ  cá»•ng ra:"
+msgid "Use custom gateway p_ort"
+msgstr "Cá»•n_g lÃ  cá»•ng ra"
 
 #: ../properties/nm-openvpn-dialog.ui.h:44
 msgid ""
@@ -866,7 +857,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:46
-msgid "Use custom _renegotiation interval:"
+msgid "Use custom _renegotiation interval"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:47
@@ -877,7 +868,7 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:49
 #, fuzzy
-msgid "Data _compression:"
+msgid "Data _compression"
 msgstr "NÃ©n báº±ng L_ZO"
 
 #: ../properties/nm-openvpn-dialog.ui.h:50
@@ -901,7 +892,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:56
-msgid "Set virtual _device type:"
+msgid "Set virtual _device type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:57
@@ -915,7 +906,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:60
-msgid " and _name:"
+msgid " and _name"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:61
@@ -926,7 +917,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:63
-msgid "Use custom tunnel Maximum Transmission _Unit (MTU):"
+msgid "Use custom tunnel Maximum Transmission _Unit (MTU)"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:64
@@ -937,7 +928,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:66
-msgid "Use custom UDP _fragment size:"
+msgid "Use custom UDP _fragment size"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:67
@@ -988,7 +979,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:81
-msgid "Specify pin_g interval:"
+msgid "Specify pin_g interval"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:82
@@ -999,7 +990,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:84
-msgid "Specify _exit or restart ping:"
+msgid "Specify _exit or restart ping"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:85
@@ -1030,7 +1021,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:93
-msgid "Specify max routes:"
+msgid "Specify max routes"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:94
@@ -1047,7 +1038,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:98
-msgid "Use custom _size of cipher key:"
+msgid "Use custom _size of cipher key"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:99
@@ -1066,11 +1057,11 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:103
 #, fuzzy
-msgid "Ci_pher:"
+msgid "Ci_pher"
 msgstr "Máºt mÃ£: %s"
 
 #: ../properties/nm-openvpn-dialog.ui.h:104
-msgid "_HMAC Authentication:"
+msgid "_HMAC Authentication"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:105
@@ -1118,7 +1109,7 @@ msgid "Security"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:115
-msgid "_Subject Match:"
+msgid "_Subject Match"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:116
@@ -1131,8 +1122,8 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:120
 #, fuzzy
-msgid "Server _Certificate Check:"
-msgstr "C_há»©ng nháºn:"
+msgid "Server _Certificate Check"
+msgstr "C_há»©ng nháºn"
 
 #: ../properties/nm-openvpn-dialog.ui.h:121
 msgid ""
@@ -1162,7 +1153,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:133
-msgid "_Remote peer certificate TLS type:"
+msgid "_Remote peer certificate TLS type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:134
@@ -1183,7 +1174,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:138
-msgid "_Remote peer certificate nsCert designation:"
+msgid "_Remote peer certificate nsCert designation"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:139
@@ -1195,8 +1186,8 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:141
 #, fuzzy
-msgid "Key _Direction:"
-msgstr "HÆ°á»›ng:"
+msgid "Key _Direction"
+msgstr "HÆ°á»›ng"
 
 #: ../properties/nm-openvpn-dialog.ui.h:142
 msgid ""
@@ -1216,11 +1207,11 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:147
-msgid "Key _File:"
+msgid "Key _File"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:148
-msgid "Mode:"
+msgid "Mode"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:149
@@ -1229,8 +1220,8 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:150
 #, fuzzy
-msgid "Extra Certificates:"
-msgstr "C_há»©ng nháºn:"
+msgid "Extra Certificates"
+msgstr "C_há»©ng nháºn"
 
 #: ../properties/nm-openvpn-dialog.ui.h:151
 msgid ""
@@ -1252,7 +1243,7 @@ msgid "TLS version control"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:156
-msgid "TLS _min version: "
+msgid "TLS _min version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:157
@@ -1264,7 +1255,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:158
-msgid "TLS ma_x version: "
+msgid "TLS ma_x version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:159
@@ -1285,7 +1276,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:163
-msgid "Proxy _Type:"
+msgid "Proxy _Type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:164
@@ -1295,7 +1286,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:165
-msgid "Server _Address:"
+msgid "Server _Address"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:166
@@ -1306,7 +1297,7 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:168
 #, fuzzy
-msgid "_Port:"
+msgid "_Port"
 msgstr "Cá»•ng: %s"
 
 #: ../properties/nm-openvpn-dialog.ui.h:169
@@ -1327,13 +1318,13 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:174
 #, fuzzy
-msgid "Proxy _Username:"
-msgstr "_TÃªn ngÆ°á»i dÃ¹ng:"
+msgid "Proxy _Username"
+msgstr "_TÃªn ngÆ°á»i dÃ¹ng"
 
 #: ../properties/nm-openvpn-dialog.ui.h:175
 #, fuzzy
-msgid "Proxy Passwor_d:"
-msgstr "_Máºt kháº©u :"
+msgid "Proxy Passwor_d"
+msgstr "_Máºt kháº©u "
 
 #: ../properties/nm-openvpn-dialog.ui.h:176
 msgid "HTTP/Socks proxy username passed to OpenVPN when prompted for it."
@@ -1346,7 +1337,7 @@ msgstr ""
 #: ../properties/nm-openvpn-dialog.ui.h:178
 #, fuzzy
 msgid "_Show password"
-msgstr "_Máºt kháº©u :"
+msgstr "_Máºt kháº©u "
 
 #: ../properties/nm-openvpn-dialog.ui.h:179
 msgid "Proxies"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 8360c20..fe44e19 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -741,7 +741,7 @@ msgid "General"
 msgstr "å¸¸è§„"
 
 #: ../properties/nm-openvpn-dialog.ui.h:13
-msgid "_Gateway:"
+msgid "_Gateway"
 msgstr "ç½‘å…³(_G)ï¼š"
 
 #: ../properties/nm-openvpn-dialog.ui.h:14
@@ -767,12 +767,8 @@ msgstr "CA"
 msgid "User"
 msgstr "ç”¨æˆ·"
 
-#: ../properties/nm-openvpn-dialog.ui.h:19
-msgid "Password:"
-msgstr "å¯†ç ï¼š"
-
 #: ../properties/nm-openvpn-dialog.ui.h:20
-msgid "User name:"
+msgid "User name"
 msgstr "ç”¨æˆ·åï¼š"
 
 #: ../properties/nm-openvpn-dialog.ui.h:21
@@ -793,21 +789,17 @@ msgstr ""
 "é…ç½®ï¼šauth-user-pass"
 
 #: ../properties/nm-openvpn-dialog.ui.h:25
-msgid "Remote IP Address:"
+msgid "Remote IP Address"
 msgstr "è¿œç¨‹ IP åœ°å€ï¼š"
 
 #: ../properties/nm-openvpn-dialog.ui.h:26
-msgid "Local IP Address:"
+msgid "Local IP Address"
 msgstr "æœ¬åœ° IP åœ°å€ï¼š"
 
 #: ../properties/nm-openvpn-dialog.ui.h:27
-msgid "Key Direction:"
+msgid "Key Direction"
 msgstr "å¯†é’¥æ–¹å‘ï¼š"
 
-#: ../properties/nm-openvpn-dialog.ui.h:28
-msgid "Static Key:"
-msgstr "é™æ€å¯†é’¥ï¼š"
-
 #: ../properties/nm-openvpn-dialog.ui.h:29
 msgid ""
 "Pre-shared file for Static Key encryption mode (non-TLS).\n"
@@ -846,7 +838,7 @@ msgstr ""
 "é…ç½®ï¼šstatic <æ–‡ä»¶> [direction]"
 
 #: ../properties/nm-openvpn-dialog.ui.h:38
-msgid "Type:"
+msgid "Type"
 msgstr "ç±»åž‹ï¼š"
 
 #: ../properties/nm-openvpn-dialog.ui.h:39
@@ -862,7 +854,7 @@ msgid "OpenVPN Advanced Options"
 msgstr "OpenVPN é«˜çº§é€‰é¡¹"
 
 #: ../properties/nm-openvpn-dialog.ui.h:43
-msgid "Use custom gateway p_ort:"
+msgid "Use custom gateway p_ort"
 msgstr "ä½¿ç”¨è‡ªå®šä¹‰ç½‘å…³ç«¯å£(_O)ï¼š"
 
 #: ../properties/nm-openvpn-dialog.ui.h:44
@@ -875,7 +867,7 @@ msgstr ""
 "é…ç½®ï¼šport"
 
 #: ../properties/nm-openvpn-dialog.ui.h:46
-msgid "Use custom _renegotiation interval:"
+msgid "Use custom _renegotiation interval"
 msgstr "ä½¿ç”¨è‡ªå®šä¹‰é‡æ–°åå•†é—´éš”(_R)ï¼š"
 
 #: ../properties/nm-openvpn-dialog.ui.h:47
@@ -888,7 +880,7 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:49
 #, fuzzy
-msgid "Data _compression:"
+msgid "Data _compression"
 msgstr "ä½¿ç”¨ L_ZO åŽ‹ç¼©"
 
 #: ../properties/nm-openvpn-dialog.ui.h:50
@@ -915,7 +907,7 @@ msgstr ""
 "é…ç½®ï¼šproto tcp-client | udp"
 
 #: ../properties/nm-openvpn-dialog.ui.h:56
-msgid "Set virtual _device type:"
+msgid "Set virtual _device type"
 msgstr "è®¾å®šè™šæ‹Ÿè®¾å¤‡ç±»åž‹(_D)ï¼š"
 
 #: ../properties/nm-openvpn-dialog.ui.h:57
@@ -931,7 +923,7 @@ msgstr ""
 "é…ç½®ï¼šdev tap | tun"
 
 #: ../properties/nm-openvpn-dialog.ui.h:60
-msgid " and _name:"
+msgid " and _name"
 msgstr "å’Œåç§°(_N)ï¼š"
 
 #: ../properties/nm-openvpn-dialog.ui.h:61
@@ -944,7 +936,7 @@ msgstr ""
 "é…ç½®ï¼šdev <åç§°>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:63
-msgid "Use custom tunnel Maximum Transmission _Unit (MTU):"
+msgid "Use custom tunnel Maximum Transmission _Unit (MTU)"
 msgstr "ä½¿ç”¨è‡ªå®šä¹‰æœ€å¤§ä¼ è¾“å•å…ƒï¼ˆMT_Uï¼‰ï¼š"
 
 #: ../properties/nm-openvpn-dialog.ui.h:64
@@ -957,7 +949,7 @@ msgstr ""
 "é…ç½®ï¼štun-mtu"
 
 #: ../properties/nm-openvpn-dialog.ui.h:66
-msgid "Use custom UDP _fragment size:"
+msgid "Use custom UDP _fragment size"
 msgstr "ä½¿ç”¨è‡ªå®šä¹‰ç”¨æˆ·æ•°æ®æŠ¥æ®µé•¿åº¦(_F)ï¼š"
 
 #: ../properties/nm-openvpn-dialog.ui.h:67
@@ -1016,7 +1008,7 @@ msgstr ""
 "é…ç½®ï¼štun-ipv6"
 
 #: ../properties/nm-openvpn-dialog.ui.h:81
-msgid "Specify pin_g interval:"
+msgid "Specify pin_g interval"
 msgstr "æŒ‡å®š pin_g é—´éš”ï¼š"
 
 #: ../properties/nm-openvpn-dialog.ui.h:82
@@ -1029,7 +1021,7 @@ msgstr ""
 "é…ç½®ï¼šping <n>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:84
-msgid "Specify _exit or restart ping:"
+msgid "Specify _exit or restart ping"
 msgstr "æŒ‡å®šé€€å‡ºæˆ–è€…é‡å¯ ping(_E)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:85
@@ -1072,7 +1064,7 @@ msgstr ""
 "é…ç½®ï¼šfloat"
 
 #: ../properties/nm-openvpn-dialog.ui.h:93
-msgid "Specify max routes:"
+msgid "Specify max routes"
 msgstr "æŒ‡å®šæœ€å¤§è·¯ç”±è·³æ•°ï¼š"
 
 #: ../properties/nm-openvpn-dialog.ui.h:94
@@ -1093,7 +1085,7 @@ msgstr ""
 "é…ç½®ï¼šcipher"
 
 #: ../properties/nm-openvpn-dialog.ui.h:98
-msgid "Use custom _size of cipher key:"
+msgid "Use custom _size of cipher key"
 msgstr "ä½¿ç”¨è‡ªå®šä¹‰çš„å¯†é’¥å¤§å°(_S)ï¼š"
 
 #: ../properties/nm-openvpn-dialog.ui.h:99
@@ -1115,11 +1107,11 @@ msgstr ""
 "é…ç½®ï¼šauth"
 
 #: ../properties/nm-openvpn-dialog.ui.h:103
-msgid "Ci_pher:"
+msgid "Ci_pher"
 msgstr "åŠ å¯†(_P)ï¼š"
 
 #: ../properties/nm-openvpn-dialog.ui.h:104
-msgid "_HMAC Authentication:"
+msgid "_HMAC Authentication"
 msgstr "_HMAC éªŒè¯ï¼š"
 
 #: ../properties/nm-openvpn-dialog.ui.h:105
@@ -1171,7 +1163,7 @@ msgid "Security"
 msgstr "å®‰å…¨æ€§"
 
 #: ../properties/nm-openvpn-dialog.ui.h:115
-msgid "_Subject Match:"
+msgid "_Subject Match"
 msgstr "ä½¿ç”¨è€…åŒ¹é…(_S)ï¼š"
 
 #: ../properties/nm-openvpn-dialog.ui.h:116
@@ -1187,7 +1179,7 @@ msgstr ""
 "é…ç½®ï¼ˆä¼ ç»Ÿæ¨¡å¼ï¼‰ï¼štls-remote subject-or-name"
 
 #: ../properties/nm-openvpn-dialog.ui.h:120
-msgid "Server _Certificate Check:"
+msgid "Server _Certificate Check"
 msgstr "æœåŠ¡å™¨è¯ä¹¦æ£€æŸ¥(_C)ï¼š"
 
 #: ../properties/nm-openvpn-dialog.ui.h:121
@@ -1229,7 +1221,7 @@ msgstr ""
 "è¦æ±‚å¯¹ç‰ç«¯è¯ä¹¦ä¸ºåŸºäºŽ RFC3280 TLS è§„åˆ™çš„æ˜¾å¼å¯†é’¥ç”¨æ³•å’Œæ‰©å±•å¯†é’¥ç”¨æ³•æ‰€ç¾åã€‚"
 
 #: ../properties/nm-openvpn-dialog.ui.h:133
-msgid "_Remote peer certificate TLS type:"
+msgid "_Remote peer certificate TLS type"
 msgstr "è¿œç¨‹ç«¯è¯ä¹¦ TLS ç±»åž‹(_R)ï¼š"
 
 #: ../properties/nm-openvpn-dialog.ui.h:134
@@ -1252,7 +1244,7 @@ msgid ""
 msgstr "è¦æ±‚å¯¹ç‰è¯ä¹¦ä»¥æ˜Žç¡®çš„ nsCertType æŒ‡ç¤ºç¬¦ç¾åã€‚"
 
 #: ../properties/nm-openvpn-dialog.ui.h:138
-msgid "_Remote peer certificate nsCert designation:"
+msgid "_Remote peer certificate nsCert designation"
 msgstr "è¿œç¨‹ç«¯è¯ä¹¦ nsCert æŒ‡ç¤ºç¬¦(_R)ï¼š"
 
 #: ../properties/nm-openvpn-dialog.ui.h:139
@@ -1265,7 +1257,7 @@ msgstr ""
 "é…ç½®ï¼šns-cert-type client|server"
 
 #: ../properties/nm-openvpn-dialog.ui.h:141
-msgid "Key _Direction:"
+msgid "Key _Direction"
 msgstr "å¯†é’¥æ–¹å‘(_D)ï¼š"
 
 #: ../properties/nm-openvpn-dialog.ui.h:142
@@ -1293,11 +1285,11 @@ msgstr ""
 "é…ç½®ï¼štls-auth <æ–‡ä»¶> [direction]"
 
 #: ../properties/nm-openvpn-dialog.ui.h:147
-msgid "Key _File:"
+msgid "Key _File"
 msgstr "å¯†é’¥æ–‡ä»¶(_F)ï¼š"
 
 #: ../properties/nm-openvpn-dialog.ui.h:148
-msgid "Mode:"
+msgid "Mode"
 msgstr "æ¨¡å¼ï¼š"
 
 #: ../properties/nm-openvpn-dialog.ui.h:149
@@ -1305,7 +1297,7 @@ msgid "Add an additional layer of encryption or HMAC authentication."
 msgstr "æ·»åŠ é¢å¤–çš„åŠ å¯†å±‚æˆ– HMAC éªŒè¯å±‚ã€‚"
 
 #: ../properties/nm-openvpn-dialog.ui.h:150
-msgid "Extra Certificates:"
+msgid "Extra Certificates"
 msgstr "é¢å¤–è¯ä¹¦ï¼š"
 
 #: ../properties/nm-openvpn-dialog.ui.h:151
@@ -1330,7 +1322,7 @@ msgid "TLS version control"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:156
-msgid "TLS _min version: "
+msgid "TLS _min version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:157
@@ -1342,7 +1334,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:158
-msgid "TLS ma_x version: "
+msgid "TLS ma_x version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:159
@@ -1364,7 +1356,7 @@ msgstr ""
 "é…ç½®ï¼šhttp-proxy æˆ– socks-proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:163
-msgid "Proxy _Type:"
+msgid "Proxy _Type"
 msgstr "ä»£ç†ç±»åž‹(_T)ï¼š"
 
 #: ../properties/nm-openvpn-dialog.ui.h:164
@@ -1374,7 +1366,7 @@ msgid ""
 msgstr "<i>å¦‚æžœæ‚¨çš„ç»„ç»‡è¦æ±‚ä½¿ç”¨ä»£ç†æœåŠ¡å™¨æ¥è®¿é—®äº’è”ç½‘ï¼Œè¯·é€‰æ‹©æ¤é€‰é¡¹ã€‚</i>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:165
-msgid "Server _Address:"
+msgid "Server _Address"
 msgstr "æœåŠ¡å™¨åœ°å€(_A)ï¼š"
 
 #: ../properties/nm-openvpn-dialog.ui.h:166
@@ -1386,7 +1378,7 @@ msgstr ""
 "é…ç½®ï¼šhttp-proxy æˆ– socks-proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:168
-msgid "_Port:"
+msgid "_Port"
 msgstr "ç«¯å£(_P)ï¼š"
 
 #: ../properties/nm-openvpn-dialog.ui.h:169
@@ -1410,11 +1402,11 @@ msgstr ""
 "é…ç½®ï¼šhttp-proxy-retry æˆ– socks-proxy-retry"
 
 #: ../properties/nm-openvpn-dialog.ui.h:174
-msgid "Proxy _Username:"
+msgid "Proxy _Username"
 msgstr "ä»£ç†ç”¨æˆ·å(_U)ï¼š"
 
 #: ../properties/nm-openvpn-dialog.ui.h:175
-msgid "Proxy Passwor_d:"
+msgid "Proxy Passwor_d"
 msgstr "ä»£ç†å¯†ç (_D)ï¼š"
 
 #: ../properties/nm-openvpn-dialog.ui.h:176
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 7a33f3b..184d0cf 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -735,7 +735,7 @@ msgid "General"
 msgstr "ä¸€èˆ¬"
 
 #: ../properties/nm-openvpn-dialog.ui.h:13
-msgid "_Gateway:"
+msgid "_Gateway"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:14
@@ -749,7 +749,7 @@ msgstr ""
 #: ../properties/nm-openvpn-dialog.ui.h:16
 #, fuzzy
 msgid "Authentication"
-msgstr "HMAC é©—è‰:"
+msgstr "HMAC é©—è‰"
 
 #: ../properties/nm-openvpn-dialog.ui.h:17
 msgid "CA"
@@ -759,14 +759,10 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#: ../properties/nm-openvpn-dialog.ui.h:19
-msgid "Password:"
-msgstr "å¯†ç¢¼:"
-
 #: ../properties/nm-openvpn-dialog.ui.h:20
 #, fuzzy
-msgid "User name:"
-msgstr "ä½¿ç”¨è€…åç¨±(_U):"
+msgid "User name"
+msgstr "ä½¿ç”¨è€…åç¨±(_U)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:21
 msgid ""
@@ -783,22 +779,17 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:25
 #, fuzzy
-msgid "Remote IP Address:"
-msgstr "æœ¬åœ°ç«¯ IP ä½å€:"
+msgid "Remote IP Address"
+msgstr "æœ¬åœ°ç«¯ IP ä½å€"
 
 #: ../properties/nm-openvpn-dialog.ui.h:26
-msgid "Local IP Address:"
-msgstr "æœ¬åœ°ç«¯ IP ä½å€:"
+msgid "Local IP Address"
+msgstr "æœ¬åœ°ç«¯ IP ä½å€"
 
 #: ../properties/nm-openvpn-dialog.ui.h:27
 #, fuzzy
-msgid "Key Direction:"
-msgstr "é‡‘é‘°æ–¹å‘:"
-
-#: ../properties/nm-openvpn-dialog.ui.h:28
-#, fuzzy
-msgid "Static Key:"
-msgstr "éœæ…‹å¯†ç¢¼åŒ™"
+msgid "Key Direction"
+msgstr "é‡‘é‘°æ–¹å‘"
 
 #: ../properties/nm-openvpn-dialog.ui.h:29
 msgid ""
@@ -832,7 +823,7 @@ msgstr ""
 "å“¡ã€‚</i>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:38
-msgid "Type:"
+msgid "Type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:39
@@ -849,7 +840,7 @@ msgid "OpenVPN Advanced Options"
 msgstr "OpenVPN é€²éšŽé¸é …"
 
 #: ../properties/nm-openvpn-dialog.ui.h:43
-msgid "Use custom gateway p_ort:"
+msgid "Use custom gateway p_ort"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:44
@@ -860,7 +851,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:46
-msgid "Use custom _renegotiation interval:"
+msgid "Use custom _renegotiation interval"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:47
@@ -870,7 +861,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:49
-msgid "Data _compression:"
+msgid "Data _compression"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:50
@@ -892,7 +883,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:56
-msgid "Set virtual _device type:"
+msgid "Set virtual _device type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:57
@@ -906,7 +897,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:60
-msgid " and _name:"
+msgid " and _name"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:61
@@ -917,7 +908,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:63
-msgid "Use custom tunnel Maximum Transmission _Unit (MTU):"
+msgid "Use custom tunnel Maximum Transmission _Unit (MTU)"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:64
@@ -928,7 +919,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:66
-msgid "Use custom UDP _fragment size:"
+msgid "Use custom UDP _fragment size"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:67
@@ -979,7 +970,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:81
-msgid "Specify pin_g interval:"
+msgid "Specify pin_g interval"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:82
@@ -990,7 +981,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:84
-msgid "Specify _exit or restart ping:"
+msgid "Specify _exit or restart ping"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:85
@@ -1021,7 +1012,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:93
-msgid "Specify max routes:"
+msgid "Specify max routes"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:94
@@ -1038,7 +1029,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:98
-msgid "Use custom _size of cipher key:"
+msgid "Use custom _size of cipher key"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:99
@@ -1056,12 +1047,12 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:103
-msgid "Ci_pher:"
-msgstr "åŠ å¯†å™¨:"
+msgid "Ci_pher"
+msgstr "åŠ å¯†å™¨"
 
 #: ../properties/nm-openvpn-dialog.ui.h:104
-msgid "_HMAC Authentication:"
-msgstr "HMAC é©—è‰:"
+msgid "_HMAC Authentication"
+msgstr "HMAC é©—è‰"
 
 #: ../properties/nm-openvpn-dialog.ui.h:105
 msgid "Disable cipher _negotiation"
@@ -1108,7 +1099,7 @@ msgid "Security"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:115
-msgid "_Subject Match:"
+msgid "_Subject Match"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:116
@@ -1121,8 +1112,8 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:120
 #, fuzzy
-msgid "Server _Certificate Check:"
-msgstr "CA æ†‘è‰:"
+msgid "Server _Certificate Check"
+msgstr "CA æ†‘è‰"
 
 #: ../properties/nm-openvpn-dialog.ui.h:121
 msgid ""
@@ -1152,7 +1143,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:133
-msgid "_Remote peer certificate TLS type:"
+msgid "_Remote peer certificate TLS type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:134
@@ -1173,7 +1164,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:138
-msgid "_Remote peer certificate nsCert designation:"
+msgid "_Remote peer certificate nsCert designation"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:139
@@ -1184,8 +1175,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:141
-msgid "Key _Direction:"
-msgstr "é‡‘é‘°æ–¹å‘:"
+msgid "Key _Direction"
+msgstr "é‡‘é‘°æ–¹å‘"
 
 #: ../properties/nm-openvpn-dialog.ui.h:142
 msgid ""
@@ -1209,11 +1200,11 @@ msgstr ""
 "å“¡ã€‚</i>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:147
-msgid "Key _File:"
-msgstr "é‡‘é‘°æª”æ¡ˆ:"
+msgid "Key _File"
+msgstr "é‡‘é‘°æª”æ¡ˆ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:148
-msgid "Mode:"
+msgid "Mode"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:149
@@ -1222,8 +1213,8 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:150
 #, fuzzy
-msgid "Extra Certificates:"
-msgstr "CA æ†‘è‰:"
+msgid "Extra Certificates"
+msgstr "CA æ†‘è‰"
 
 #: ../properties/nm-openvpn-dialog.ui.h:151
 msgid ""
@@ -1245,7 +1236,7 @@ msgid "TLS version control"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:156
-msgid "TLS _min version: "
+msgid "TLS _min version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:157
@@ -1257,7 +1248,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:158
-msgid "TLS ma_x version: "
+msgid "TLS ma_x version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:159
@@ -1269,7 +1260,7 @@ msgstr ""
 #: ../properties/nm-openvpn-dialog.ui.h:160
 #, fuzzy
 msgid "TLS Authentication"
-msgstr "HMAC é©—è‰:"
+msgstr "HMAC é©—è‰"
 
 #: ../properties/nm-openvpn-dialog.ui.h:161
 msgid ""
@@ -1278,7 +1269,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:163
-msgid "Proxy _Type:"
+msgid "Proxy _Type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:164
@@ -1288,7 +1279,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:165
-msgid "Server _Address:"
+msgid "Server _Address"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:166
@@ -1298,7 +1289,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:168
-msgid "_Port:"
+msgid "_Port"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:169
@@ -1319,13 +1310,13 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:174
 #, fuzzy
-msgid "Proxy _Username:"
-msgstr "ä½¿ç”¨è€…åç¨±(_U):"
+msgid "Proxy _Username"
+msgstr "ä½¿ç”¨è€…åç¨±(_U)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:175
 #, fuzzy
-msgid "Proxy Passwor_d:"
-msgstr "å¯†ç¢¼:"
+msgid "Proxy Passwor_d"
+msgstr "å¯†ç¢¼"
 
 #: ../properties/nm-openvpn-dialog.ui.h:176
 msgid "HTTP/Socks proxy username passed to OpenVPN when prompted for it."
@@ -1338,7 +1329,7 @@ msgstr ""
 #: ../properties/nm-openvpn-dialog.ui.h:178
 #, fuzzy
 msgid "_Show password"
-msgstr "å¯†ç¢¼(_P):"
+msgstr "å¯†ç¢¼(_P)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:179
 msgid "Proxies"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 5a69d89..c1ed0b6 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -735,7 +735,7 @@ msgid "General"
 msgstr "ä¸€èˆ¬"
 
 #: ../properties/nm-openvpn-dialog.ui.h:13
-msgid "_Gateway:"
+msgid "_Gateway"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:14
@@ -749,7 +749,7 @@ msgstr ""
 #: ../properties/nm-openvpn-dialog.ui.h:16
 #, fuzzy
 msgid "Authentication"
-msgstr "HMAC é©—è‰:"
+msgstr "HMAC é©—è‰"
 
 #: ../properties/nm-openvpn-dialog.ui.h:17
 msgid "CA"
@@ -759,14 +759,10 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#: ../properties/nm-openvpn-dialog.ui.h:19
-msgid "Password:"
-msgstr "å¯†ç¢¼:"
-
 #: ../properties/nm-openvpn-dialog.ui.h:20
 #, fuzzy
-msgid "User name:"
-msgstr "ä½¿ç”¨è€…åç¨±(_U):"
+msgid "User name"
+msgstr "ä½¿ç”¨è€…åç¨±(_U)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:21
 msgid ""
@@ -783,22 +779,17 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:25
 #, fuzzy
-msgid "Remote IP Address:"
-msgstr "æœ¬åœ°ç«¯ IP ä½å€:"
+msgid "Remote IP Address"
+msgstr "æœ¬åœ°ç«¯ IP ä½å€"
 
 #: ../properties/nm-openvpn-dialog.ui.h:26
-msgid "Local IP Address:"
-msgstr "æœ¬åœ°ç«¯ IP ä½å€:"
+msgid "Local IP Address"
+msgstr "æœ¬åœ°ç«¯ IP ä½å€"
 
 #: ../properties/nm-openvpn-dialog.ui.h:27
 #, fuzzy
-msgid "Key Direction:"
-msgstr "é‡‘é‘°æ–¹å‘:"
-
-#: ../properties/nm-openvpn-dialog.ui.h:28
-#, fuzzy
-msgid "Static Key:"
-msgstr "éœæ…‹é‡‘é‘°"
+msgid "Key Direction"
+msgstr "é‡‘é‘°æ–¹å‘"
 
 #: ../properties/nm-openvpn-dialog.ui.h:29
 msgid ""
@@ -832,7 +823,7 @@ msgstr ""
 "å“¡ã€‚</i>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:38
-msgid "Type:"
+msgid "Type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:39
@@ -849,7 +840,7 @@ msgid "OpenVPN Advanced Options"
 msgstr "OpenVPN é€²éšŽé¸é …"
 
 #: ../properties/nm-openvpn-dialog.ui.h:43
-msgid "Use custom gateway p_ort:"
+msgid "Use custom gateway p_ort"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:44
@@ -860,7 +851,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:46
-msgid "Use custom _renegotiation interval:"
+msgid "Use custom _renegotiation interval"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:47
@@ -870,7 +861,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:49
-msgid "Data _compression:"
+msgid "Data _compression"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:50
@@ -892,7 +883,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:56
-msgid "Set virtual _device type:"
+msgid "Set virtual _device type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:57
@@ -906,7 +897,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:60
-msgid " and _name:"
+msgid " and _name"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:61
@@ -917,7 +908,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:63
-msgid "Use custom tunnel Maximum Transmission _Unit (MTU):"
+msgid "Use custom tunnel Maximum Transmission _Unit (MTU)"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:64
@@ -928,7 +919,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:66
-msgid "Use custom UDP _fragment size:"
+msgid "Use custom UDP _fragment size"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:67
@@ -979,7 +970,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:81
-msgid "Specify pin_g interval:"
+msgid "Specify pin_g interval"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:82
@@ -990,7 +981,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:84
-msgid "Specify _exit or restart ping:"
+msgid "Specify _exit or restart ping"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:85
@@ -1021,7 +1012,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:93
-msgid "Specify max routes:"
+msgid "Specify max routes"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:94
@@ -1038,7 +1029,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:98
-msgid "Use custom _size of cipher key:"
+msgid "Use custom _size of cipher key"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:99
@@ -1056,12 +1047,12 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:103
-msgid "Ci_pher:"
-msgstr "åŠ å¯†å™¨:"
+msgid "Ci_pher"
+msgstr "åŠ å¯†å™¨"
 
 #: ../properties/nm-openvpn-dialog.ui.h:104
-msgid "_HMAC Authentication:"
-msgstr "HMAC é©—è‰:"
+msgid "_HMAC Authentication"
+msgstr "HMAC é©—è‰"
 
 #: ../properties/nm-openvpn-dialog.ui.h:105
 msgid "Disable cipher _negotiation"
@@ -1108,7 +1099,7 @@ msgid "Security"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:115
-msgid "_Subject Match:"
+msgid "_Subject Match"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:116
@@ -1121,8 +1112,8 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:120
 #, fuzzy
-msgid "Server _Certificate Check:"
-msgstr "CA æ†‘è‰:"
+msgid "Server _Certificate Check"
+msgstr "CA æ†‘è‰"
 
 #: ../properties/nm-openvpn-dialog.ui.h:121
 msgid ""
@@ -1152,7 +1143,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:133
-msgid "_Remote peer certificate TLS type:"
+msgid "_Remote peer certificate TLS type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:134
@@ -1173,7 +1164,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:138
-msgid "_Remote peer certificate nsCert designation:"
+msgid "_Remote peer certificate nsCert designation"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:139
@@ -1184,8 +1175,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:141
-msgid "Key _Direction:"
-msgstr "é‡‘é‘°æ–¹å‘:"
+msgid "Key _Direction"
+msgstr "é‡‘é‘°æ–¹å‘"
 
 #: ../properties/nm-openvpn-dialog.ui.h:142
 msgid ""
@@ -1209,11 +1200,11 @@ msgstr ""
 "å“¡ã€‚</i>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:147
-msgid "Key _File:"
-msgstr "é‡‘é‘°æª”æ¡ˆ:"
+msgid "Key _File"
+msgstr "é‡‘é‘°æª”æ¡ˆ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:148
-msgid "Mode:"
+msgid "Mode"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:149
@@ -1222,8 +1213,8 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:150
 #, fuzzy
-msgid "Extra Certificates:"
-msgstr "CA æ†‘è‰:"
+msgid "Extra Certificates"
+msgstr "CA æ†‘è‰"
 
 #: ../properties/nm-openvpn-dialog.ui.h:151
 msgid ""
@@ -1245,7 +1236,7 @@ msgid "TLS version control"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:156
-msgid "TLS _min version: "
+msgid "TLS _min version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:157
@@ -1257,7 +1248,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:158
-msgid "TLS ma_x version: "
+msgid "TLS ma_x version"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:159
@@ -1269,7 +1260,7 @@ msgstr ""
 #: ../properties/nm-openvpn-dialog.ui.h:160
 #, fuzzy
 msgid "TLS Authentication"
-msgstr "HMAC é©—è‰:"
+msgstr "HMAC é©—è‰"
 
 #: ../properties/nm-openvpn-dialog.ui.h:161
 msgid ""
@@ -1278,7 +1269,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:163
-msgid "Proxy _Type:"
+msgid "Proxy _Type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:164
@@ -1288,7 +1279,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:165
-msgid "Server _Address:"
+msgid "Server _Address"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:166
@@ -1298,7 +1289,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:168
-msgid "_Port:"
+msgid "_Port"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:169
@@ -1319,13 +1310,13 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:174
 #, fuzzy
-msgid "Proxy _Username:"
-msgstr "ä½¿ç”¨è€…åç¨±(_U):"
+msgid "Proxy _Username"
+msgstr "ä½¿ç”¨è€…åç¨±(_U)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:175
 #, fuzzy
-msgid "Proxy Passwor_d:"
-msgstr "å¯†ç¢¼:"
+msgid "Proxy Passwor_d"
+msgstr "å¯†ç¢¼"
 
 #: ../properties/nm-openvpn-dialog.ui.h:176
 msgid "HTTP/Socks proxy username passed to OpenVPN when prompted for it."
@@ -1338,7 +1329,7 @@ msgstr ""
 #: ../properties/nm-openvpn-dialog.ui.h:178
 #, fuzzy
 msgid "_Show password"
-msgstr "å¯†ç¢¼(_P):"
+msgstr "å¯†ç¢¼(_P)"
 
 #: ../properties/nm-openvpn-dialog.ui.h:179
 msgid "Proxies"
diff --git a/properties/nm-openvpn-dialog.ui b/properties/nm-openvpn-dialog.ui
index 228cca5..9630302 100644
--- a/properties/nm-openvpn-dialog.ui
+++ b/properties/nm-openvpn-dialog.ui
@@ -154,7 +154,6 @@
   <object class="GtkBox" id="openvpn-vbox">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="border_width">12</property>
     <property name="orientation">vertical</property>
     <property name="spacing">16</property>
     <child>
@@ -180,43 +179,36 @@
           </packing>
         </child>
         <child>
-          <object class="GtkAlignment" id="alignment8">
+          <object class="GtkGrid" id="table2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="left_padding">12</property>
+            <property name="row_spacing">6</property>
+            <property name="column_spacing">6</property>
             <child>
-              <object class="GtkGrid" id="table2">
+              <object class="GtkLabel" id="gateway_label">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="row_spacing">6</property>
-                <property name="column_spacing">12</property>
-                <child>
-                  <object class="GtkLabel" id="gateway_label">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">_Gateway:</property>
-                    <property name="use_underline">True</property>
-                    <property name="xalign">0</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkEntry" id="gateway_entry">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="tooltip_text" translatable="yes">Remote gateway(s), with optional port 
and protocol (e.g. ovpn.corp.com:1234:tcp). You can specify multiple hosts for redundancy (use commas or 
spaces as delimiters).
+                <property name="label" translatable="yes">_Gateway</property>
+                <property name="use_underline">True</property>
+                <property name="xalign">1</property>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" id="gateway_entry">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="tooltip_text" translatable="yes">Remote gateway(s), with optional port and 
protocol (e.g. ovpn.corp.com:1234:tcp). You can specify multiple hosts for redundancy (use commas or spaces 
as delimiters).
 config: remote</property>
-                    <property name="hexpand">True</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">0</property>
-                  </packing>
-                </child>
+                <property name="hexpand">True</property>
               </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">0</property>
+              </packing>
             </child>
           </object>
           <packing>
@@ -255,321 +247,179 @@ config: remote</property>
           </packing>
         </child>
         <child>
-          <object class="GtkAlignment" id="alignment9">
+          <object class="GtkGrid" id="table3">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="left_padding">12</property>
+            <property name="row_spacing">6</property>
+            <property name="column_spacing">6</property>
             <child>
-              <object class="GtkGrid" id="table3">
+              <object class="GtkNotebook" id="auth_notebook">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="row_spacing">6</property>
-                <property name="column_spacing">12</property>
+                <property name="show_tabs">False</property>
+                <property name="show_border">False</property>
                 <child>
-                  <object class="GtkNotebook" id="auth_notebook">
+                  <object class="GtkBox" id="tls">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="show_tabs">False</property>
-                    <property name="show_border">False</property>
+                    <property name="valign">start</property>
+                    <property name="orientation">vertical</property>
+                    <property name="spacing">6</property>
                     <child>
-                      <object class="GtkBox" id="tls">
+                      <object class="NMACertChooser" id="tls_ca_cert">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="valign">start</property>
-                        <property name="orientation">vertical</property>
-                        <property name="spacing">6</property>
-                        <child>
-                          <object class="NMACertChooser" id="tls_ca_cert">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="title" translatable="yes">CA</property>
-                            <property name="flags">5</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="NMACertChooser" id="tls_user_cert">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="title" translatable="yes">User</property>
-                            <property name="flags">4</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
+                        <property name="title" translatable="yes">CA</property>
+                        <property name="flags">5</property>
                       </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
                     </child>
-                    <child type="tab">
-                      <object class="GtkLabel" id="label14">
+                    <child>
+                      <object class="NMACertChooser" id="tls_user_cert">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label">page 1</property>
+                        <property name="title" translatable="yes">User</property>
+                        <property name="flags">4</property>
                       </object>
                       <packing>
-                        <property name="tab_fill">False</property>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
                       </packing>
                     </child>
+                  </object>
+                </child>
+                <child type="tab">
+                  <object class="GtkLabel" id="label14">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label">page 1</property>
+                  </object>
+                  <packing>
+                    <property name="tab_fill">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkBox" id="pw">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="valign">start</property>
+                    <property name="orientation">vertical</property>
+                    <property name="spacing">6</property>
                     <child>
-                      <object class="GtkBox" id="pw">
+                      <object class="GtkGrid">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="valign">start</property>
-                        <property name="orientation">vertical</property>
-                        <property name="spacing">6</property>
+                        <property name="row_spacing">6</property>
+                        <property name="column_spacing">6</property>
                         <child>
-                          <object class="GtkGrid">
+                          <object class="GtkLabel" id="label27">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="row_spacing">6</property>
-                            <property name="column_spacing">12</property>
-                            <child>
-                              <object class="GtkLabel" id="label27">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">Password:</property>
-                                <property name="xalign">0</property>
-                              </object>
-                              <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="label5">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">User name:</property>
-                                <property name="xalign">0</property>
-                              </object>
-                              <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkEntry" id="pw_password_entry">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="tooltip_text" translatable="yes">Password passed to OpenVPN 
when prompted for it.
-config: auth-user-pass</property>
-                                <property name="hexpand">True</property>
-                                <property name="visibility">False</property>
-                              </object>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">1</property>
-                                <property name="width">2</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkEntry" id="pw_username_entry">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="tooltip_text" translatable="yes">Username passed to OpenVPN 
when prompted for it. If omitted, use the name of the system user that activates the connection.
-config: auth-user-pass</property>
-                                <property name="hexpand">True</property>
-                              </object>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">0</property>
-                                <property name="width">2</property>
-                              </packing>
-                            </child>
+                            <property name="label" translatable="yes">Password</property>
+                            <property name="xalign">1</property>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">1</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="NMACertChooser" id="pw_ca_cert">
+                          <object class="GtkLabel" id="label5">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="title" translatable="yes">CA</property>
-                            <property name="flags">5</property>
+                            <property name="label" translatable="yes">User name</property>
+                            <property name="xalign">1</property>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">0</property>
                           </packing>
                         </child>
-                      </object>
-                      <packing>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                    <child type="tab">
-                      <object class="GtkLabel" id="label15">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label">page 2</property>
-                      </object>
-                      <packing>
-                        <property name="position">1</property>
-                        <property name="tab_fill">False</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkBox" id="pw_tls">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">start</property>
-                        <property name="orientation">vertical</property>
-                        <property name="spacing">6</property>
                         <child>
-                          <object class="GtkGrid">
+                          <object class="GtkEntry" id="pw_password_entry">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="row_spacing">6</property>
-                            <property name="column_spacing">12</property>
-                            <child>
-                              <object class="GtkLabel" id="label28">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">Password:</property>
-                                <property name="xalign">0</property>
-                              </object>
-                              <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="label10">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">User name:</property>
-                                <property name="xalign">0</property>
-                              </object>
-                              <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkEntry" id="pw_tls_password_entry">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="tooltip_text" translatable="yes">Password passed to OpenVPN 
when prompted for it.
-config: auth-user-pass</property>
-                                <property name="hexpand">True</property>
-                                <property name="visibility">False</property>
-                              </object>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">1</property>
-                                <property name="width">2</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkEntry" id="pw_tls_username_entry">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="tooltip_text" translatable="yes">Username passed to OpenVPN 
when prompted for it. If omitted, use the name of the system user that activates the connection.
+                            <property name="can_focus">True</property>
+                            <property name="tooltip_text" translatable="yes">Password passed to OpenVPN when 
prompted for it.
 config: auth-user-pass</property>
-                                <property name="hexpand">True</property>
-                              </object>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">0</property>
-                                <property name="width">2</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="NMACertChooser" id="pw_tls_ca_cert">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="title" translatable="yes">CA</property>
-                            <property name="flags">5</property>
+                            <property name="hexpand">True</property>
+                            <property name="visibility">False</property>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
+                            <property name="left_attach">1</property>
+                            <property name="top_attach">1</property>
+                            <property name="width">2</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="NMACertChooser" id="pw_tls_user_cert">
+                          <object class="GtkEntry" id="pw_username_entry">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="title" translatable="yes">User</property>
-                            <property name="flags">4</property>
+                            <property name="can_focus">True</property>
+                            <property name="tooltip_text" translatable="yes">Username passed to OpenVPN when 
prompted for it. If omitted, use the name of the system user that activates the connection.
+config: auth-user-pass</property>
+                            <property name="hexpand">True</property>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
+                            <property name="left_attach">1</property>
+                            <property name="top_attach">0</property>
+                            <property name="width">2</property>
                           </packing>
                         </child>
                       </object>
                       <packing>
-                        <property name="position">2</property>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
-                    <child type="tab">
-                      <object class="GtkLabel" id="label16">
+                    <child>
+                      <object class="NMACertChooser" id="pw_ca_cert">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label">page 3</property>
+                        <property name="title" translatable="yes">CA</property>
+                        <property name="flags">5</property>
                       </object>
                       <packing>
-                        <property name="position">2</property>
-                        <property name="tab_fill">False</property>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
                       </packing>
                     </child>
+                  </object>
+                </child>
+                <child type="tab">
+                  <object class="GtkLabel" id="label15">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label">page 2</property>
+                  </object>
+                  <packing>
+                    <property name="position">1</property>
+                    <property name="tab_fill">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkBox" id="pw_tls">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="valign">start</property>
+                    <property name="orientation">vertical</property>
+                    <property name="spacing">6</property>
                     <child>
-                      <object class="GtkGrid" id="psk">
+                      <object class="GtkGrid">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="row_spacing">6</property>
-                        <property name="column_spacing">12</property>
-                        <child>
-                          <object class="GtkLabel" id="label31">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Remote IP Address:</property>
-                            <property name="justify">right</property>
-                            <property name="xalign">0</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">3</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label20">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Local IP Address:</property>
-                            <property name="justify">right</property>
-                            <property name="xalign">0</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">4</property>
-                          </packing>
-                        </child>
+                        <property name="column_spacing">6</property>
                         <child>
-                          <object class="GtkLabel" id="label12">
+                          <object class="GtkLabel" id="label28">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Key Direction:</property>
+                            <property name="label" translatable="yes">Password</property>
                             <property name="xalign">0</property>
                           </object>
                           <packing>
@@ -578,10 +428,10 @@ config: auth-user-pass</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="label11">
+                          <object class="GtkLabel" id="label10">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Static Key:</property>
+                            <property name="label" translatable="yes">User name</property>
                             <property name="xalign">0</property>
                           </object>
                           <packing>
@@ -590,124 +440,254 @@ config: auth-user-pass</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkFileChooserButton" id="sk_key_chooser">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="tooltip_text" translatable="yes">Pre-shared file for Static Key 
encryption mode (non-TLS).
-config: static &lt;file&gt;</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkEntry" id="sk_remote_address_entry">
+                          <object class="GtkEntry" id="pw_tls_password_entry">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="tooltip_text" translatable="yes">IP address of the remote VPN 
endpoint.
-config: ifconfig &lt;l&gt; &lt;rn&gt;</property>
+                            <property name="tooltip_text" translatable="yes">Password passed to OpenVPN when 
prompted for it.
+config: auth-user-pass</property>
                             <property name="hexpand">True</property>
+                            <property name="visibility">False</property>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
-                            <property name="top_attach">3</property>
+                            <property name="top_attach">1</property>
+                            <property name="width">2</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkEntry" id="sk_local_address_entry">
+                          <object class="GtkEntry" id="pw_tls_username_entry">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="tooltip_text" translatable="yes">IP address of the local VPN 
endpoint.
-config: ifconfig &lt;l&gt; &lt;rn&gt;</property>
+                            <property name="tooltip_text" translatable="yes">Username passed to OpenVPN when 
prompted for it. If omitted, use the name of the system user that activates the connection.
+config: auth-user-pass</property>
                             <property name="hexpand">True</property>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
-                            <property name="top_attach">4</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkComboBox" id="sk_direction_combo">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="tooltip_text" translatable="yes">Direction for Static Key 
encryption mode (non-TLS).
-If key direction is used, it must be the opposite of that used on the VPN peer. For example, if the peer 
uses â€œ1â€, this connection must use â€œ0â€. If you are unsure what value to use, contact your system 
administrator.
-config: static &lt;file&gt; [direction]</property>
-                            <property name="model">model1</property>
-                            <child>
-                              <object class="GtkCellRendererText" id="renderer1"/>
-                              <attributes>
-                                <attribute name="text">0</attribute>
-                              </attributes>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">1</property>
+                            <property name="top_attach">0</property>
+                            <property name="width">2</property>
                           </packing>
                         </child>
-                        <child>
-                          <placeholder/>
-                        </child>
-                        <child>
-                          <placeholder/>
-                        </child>
                       </object>
                       <packing>
-                        <property name="position">3</property>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
-                    <child type="tab">
-                      <object class="GtkLabel" id="label17">
+                    <child>
+                      <object class="NMACertChooser" id="pw_tls_ca_cert">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label">page 4</property>
+                        <property name="title" translatable="yes">CA</property>
+                        <property name="flags">5</property>
                       </object>
                       <packing>
-                        <property name="position">3</property>
-                        <property name="tab_fill">False</property>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="NMACertChooser" id="pw_tls_user_cert">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="title" translatable="yes">User</property>
+                        <property name="flags">4</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">2</property>
                       </packing>
                     </child>
                   </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">1</property>
-                    <property name="width">2</property>
-                  </packing>
                 </child>
-                <child>
-                  <object class="GtkLabel" id="auth_label">
+                <child type="tab">
+                  <object class="GtkLabel" id="label16">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Type:</property>
-                    <property name="xalign">0</property>
+                    <property name="label">page 3</property>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">0</property>
+                    <property name="position">2</property>
+                    <property name="tab_fill">False</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkComboBox" id="auth_combo">
+                  <object class="GtkGrid" id="psk">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="tooltip_text" translatable="yes">Select an authentication 
mode.</property>
-                    <property name="hexpand">True</property>
-                    <property name="model">model2</property>
+                    <property name="row_spacing">6</property>
+                    <property name="column_spacing">6</property>
+                    <property name="margin-start">12</property>
+                    <property name="margin-end">12</property>
+                    <property name="margin-top">12</property>
+                    <property name="margin-bottom">12</property>
                     <child>
-                      <object class="GtkCellRendererText" id="renderer2"/>
-                      <attributes>
-                        <attribute name="text">0</attribute>
-                      </attributes>
-                    </child>
-                  </object>
+                      <object class="GtkLabel" id="label31">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">Remote IP Address</property>
+                        <property name="justify">right</property>
+                        <property name="xalign">0</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">3</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="label20">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">Local IP Address</property>
+                        <property name="justify">right</property>
+                        <property name="xalign">0</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">4</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="label12">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">Key Direction</property>
+                        <property name="xalign">0</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="label11">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">Static Key</property>
+                        <property name="xalign">0</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkFileChooserButton" id="sk_key_chooser">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="tooltip_text" translatable="yes">Pre-shared file for Static Key 
encryption mode (non-TLS).
+config: static &lt;file&gt;</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkEntry" id="sk_remote_address_entry">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="tooltip_text" translatable="yes">IP address of the remote VPN 
endpoint.
+config: ifconfig &lt;l&gt; &lt;rn&gt;</property>
+                        <property name="hexpand">True</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">3</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkEntry" id="sk_local_address_entry">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="tooltip_text" translatable="yes">IP address of the local VPN 
endpoint.
+config: ifconfig &lt;l&gt; &lt;rn&gt;</property>
+                        <property name="hexpand">True</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">4</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkComboBox" id="sk_direction_combo">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="tooltip_text" translatable="yes">Direction for Static Key encryption 
mode (non-TLS).
+If key direction is used, it must be the opposite of that used on the VPN peer. For example, if the peer 
uses â€œ1â€, this connection must use â€œ0â€. If you are unsure what value to use, contact your system 
administrator.
+config: static &lt;file&gt; [direction]</property>
+                        <property name="model">model1</property>
+                        <child>
+                          <object class="GtkCellRendererText" id="renderer1"/>
+                          <attributes>
+                            <attribute name="text">0</attribute>
+                          </attributes>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                  </object>
+                </child>
+                <child type="tab">
+                  <object class="GtkLabel" id="label17">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label">page 4</property>
+                  </object>
                   <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">0</property>
+                    <property name="position">3</property>
+                    <property name="tab_fill">False</property>
                   </packing>
                 </child>
               </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">1</property>
+                <property name="width">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="auth_label">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Type</property>
+                <property name="xalign">1</property>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkComboBox" id="auth_combo">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="tooltip_text" translatable="yes">Select an authentication mode.</property>
+                <property name="hexpand">True</property>
+                <property name="model">model2</property>
+                <child>
+                  <object class="GtkCellRendererText" id="renderer2"/>
+                  <attributes>
+                    <attribute name="text">0</attribute>
+                  </attributes>
+                </child>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">0</property>
+              </packing>
             </child>
           </object>
           <packing>
@@ -724,48 +704,41 @@ config: static &lt;file&gt; [direction]</property>
       </packing>
     </child>
     <child>
-      <object class="GtkAlignment" id="alignment1">
+      <object class="GtkButton" id="advanced_button">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="xalign">1</property>
-        <property name="xscale">0</property>
+        <property name="can_focus">True</property>
+        <property name="receives_default">False</property>
+        <property name="halign">end</property>
+        <property name="valign">end</property>
         <child>
-          <object class="GtkButton" id="advanced_button">
-            <property name="use_action_appearance">False</property>
+          <object class="GtkBox" id="hbox2">
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">False</property>
+            <property name="can_focus">False</property>
+            <property name="spacing">6</property>
             <child>
-              <object class="GtkBox" id="hbox2">
+              <object class="GtkImage" id="image1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="spacing">6</property>
-                <child>
-                  <object class="GtkImage" id="image1">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="stock">gtk-preferences</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="label1">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Ad_vancedâ€¦</property>
-                    <property name="use_underline">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
+                <property name="icon_name">preferences-system-symbolic</property>
               </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label1">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Ad_vancedâ€¦</property>
+                <property name="use_underline">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
             </child>
           </object>
         </child>
@@ -779,7 +752,6 @@ config: static &lt;file&gt; [direction]</property>
     </child>
   </object>
   <object class="GtkSizeGroup" id="labels">
-    <property name="ignore_hidden">True</property>
     <widgets>
       <widget name="gateway_label"/>
       <widget name="label27"/>
@@ -871,66 +843,67 @@ config: static &lt;file&gt; [direction]</property>
     </data>
   </object>
   <object class="GtkDialog" id="openvpn-advanced-dialog">
+    <property name="resizable">False</property>
     <property name="can_focus">False</property>
-    <property name="border_width">5</property>
     <property name="title" translatable="yes">OpenVPN Advanced Options</property>
-    <property name="window_position">center-on-parent</property>
     <property name="destroy_with_parent">True</property>
     <property name="icon_name">stock-preferences</property>
-    <property name="type_hint">dialog</property>
-    <property name="skip_pager_hint">True</property>
     <child type="titlebar">
       <placeholder/>
     </child>
-    <child internal-child="vbox">
-      <object class="GtkBox" id="dialog-vbox1">
+    <action-widgets>
+      <action-widget response="-6">cancel_button</action-widget>
+      <action-widget response="-5">ok_button</action-widget>
+    </action-widgets>
+    <child type="titlebar">
+      <object class="GtkHeaderBar">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">2</property>
-        <child internal-child="action_area">
-          <object class="GtkButtonBox" id="dialog-action_area1">
+        <property name="can-focus">False</property>
+        <property name="show-close-button">False</property>
+        <child type="title">
+          <object class="GtkLabel">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="cancel_button">
-                <property name="label">gtk-cancel</property>
-                <property name="use_action_appearance">False</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="ok_button">
-                <property name="label">gtk-ok</property>
-                <property name="use_action_appearance">False</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
+            <property name="can-focus">False</property>
+            <property name="label" translatable="yes">Advanced Properties</property>
+            <style>
+              <class name="title"/>
+            </style>
+          </object>
+        </child>
+        <child>
+          <object class="GtkButton" id="cancel_button">
+            <property name="label" translatable="yes">_Cancel</property>
+            <property name="visible">True</property>
+            <property name="can-focus">True</property>
+            <property name="use-underline">True</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkButton" id="ok_button">
+            <property name="label" translatable="yes">_Apply</property>
+            <property name="visible">True</property>
+            <property name="can-focus">True</property>
+            <property name="receives-default">True</property>
+            <property name="use-underline">True</property>
+            <property name="can-default">True</property>
+            <style>
+              <class name="default"/>
+              <class name="suggested-action"/>
+            </style>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
+            <property name="pack-type">end</property>
+            <property name="position">1</property>
           </packing>
         </child>
+      </object>
+    </child>
+    <child internal-child="vbox">
+      <object class="GtkBox" id="dialog-vbox1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">2</property>
         <child>
           <object class="GtkNotebook" id="options_notebook">
             <property name="visible">True</property>
@@ -939,10 +912,13 @@ config: static &lt;file&gt; [direction]</property>
               <object class="GtkBox" id="vbox1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="border_width">12</property>
                 <property name="orientation">vertical</property>
                 <property name="spacing">6</property>
                 <property name="homogeneous">True</property>
+                <property name="margin-start">12</property>
+                <property name="margin-end">12</property>
+                <property name="margin-top">12</property>
+                <property name="margin-bottom">12</property>
                 <child>
                   <object class="GtkBox" id="hbox1">
                     <property name="visible">True</property>
@@ -950,15 +926,13 @@ config: static &lt;file&gt; [direction]</property>
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkCheckButton" id="port_checkbutton">
-                        <property name="label" translatable="yes">Use custom gateway p_ort:</property>
-                        <property name="use_action_appearance">False</property>
+                        <property name="label" translatable="yes">Use custom gateway p_ort</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="tooltip_text" translatable="yes">TCP/UDP port number for peer. 
(Default value when there is no port for gateway).
 config: port</property>
                         <property name="use_underline">True</property>
-                        <property name="xalign">0.5</property>
                         <property name="draw_indicator">True</property>
                       </object>
                       <packing>
@@ -997,15 +971,13 @@ config: port</property>
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkCheckButton" id="reneg_checkbutton">
-                        <property name="label" translatable="yes">Use custom _renegotiation 
interval:</property>
-                        <property name="use_action_appearance">False</property>
+                        <property name="label" translatable="yes">Use custom _renegotiation 
interval</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="tooltip_text" translatable="yes">Renegotiate data channel key after 
the specified number of seconds.
 config: reneg-sec</property>
                         <property name="use_underline">True</property>
-                        <property name="xalign">0.5</property>
                         <property name="draw_indicator">True</property>
                       </object>
                       <packing>
@@ -1044,15 +1016,13 @@ config: reneg-sec</property>
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkCheckButton" id="compress_checkbutton">
-                        <property name="label" translatable="yes">Data _compression:</property>
-                        <property name="use_action_appearance">False</property>
+                        <property name="label" translatable="yes">Data _compression</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="tooltip_text" translatable="yes">Use fast LZO compression.
 config: comp-lzo</property>
                         <property name="use_underline">True</property>
-                        <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
                       </object>
                       <packing>
@@ -1091,7 +1061,6 @@ config: comp-lzo</property>
                 <child>
                   <object class="GtkCheckButton" id="tcp_checkbutton">
                     <property name="label" translatable="yes">Use a _TCP connection</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -1099,7 +1068,6 @@ config: comp-lzo</property>
 (This is a default setting only used when no protocol is specified for the gateway.)
 config: proto tcp-client | udp</property>
                     <property name="use_underline">True</property>
-                    <property name="xalign">0</property>
                     <property name="draw_indicator">True</property>
                   </object>
                   <packing>
@@ -1115,14 +1083,12 @@ config: proto tcp-client | udp</property>
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkCheckButton" id="dev_checkbutton">
-                        <property name="label" translatable="yes">Set virtual _device type:</property>
-                        <property name="use_action_appearance">False</property>
+                        <property name="label" translatable="yes">Set virtual _device type</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="tooltip_text" translatable="yes">Explicitly set virtual device type 
and name (TUN/TAP).</property>
                         <property name="use_underline">True</property>
-                        <property name="xalign">0.5</property>
                         <property name="draw_indicator">True</property>
                       </object>
                       <packing>
@@ -1155,7 +1121,7 @@ config: dev-type tun | tap</property>
                       <object class="GtkLabel" id="label35">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes"> and _name:</property>
+                        <property name="label" translatable="yes"> and _name</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">dev_entry</property>
                         <property name="xalign">0</property>
@@ -1194,15 +1160,13 @@ config: dev &lt;name&gt;</property>
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkCheckButton" id="tunmtu_checkbutton">
-                        <property name="label" translatable="yes">Use custom tunnel Maximum Transmission 
_Unit (MTU):</property>
-                        <property name="use_action_appearance">False</property>
+                        <property name="label" translatable="yes">Use custom tunnel Maximum Transmission 
_Unit (MTU)</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="tooltip_text" translatable="yes">Take the TUN device MTU to be the 
specified value and derive the link MTU from it.
 config: tun-mtu</property>
                         <property name="use_underline">True</property>
-                        <property name="xalign">0.5</property>
                         <property name="draw_indicator">True</property>
                       </object>
                       <packing>
@@ -1241,15 +1205,13 @@ config: tun-mtu</property>
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkCheckButton" id="fragment_checkbutton">
-                        <property name="label" translatable="yes">Use custom UDP _fragment size:</property>
-                        <property name="use_action_appearance">False</property>
+                        <property name="label" translatable="yes">Use custom UDP _fragment size</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="tooltip_text" translatable="yes">Enable internal datagram 
fragmentation with this maximum size.
 config: fragment</property>
                         <property name="use_underline">True</property>
-                        <property name="xalign">0.5</property>
                         <property name="draw_indicator">True</property>
                       </object>
                       <packing>
@@ -1284,14 +1246,12 @@ config: fragment</property>
                 <child>
                   <object class="GtkCheckButton" id="mssfix_checkbutton">
                     <property name="label" translatable="yes">Restrict tunnel TCP Maximum _Segment Size 
(MSS)</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
                     <property name="tooltip_text" translatable="yes">Restrict tunnel TCP MSS.
 config: mssfix</property>
                     <property name="use_underline">True</property>
-                    <property name="xalign">0</property>
                     <property name="draw_indicator">True</property>
                   </object>
                   <packing>
@@ -1303,14 +1263,12 @@ config: mssfix</property>
                 <child>
                   <object class="GtkCheckButton" id="remote_random_checkbutton">
                     <property name="label" translatable="yes">Rando_mize remote hosts</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
                     <property name="tooltip_text" translatable="yes">Randomize the order of gateways list 
(remote) as a kind of basic load-balancing measure.
 config: remote-random</property>
                     <property name="use_underline">True</property>
-                    <property name="xalign">0</property>
                     <property name="draw_indicator">True</property>
                   </object>
                   <packing>
@@ -1322,14 +1280,12 @@ config: remote-random</property>
                 <child>
                   <object class="GtkCheckButton" id="allow_pull_fqdn_checkbutton">
                     <property name="label" translatable="yes">Allow Pull FQDN</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
                     <property name="tooltip_text" translatable="yes">Allow client to pull DNS names from 
server
 config: allow-pull-fqdn</property>
                     <property name="use_underline">True</property>
-                    <property name="xalign">0</property>
                     <property name="draw_indicator">True</property>
                   </object>
                   <packing>
@@ -1341,14 +1297,12 @@ config: allow-pull-fqdn</property>
                 <child>
                   <object class="GtkCheckButton" id="remote_random_hostname_checkbutton">
                     <property name="label" translatable="yes">_Prefix remote DNS name with random 
string</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
                     <property name="tooltip_text" translatable="yes">Adds a random string to remote DNS name 
to avoid DNS caching.
 config: remote-random-hostname</property>
                     <property name="use_underline">True</property>
-                    <property name="xalign">0</property>
                     <property name="draw_indicator">True</property>
                   </object>
                   <packing>
@@ -1360,14 +1314,12 @@ config: remote-random-hostname</property>
                 <child>
                   <object class="GtkCheckButton" id="tun_ipv6_checkbutton">
                     <property name="label" translatable="yes">IPv6 tun link</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
                     <property name="tooltip_text" translatable="yes">Build a tun link capable of forwarding 
IPv6 traffic
 config: tun-ipv6</property>
                     <property name="use_underline">True</property>
-                    <property name="xalign">0</property>
                     <property name="draw_indicator">True</property>
                   </object>
                   <packing>
@@ -1383,15 +1335,13 @@ config: tun-ipv6</property>
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkCheckButton" id="ping_checkbutton">
-                        <property name="label" translatable="yes">Specify pin_g interval:</property>
-                        <property name="use_action_appearance">False</property>
+                        <property name="label" translatable="yes">Specify pin_g interval</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="tooltip_text" translatable="yes">Ping remote over the TCP/UDP 
control channel if no packets have been sent for at least n seconds.
 config: ping &lt;n&gt;</property>
                         <property name="use_underline">True</property>
-                        <property name="xalign">0.5</property>
                         <property name="draw_indicator">True</property>
                       </object>
                       <packing>
@@ -1430,15 +1380,13 @@ config: ping &lt;n&gt;</property>
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkCheckButton" id="ping_exit_restart_checkbutton">
-                        <property name="label" translatable="yes">Specify _exit or restart ping:</property>
-                        <property name="use_action_appearance">False</property>
+                        <property name="label" translatable="yes">Specify _exit or restart ping</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="tooltip_text" translatable="yes">Exit or restart after n seconds 
pass without reception of a ping or other packet from remote.
 config: ping-exit | ping-restart &lt;n&gt;</property>
                         <property name="use_underline">True</property>
-                        <property name="xalign">0.5</property>
                         <property name="draw_indicator">True</property>
                       </object>
                       <packing>
@@ -1493,7 +1441,6 @@ config: ping-exit | ping-restart &lt;n&gt;</property>
                 <child>
                   <object class="GtkCheckButton" id="float_checkbutton">
                     <property name="label" translatable="yes">Accept authenticated packets from any address 
(F_loat)</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -1503,7 +1450,6 @@ Essentially, --float tells OpenVPN to accept authenticated packets from any addr
 
 config: float</property>
                     <property name="use_underline">True</property>
-                    <property name="xalign">0</property>
                     <property name="draw_indicator">True</property>
                   </object>
                   <packing>
@@ -1519,15 +1465,13 @@ config: float</property>
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkCheckButton" id="max_routes_checkbutton">
-                        <property name="label" translatable="yes">Specify max routes:</property>
-                        <property name="use_action_appearance">False</property>
+                        <property name="label" translatable="yes">Specify max routes</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="tooltip_text" translatable="yes">Specify the maximum number of 
routes the server is allowed to specify.
 config: max-routes &lt;n&gt;</property>
                         <property name="use_underline">True</property>
-                        <property name="xalign">0.5</property>
                         <property name="draw_indicator">True</property>
                       </object>
                       <packing>
@@ -1572,102 +1516,265 @@ config: max-routes &lt;n&gt;</property>
               </packing>
             </child>
             <child>
-              <object class="GtkAlignment" id="alignment24">
+              <object class="GtkGrid" id="table9">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">0</property>
-                <property name="yalign">0</property>
-                <property name="xscale">0</property>
-                <property name="yscale">0</property>
-                <property name="top_padding">12</property>
-                <property name="bottom_padding">12</property>
-                <property name="left_padding">12</property>
-                <property name="right_padding">12</property>
+                <property name="row_spacing">12</property>
+                <property name="column_spacing">6</property>
+                <property name="margin-start">12</property>
+                <property name="margin-end">12</property>
+                <property name="margin-top">12</property>
+                <property name="margin-bottom">12</property>
                 <child>
-                  <object class="GtkGrid" id="table9">
+                  <object class="GtkComboBox" id="cipher_combo">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="row_spacing">12</property>
-                    <property name="column_spacing">12</property>
-                    <child>
-                      <object class="GtkComboBox" id="cipher_combo">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="tooltip_text" translatable="yes">Encrypt packets with cipher 
algorithm. The default is BF-CBC (Blowfish in Cipher Block Chaining mode).
+                    <property name="tooltip_text" translatable="yes">Encrypt packets with cipher algorithm. 
The default is BF-CBC (Blowfish in Cipher Block Chaining mode).
 config: cipher</property>
-                        <property name="model">model3</property>
-                        <child>
-                          <object class="GtkCellRendererText" id="renderer3"/>
-                          <attributes>
-                            <attribute name="text">0</attribute>
-                          </attributes>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">0</property>
-                      </packing>
-                    </child>
+                    <property name="model">model3</property>
                     <child>
-                      <object class="GtkCheckButton" id="keysize_checkbutton">
-                        <property name="label" translatable="yes">Use custom _size of cipher key:</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="tooltip_text" translatable="yes">Set cipher key size to a custom 
value. If unspecified, it defaults to cipher-specific size.
-config: keysize &lt;n&gt;</property>
-                        <property name="use_underline">True</property>
-                        <property name="xalign">0.5</property>
-                        <property name="draw_indicator">True</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">1</property>
-                      </packing>
+                      <object class="GtkCellRendererText" id="renderer3"/>
+                      <attributes>
+                        <attribute name="text">0</attribute>
+                      </attributes>
                     </child>
-                    <child>
-                      <object class="GtkSpinButton" id="keysize_spinbutton">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="tooltip_text" translatable="yes">Set cipher key size to a custom 
value. If unspecified, it defaults to cipher-specific size.
-config: keysize &lt;n&gt;</property>
-                        <property name="adjustment">adjustment6</property>
-                        <property name="climb_rate">1</property>
-                        <property name="numeric">True</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">1</property>
-                      </packing>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="keysize_checkbutton">
+                    <property name="label" translatable="yes">Use custom _size of cipher key</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="tooltip_text" translatable="yes">Set cipher key size to a custom value. 
If unspecified, it defaults to cipher-specific size.
+config: keysize &lt;n&gt;</property>
+                    <property name="use_underline">True</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkSpinButton" id="keysize_spinbutton">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="tooltip_text" translatable="yes">Set cipher key size to a custom value. 
If unspecified, it defaults to cipher-specific size.
+config: keysize &lt;n&gt;</property>
+                    <property name="adjustment">adjustment6</property>
+                    <property name="climb_rate">1</property>
+                    <property name="numeric">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkComboBox" id="hmacauth_combo">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="tooltip_text" translatable="yes">Authenticate packets with HMAC using 
message digest algorithm. The default is SHA1.
+config: auth</property>
+                    <property name="model">model4</property>
+                    <child>
+                      <object class="GtkCellRendererText" id="renderer4"/>
+                      <attributes>
+                        <attribute name="text">0</attribute>
+                      </attributes>
                     </child>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label19">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">Ci_pher</property>
+                    <property name="use_underline">True</property>
+                    <property name="justify">right</property>
+                    <property name="mnemonic_widget">cipher_combo</property>
+                    <property name="xalign">1</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label24">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">_HMAC Authentication</property>
+                    <property name="use_underline">True</property>
+                    <property name="justify">right</property>
+                    <property name="mnemonic_widget">hmacauth_combo</property>
+                    <property name="xalign">1</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="ncp_disable_checkbutton">
+                    <property name="label" translatable="yes">Disable cipher _negotiation</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="tooltip_text" translatable="yes">Disable cipher negotiation between 
client and server.
+config: ncp-disable</property>
+                    <property name="use_underline">True</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">7</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="crl_file_check">
+                    <property name="label" translatable="yes">Verify CRL from file</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="tooltip_text" translatable="yes">Check peer certificate against the 
specified file in PEM format. A CRL (certificate revocation list) is used when a particular key is 
compromised but when the overall PKI is still intact.</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">3</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="crl_dir_check">
+                    <property name="label" translatable="yes">Verify CRL from directory</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="tooltip_text" translatable="yes">Check peer certificate by looking at 
files in the specified directory. The directory must contain files named as revoked serial numbers (the files 
may be empty, the contents are never read).</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">4</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkFileChooserButton" id="crl_file_chooser">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="tooltip_text" translatable="yes">Check peer certificate against the 
specified file in PEM format. A CRL (certificate revocation list) is used when a particular key is 
compromised but when the overall PKI is still intact.</property>
+                    <property name="title" translatable="yes">Choose CRL file</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">3</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkFileChooserButton" id="crl_dir_chooser">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="tooltip_text" translatable="yes">Check peer certificate by looking at 
files in the specified directory. The directory must contain files named as revoked serial numbers (the files 
may be empty, the contents are never read).</property>
+                    <property name="action">select-folder</property>
+                    <property name="title" translatable="yes">Choose CRL directory</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">4</property>
+                  </packing>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+              </object>
+            </child>
+            <child type="tab">
+              <object class="GtkLabel" id="label21">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Security</property>
+              </object>
+              <packing>
+                <property name="position">1</property>
+                <property name="tab_fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkBox" id="vbox3">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="orientation">vertical</property>
+                <property name="spacing">12</property>
+                <property name="margin-start">12</property>
+                <property name="margin-end">12</property>
+                <property name="margin-top">12</property>
+                <property name="margin-bottom">12</property>
+                <child>
+                  <object class="GtkGrid" id="table10">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="valign">start</property>
+                    <property name="hexpand">True</property>
+                    <property name="row_spacing">6</property>
+                    <property name="column_spacing">6</property>
                     <child>
-                      <object class="GtkComboBox" id="hmacauth_combo">
+                      <object class="GtkLabel" id="tls_remote_label">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="tooltip_text" translatable="yes">Authenticate packets with HMAC 
using message digest algorithm. The default is SHA1.
-config: auth</property>
-                        <property name="model">model4</property>
-                        <child>
-                          <object class="GtkCellRendererText" id="renderer4"/>
-                          <attributes>
-                            <attribute name="text">0</attribute>
-                          </attributes>
-                        </child>
+                        <property name="label" translatable="yes">_Subject Match</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">tls_remote_entry</property>
+                        <property name="xalign">1</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkEntry" id="tls_remote_entry">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="tooltip_text" translatable="yes">Subject or Common Name to verify 
server certificate information against.
+
+config: verify-x509-name subject-or-name [mode]
+config (legacy mode): tls-remote subject-or-name</property>
+                        <property name="hexpand">True</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
-                        <property name="top_attach">2</property>
+                        <property name="top_attach">1</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkLabel" id="label19">
+                      <object class="GtkLabel" id="tls_remote_mode_label">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Ci_pher:</property>
+                        <property name="label" translatable="yes">Server _Certificate Check</property>
                         <property name="use_underline">True</property>
-                        <property name="justify">right</property>
-                        <property name="mnemonic_widget">cipher_combo</property>
+                        <property name="mnemonic_widget">tls_remote_mode_combo</property>
                         <property name="xalign">1</property>
                       </object>
                       <packing>
@@ -1676,272 +1783,222 @@ config: auth</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkLabel" id="label24">
+                      <object class="GtkComboBox" id="tls_remote_mode_combo">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">_HMAC Authentication:</property>
-                        <property name="use_underline">True</property>
-                        <property name="justify">right</property>
-                        <property name="mnemonic_widget">hmacauth_combo</property>
-                        <property name="xalign">1</property>
+                        <property name="tooltip_text" translatable="yes">Verify server certificate 
identification.
+
+When enabled, connection will only succeed if the server certificate matches some expected properties.
+Matching can either apply to the whole certificate subject (all the fields),
+or just the Common Name (CN field).
+
+The legacy option tls-remote is deprecated and removed from OpenVPN 2.4 and newer. Do not use it anymore.
+
+config: verify-x509-name subject-or-name [mode]
+config (legacy mode): tls-remote subject-or-name</property>
+                        <property name="hexpand">True</property>
+                        <property name="model">model9</property>
+                        <child>
+                          <object class="GtkCellRendererText" id="renderer12"/>
+                          <attributes>
+                            <attribute name="text">0</attribute>
+                          </attributes>
+                        </child>
                       </object>
                       <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">2</property>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">0</property>
                       </packing>
                     </child>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkGrid" id="table12">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="valign">start</property>
+                    <property name="row_spacing">3</property>
+                    <property name="column_spacing">6</property>
                     <child>
-                      <object class="GtkCheckButton" id="ncp_disable_checkbutton">
-                        <property name="label" translatable="yes">Disable cipher _negotiation</property>
-                        <property name="use_action_appearance">False</property>
+                      <object class="GtkCheckButton" id="remote_cert_tls_checkbutton">
+                        <property name="label" translatable="yes">_Verify peer (server) certificate usage 
signature</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="tooltip_text" translatable="yes">Disable cipher negotiation between 
client and server.
-config: ncp-disable</property>
+                        <property name="tooltip_text" translatable="yes">Require that peer certificate was 
signed with an explicit key usage and extended key usage based on RFC3280 TLS rules.</property>
                         <property name="use_underline">True</property>
-                        <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
-                        <property name="top_attach">7</property>
+                        <property name="top_attach">0</property>
+                        <property name="width">2</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkCheckButton" id="crl_file_check">
-                        <property name="label" translatable="yes">Verify CRL from file</property>
+                      <object class="GtkLabel" id="remote_cert_tls_label">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="tooltip_text" translatable="yes">Check peer certificate against the 
specified file in PEM format. A CRL (certificate revocation list) is used when a particular key is 
compromised but when the overall PKI is still intact.</property>
-                        <property name="draw_indicator">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">_Remote peer certificate TLS 
type</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">remote_cert_tls_combo</property>
+                        <property name="xalign">0</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
-                        <property name="top_attach">3</property>
+                        <property name="top_attach">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkComboBox" id="remote_cert_tls_combo">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="tooltip_text" translatable="yes">Require that peer certificate was 
signed with an explicit key usage and extended key usage based on RFC3280 TLS rules.
+config: remote-cert-tls client|server</property>
+                        <property name="model">model7</property>
+                        <child>
+                          <object class="GtkCellRendererText" id="renderer9"/>
+                          <attributes>
+                            <attribute name="text">0</attribute>
+                          </attributes>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">1</property>
                       </packing>
                     </child>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="padding">6</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkGrid" id="table13">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="valign">start</property>
+                    <property name="row_spacing">3</property>
+                    <property name="column_spacing">6</property>
                     <child>
-                      <object class="GtkCheckButton" id="crl_dir_check">
-                        <property name="label" translatable="yes">Verify CRL from directory</property>
+                      <object class="GtkCheckButton" id="ns_cert_type_checkbutton">
+                        <property name="label" translatable="yes">_Verify peer (server) certificate 
nsCertType designation</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="tooltip_text" translatable="yes">Check peer certificate by looking 
at files in the specified directory. The directory must contain files named as revoked serial numbers (the 
files may be empty, the contents are never read).</property>
+                        <property name="tooltip_text" translatable="yes">Require that peer certificate was 
signed with an explicit nsCertType designation.</property>
+                        <property name="halign">baseline</property>
+                        <property name="valign">start</property>
+                        <property name="use_underline">True</property>
                         <property name="draw_indicator">True</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
-                        <property name="top_attach">4</property>
+                        <property name="top_attach">0</property>
+                        <property name="width">2</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkFileChooserButton" id="crl_file_chooser">
+                      <object class="GtkLabel" id="ns_cert_type_label">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="tooltip_text" translatable="yes">Check peer certificate against the 
specified file in PEM format. A CRL (certificate revocation list) is used when a particular key is 
compromised but when the overall PKI is still intact.</property>
-                        <property name="title" translatable="yes">Choose CRL file</property>
+                        <property name="label" translatable="yes">_Remote peer certificate nsCert 
designation</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">remote_cert_tls_combo</property>
+                        <property name="xalign">0</property>
                       </object>
                       <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">3</property>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">1</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkFileChooserButton" id="crl_dir_chooser">
+                      <object class="GtkComboBox" id="ns_cert_type_combo">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="tooltip_text" translatable="yes">Check peer certificate by looking 
at files in the specified directory. The directory must contain files named as revoked serial numbers (the 
files may be empty, the contents are never read).</property>
-                        <property name="action">select-folder</property>
-                        <property name="title" translatable="yes">Choose CRL directory</property>
+                        <property name="tooltip_text" translatable="yes">Require that peer certificate was 
signed with an explicit nsCertType designation.
+config: ns-cert-type client|server</property>
+                        <property name="model">model7</property>
+                        <child>
+                          <object class="GtkCellRendererText" id="renderer7"/>
+                          <attributes>
+                            <attribute name="text">0</attribute>
+                          </attributes>
+                        </child>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
-                        <property name="top_attach">4</property>
+                        <property name="top_attach">1</property>
                       </packing>
                     </child>
-                    <child>
-                      <placeholder/>
-                    </child>
-                    <child>
-                      <placeholder/>
-                    </child>
-                    <child>
-                      <placeholder/>
-                    </child>
-                    <child>
-                      <placeholder/>
-                    </child>
-                    <child>
-                      <placeholder/>
-                    </child>
                   </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="padding">6</property>
+                    <property name="position">2</property>
+                  </packing>
                 </child>
-              </object>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkLabel" id="label21">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Security</property>
-              </object>
-              <packing>
-                <property name="position">1</property>
-                <property name="tab_fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkAlignment" id="alignment27">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="top_padding">12</property>
-                <property name="bottom_padding">12</property>
-                <property name="left_padding">12</property>
-                <property name="right_padding">12</property>
                 <child>
-                  <object class="GtkBox" id="vbox3">
+                  <object class="GtkGrid" id="table7">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="orientation">vertical</property>
-                    <property name="spacing">12</property>
+                    <property name="row_spacing">6</property>
+                    <property name="column_spacing">6</property>
                     <child>
-                      <object class="GtkGrid" id="table10">
+                      <object class="GtkGrid" id="table8">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="valign">start</property>
+                        <property name="margin_left">24</property>
                         <property name="hexpand">True</property>
                         <property name="row_spacing">6</property>
-                        <property name="column_spacing">12</property>
-                        <child>
-                          <object class="GtkLabel" id="tls_remote_label">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">_Subject Match:</property>
-                            <property name="use_underline">True</property>
-                            <property name="mnemonic_widget">tls_remote_entry</property>
-                            <property name="xalign">1</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkEntry" id="tls_remote_entry">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="tooltip_text" translatable="yes">Subject or Common Name to 
verify server certificate information against.
-
-config: verify-x509-name subject-or-name [mode]
-config (legacy mode): tls-remote subject-or-name</property>
-                            <property name="hexpand">True</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">1</property>
-                          </packing>
-                        </child>
+                        <property name="column_spacing">6</property>
                         <child>
-                          <object class="GtkLabel" id="tls_remote_mode_label">
+                          <object class="GtkLabel" id="direction_label">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Server _Certificate Check:</property>
+                            <property name="label" translatable="yes">Key _Direction</property>
                             <property name="use_underline">True</property>
-                            <property name="mnemonic_widget">tls_remote_mode_combo</property>
+                            <property name="mnemonic_widget">direction_combo</property>
                             <property name="xalign">1</property>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
-                            <property name="top_attach">0</property>
+                            <property name="top_attach">2</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkComboBox" id="tls_remote_mode_combo">
+                          <object class="GtkFileChooserButton" id="tls_auth_chooser">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="tooltip_text" translatable="yes">Verify server certificate 
identification.
-
-When enabled, connection will only succeed if the server certificate matches some expected properties.
-Matching can either apply to the whole certificate subject (all the fields),
-or just the Common Name (CN field).
-
-The legacy option tls-remote is deprecated and removed from OpenVPN 2.4 and newer. Do not use it anymore.
-
-config: verify-x509-name subject-or-name [mode]
-config (legacy mode): tls-remote subject-or-name</property>
+                            <property name="tooltip_text" translatable="yes">Add an additional layer of HMAC 
authentication on top of the TLS control channel to protect against DoS attacks. In case of TLS-Crypt mode, 
the control channel is also encrypted.
+config: tls-auth &lt;file&gt; [direction] | tls-crypt &lt;file&gt;</property>
                             <property name="hexpand">True</property>
-                            <property name="model">model9</property>
-                            <child>
-                              <object class="GtkCellRendererText" id="renderer12"/>
-                              <attributes>
-                                <attribute name="text">0</attribute>
-                              </attributes>
-                            </child>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
-                            <property name="top_attach">0</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkGrid" id="table12">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">start</property>
-                        <property name="row_spacing">3</property>
-                        <property name="column_spacing">12</property>
-                        <child>
-                          <object class="GtkCheckButton" id="remote_cert_tls_checkbutton">
-                            <property name="label" translatable="yes">_Verify peer (server) certificate 
usage signature</property>
-                            <property name="use_action_appearance">False</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="tooltip_text" translatable="yes">Require that peer certificate 
was signed with an explicit key usage and extended key usage based on RFC3280 TLS rules.</property>
-                            <property name="use_underline">True</property>
-                            <property name="xalign">0</property>
-                            <property name="draw_indicator">True</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">0</property>
-                            <property name="width">2</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="remote_cert_tls_label">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">_Remote peer certificate TLS 
type:</property>
-                            <property name="use_underline">True</property>
-                            <property name="mnemonic_widget">remote_cert_tls_combo</property>
-                            <property name="xalign">0</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">0</property>
                             <property name="top_attach">1</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkComboBox" id="remote_cert_tls_combo">
+                          <object class="GtkComboBox" id="direction_combo">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="tooltip_text" translatable="yes">Require that peer certificate 
was signed with an explicit key usage and extended key usage based on RFC3280 TLS rules.
-config: remote-cert-tls client|server</property>
-                            <property name="model">model7</property>
+                            <property name="tooltip_text" translatable="yes">Direction parameter for static 
key mode.
+If key direction is used, it must be the opposite of that used on the VPN peer. For example, if the peer 
uses â€œ1â€, this connection must use â€œ0â€. If you are unsure what value to use, contact your system 
administrator.
+config: tls-auth &lt;file&gt; [direction]</property>
+                            <property name="model">model5</property>
                             <child>
-                              <object class="GtkCellRendererText" id="renderer9"/>
+                              <object class="GtkCellRendererText" id="renderer5"/>
                               <attributes>
                                 <attribute name="text">0</attribute>
                               </attributes>
@@ -1949,67 +2006,45 @@ config: remote-cert-tls client|server</property>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
-                            <property name="top_attach">1</property>
+                            <property name="top_attach">2</property>
                           </packing>
                         </child>
-                      </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="padding">6</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkGrid" id="table13">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">start</property>
-                        <property name="row_spacing">3</property>
-                        <property name="column_spacing">12</property>
                         <child>
-                          <object class="GtkCheckButton" id="ns_cert_type_checkbutton">
-                            <property name="label" translatable="yes">_Verify peer (server) certificate 
nsCertType designation</property>
-                            <property name="use_action_appearance">False</property>
+                          <object class="GtkLabel" id="tls_auth_label">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="tooltip_text" translatable="yes">Require that peer certificate 
was signed with an explicit nsCertType designation.</property>
-                            <property name="halign">baseline</property>
-                            <property name="valign">start</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">Key _File</property>
                             <property name="use_underline">True</property>
-                            <property name="xalign">0</property>
-                            <property name="draw_indicator">True</property>
+                            <property name="mnemonic_widget">tls_auth_chooser</property>
+                            <property name="xalign">1</property>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
-                            <property name="top_attach">0</property>
-                            <property name="width">2</property>
+                            <property name="top_attach">1</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="ns_cert_type_label">
+                          <object class="GtkLabel">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">_Remote peer certificate nsCert 
designation:</property>
-                            <property name="use_underline">True</property>
-                            <property name="mnemonic_widget">remote_cert_tls_combo</property>
-                            <property name="xalign">0</property>
+                            <property name="label" translatable="yes">Mode</property>
+                            <property name="xalign">1</property>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
-                            <property name="top_attach">1</property>
+                            <property name="top_attach">0</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkComboBox" id="ns_cert_type_combo">
+                          <object class="GtkComboBox" id="tls_auth_mode">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="tooltip_text" translatable="yes">Require that peer certificate 
was signed with an explicit nsCertType designation.
-config: ns-cert-type client|server</property>
-                            <property name="model">model7</property>
+                            <property name="tooltip_text" translatable="yes">Add an additional layer of 
encryption or HMAC authentication.</property>
+                            <property name="model">model10</property>
+                            <property name="active">0</property>
+                            <property name="id_column">0</property>
                             <child>
-                              <object class="GtkCellRendererText" id="renderer7"/>
+                              <object class="GtkCellRendererText" id="renderer16"/>
                               <attributes>
                                 <attribute name="text">0</attribute>
                               </attributes>
@@ -2017,189 +2052,105 @@ config: ns-cert-type client|server</property>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
-                            <property name="top_attach">1</property>
+                            <property name="top_attach">0</property>
                           </packing>
                         </child>
-                      </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="padding">6</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkGrid" id="table7">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="row_spacing">6</property>
-                        <property name="column_spacing">12</property>
                         <child>
-                          <object class="GtkGrid" id="table8">
+                          <object class="GtkLabel">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="valign">start</property>
-                            <property name="margin_left">24</property>
-                            <property name="hexpand">True</property>
-                            <property name="row_spacing">6</property>
-                            <property name="column_spacing">12</property>
-                            <child>
-                              <object class="GtkLabel" id="direction_label">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">Key _Direction:</property>
-                                <property name="use_underline">True</property>
-                                <property name="mnemonic_widget">direction_combo</property>
-                                <property name="xalign">1</property>
-                              </object>
-                              <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">2</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkFileChooserButton" id="tls_auth_chooser">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="tooltip_text" translatable="yes">Add an additional layer of 
HMAC authentication on top of the TLS control channel to protect against DoS attacks. In case of TLS-Crypt 
mode, the control channel is also encrypted.
-config: tls-auth &lt;file&gt; [direction] | tls-crypt &lt;file&gt;</property>
-                                <property name="hexpand">True</property>
-                              </object>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkComboBox" id="direction_combo">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="tooltip_text" translatable="yes">Direction parameter for 
static key mode.
-If key direction is used, it must be the opposite of that used on the VPN peer. For example, if the peer 
uses â€œ1â€, this connection must use â€œ0â€. If you are unsure what value to use, contact your system 
administrator.
-config: tls-auth &lt;file&gt; [direction]</property>
-                                <property name="model">model5</property>
-                                <child>
-                                  <object class="GtkCellRendererText" id="renderer5"/>
-                                  <attributes>
-                                    <attribute name="text">0</attribute>
-                                  </attributes>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">2</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="tls_auth_label">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">Key _File:</property>
-                                <property name="use_underline">True</property>
-                                <property name="mnemonic_widget">tls_auth_chooser</property>
-                                <property name="xalign">1</property>
-                              </object>
-                              <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkLabel">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">Mode:</property>
-                                <property name="xalign">1</property>
-                              </object>
-                              <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkComboBox" id="tls_auth_mode">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="tooltip_text" translatable="yes">Add an additional layer of 
encryption or HMAC authentication.</property>
-                                <property name="model">model10</property>
-                                <property name="active">0</property>
-                                <property name="id_column">0</property>
-                                <child>
-                                  <object class="GtkCellRendererText" id="renderer16"/>
-                                  <attributes>
-                                    <attribute name="text">0</attribute>
-                                  </attributes>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkLabel">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">Extra Certificates:</property>
-                                <property name="use_underline">True</property>
-                                <property name="xalign">1</property>
-                              </object>
-                              <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">3</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkFileChooserButton" id="extra_certs_chooser">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="tooltip_text" translatable="yes">Specify a file containing 
one or more PEM certs (concatenated together) that complete the local certificate chain.
-config: extra-certs &lt;file&gt;</property>
-                              </object>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">3</property>
-                              </packing>
-                            </child>
+                            <property name="label" translatable="yes">Extra Certificates</property>
+                            <property name="use_underline">True</property>
+                            <property name="xalign">1</property>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
-                            <property name="top_attach">1</property>
+                            <property name="top_attach">3</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel">
+                          <object class="GtkFileChooserButton" id="extra_certs_chooser">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="tooltip_text" translatable="yes">Add an additional layer of 
encryption or HMAC authentication.</property>
-                            <property name="halign">start</property>
-                            <property name="valign">start</property>
-                            <property name="label" translatable="yes">Additional TLS authentication or 
encryption</property>
+                            <property name="tooltip_text" translatable="yes">Specify a file containing one 
or more PEM certs (concatenated together) that complete the local certificate chain.
+config: extra-certs &lt;file&gt;</property>
                           </object>
                           <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">0</property>
+                            <property name="left_attach">1</property>
+                            <property name="top_attach">3</property>
                           </packing>
                         </child>
                       </object>
                       <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">3</property>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="tooltip_text" translatable="yes">Add an additional layer of 
encryption or HMAC authentication.</property>
+                        <property name="halign">start</property>
+                        <property name="valign">start</property>
+                        <property name="label" translatable="yes">Additional TLS authentication or 
encryption</property>
+                        <property name="margin_top">12</property>
+                        <property name="margin_bottom">6</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                        </attributes>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">0</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">3</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkGrid">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <child>
+                      <object class="GtkLabel">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="tooltip_text" translatable="yes">Controls min and max version 
allowed for TLS.</property>
+                        <property name="halign">start</property>
+                        <property name="valign">start</property>
+                        <property name="label" translatable="yes">TLS version control</property>
+                        <property name="margin_top">12</property>
+                        <property name="margin_bottom">6</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                        </attributes>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">0</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkGrid">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
+                        <property name="valign">start</property>
+                        <property name="margin_left">24</property>
+                        <property name="hexpand">True</property>
+                        <property name="row_spacing">6</property>
+                        <property name="column_spacing">6</property>
                         <child>
-                          <object class="GtkLabel">
+                          <object class="GtkLabel" id="tls_version_min_lbl">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="tooltip_text" translatable="yes">Controls min and max version 
allowed for TLS.</property>
-                            <property name="halign">start</property>
-                            <property name="valign">start</property>
-                            <property name="label" translatable="yes">TLS version control</property>
+                            <property name="label" translatable="yes">TLS _min version</property>
+                            <property name="use_underline">True</property>
+                            <property name="xalign">1</property>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
@@ -2207,83 +2158,56 @@ config: extra-certs &lt;file&gt;</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkGrid">
+                          <object class="GtkEntry" id="tls_version_min">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">start</property>
-                            <property name="margin_left">24</property>
+                            <property name="can_focus">True</property>
+                            <property name="tooltip_text" translatable="yes"> Sets the minimum TLS version 
we will accept from the peer (default is "1.0").  Examples for version include "1.0", "1.1", or "1.2".  If 
'or-highest' is specified and version is not recognized, we will only accept the highest TLS version 
supported by the local SSL implementation.</property>
                             <property name="hexpand">True</property>
-                            <property name="row_spacing">6</property>
-                            <property name="column_spacing">12</property>
-                            <child>
-                              <object class="GtkLabel" id="tls_version_min_lbl">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">TLS _min version: </property>
-                                <property name="use_underline">True</property>
-                                <property name="xalign">1</property>
-                              </object>
-                              <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkEntry" id="tls_version_min">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="tooltip_text" translatable="yes"> Sets the minimum TLS 
version we will accept from the peer (default is "1.0").  Examples for version include "1.0", "1.1", or 
"1.2".  If 'or-highest' is specified and version is not recognized, we will only accept the highest TLS 
version supported by the local SSL implementation.</property>
-                                <property name="hexpand">True</property>
-                              </object>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="tls_version_max_lbl">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">TLS ma_x version: </property>
-                                <property name="use_underline">True</property>
-                                <property name="xalign">1</property>
-                              </object>
-                              <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkEntry" id="tls_version_max">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="tooltip_text" translatable="yes">Set the maximum TLS version 
we will use (default is the highest version supported).  Examples for version include "1.0", "1.1", or 
"1.2".</property>
-                                <property name="hexpand">True</property>
-                              </object>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">1</property>
-                              </packing>
-                            </child>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="top_attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="tls_version_max_lbl">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">TLS ma_x version</property>
+                            <property name="use_underline">True</property>
+                            <property name="xalign">1</property>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
                             <property name="top_attach">1</property>
                           </packing>
                         </child>
+                        <child>
+                          <object class="GtkEntry" id="tls_version_max">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="tooltip_text" translatable="yes">Set the maximum TLS version we 
will use (default is the highest version supported).  Examples for version include "1.0", "1.1", or 
"1.2".</property>
+                            <property name="hexpand">True</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="top_attach">1</property>
+                          </packing>
+                        </child>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">7</property>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">1</property>
                       </packing>
                     </child>
                   </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">7</property>
+                  </packing>
                 </child>
               </object>
-              <packing>
-                <property name="position">2</property>
-              </packing>
             </child>
             <child type="tab">
               <object class="GtkLabel" id="label18">
@@ -2297,255 +2221,230 @@ config: extra-certs &lt;file&gt;</property>
               </packing>
             </child>
             <child>
-              <object class="GtkAlignment" id="alignment28">
+              <object class="GtkGrid" id="table11">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">0</property>
-                <property name="yalign">0</property>
-                <property name="yscale">0</property>
-                <property name="top_padding">12</property>
-                <property name="bottom_padding">12</property>
-                <property name="left_padding">12</property>
-                <property name="right_padding">12</property>
+                <property name="row_spacing">6</property>
+                <property name="column_spacing">6</property>
+                <property name="margin-start">12</property>
+                <property name="margin-end">12</property>
+                <property name="margin-top">12</property>
+                <property name="margin-bottom">12</property>
                 <child>
-                  <object class="GtkGrid" id="table11">
+                  <object class="GtkComboBox" id="proxy_type_combo">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="row_spacing">6</property>
-                    <property name="column_spacing">12</property>
-                    <child>
-                      <object class="GtkComboBox" id="proxy_type_combo">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="tooltip_text" translatable="yes">Proxy type: HTTP or Socks.
+                    <property name="tooltip_text" translatable="yes">Proxy type: HTTP or Socks.
 config: http-proxy or socks-proxy</property>
-                        <property name="model">model6</property>
-                        <property name="button_sensitivity">on</property>
-                        <child>
-                          <object class="GtkCellRendererText" id="renderer6"/>
-                          <attributes>
-                            <attribute name="text">0</attribute>
-                          </attributes>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="label34">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Proxy _Type:</property>
-                        <property name="use_underline">True</property>
-                        <property name="justify">right</property>
-                        <property name="mnemonic_widget">proxy_type_combo</property>
-                        <property name="xalign">1</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="proxy_desc_label">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">start</property>
-                        <property name="label" translatable="yes">&lt;i&gt;Select this option if your 
organization requires the use of a proxy server to access the Internet.&lt;/i&gt;</property>
-                        <property name="use_markup">True</property>
-                        <property name="wrap">True</property>
-                        <property name="width_chars">35</property>
-                        <property name="xalign">0</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="proxy_server_label">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Server _Address:</property>
-                        <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">proxy_server_entry</property>
-                        <property name="xalign">1</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">2</property>
-                      </packing>
-                    </child>
+                    <property name="model">model6</property>
+                    <property name="button_sensitivity">on</property>
                     <child>
-                      <object class="GtkAlignment" id="alignment29">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
-                        <property name="yalign">0</property>
-                        <property name="xscale">0</property>
-                        <child>
-                          <object class="GtkBox" id="hbox6">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <child>
-                              <object class="GtkEntry" id="proxy_server_entry">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="tooltip_text" translatable="yes">Connect to remote host 
through a proxy with this address.
-config: http-proxy or socks-proxy</property>
-                              </object>
-                              <packing>
-                                <property name="expand">True</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="proxy_port_label">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">_Port:</property>
-                                <property name="use_underline">True</property>
-                                <property name="justify">right</property>
-                                <property name="mnemonic_widget">proxy_port_spinbutton</property>
-                                <property name="xalign">1</property>
-                              </object>
-                              <packing>
-                                <property name="expand">True</property>
-                                <property name="fill">True</property>
-                                <property name="padding">6</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkSpinButton" id="proxy_port_spinbutton">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="tooltip_text" translatable="yes">Connect to remote host 
through a proxy with this port.
-config: http-proxy or socks-proxy</property>
-                                <property name="width_chars">5</property>
-                                <property name="adjustment">adjustment5</property>
-                                <property name="climb_rate">1</property>
-                                <property name="numeric">True</property>
-                              </object>
-                              <packing>
-                                <property name="expand">True</property>
-                                <property name="fill">True</property>
-                                <property name="position">2</property>
-                              </packing>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">2</property>
-                      </packing>
+                      <object class="GtkCellRendererText" id="renderer6"/>
+                      <attributes>
+                        <attribute name="text">0</attribute>
+                      </attributes>
                     </child>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label34">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">Proxy _Type</property>
+                    <property name="use_underline">True</property>
+                    <property name="justify">right</property>
+                    <property name="mnemonic_widget">proxy_type_combo</property>
+                    <property name="xalign">1</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="proxy_desc_label">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="valign">start</property>
+                    <property name="label" translatable="yes">&lt;i&gt;Select this option if your 
organization requires the use of a proxy server to access the Internet.&lt;/i&gt;</property>
+                    <property name="use_markup">True</property>
+                    <property name="wrap">True</property>
+                    <property name="width_chars">35</property>
+                    <property name="xalign">0</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="proxy_server_label">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">Server _Address</property>
+                    <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">proxy_server_entry</property>
+                    <property name="xalign">1</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkBox" id="hbox6">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <child>
-                      <object class="GtkCheckButton" id="proxy_retry_checkbutton">
-                        <property name="label" translatable="yes">_Retry indefinitely when errors 
occur</property>
-                        <property name="use_action_appearance">False</property>
+                      <object class="GtkEntry" id="proxy_server_entry">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="tooltip_text" translatable="yes">Retry indefinitely on proxy errors. 
It simulates a SIGUSR1 reset.
-config: http-proxy-retry or socks-proxy-retry</property>
-                        <property name="use_underline">True</property>
-                        <property name="xalign">0</property>
-                        <property name="draw_indicator">True</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">3</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="proxy_username_label">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Proxy _Username:</property>
-                        <property name="use_underline">True</property>
-                        <property name="justify">right</property>
-                        <property name="mnemonic_widget">proxy_username_entry</property>
-                        <property name="xalign">1</property>
+                        <property name="tooltip_text" translatable="yes">Connect to remote host through a 
proxy with this address.
+config: http-proxy or socks-proxy</property>
                       </object>
                       <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">4</property>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkLabel" id="proxy_password_label">
+                      <object class="GtkLabel" id="proxy_port_label">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Proxy Passwor_d:</property>
+                        <property name="label" translatable="yes">_Port</property>
                         <property name="use_underline">True</property>
                         <property name="justify">right</property>
-                        <property name="mnemonic_widget">proxy_password_entry</property>
+                        <property name="mnemonic_widget">proxy_port_spinbutton</property>
                         <property name="xalign">1</property>
                       </object>
                       <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">5</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkEntry" id="proxy_username_entry">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="tooltip_text" translatable="yes">HTTP/Socks proxy username passed to 
OpenVPN when prompted for it.</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">4</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkEntry" id="proxy_password_entry">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="tooltip_text" translatable="yes">HTTP/Socks proxy password passed to 
OpenVPN when prompted for it.</property>
-                        <property name="visibility">False</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">5</property>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="padding">6</property>
+                        <property name="position">1</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkCheckButton" id="show_proxy_password">
-                        <property name="label" translatable="yes">_Show password</property>
-                        <property name="use_action_appearance">False</property>
+                      <object class="GtkSpinButton" id="proxy_port_spinbutton">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="xalign">0.5</property>
-                        <property name="draw_indicator">True</property>
+                        <property name="tooltip_text" translatable="yes">Connect to remote host through a 
proxy with this port.
+config: http-proxy or socks-proxy</property>
+                        <property name="width_chars">5</property>
+                        <property name="adjustment">adjustment5</property>
+                        <property name="climb_rate">1</property>
+                        <property name="numeric">True</property>
                       </object>
                       <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">6</property>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">2</property>
                       </packing>
                     </child>
-                    <child>
-                      <placeholder/>
-                    </child>
-                    <child>
-                      <placeholder/>
-                    </child>
-                    <child>
-                      <placeholder/>
-                    </child>
                   </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="proxy_retry_checkbutton">
+                    <property name="label" translatable="yes">_Retry indefinitely when errors 
occur</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="tooltip_text" translatable="yes">Retry indefinitely on proxy errors. It 
simulates a SIGUSR1 reset.
+config: http-proxy-retry or socks-proxy-retry</property>
+                    <property name="use_underline">True</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">3</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="proxy_username_label">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">Proxy _Username</property>
+                    <property name="use_underline">True</property>
+                    <property name="justify">right</property>
+                    <property name="mnemonic_widget">proxy_username_entry</property>
+                    <property name="xalign">1</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">4</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="proxy_password_label">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">Proxy Passwor_d</property>
+                    <property name="use_underline">True</property>
+                    <property name="justify">right</property>
+                    <property name="mnemonic_widget">proxy_password_entry</property>
+                    <property name="xalign">1</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">5</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkEntry" id="proxy_username_entry">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="tooltip_text" translatable="yes">HTTP/Socks proxy username passed to 
OpenVPN when prompted for it.</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">4</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkEntry" id="proxy_password_entry">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="tooltip_text" translatable="yes">HTTP/Socks proxy password passed to 
OpenVPN when prompted for it.</property>
+                    <property name="visibility">False</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">5</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="show_proxy_password">
+                    <property name="label" translatable="yes">_Show password</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="use_underline">True</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">6</property>
+                  </packing>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
                 </child>
               </object>
-              <packing>
-                <property name="position">3</property>
-              </packing>
             </child>
             <child type="tab">
               <object class="GtkLabel" id="label32">
@@ -2559,109 +2458,98 @@ config: http-proxy-retry or socks-proxy-retry</property>
               </packing>
             </child>
             <child>
-              <object class="GtkAlignment">
+              <object class="GtkGrid">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="top_padding">12</property>
-                <property name="bottom_padding">12</property>
-                <property name="left_padding">12</property>
-                <property name="right_padding">12</property>
+                <property name="valign">start</property>
+                <property name="row_spacing">6</property>
+                <property name="column_spacing">6</property>
+                <property name="row_homogeneous">True</property>
+                <property name="margin-start">12</property>
+                <property name="margin-end">12</property>
+                <property name="margin-top">12</property>
+                <property name="margin-bottom">12</property>
                 <child>
-                  <object class="GtkGrid">
+                  <object class="GtkCheckButton" id="mtu_disc_checkbutton">
+                    <property name="label" translatable="yes">Path mtu discovery</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkComboBox" id="mtu_disc_combo">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="valign">start</property>
-                    <property name="row_spacing">6</property>
-                    <property name="column_spacing">12</property>
-                    <property name="row_homogeneous">True</property>
-                    <child>
-                      <object class="GtkCheckButton" id="mtu_disc_checkbutton">
-                        <property name="label" translatable="yes">Path mtu discovery</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="draw_indicator">True</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">0</property>
-                      </packing>
-                    </child>
+                    <property name="halign">start</property>
+                    <property name="model">model11</property>
+                    <property name="active">0</property>
+                    <property name="id_column">0</property>
                     <child>
-                      <object class="GtkComboBox" id="mtu_disc_combo">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="halign">start</property>
-                        <property name="model">model11</property>
-                        <property name="active">0</property>
-                        <property name="id_column">0</property>
-                        <child>
-                          <object class="GtkCellRendererText" id="renderer51"/>
-                          <attributes>
-                            <attribute name="text">0</attribute>
-                          </attributes>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">0</property>
-                      </packing>
+                      <object class="GtkCellRendererText" id="renderer51"/>
+                      <attributes>
+                        <attribute name="text">0</attribute>
+                      </attributes>
                     </child>
-                    <child>
-                      <object class="GtkCheckButton" id="connect_timeout_checkbutton">
-                        <property name="label" translatable="yes">Connect timeout</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="tooltip_text" translatable="yes">The timeout in seconds before 
trying the next server. This timeout includes proxy and TCP connect timeouts.
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="connect_timeout_checkbutton">
+                    <property name="label" translatable="yes">Connect timeout</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="tooltip_text" translatable="yes">The timeout in seconds before trying 
the next server. This timeout includes proxy and TCP connect timeouts.
 config: connect-timeout &lt;n&gt; | server-poll-timeout &lt;n&gt;</property>
-                        <property name="draw_indicator">True</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkSpinButton" id="connect_timeout_spinbutton">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="tooltip_text" translatable="yes">The timeout in seconds before 
trying the next server. This timeout includes proxy and TCP connect timeouts.
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkSpinButton" id="connect_timeout_spinbutton">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="tooltip_text" translatable="yes">The timeout in seconds before trying 
the next server. This timeout includes proxy and TCP connect timeouts.
 config: connect-timeout &lt;n&gt; | server-poll-timeout &lt;n&gt;</property>
-                        <property name="halign">start</property>
-                        <property name="text" translatable="yes">0</property>
-                        <property name="adjustment">adjustment10</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkCheckButton" id="push_peer_info_checkbutton">
-                        <property name="label" translatable="yes">Push peer info</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="tooltip_text" translatable="yes">Push additional information about 
the client to server.
+                    <property name="halign">start</property>
+                    <property name="text" translatable="yes">0</property>
+                    <property name="adjustment">adjustment10</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="push_peer_info_checkbutton">
+                    <property name="label" translatable="yes">Push peer info</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="tooltip_text" translatable="yes">Push additional information about the 
client to server.
 config: push-peer-info</property>
-                        <property name="use_underline">True</property>
-                        <property name="xalign">0</property>
-                        <property name="draw_indicator">True</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">2</property>
-                        <property name="width">2</property>
-                      </packing>
-                    </child>
+                    <property name="use_underline">True</property>
+                    <property name="draw_indicator">True</property>
                   </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">2</property>
+                    <property name="width">2</property>
+                  </packing>
                 </child>
               </object>
-              <packing>
-                <property name="position">4</property>
-              </packing>
             </child>
             <child type="tab">
               <object class="GtkLabel" id="label33">
@@ -2683,9 +2571,5 @@ config: push-peer-info</property>
         </child>
       </object>
     </child>
-    <action-widgets>
-      <action-widget response="-6">cancel_button</action-widget>
-      <action-widget response="-5">ok_button</action-widget>
-    </action-widgets>
   </object>
 </interface>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]