[NetworkManager-openvpn/lr/gtk-4.0: 8/9] editor: modernize the GtkBuilder file




commit 30281ef83ee10a5fc54cce4347998a2dc7f955d2
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                        |  138 +--
 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                        |   90 +-
 po/hr.po                        |  104 +-
 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, 4557 insertions(+), 5174 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 32920eb..4c9d12e 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 1bfa0dd..41a2f40 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -752,8 +752,8 @@ msgid "General"
 msgstr "Obecné"
 
 #: ../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 ""
@@ -779,13 +779,9 @@ msgstr "CA"
 msgid "User"
 msgstr "Uživatel"
 
-#: ../properties/nm-openvpn-dialog.ui.h:19
-msgid "Password:"
-msgstr "Heslo:"
-
 #: ../properties/nm-openvpn-dialog.ui.h:20
-msgid "User name:"
-msgstr "Uživatelské jméno:"
+msgid "User name"
+msgstr "Uživatelské jméno"
 
 #: ../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 "Vzdálená adresa IP:"
+msgid "Remote IP Address"
+msgstr "Vzdálená adresa IP"
 
 #: ../properties/nm-openvpn-dialog.ui.h:26
-msgid "Local IP Address:"
-msgstr "Místní adresa IP:"
+msgid "Local IP Address"
+msgstr "Místní adresa IP"
 
 #: ../properties/nm-openvpn-dialog.ui.h:27
-msgid "Key Direction:"
-msgstr "Směr klíče:"
-
-#: ../properties/nm-openvpn-dialog.ui.h:28
-msgid "Static Key:"
-msgstr "Statický klíč:"
+msgid "Key Direction"
+msgstr "Směr klíče"
 
 #: ../properties/nm-openvpn-dialog.ui.h:29
 msgid ""
@@ -860,8 +852,8 @@ msgstr ""
 "config: static <soubor> [směr]"
 
 #: ../properties/nm-openvpn-dialog.ui.h:38
-msgid "Type:"
-msgstr "Typ:"
+msgid "Type"
+msgstr "Typ"
 
 #: ../properties/nm-openvpn-dialog.ui.h:39
 msgid "Select an authentication mode."
@@ -876,8 +868,8 @@ msgid "OpenVPN Advanced Options"
 msgstr "Pokročilé volby OpenVPN"
 
 #: ../properties/nm-openvpn-dialog.ui.h:43
-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:44
 msgid ""
@@ -890,8 +882,8 @@ msgstr ""
 "config: port"
 
 #: ../properties/nm-openvpn-dialog.ui.h:46
-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:47
 msgid ""
@@ -903,7 +895,7 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:49
 #, fuzzy
-msgid "Data _compression:"
+msgid "Data _compression"
 msgstr "Použít komprimaci L_ZO"
 
 #: ../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 "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: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 "a _název:"
+msgid " and _name"
+msgstr "a _název"
 
 #: ../properties/nm-openvpn-dialog.ui.h:61
 msgid ""
@@ -961,8 +953,8 @@ msgstr ""
 "config: dev <název>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:63
-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:64
 msgid ""
@@ -974,8 +966,8 @@ msgstr ""
 "config: tun-mtu"
 
 #: ../properties/nm-openvpn-dialog.ui.h:66
-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:67
 msgid ""
@@ -1033,8 +1025,8 @@ msgstr ""
 "config: tun-ipv6"
 
 #: ../properties/nm-openvpn-dialog.ui.h:81
-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:82
 msgid ""
@@ -1047,8 +1039,8 @@ msgstr ""
 "config: ping <n>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:84
-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:85
 msgid ""
@@ -1093,8 +1085,8 @@ msgstr ""
 "config: float"
 
 #: ../properties/nm-openvpn-dialog.ui.h:93
-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:94
 msgid ""
@@ -1115,8 +1107,8 @@ msgstr ""
 "config: cipher"
 
 #: ../properties/nm-openvpn-dialog.ui.h:98
-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:99
 msgid ""
@@ -1139,12 +1131,12 @@ msgstr ""
 "config: 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 "Autentizace HMAC:"
+msgid "_HMAC Authentication"
+msgstr "Autentizace HMAC"
 
 #: ../properties/nm-openvpn-dialog.ui.h:105
 msgid "Disable cipher _negotiation"
