Merge lp:~jonas-drange/ubuntu-settings-components/prune-vpn-translations into lp:~registry/ubuntu-settings-components/trunk

[Jonas G. Drange]

prune vpn's translated strings like cipher options, "0" and "1", and update the .pot file

[lp:~jonas-drange/ubuntu-settings-components/prune-vpn-translations]

118. By Jonas G. Drange on 2016-03-18

update pot file

[Nick Dedekind (nick-dedekind)]

I don't think the protocol acronyms should be translated.

UDP
TCP

And the value types:
OpenVPN
Pptp

VPN “%1”
VPN

review: Needs Fixing

[lp:~jonas-drange/ubuntu-settings-components/prune-vpn-translations]

119. By Jonas G. Drange on 2016-03-21

remove type and protocols

[Jonas G. Drange (jonas-drange)]

Removed localization of OpenVPN/Pptp and TCP/UPD. I've kept the localization for “VPN” because we can't assume “VPN” is the label for a virtual private network in all languages. As an example to justify this: APN, which is the same type of abbreviation as VPN, is not APN in Norwegian, but rather “Internett-tilknytningspunkt”.

[Nick Dedekind (nick-dedekind)]

review: Approve

=== modified file 'plugins/Ubuntu/Settings/Vpn/Openvpn/Editor.qml'
--- plugins/Ubuntu/Settings/Vpn/Openvpn/Editor.qml	2016-03-14 15:01:48 +0000
+++ plugins/Ubuntu/Settings/Vpn/Openvpn/Editor.qml	2016-03-21 12:11:30 +0000
@@ -207,7 +207,7 @@
 
         Label {
             id: tcpLabel
-            text: i18n.dtr("ubuntu-settings-components", "TCP")
+            text: "TCP"
         }
 
         CheckBox {
@@ -217,7 +217,7 @@
         }
 
         Label {
-            text: i18n.dtr("ubuntu-settings-components", "UDP")
+            text: "UDP"
         }
 
         CheckBox {
@@ -338,8 +338,8 @@
         objectName: "vpnOpenvpnTaDirSelector"
         model: [
             i18n.dtr("ubuntu-settings-components", "None"),
-            i18n.dtr("ubuntu-settings-components", "0"),
-            i18n.dtr("ubuntu-settings-components", "1"),
+            0,
+            1,
         ]
         selectedIndex: connection.taDir
         visible: taSetToggle.checked
@@ -390,22 +390,22 @@
         objectName: "vpnOpenvpnCipherSelector"
         model: [
             i18n.dtr("ubuntu-settings-components", "Default"),
-            i18n.dtr("ubuntu-settings-components", "DES-CBC"),
-            i18n.dtr("ubuntu-settings-components", "RC2-CBC"),
-            i18n.dtr("ubuntu-settings-components", "DES-EDE-CBC"),
-            i18n.dtr("ubuntu-settings-components", "DES-EDE3-CBC"),
-            i18n.dtr("ubuntu-settings-components", "DESX-CBC"),
-            i18n.dtr("ubuntu-settings-components", "RC2-40-CBC"),
-            i18n.dtr("ubuntu-settings-components", "CAST5-CBC"),
-            i18n.dtr("ubuntu-settings-components", "AES-128-CBC"),
-            i18n.dtr("ubuntu-settings-components", "AES-192-CBC"),
-            i18n.dtr("ubuntu-settings-components", "AES-256-CBC"),
-            i18n.dtr("ubuntu-settings-components", "CAMELLIA-128-CBC"),
-            i18n.dtr("ubuntu-settings-components", "CAMELLIA-192-CBC"),
-            i18n.dtr("ubuntu-settings-components", "CAMELLIA-256-CBC"),
-            i18n.dtr("ubuntu-settings-components", "SEED-CBC"),
-            i18n.dtr("ubuntu-settings-components", "AES-128-CBC-HMAC-SHA1"),
-            i18n.dtr("ubuntu-settings-components", "AES-256-CBC-HMAC-SHA1"),
+            "DES-CBC",
+            "RC2-CBC",
+            "DES-EDE-CBC",
+            "DES-EDE3-CBC",
+            "DESX-CBC",
+            "RC2-40-CBC",
+            "CAST5-CBC",
+            "AES-128-CBC",
+            "AES-192-CBC",
+            "AES-256-CBC",
+            "CAMELLIA-128-CBC",
+            "CAMELLIA-192-CBC",
+            "CAMELLIA-256-CBC",
+            "SEED-CBC",
+            "AES-128-CBC-HMAC-SHA1",
+            "AES-256-CBC-HMAC-SHA1",
         ]
         selectedIndex: connection.cipher
     }