@@ -1199,8 +1191,8 @@ msgid "Security"
 msgstr "Zabezpečení"
 
 #: ../properties/nm-openvpn-dialog.ui.h:115
-msgid "_Subject Match:"
-msgstr "_Subjekt odpovídá:"
+msgid "_Subject Match"
+msgstr "_Subjekt odpovídá"
 
 #: ../properties/nm-openvpn-dialog.ui.h:116
 msgid ""
@@ -1216,8 +1208,8 @@ msgstr ""
 "config (zastaralý režim): tls-remote předmět-nebo-název"
 
 #: ../properties/nm-openvpn-dialog.ui.h:120
-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:121
 msgid ""
@@ -1262,8 +1254,8 @@ msgstr ""
 "(RFC3289)."
 
 #: ../properties/nm-openvpn-dialog.ui.h:133
-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:134
 msgid ""
@@ -1289,8 +1281,8 @@ msgstr ""
 "nsCertType"
 
 #: ../properties/nm-openvpn-dialog.ui.h:138
-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:139
 msgid ""
@@ -1303,8 +1295,8 @@ msgstr ""
 "config: ns-cert-type client|server"
 
 #: ../properties/nm-openvpn-dialog.ui.h:141
-msgid "Key _Direction:"
-msgstr "Směr _klíče:"
+msgid "Key _Direction"
+msgstr "Směr _klíče"
 
 #: ../properties/nm-openvpn-dialog.ui.h:142
 msgid ""
@@ -1332,20 +1324,20 @@ msgstr ""
 "config: tls-auth <soubor> [směr]"
 
 #: ../properties/nm-openvpn-dialog.ui.h:147
-msgid "Key _File:"
-msgstr "_Soubor klíče:"
+msgid "Key _File"
+msgstr "_Soubor klíče"
 
 #: ../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 "Přidat další úroveň šifrování nebo autentizace HMAC."
 
 #: ../properties/nm-openvpn-dialog.ui.h:150
-msgid "Extra Certificates:"
-msgstr "Další certifikáty:"
+msgid "Extra Certificates"
+msgstr "Další certifikáty"
 
 #: ../properties/nm-openvpn-dialog.ui.h:151
 msgid ""
@@ -1370,7 +1362,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
@@ -1382,7 +1374,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
@@ -1404,8 +1396,8 @@ msgstr ""
 "config: http-proxy nebo socks-proxy"
 
 #: ../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 ""
@@ -1416,8 +1408,8 @@ msgstr ""
 "Internetu server proxy.</i>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:165
-msgid "Server _Address:"
-msgstr "_Adresa serveru:"
+msgid "Server _Address"
+msgstr "_Adresa serveru"
 
 #: ../properties/nm-openvpn-dialog.ui.h:166
 msgid ""
@@ -1428,8 +1420,8 @@ msgstr ""
 "config: http-proxy nebo 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 ""
@@ -1452,12 +1444,12 @@ msgstr ""
 "config: http-proxy-retry nebo socks-proxy-retry"
 
 #: ../properties/nm-openvpn-dialog.ui.h:174
-msgid "Proxy _Username:"
-msgstr "_Uživatelské jméno proxy:"
+msgid "Proxy _Username"
+msgstr "_Uživatelské jméno 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/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 "Dirección del servidor:"
+msgid "Server _Address"
+msgstr "Direcció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 4c5c936..bb3dffb 100644
--- a/po/he.po
+++ b/po/he.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,15 +763,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 ""
@@ -787,22 +782,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"
@@ -831,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 +837,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 +848,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
@@ -868,7 +858,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:49
-msgid "Data _compression:"
+msgid "Data _compression"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:50
@@ -890,7 +880,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
@@ -904,7 +894,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:60
-msgid " and _name:"
+msgid " and _name"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:61
@@ -915,7 +905,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
@@ -926,7 +916,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
@@ -977,7 +967,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
@@ -988,7 +978,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
@@ -1019,7 +1009,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
@@ -1036,7 +1026,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
@@ -1054,11 +1044,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
@@ -1106,7 +1096,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
@@ -1119,8 +1109,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 ""
@@ -1150,7 +1140,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
@@ -1171,7 +1161,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
@@ -1182,7 +1172,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:141
-msgid "Key _Direction:"
+msgid "Key _Direction"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:142
@@ -1203,11 +1193,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
@@ -1216,8 +1206,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 ""
@@ -1239,7 +1229,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
@@ -1251,7 +1241,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
@@ -1272,7 +1262,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:163
-msgid "Proxy _Type:"
+msgid "Proxy _Type"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:164
@@ -1282,7 +1272,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:165
-msgid "Server _Address:"
+msgid "Server _Address"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:166
@@ -1292,7 +1282,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:168
-msgid "_Port:"
+msgid "_Port"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:169
@@ -1313,13 +1303,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."
@@ -1332,7 +1322,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/hr.po b/po/hr.po
index ac641c1..48d7552 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -744,8 +744,8 @@ msgid "General"
 msgstr "Općenito"
 
 #: ../properties/nm-openvpn-dialog.ui.h:13
-msgid "_Gateway:"
-msgstr "_Pristupnik:"
+msgid "_Gateway"
+msgstr "_Pristupnik"
 
 #: ../properties/nm-openvpn-dialog.ui.h:14
 msgid ""
@@ -767,13 +767,9 @@ msgstr ""
 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 ""
@@ -789,21 +785,17 @@ msgid ""
 msgstr ""
 
 #: ../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 "Lokalna IP adresa:"
+msgid "Local IP Address"
+msgstr "Lokalna IP adresa"
 
 #: ../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 "Nepromjenjivi ključ:"
-
 #: ../properties/nm-openvpn-dialog.ui.h:29
 msgid ""
 "Pre-shared file for Static Key encryption mode (non-TLS).\n"
@@ -832,8 +824,8 @@ msgid ""
 msgstr ""
 
 #: ../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."
@@ -848,8 +840,8 @@ msgid "OpenVPN Advanced Options"
 msgstr "OpenVPN napredne mogućnosti"
 
 #: ../properties/nm-openvpn-dialog.ui.h:43
-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:44
 msgid ""
@@ -859,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
@@ -869,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
@@ -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,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
@@ -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:"
+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
@@ -1107,7 +1099,7 @@ msgid "Security"
 msgstr "Sigurnost"
 
 #: ../properties/nm-openvpn-dialog.ui.h:115
-msgid "_Subject Match:"
+msgid "_Subject Match"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:116
@@ -1119,7 +1111,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
@@ -1150,7 +1142,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
@@ -1171,7 +1163,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
@@ -1182,7 +1174,7 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:141
-msgid "Key _Direction:"
+msgid "Key _Direction"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:142
@@ -1203,20 +1195,20 @@ msgid ""
 msgstr ""
 
 #: ../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
-msgid "Mode:"
-msgstr "Način:"
+msgid "Mode"
+msgstr "Način"
 
 #: ../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 "Dodatne vjerodajnice:"
+msgid "Extra Certificates"
+msgstr "Dodatne vjerodajnice"
 
 #: ../properties/nm-openvpn-dialog.ui.h:151
 msgid ""
@@ -1238,7 +1230,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 +1242,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,8 +1262,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:163
-msgid "Proxy _Type:"
-msgstr "Vrsta _proxya:"
+msgid "Proxy _Type"
+msgstr "Vrsta _proxya"
 
 #: ../properties/nm-openvpn-dialog.ui.h:164
 msgid ""
@@ -1280,8 +1272,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:165
-msgid "Server _Address:"
-msgstr "Adresa _poslužitelja:"
+msgid "Server _Address"
+msgstr "Adresa _poslužitelja"
 
 #: ../properties/nm-openvpn-dialog.ui.h:166
 msgid ""
@@ -1290,8 +1282,8 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:168
-msgid "_Port:"
-msgstr "_Ulaz:"
+msgid "_Port"
+msgstr "_Ulaz"
 
 #: ../properties/nm-openvpn-dialog.ui.h:169
 msgid ""
@@ -1310,12 +1302,12 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:174
-msgid "Proxy _Username:"
-msgstr "Korisničko ime _proxya:"
+msgid "Proxy _Username"
+msgstr "Korisničko ime _proxya"
 
 #: ../properties/nm-openvpn-dialog.ui.h:175