=== modified file 'plugins/Ubuntu/Settings/Vpn/VpnTypeField.qml'
--- plugins/Ubuntu/Settings/Vpn/VpnTypeField.qml	2016-03-14 15:01:48 +0000
+++ plugins/Ubuntu/Settings/Vpn/VpnTypeField.qml	2016-03-21 12:11:30 +0000
@@ -43,8 +43,8 @@
         objectName: "vpnTypeField"
         enabled: parent.enabled
         model: [
-            i18n.dtr("ubuntu-settings-components", "OpenVPN"),
-            i18n.dtr("ubuntu-settings-components", "Pptp")
+            "OpenVPN",
+            "Pptp"
         ]
         expanded: false
         onDelegateClicked: typeRequested(index)

=== modified file 'po/ubuntu-settings-components.pot'
--- po/ubuntu-settings-components.pot	2016-02-11 11:26:23 +0000
+++ po/ubuntu-settings-components.pot	2016-03-21 12:11:30 +0000
@@ -8,13 +8,13 @@
 msgstr ""
 "Project-Id-Version: ubuntu-settings-components\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-11 11:25+0000\n"
+"POT-Creation-Date: 2016-03-21 13:10+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: plugins/Ubuntu/Settings/Components/QuickReply.qml:63
@@ -47,3 +47,323 @@
 #: plugins/Ubuntu/Settings/Menus/SnapDecisionMenu.qml:58
 msgid "Message"
 msgstr ""