-msgid "Proxy Passwor_d:"
-msgstr "Lozinka _proxya:"
+msgid "Proxy Passwor_d"
+msgstr "Lozinka _proxya"
 
 #: ../properties/nm-openvpn-dialog.ui.h:176
 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 4a3c8f4..0c0ef40 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -752,8 +752,8 @@ msgid "General"
 msgstr "Splošno"
 
 #: ../properties/nm-openvpn-dialog.ui.h:13
-msgid "_Gateway:"
-msgstr "_Prehod:"
+msgid "_Gateway"
+msgstr "_Prehod"
 
 #: ../properties/nm-openvpn-dialog.ui.h:14
 #, fuzzy
@@ -780,13 +780,9 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#: ../properties/nm-openvpn-dialog.ui.h:19
-msgid "Password:"
-msgstr "Geslo:"
-
 #: ../properties/nm-openvpn-dialog.ui.h:20
-msgid "User name:"
-msgstr "Uporabniško ime:"
+msgid "User name"
+msgstr "Uporabniško ime"
 
 #: ../properties/nm-openvpn-dialog.ui.h:21
 msgid ""
@@ -807,20 +803,16 @@ msgstr ""
 "Nastavitev: auth-user-pass"
 
 #: ../properties/nm-openvpn-dialog.ui.h:25
-msgid "Remote IP Address:"
-msgstr "Oddaljeni naslov IP:"
+msgid "Remote IP Address"
+msgstr "Oddaljeni naslov IP"
 
 #: ../properties/nm-openvpn-dialog.ui.h:26
-msgid "Local IP Address:"
-msgstr "Krajevni naslov IP:"
+msgid "Local IP Address"
+msgstr "Krajevni naslov IP"
 
 #: ../properties/nm-openvpn-dialog.ui.h:27
-msgid "Key Direction:"
-msgstr "Smer ključa:"
-
-#: ../properties/nm-openvpn-dialog.ui.h:28
-msgid "Static Key:"
-msgstr "Stalni ključ:"
+msgid "Key Direction"
+msgstr "Smer ključa"
 
 #: ../properties/nm-openvpn-dialog.ui.h:29
 msgid ""
@@ -864,8 +856,8 @@ msgstr ""
 "Nastavitev: static <datoteka> [smer]"
 
 #: ../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."
@@ -881,8 +873,8 @@ msgid "OpenVPN Advanced Options"
 msgstr "Napredne OpenVPN možnosti"
 
 #: ../properties/nm-openvpn-dialog.ui.h:43
-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:44
 #, fuzzy
@@ -895,8 +887,8 @@ msgstr ""
 "Nastavitev: vrata"
 
 #: ../properties/nm-openvpn-dialog.ui.h:46
-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:47
 msgid ""
@@ -908,7 +900,7 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:49
 #, fuzzy
-msgid "Data _compression:"
+msgid "Data _compression"
 msgstr "Uporabi _LZO stiskanje"
 
 #: ../properties/nm-openvpn-dialog.ui.h:50
@@ -935,8 +927,8 @@ msgstr ""
 "Nastavitev: proto tcp-client | udp"
 
 #: ../properties/nm-openvpn-dialog.ui.h:56
-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:57
 msgid "Explicitly set virtual device type and name (TUN/TAP)."
@@ -949,8 +941,8 @@ msgid ""
 msgstr "Nastavitev: dev-type tap | tun"
 
 #: ../properties/nm-openvpn-dialog.ui.h:60
-msgid " and _name:"
-msgstr "in _ime:"
+msgid " and _name"
+msgstr "in _ime"
 
 #: ../properties/nm-openvpn-dialog.ui.h:61
 #, fuzzy
@@ -964,8 +956,8 @@ msgstr ""
 "Nastavitev: dev <ime>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:63
-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:64
 msgid ""
@@ -978,8 +970,8 @@ msgstr ""
 "Nastavitev: tun-mtu"
 
 #: ../properties/nm-openvpn-dialog.ui.h:66
-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:67
 msgid ""
@@ -1036,7 +1028,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
@@ -1047,7 +1039,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
@@ -1078,7 +1070,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
@@ -1098,8 +1090,8 @@ msgstr ""
 "Nastavitev: cipher"
 
 #: ../properties/nm-openvpn-dialog.ui.h:98
-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:99
 msgid ""
@@ -1122,12 +1114,12 @@ msgstr ""
 "Nastavitev: auth"
 
 #: ../properties/nm-openvpn-dialog.ui.h:103
-msgid "Ci_pher:"
-msgstr "_Cifra:"
+msgid "Ci_pher"
+msgstr "_Cifra"
 
 #: ../properties/nm-openvpn-dialog.ui.h:104
-msgid "_HMAC Authentication:"
-msgstr "Overitev _HMAC:"
+msgid "_HMAC Authentication"
+msgstr "Overitev _HMAC"
 
 #: ../properties/nm-openvpn-dialog.ui.h:105
 msgid "Disable cipher _negotiation"
@@ -1174,8 +1166,8 @@ msgid "Security"
 msgstr "Varnost"
 
 #: ../properties/nm-openvpn-dialog.ui.h:115
-msgid "_Subject Match:"
-msgstr "Skladnost _zadeve:"
+msgid "_Subject Match"
+msgstr "Skladnost _zadeve"
 
 #: ../properties/nm-openvpn-dialog.ui.h:116
 msgid ""
@@ -1187,8 +1179,8 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:120
 #, fuzzy
-msgid "Server _Certificate Check:"
-msgstr "Uporabniško potrdilo:"
+msgid "Server _Certificate Check"
+msgstr "Uporabniško potrdilo"
 
 #: ../properties/nm-openvpn-dialog.ui.h:121
 msgid ""
@@ -1220,8 +1212,8 @@ msgstr ""
 "osnovi pravil RFC3280 TLS."
 
 #: ../properties/nm-openvpn-dialog.ui.h:133
-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:134
 msgid ""
@@ -1249,8 +1241,8 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:138
 #, fuzzy
-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:139
 #, fuzzy
@@ -1264,8 +1256,8 @@ msgstr ""
 "Nastavitev: remote-cert-tls client|server"
 
 #: ../properties/nm-openvpn-dialog.ui.h:141
-msgid "Key _Direction:"
-msgstr "_Smer ključa:"
+msgid "Key _Direction"
+msgstr "_Smer ključa"
 
 #: ../properties/nm-openvpn-dialog.ui.h:142
 #, fuzzy
@@ -1297,11 +1289,11 @@ msgstr ""
 "Nastavitev: tls-auth <datoteka> [smer]"
 
 #: ../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
-msgid "Mode:"
+msgid "Mode"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.ui.h:149
@@ -1311,8 +1303,8 @@ msgstr "Dodaj dodatno  zaščito z overjanjem HMAC."
 
 #: ../properties/nm-openvpn-dialog.ui.h:150
 #, fuzzy
-msgid "Extra Certificates:"
-msgstr "Uporabniško potrdilo:"
+msgid "Extra Certificates"
+msgstr "Uporabniško potrdilo"
 
 #: ../properties/nm-openvpn-dialog.ui.h:151
 msgid ""
@@ -1335,7 +1327,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
@@ -1347,7 +1339,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
@@ -1369,8 +1361,8 @@ msgstr ""
 "Nastavitev: http-proxy ali socks-proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:163
-msgid "Proxy _Type:"
-msgstr "_Vrsta posredniškega strežnika:"
+msgid "Proxy _Type"
+msgstr "_Vrsta posredniškega strežnika"
 
 #: ../properties/nm-openvpn-dialog.ui.h:164
 msgid ""
@@ -1381,8 +1373,8 @@ msgstr ""
 "posredniškega strežnika.</i>"
 
 #: ../properties/nm-openvpn-dialog.ui.h:165
-msgid "Server _Address:"
-msgstr "Naslov _strežnika:"
+msgid "Server _Address"
+msgstr "Naslov _strežnika"
 
 #: ../properties/nm-openvpn-dialog.ui.h:166
 msgid ""
@@ -1394,8 +1386,8 @@ msgstr ""
 "Nastavitev: http-proxy ali socks-proxy"
 
 #: ../properties/nm-openvpn-dialog.ui.h:168
-msgid "_Port:"
-msgstr "_Vrata:"
+msgid "_Port"
+msgstr "_Vrata"
 
 #: ../properties/nm-openvpn-dialog.ui.h:169
 msgid ""
@@ -1420,12 +1412,12 @@ msgstr ""
 "Nastavitev: http-proxy-retry ali socks-proxy-retry"
 
 #: ../properties/nm-openvpn-dialog.ui.h:174
-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:175
-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:176
 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]