+
+#: plugins/Ubuntu/Settings/Vpn/DialogFile.qml:161
+#: plugins/Ubuntu/Settings/Vpn/VpnEditor.qml:102
+#: plugins/Ubuntu/Settings/Vpn/VpnPreviewDialog.qml:104
+msgid "Cancel"
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Vpn/DialogFile.qml:170
+msgid "Accept"
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Vpn/FileSelector.qml:25
+msgid "Choose…"
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Vpn/FileSelector.qml:34
+#: plugins/Ubuntu/Settings/Vpn/Openvpn/Editor.qml:340
+msgid "None"
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Vpn/Openvpn/Editor.qml:110
+#: plugins/Ubuntu/Settings/Vpn/Pptp/Editor.qml:114
+msgid "Server:"
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Vpn/Openvpn/Editor.qml:124
+msgid "Port:"
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Vpn/Openvpn/Editor.qml:174
+msgid "Use custom gateway port"
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Vpn/Openvpn/Editor.qml:202
+msgid "Protocol:"
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Vpn/Openvpn/Editor.qml:240
+msgid "Client certificate:"
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Vpn/Openvpn/Editor.qml:248
+#: plugins/Ubuntu/Settings/Vpn/Openvpn/Editor.qml:263
+msgid "Choose Certificate…"
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Vpn/Openvpn/Editor.qml:255
+msgid "CA certificate:"
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Vpn/Openvpn/Editor.qml:270
+msgid "Private key:"
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Vpn/Openvpn/Editor.qml:278
+#: plugins/Ubuntu/Settings/Vpn/Openvpn/Editor.qml:324
+msgid "Choose Key…"
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Vpn/Openvpn/Editor.qml:285
+msgid "Key password:"
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Vpn/Openvpn/Editor.qml:306
+msgid "Use additional TLS authentication:"
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Vpn/Openvpn/Editor.qml:315
+msgid "TLS key:"
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Vpn/Openvpn/Editor.qml:329
+msgid "Key direction:"
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Vpn/Openvpn/Editor.qml:357
+msgid "Verify peer certificate:"
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Vpn/Openvpn/Editor.qml:366
+msgid "Peer certificate TLS type:"
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Vpn/Openvpn/Editor.qml:374
+msgid "Server"
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Vpn/Openvpn/Editor.qml:375
+msgid "Client"
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Vpn/Openvpn/Editor.qml:385
+msgid "Cipher:"
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Vpn/Openvpn/Editor.qml:392
+msgid "Default"
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Vpn/Openvpn/Editor.qml:422
+msgid "Compress data"
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Vpn/Pptp/Editor.qml:150
+msgid "User:"
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Vpn/Pptp/Editor.qml:165
+msgid "Password:"
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Vpn/Pptp/Editor.qml:180
+msgid "NT Domain:"
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Vpn/Pptp/Editor.qml:192
+msgid "Authentication methods:"
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Vpn/Pptp/Editor.qml:292
+msgid "Use Point-to-Point encryption"
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Vpn/Pptp/Editor.qml:301
+msgid "All Available (Default)"
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Vpn/Pptp/Editor.qml:302
+msgid "128-bit (most secure)"
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Vpn/Pptp/Editor.qml:303
+msgid "40-bit (less secure)"
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Vpn/Pptp/Editor.qml:319
+msgid "Allow stateful encryption"
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Vpn/Pptp/Editor.qml:333
+msgid "Allow BSD data compression"
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Vpn/Pptp/Editor.qml:347
+msgid "Allow Deflate data compression"
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Vpn/Pptp/Editor.qml:361
+msgid "Use TCP Header compression"
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Vpn/Pptp/Editor.qml:375
+msgid "Send PPP echo packets"
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Vpn/PreviewDialog/AllTrafficWithDns.qml:27
+#: plugins/Ubuntu/Settings/Vpn/PreviewDialog/AllTrafficWithoutDns.qml:27
+msgid "You’re using this VPN for all Internet traffic."
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Vpn/PreviewDialog/AllTrafficWithDns.qml:33
+#: plugins/Ubuntu/Settings/Vpn/PreviewDialog/NotInstalledWithoutRoutes.qml:39
+#: plugins/Ubuntu/Settings/Vpn/PreviewDialog/NotInstalledWithRoutes.qml:39
+#: plugins/Ubuntu/Settings/Vpn/PreviewDialog/SetUpUnused.qml:40
+msgid ""
+"Your Wi-Fi/mobile provider can see when and how much you use the Internet, "
+"but not what for."
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Vpn/PreviewDialog/AllTrafficWithDns.qml:39
+#: plugins/Ubuntu/Settings/Vpn/PreviewDialog/AllTrafficWithoutDns.qml:45
+#: plugins/Ubuntu/Settings/Vpn/PreviewDialog/NotInstalledWithoutRoutes.qml:51
+#: plugins/Ubuntu/Settings/Vpn/PreviewDialog/NotInstalledWithRoutes.qml:51
+#: plugins/Ubuntu/Settings/Vpn/PreviewDialog/SetUpUnused.qml:47
+msgid "The VPN provider can see or modify your Internet traffic."
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Vpn/PreviewDialog/AllTrafficWithDns.qml:45
+#: plugins/Ubuntu/Settings/Vpn/PreviewDialog/AllTrafficWithoutDns.qml:51
+#: plugins/Ubuntu/Settings/Vpn/PreviewDialog/NotInstalledWithoutRoutes.qml:57
+#: plugins/Ubuntu/Settings/Vpn/PreviewDialog/NotInstalledWithRoutes.qml:57
+#: plugins/Ubuntu/Settings/Vpn/PreviewDialog/SetUpUnused.qml:54
+msgid "Web sites and other service providers can still monitor your use."
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Vpn/PreviewDialog/AllTrafficWithoutDns.qml:33
+msgid ""
+"Your Wi-Fi/mobile provider can still see when and how much you use the "
+"Internet."
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Vpn/PreviewDialog/AllTrafficWithoutDns.qml:39
+#: plugins/Ubuntu/Settings/Vpn/PreviewDialog/NotInstalledWithRoutes.qml:45
+msgid "The DNS provider can see which Web sites and other services you use."
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Vpn/PreviewDialog/InvalidCert.qml:30
+#: plugins/Ubuntu/Settings/Vpn/PreviewDialog/NoCert.qml:27
+msgid "This VPN is not safe to use."
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Vpn/PreviewDialog/InvalidCert.qml:36
+msgid ""
+"The server certificate is not valid. The VPN provider may be being "
+"impersonated."
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Vpn/PreviewDialog/InvalidCert.qml:46
+#, qt-format
+msgid "Details: %1"
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Vpn/PreviewDialog/InvalidCert.qml:51
+msgid "The certificate was not found."
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Vpn/PreviewDialog/InvalidCert.qml:54
+msgid "The certificate is empty."
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Vpn/PreviewDialog/InvalidCert.qml:57
+msgid "The certificate is self signed."
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Vpn/PreviewDialog/InvalidCert.qml:60
+msgid "The certificate has expired."
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Vpn/PreviewDialog/InvalidCert.qml:63
+msgid "The certificate is blacklisted."
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Vpn/PreviewDialog/NoCert.qml:33
+msgid ""
+"It does not provide a certificate. The VPN provider could be impersonated."
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Vpn/PreviewDialog/NotInstalledWithoutRoutes.qml:27
+#: plugins/Ubuntu/Settings/Vpn/PreviewDialog/NotInstalledWithRoutes.qml:27
+msgid "This VPN configuration is not installed."
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Vpn/PreviewDialog/NotInstalledWithoutRoutes.qml:33
+#: plugins/Ubuntu/Settings/Vpn/PreviewDialog/NotInstalledWithRoutes.qml:33
+msgid "If you install it:"
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Vpn/PreviewDialog/NotInstalledWithoutRoutes.qml:45
+msgid "The DNS provider can see which Web sites and other services you use. "
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Vpn/PreviewDialog/SetUpUnused.qml:27
+msgid "This VPN is set up, but not in use now."
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Vpn/PreviewDialog/SetUpUnused.qml:33
+msgid "When you use it:"
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Vpn/PreviewDialog/SomeTraffic.qml:27
+msgid "You’re using this VPN for specific services."
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Vpn/PreviewDialog/SomeTraffic.qml:33
+msgid "Your traffic to these services is private to them and the VPN provider."
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Vpn/PreviewDialog/SomeTraffic.qml:39
+msgid "Your Wi-Fi/mobile provider can track your use of any other services. "
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Vpn/VpnEditor.qml:25
+msgid "Set up VPN"
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Vpn/VpnEditor.qml:115
+msgid "OK"
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Vpn/VpnList.qml:62
+msgid "Delete configuration"
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Vpn/VpnPreviewDialog.qml:53
+#: plugins/Ubuntu/Settings/Vpn/VpnPreviewDialog.qml:58
+#, qt-format
+msgid "VPN “%1”"
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Vpn/VpnPreviewDialog.qml:69
+msgid "VPN"
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Vpn/VpnPreviewDialog.qml:84
+msgid "Remove"
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Vpn/VpnPreviewDialog.qml:96
+msgid "Change"
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Vpn/VpnPreviewDialog.qml:112
+msgid "Install"
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Vpn/VpnRoutesField.qml:30
+msgid "Use this VPN for:"
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Vpn/VpnRoutesField.qml:60
+msgid "All network connections"
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Vpn/VpnRoutesField.qml:76
+msgid "Its own network"
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Vpn/VpnTypeField.qml:32
+msgid "Type:"
+msgstr ""