Import translations from GNOME

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

2 files changed, 569 insertions, 450 deletions

diff --git a/po/nb.po b/po/nb.po
index e24c684..af1eb17 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openconnect\n"
 "Report-Msgid-Bugs-To: openconnect-devel@lists.infradead.org\n"
-"POT-Creation-Date: 2012-06-20 15:42+0100\n"
+"POT-Creation-Date: 2012-11-07 13:21+0000\n"
 "PO-Revision-Date: 2011-09-22 22:31+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.net/projects/p/meego/"
@@ -18,57 +18,108 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: auth.c:121
+#: auth.c:130
 msgid "Form choice has no name\n"
 msgstr ""
 
-#: auth.c:185
+#: auth.c:194
 #, c-format
 msgid "name %s not input\n"
 msgstr ""
 
-#: auth.c:192
+#: auth.c:201
 msgid "No input type in form\n"
 msgstr ""
 
-#: auth.c:204
+#: auth.c:213
 msgid "No input name in form\n"
 msgstr ""
 
-#: auth.c:227
+#: auth.c:242
 #, c-format
 msgid "Unknown input type %s in form\n"
 msgstr ""
 
-#: auth.c:247
+#: auth.c:435
 #, c-format
-msgid "Fixed options give %s\n"
+msgid "Cannot handle form method='%s', action='%s'\n"
 msgstr ""
 
-#: auth.c:332
+#: auth.c:500
 msgid "Failed to parse server response\n"
 msgstr ""
 
-#: auth.c:334
+#: auth.c:502
 #, c-format
 msgid "Response was:%s\n"
 msgstr ""
 
-#: auth.c:342
-msgid "XML response has no \"auth\" root node\n"
+#: auth.c:542
+msgid "XML response has no \"auth\" node\n"
 msgstr ""
 
-#: auth.c:355
+#: auth.c:574
 msgid "Asked for password but '--no-passwd' set\n"
 msgstr ""
 
-#: auth.c:380
-#, c-format
-msgid "Cannot handle form method='%s', action='%s'\n"
+#: auth.c:601 auth.c:910
+msgid "No form handler; cannot authenticate.\n"
 msgstr ""
 
-#: auth.c:436
-msgid "No form handler; cannot authenticate.\n"
+#: auth.c:846
+msgid "Enter credentials to unlock software token."
+msgstr ""
+
+#: auth.c:854
+msgid "Device ID:"
+msgstr ""
+
+#: auth.c:861
+msgid "Password:"
+msgstr ""
+
+#: auth.c:868
+msgid "PIN:"
+msgstr ""
+
+#: auth.c:898
+msgid "User bypassed soft token.\n"
+msgstr ""
+
+#: auth.c:905
+msgid "All fields are required; try again.\n"
+msgstr ""
+
+#: auth.c:920 auth.c:1007
+msgid "General failure in libstoken.\n"
+msgstr ""
+
+#: auth.c:924
+msgid "Incorrect device ID or password; try again.\n"
+msgstr ""
+
+#: auth.c:931
+msgid "Invalid PIN format; try again.\n"
+msgstr ""
+
+#: auth.c:941
+msgid "Soft token init was successful.\n"
+msgstr ""
+
+#: auth.c:964
+msgid "OK to generate INITIAL tokencode\n"
+msgstr ""
+
+#: auth.c:968
+msgid "OK to generate NEXT tokencode\n"
+msgstr ""
+
+#: auth.c:973
+msgid "Server is rejecting the soft token; switching to manual entry\n"
+msgstr ""
+
+#: auth.c:1002
+msgid "Generating tokencode\n"
 msgstr ""
 
 #: cstp.c:120
@@ -86,11 +137,11 @@ msgstr ""
 msgid "Failed to initialise DTLS secret\n"
 msgstr ""
 
-#: cstp.c:229 http.c:119
+#: cstp.c:229 http.c:199
 msgid "Error fetching HTTPS response\n"
 msgstr ""
 
-#: cstp.c:236 http.c:359 http.c:646
+#: cstp.c:236 http.c:458 http.c:828
 #, c-format
 msgid "Failed to open HTTPS connection to %s\n"
 msgstr ""
@@ -110,174 +161,178 @@ msgstr ""
 msgid "Got CONNECT response: %s\n"
 msgstr ""
 
-#: cstp.c:295 cstp.c:303
+#: cstp.c:296 cstp.c:304
 msgid "No memory for options\n"
 msgstr ""
 
-#: cstp.c:320
+#: cstp.c:324
 #, c-format
 msgid "X-DTLS-Session-ID not 64 characters; is: \"%s\"\n"
 msgstr ""
 
-#: cstp.c:350
+#: cstp.c:354
 #, c-format
 msgid "Unknown CSTP-Content-Encoding %s\n"
 msgstr ""
 
-#: cstp.c:418
+#: cstp.c:422
+msgid "No MTU received. Aborting\n"
+msgstr ""
+
+#: cstp.c:429
 msgid "No IP address received. Aborting\n"
 msgstr ""
 
-#: cstp.c:424
+#: cstp.c:435
 #, c-format
 msgid "Reconnect gave different Legacy IP address (%s != %s)\n"
 msgstr ""
 
-#: cstp.c:432
+#: cstp.c:443
 #, c-format
 msgid "Reconnect gave different Legacy IP netmask (%s != %s)\n"
 msgstr ""
 
-#: cstp.c:440
+#: cstp.c:451
 #, c-format
 msgid "Reconnect gave different IPv6 address (%s != %s)\n"
 msgstr ""
 
-#: cstp.c:448
+#: cstp.c:459
 #, c-format
 msgid "Reconnect gave different IPv6 netmask (%s != %s)\n"
 msgstr ""
 
-#: cstp.c:468
+#: cstp.c:479
 #, c-format
 msgid "CSTP connected. DPD %d, Keepalive %d\n"
 msgstr ""
 
-#: cstp.c:501
+#: cstp.c:512
 msgid "Compression setup failed\n"
 msgstr ""
 
-#: cstp.c:509
+#: cstp.c:520
 msgid "Allocation of deflate buffer failed\n"
 msgstr ""
 
-#: cstp.c:549
+#: cstp.c:560
 #, c-format
 msgid "sleep %ds, remaining timeout %ds\n"
 msgstr ""
 
-#: cstp.c:582
+#: cstp.c:593
 msgid "inflate failed\n"
 msgstr ""
 
-#: cstp.c:600
+#: cstp.c:611
 #, c-format
 msgid "Received compressed data packet of %ld bytes\n"
 msgstr ""
 
-#: cstp.c:619
+#: cstp.c:630
 #, c-format
 msgid "SSL read error %d (server probably closed connection); reconnecting.\n"
 msgstr ""
 
-#: cstp.c:644
+#: cstp.c:655
 #, c-format
 msgid "SSL_write failed: %d\n"
 msgstr ""
 
-#: cstp.c:660
+#: cstp.c:671
 #, c-format
 msgid "SSL read error: %s; reconnecting.\n"
 msgstr ""
 
-#: cstp.c:683
+#: cstp.c:694
 #, c-format
 msgid "SSL send failed: %s\n"
 msgstr ""
 
-#: cstp.c:711
+#: cstp.c:722
 #, c-format
 msgid "Unexpected packet length. SSL_read returned %d but packet is\n"
 msgstr ""
 
-#: cstp.c:723
+#: cstp.c:734
 msgid "Got CSTP DPD request\n"
 msgstr ""
 
-#: cstp.c:729
+#: cstp.c:740
 msgid "Got CSTP DPD response\n"
 msgstr ""
 
-#: cstp.c:734
+#: cstp.c:745
 msgid "Got CSTP Keepalive\n"
 msgstr ""
 
-#: cstp.c:739
+#: cstp.c:750
 #, c-format
 msgid "Received uncompressed data packet of %d bytes\n"
 msgstr ""
 
-#: cstp.c:754
+#: cstp.c:765
 #, c-format
 msgid "Received server disconnect: %02x '%s'\n"
 msgstr ""
 
-#: cstp.c:762
+#: cstp.c:773
 msgid "Compressed packet received in !deflate mode\n"
 msgstr ""
 
-#: cstp.c:770
+#: cstp.c:781
 msgid "received server terminate packet\n"
 msgstr ""
 
-#: cstp.c:777
+#: cstp.c:788
 #, c-format
 msgid "Unknown packet %02x %02x %02x %02x %02x %02x %02x %02x\n"
 msgstr ""
 
-#: cstp.c:806
+#: cstp.c:831
 #, c-format
 msgid "SSL wrote too few bytes! Asked for %d, sent %d\n"
 msgstr ""
 
 #. Not that this will ever happen; we don't even process
 #. the setting when we're asked for it.
-#: cstp.c:832
+#: cstp.c:858
 msgid "CSTP rekey due\n"
 msgstr ""
 
-#: cstp.c:839
+#: cstp.c:865
 msgid "CSTP Dead Peer Detection detected dead peer!\n"
 msgstr ""
 
-#: cstp.c:842 dtls.c:695
+#: cstp.c:868 dtls.c:758
 msgid "Reconnect failed\n"
 msgstr ""
 
-#: cstp.c:851
+#: cstp.c:877
 msgid "Send CSTP DPD\n"
 msgstr ""
 
-#: cstp.c:862
+#: cstp.c:888
 msgid "Send CSTP Keepalive\n"
 msgstr ""
 
-#: cstp.c:889
+#: cstp.c:915
 #, c-format
 msgid "deflate failed %d\n"
 msgstr ""
 
-#: cstp.c:909
+#: cstp.c:935
 #, c-format
 msgid "Sending compressed data packet of %d bytes\n"
 msgstr ""
 
-#: cstp.c:921
+#: cstp.c:947
 #, c-format
 msgid "Sending uncompressed data packet of %d bytes\n"
 msgstr ""
 
-#: cstp.c:961
+#: cstp.c:987
 #, c-format
 msgid "Send BYE packet: %s\n"
 msgstr ""
@@ -315,7 +370,7 @@ msgstr ""
 msgid "Your OpenSSL is older than the one you built against, so DTLS may fail!"
 msgstr ""
 
-#: dtls.c:303 dtls.c:433
+#: dtls.c:303 dtls.c:458
 msgid "DTLS handshake timed out\n"
 msgstr ""
 
@@ -324,143 +379,152 @@ msgstr ""
 msgid "DTLS handshake failed: %d\n"
 msgstr ""
 
-#: dtls.c:360
+#: dtls.c:362
 #, c-format
 msgid "Unknown DTLS parameters for requested CipherSuite '%s'\n"
 msgstr ""
 
-#: dtls.c:373
+#: dtls.c:375
 #, c-format
 msgid "Failed to set DTLS priority: %s\n"
 msgstr ""
 
-#: dtls.c:392
+#: dtls.c:394
 #, c-format
 msgid "Failed to set DTLS session parameters: %s\n"
 msgstr ""
 
-#: dtls.c:408
+#: dtls.c:416
+#, c-format
+msgid "Failed to set DTLS MTU: %s\n"
+msgstr ""
+
+#: dtls.c:433
 msgid "Established DTLS connection (using GnuTLS)\n"
 msgstr ""
 
-#: dtls.c:436
+#: dtls.c:461
 #, c-format
 msgid "DTLS handshake failed: %s\n"
 msgstr ""
 
-#: dtls.c:470
+#: dtls.c:497
 msgid "No DTLS address\n"
 msgstr ""
 
 #. We probably didn't offer it any ciphers it liked
-#: dtls.c:477
+#: dtls.c:504
 msgid "Server offered no DTLS cipher option\n"
 msgstr ""
 
 #. XXX: Theoretically, SOCKS5 proxies can do UDP too
-#: dtls.c:484
+#: dtls.c:511
 msgid "No DTLS when connected via proxy\n"
 msgstr ""
 
-#: dtls.c:491
+#: dtls.c:518
 msgid "Open UDP socket for DTLS:"
 msgstr ""
 
-#: dtls.c:496
-msgid "UDP (DTLS) connect:\n"
+#: dtls.c:544 dtls.c:660
+#, c-format
+msgid "Unknown protocol family %d. Cannot do DTLS\n"
 msgstr ""
 
-#: dtls.c:558
-#, c-format
-msgid "DTLS option %s : %s\n"
+#: dtls.c:552
+msgid "Bind UDP socket for DTLS"
 msgstr ""
 
-#: dtls.c:597
+#: dtls.c:559
+msgid "UDP (DTLS) connect:\n"
+msgstr ""
+
+#: dtls.c:621
 #, c-format
-msgid "Unknown protocol family %d. Cannot do DTLS\n"
+msgid "DTLS option %s : %s\n"
 msgstr ""
 
-#: dtls.c:607
+#: dtls.c:670
 #, c-format
 msgid "DTLS connected. DPD %d, Keepalive %d\n"
 msgstr ""
 
-#: dtls.c:638
+#: dtls.c:701
 #, c-format
 msgid "Received DTLS packet 0x%02x of %d bytes\n"
 msgstr ""
 
-#: dtls.c:652
+#: dtls.c:715
 msgid "Got DTLS DPD request\n"
 msgstr ""
 
-#: dtls.c:658
+#: dtls.c:721
 msgid "Failed to send DPD response. Expect disconnect\n"
 msgstr ""
 
-#: dtls.c:662
+#: dtls.c:725
 msgid "Got DTLS DPD response\n"
 msgstr ""
 
-#: dtls.c:666
+#: dtls.c:729
 msgid "Got DTLS Keepalive\n"
 msgstr ""
 
-#: dtls.c:671
+#: dtls.c:734
 #, c-format
 msgid "Unknown DTLS packet type %02x, len %d\n"
 msgstr ""
 
-#: dtls.c:690
+#: dtls.c:753
 msgid "DTLS rekey due\n"
 msgstr ""
 
-#: dtls.c:701
+#: dtls.c:764
 msgid "DTLS rekey failed\n"
 msgstr ""
 
-#: dtls.c:709
+#: dtls.c:772
 msgid "DTLS Dead Peer Detection detected dead peer!\n"
 msgstr ""
 
-#: dtls.c:715
+#: dtls.c:778
 msgid "Send DTLS DPD\n"
 msgstr ""
 
-#: dtls.c:720
+#: dtls.c:783
 msgid "Failed to send DPD request. Expect disconnect\n"
 msgstr ""
 
-#: dtls.c:733
+#: dtls.c:796
 msgid "Send DTLS Keepalive\n"
 msgstr ""
 
-#: dtls.c:738
+#: dtls.c:801
 msgid "Failed to send keepalive request. Expect disconnect\n"
 msgstr ""
 
-#: dtls.c:767
+#: dtls.c:830
 #, c-format
 msgid "DTLS got write error %d. Falling back to SSL\n"
 msgstr ""
 
-#: dtls.c:781
+#: dtls.c:844
 #, c-format
 msgid "DTLS got write error: %s. Falling back to SSL\n"
 msgstr ""
 
-#: dtls.c:792
+#: dtls.c:855
 #, c-format
 msgid "Sent DTLS packet of %d bytes; DTLS send returned %d\n"
 msgstr ""
 
-#: dtls.c:804
+#: dtls.c:867
 msgid "Built against SSL library with no Cisco DTLS support\n"
 msgstr ""
 
 #: gnutls.c:82
 #, c-format
-msgid "Failed to write to SSL socket: %s"
+msgid "Failed to write to SSL socket: %s\n"
 msgstr ""
 
 #: gnutls.c:105 openssl.c:122
@@ -565,313 +629,313 @@ msgstr ""
 msgid "MD5 hash error: %s\n"
 msgstr ""
 
-#: gnutls.c:663
+#: gnutls.c:664
 msgid "Missing DEK-Info: header from OpenSSL encrypted key\n"
 msgstr ""
 
-#: gnutls.c:683
+#: gnutls.c:671
+msgid "Cannot determine PEM encryption type\n"
+msgstr ""
+
+#: gnutls.c:684
 #, c-format
 msgid "Unsupported PEM encryption type: %s\n"
 msgstr ""
 
-#: gnutls.c:701
+#: gnutls.c:709 gnutls.c:722
 msgid "Invalid salt in encrypted PEM file\n"
 msgstr ""
 
-#: gnutls.c:714
-msgid "Invalid encrypted PEM file\n"
-msgstr ""
-
-#: gnutls.c:738
+#: gnutls.c:746
 #, c-format
 msgid "Error base64-decoding encrypted PEM file: %s\n"
 msgstr ""
 
-#: gnutls.c:746
+#: gnutls.c:754
 msgid "Encrypted PEM file too short\n"
 msgstr ""
 
-#: gnutls.c:774
+#: gnutls.c:782
 #, c-format
 msgid "Failed to initialise cipher for decrypting PEM file: %s\n"
 msgstr ""
 
-#: gnutls.c:785
+#: gnutls.c:793
 #, c-format
 msgid "Failed to decrypt PEM key: %s\n"
 msgstr ""
 
-#: gnutls.c:837
+#: gnutls.c:845
 msgid "Decrypting PEM key failed\n"
 msgstr ""
 
-#: gnutls.c:841 gnutls.c:1181 openssl.c:394
+#: gnutls.c:849 gnutls.c:1281 openssl.c:394
 msgid "Enter PEM pass phrase:"
 msgstr ""
 
-#: gnutls.c:895 openssl.c:667
+#: gnutls.c:903 openssl.c:667
 msgid "This binary built without PKCS#11 support\n"
 msgstr ""
 
-#: gnutls.c:945
+#: gnutls.c:953
 #, c-format
 msgid "Using PKCS#11 certificate %s\n"
 msgstr ""
 
-#: gnutls.c:958
+#: gnutls.c:966
 #, c-format
 msgid "Error loading certificate from PKCS#11: %s\n"
 msgstr ""
 
-#: gnutls.c:969 openssl.c:672
+#: gnutls.c:977 openssl.c:672
 #, c-format
 msgid "Using certificate file %s\n"
 msgstr ""
 
-#: gnutls.c:992
+#: gnutls.c:1000
 msgid "PKCS#11 file contained no certificate\n"
 msgstr ""
 
-#: gnutls.c:1018
+#: gnutls.c:1026
 msgid "No certificate found in file"
 msgstr ""
 
-#: gnutls.c:1023
+#: gnutls.c:1031
 #, c-format
 msgid "Loading certificate failed: %s\n"
 msgstr ""
 
-#: gnutls.c:1038
+#: gnutls.c:1046
 #, c-format
 msgid "Using PKCS#11 key %s\n"
 msgstr ""
 
-#: gnutls.c:1043
+#: gnutls.c:1051
 #, c-format
 msgid "Error initialising PKCS#11 key structure: %s\n"
 msgstr ""
 
-#: gnutls.c:1052
+#: gnutls.c:1141
 #, c-format
 msgid "Error importing PKCS#11 URL %s: %s\n"
 msgstr ""
 
-#: gnutls.c:1062
+#: gnutls.c:1151
 #, c-format
 msgid "Error initialising private key structure: %s\n"
 msgstr ""
 
-#: gnutls.c:1072
+#: gnutls.c:1161
 #, c-format
 msgid "Error importing PKCS#11 key into private key structure: %s\n"
 msgstr ""
 
-#: gnutls.c:1100
+#: gnutls.c:1189
 #, c-format
 msgid "Using private key file %s\n"
 msgstr ""
 
-#: gnutls.c:1113 openssl.c:570
+#: gnutls.c:1202 openssl.c:570
 msgid "This version of OpenConnect was built without TPM support\n"
 msgstr ""
 
-#: gnutls.c:1134
+#: gnutls.c:1223
 msgid "Failed to interpret PEM file\n"
 msgstr ""
 
-#: gnutls.c:1153
+#: gnutls.c:1242
 #, c-format
 msgid "Failed to load PKCS#1 private key: %s\n"
 msgstr ""
 
-#: gnutls.c:1169
+#: gnutls.c:1255 gnutls.c:1269
 #, c-format
 msgid "Failed to load private key as PKCS#8: %s\n"
 msgstr ""
 
-#: gnutls.c:1177
+#: gnutls.c:1277
 msgid "Failed to decrypt PKCS#8 certificate file\n"
 msgstr ""
 
-#: gnutls.c:1191
+#: gnutls.c:1291
 #, c-format
 msgid "Failed to determine type of private key %s\n"
 msgstr ""
 
-#: gnutls.c:1203
+#: gnutls.c:1303
 #, c-format
 msgid "Failed to get key ID: %s\n"
 msgstr ""
 
-#: gnutls.c:1248
+#: gnutls.c:1348
 #, c-format
 msgid "Error signing test data with private key: %s\n"
 msgstr ""
 
-#: gnutls.c:1263
+#: gnutls.c:1363
 #, c-format
 msgid "Error validating signature against certificate: %s\n"
 msgstr ""
 
-#: gnutls.c:1287
+#: gnutls.c:1387
 msgid "No SSL certificate found to match private key\n"
 msgstr ""
 
-#: gnutls.c:1298 openssl.c:461 openssl.c:598
+#: gnutls.c:1398 openssl.c:461 openssl.c:598
 #, c-format
 msgid "Using client certificate '%s'\n"
 msgstr ""
 
-#: gnutls.c:1305
+#: gnutls.c:1405
 #, c-format
 msgid "Setting certificate recovation list failed: %s\n"
 msgstr ""
 
-#: gnutls.c:1358
+#: gnutls.c:1458
 msgid ""
 "WARNING: GnuTLS returned incorrect issuer certs; authentication may fail!\n"
 msgstr ""
 
-#: gnutls.c:1377
+#: gnutls.c:1477
 msgid "Failed to allocate memory for supporting certificates\n"
 msgstr ""
 
-#: gnutls.c:1396
+#: gnutls.c:1496
 #, c-format
 msgid "Adding supporting CA '%s'\n"
 msgstr ""
 
-#: gnutls.c:1424
+#: gnutls.c:1524
 #, c-format
 msgid "Setting certificate failed: %s\n"
 msgstr ""
 
-#: gnutls.c:1553
+#: gnutls.c:1653
 msgid "Server presented no certificate\n"
 msgstr ""
 
-#: gnutls.c:1565
+#: gnutls.c:1665
 msgid "Could not calculate SHA1 of server's certificate\n"
 msgstr ""
 
-#: gnutls.c:1573 openssl.c:854
+#: gnutls.c:1673 openssl.c:854
 #, c-format
 msgid "Server SSL certificate didn't match: %s\n"
 msgstr ""
 
-#: gnutls.c:1581
+#: gnutls.c:1681
 msgid "Error checking server cert status\n"
 msgstr ""
 
-#: gnutls.c:1586
+#: gnutls.c:1686
 msgid "certificate revoked"
 msgstr ""
 
-#: gnutls.c:1588
+#: gnutls.c:1688
 msgid "signer not found"
 msgstr ""
 
-#: gnutls.c:1590
+#: gnutls.c:1690
 msgid "signer not a CA certificate"
 msgstr ""
 
-#: gnutls.c:1592
+#: gnutls.c:1692
 msgid "insecure algorithm"
 msgstr ""
 
-#: gnutls.c:1594
+#: gnutls.c:1694
 msgid "certificate not yet activated"
 msgstr ""
 
-#: gnutls.c:1596
+#: gnutls.c:1696
 msgid "certificate expired"
 msgstr ""
 
 #. If this is set and no other reason, it apparently means
 #. that signature verification failed. Not entirely sure
 #. why we don't just set a bit for that too.
-#: gnutls.c:1601
+#: gnutls.c:1701
 msgid "signature verification failed"
 msgstr ""
 
-#: gnutls.c:1605
+#: gnutls.c:1705
 msgid "Error initialising X509 cert structure\n"
 msgstr ""
 
-#: gnutls.c:1611
+#: gnutls.c:1711
 msgid "Error importing server's cert\n"
 msgstr ""
 
-#: gnutls.c:1617 openssl.c:1152
+#: gnutls.c:1717 openssl.c:1152
 msgid "certificate does not match hostname"
 msgstr ""
 
-#: gnutls.c:1678
+#: gnutls.c:1778
 msgid "Failed to allocate memory for cafile certs\n"
 msgstr ""
 
-#: gnutls.c:1697
+#: gnutls.c:1797
 #, c-format
 msgid "Failed to read certs from cafile: %s\n"
 msgstr ""
 
-#: gnutls.c:1711
+#: gnutls.c:1811
 #, c-format
 msgid "Failed to open CA file '%s': %s\n"
 msgstr ""
 
-#: gnutls.c:1722 openssl.c:1300
+#: gnutls.c:1822 openssl.c:1300
 msgid "Loading certificate failed. Aborting.\n"
 msgstr ""
 
-#: gnutls.c:1737
+#: gnutls.c:1844
 #, c-format
 msgid "Failed to set TLS priority string: %s\n"
 msgstr ""
 
 #. really?
-#: gnutls.c:1746 openssl.c:1375
+#: gnutls.c:1856 openssl.c:1384
 #, c-format
 msgid "SSL negotiation with %s\n"
 msgstr ""
 
-#: gnutls.c:1770 openssl.c:1406
+#: gnutls.c:1880 openssl.c:1415
 msgid "SSL connection cancelled\n"
 msgstr ""
 
-#: gnutls.c:1777
+#: gnutls.c:1887
 #, c-format
 msgid "SSL connection failure: %s\n"
 msgstr ""
 
-#: gnutls.c:1786
+#: gnutls.c:1896
 #, c-format
 msgid "GnuTLS non-fatal return during handshake: %s\n"
 msgstr ""
 
-#: gnutls.c:1793 openssl.c:1426
+#: gnutls.c:1903 openssl.c:1435
 #, c-format
 msgid "Connected to HTTPS on %s\n"
 msgstr ""
 
-#: gnutls.c:1969
+#: gnutls.c:2080
 #, c-format
 msgid "PIN required for %s"
 msgstr ""
 
-#: gnutls.c:1979
+#: gnutls.c:2090
 msgid "Wrong PIN"
 msgstr ""
 
-#: gnutls.c:1982
+#: gnutls.c:2093
 msgid "This is the final try before locking!"
 msgstr ""
 
-#: gnutls.c:1984
+#: gnutls.c:2095
 msgid "Only a few tries left before locking!"
 msgstr ""
 
-#: gnutls.c:1989
+#: gnutls.c:2100
 msgid "Enter PIN:"
 msgstr ""
 
@@ -962,700 +1026,721 @@ msgstr ""
 msgid "Failed to set key PIN: %s\n"
 msgstr ""
 
-#: http.c:64
+#: http.c:144
 msgid "No memory for allocating cookies\n"
 msgstr ""
 
-#: http.c:128
+#: http.c:208
 #, c-format
 msgid "Failed to parse HTTP response '%s'\n"
 msgstr ""
 
-#: http.c:133
+#: http.c:213
 #, c-format
 msgid "Got HTTP response: %s\n"
 msgstr ""
 
-#: http.c:141
+#: http.c:221
 msgid "Error processing HTTP response\n"
 msgstr ""
 
-#: http.c:147
+#: http.c:227
 #, c-format
 msgid "Ignoring unknown HTTP response line '%s'\n"
 msgstr ""
 
-#: http.c:167
+#: http.c:247
 #, c-format
 msgid "Invalid cookie offered: %s\n"
 msgstr ""
 
-#: http.c:176
+#: http.c:256
 msgid "<elided>"
 msgstr ""
 
-#: http.c:186
+#: http.c:266
 msgid "SSL certificate authentication failed\n"
 msgstr ""
 
-#: http.c:217
+#: http.c:297
 #, c-format
 msgid "Response body has negative size (%d)\n"
 msgstr ""
 
-#: http.c:227
+#: http.c:307
 #, c-format
 msgid "Unknown Transfer-Encoding: %s\n"
 msgstr ""
 
 #. Now the body, if there is one
-#: http.c:241
+#: http.c:321
 #, c-format
 msgid "HTTP body %s (%d)\n"
 msgstr ""
 
-#: http.c:255 http.c:283
+#: http.c:335 http.c:363
 msgid "Error reading HTTP response body\n"
 msgstr ""
 
-#: http.c:268
+#: http.c:348
 msgid "Error fetching chunk header\n"
 msgstr ""
 
-#: http.c:294
+#: http.c:374
 msgid "Error fetching HTTP response body\n"
 msgstr ""
 
-#: http.c:297
+#: http.c:377
 #, c-format
 msgid "Error in chunked decoding. Expected '', got: '%s'"
 msgstr ""
 
-#: http.c:310
+#: http.c:390
 msgid "Cannot receive HTTP 1.0 body without closing connection\n"
 msgstr ""
 
-#: http.c:380
+#: http.c:473
 msgid "Failed to send GET request for new config\n"
 msgstr ""
 
-#: http.c:402
+#: http.c:497
 msgid "Downloaded config file did not match intended SHA1\n"
 msgstr ""
 
-#: http.c:419
+#: http.c:514
 msgid ""
 "Error: Server asked us to download and run a 'Cisco Secure Desktop' trojan.\n"
 "This facility is disabled by default for security reasons, so you may wish "
 "to enable it."
 msgstr ""
 
-#: http.c:426
+#: http.c:521
 msgid "Trying to run Linux CSD trojan script."
 msgstr ""
 
-#: http.c:434
+#: http.c:529
 #, c-format
 msgid "Failed to open temporary CSD script file: %s\n"
 msgstr ""
 
-#: http.c:442
+#: http.c:537
 #, c-format
 msgid "Failed to write temporary CSD script file: %s\n"
 msgstr ""
 
-#: http.c:459 main.c:794
+#: http.c:554 main.c:840
 #, c-format
 msgid "Failed to set uid %ld\n"
 msgstr ""
 
-#: http.c:464
+#: http.c:559
 #, c-format
 msgid "Invalid user uid=%ld\n"
 msgstr ""
 
-#: http.c:470
+#: http.c:565
 #, c-format
 msgid "Failed to change to CSD home directory '%s': %s\n"
 msgstr ""
 
-#: http.c:476
+#: http.c:571
 #, c-format
 msgid ""
 "Warning: you are running insecure CSD code with root privileges\n"
 "\t Use command line option \"--csd-user\"\n"
 msgstr ""
 
-#: http.c:521
+#: http.c:615
 #, c-format
 msgid "Failed to exec CSD script %s\n"
 msgstr ""
 
-#: http.c:715
+#: http.c:732
 #, c-format
 msgid "Failed to parse redirected URL '%s': %s\n"
 msgstr ""
 
-#: http.c:750
+#: http.c:759
 #, c-format
 msgid "Cannot follow redirection to non-https URL '%s'\n"
 msgstr ""
 
-#: http.c:779
+#: http.c:787
 #, c-format
 msgid "Allocating new path for relative redirect failed: %s\n"
 msgstr ""
 
-#: http.c:792
+#: http.c:889
 #, c-format
 msgid "Unexpected %d result from server\n"
 msgstr ""
 
-#: http.c:812
-#, c-format
-msgid "Refreshing %s after 1 second...\n"
+#: http.c:915
+msgid "Unknown response from server\n"
 msgstr ""
 
-#: http.c:818
-msgid "Unknown response from server\n"
+#: http.c:977
+msgid "XML POST enabled\n"
 msgstr ""
 
-#: http.c:986
+#: http.c:1031
+#, c-format
+msgid "Refreshing %s after 1 second...\n"
+msgstr ""
+
+#: http.c:1231
 msgid "request granted"
 msgstr ""
 
-#: http.c:987
+#: http.c:1232
 msgid "general failure"
 msgstr ""
 
-#: http.c:988
+#: http.c:1233
 msgid "connection not allowed by ruleset"
 msgstr ""
 
-#: http.c:989
+#: http.c:1234
 msgid "network unreachable"
 msgstr ""
 
-#: http.c:990
+#: http.c:1235
 msgid "host unreachable"
 msgstr ""
 
-#: http.c:991
+#: http.c:1236
 msgid "connection refused by destination host"
 msgstr ""
 
-#: http.c:992
+#: http.c:1237
 msgid "TTL expired"
 msgstr ""
 
-#: http.c:993
+#: http.c:1238
 msgid "command not supported / protocol error"
 msgstr ""
 
-#: http.c:994
+#: http.c:1239
 msgid "address type not supported"
 msgstr ""
 
-#: http.c:1008
+#: http.c:1253
 #, c-format
 msgid "Error writing auth request to SOCKS proxy: %s\n"
 msgstr ""
 
-#: http.c:1015
+#: http.c:1260
 #, c-format
 msgid "Error reading auth response from SOCKS proxy: %s\n"
 msgstr ""
 
-#: http.c:1021
+#: http.c:1266
 #, c-format
 msgid "Unexpected auth response from SOCKS proxy: %02x %02x\n"
 msgstr ""
 
-#: http.c:1029
+#: http.c:1274
 #, c-format
 msgid "SOCKS proxy error %02x: %s\n"
 msgstr ""
 
-#: http.c:1033
+#: http.c:1278
 #, c-format
 msgid "SOCKS proxy error %02x\n"
 msgstr ""
 
-#: http.c:1039
+#: http.c:1284
 #, c-format
 msgid "Requesting SOCKS proxy connection to %s:%d\n"
 msgstr ""
 
-#: http.c:1054
+#: http.c:1299
 #, c-format
 msgid "Error writing connect request to SOCKS proxy: %s\n"
 msgstr ""
 
-#: http.c:1062 http.c:1095
+#: http.c:1307 http.c:1340
 #, c-format
 msgid "Error reading connect response from SOCKS proxy: %s\n"
 msgstr ""
 
-#: http.c:1068
+#: http.c:1313
 #, c-format
 msgid "Unexpected connect response from SOCKS proxy: %02x %02x...\n"
 msgstr ""
 
-#: http.c:1088
+#: http.c:1333
 #, c-format
 msgid "Unexpected address type %02x in SOCKS connect response\n"
 msgstr ""
 
-#: http.c:1116
+#: http.c:1366
 #, c-format
 msgid "Requesting HTTP proxy connection to %s:%d\n"
 msgstr ""
 
-#: http.c:1122
+#: http.c:1374
 #, c-format
 msgid "Sending proxy request failed: %s\n"
 msgstr ""
 
-#: http.c:1129
+#: http.c:1381
 msgid "Error fetching proxy response\n"
 msgstr ""
 
-#: http.c:1136
+#: http.c:1388
 #, c-format
 msgid "Failed to parse proxy response '%s'\n"
 msgstr ""
 
-#: http.c:1142
+#: http.c:1394
 #, c-format
 msgid "Proxy CONNECT request failed: %s\n"
 msgstr ""
 
-#: http.c:1149
+#: http.c:1401
 msgid "Failed to read proxy response\n"
 msgstr ""
 
-#: http.c:1153
+#: http.c:1405
 #, c-format
 msgid "Unexpected continuation line after CONNECT response: '%s'\n"
 msgstr ""
 
-#: http.c:1169
+#: http.c:1421
 #, c-format
 msgid "Unknown proxy type '%s'\n"
 msgstr ""
 
-#: http.c:1197
+#: http.c:1449
 msgid "Only http or socks(5) proxies supported\n"
 msgstr ""
 
-#: library.c:202
+#: library.c:251
 #, c-format
 msgid "Failed to parse server URL '%s'\n"
 msgstr ""
 
-#: library.c:208
+#: library.c:257
 msgid "Only https:// permitted for server URL\n"
 msgstr ""
 
-#: main.c:177
+#: main.c:185
 #, c-format
 msgid ""
 "For assistance with OpenConnect, please see the web page at\n"
 "  http://www.infradead.org/openconnect/mail.html\n"
 msgstr ""
 
-#: main.c:186
+#: main.c:194
 #, c-format
 msgid "Using OpenSSL. Features present:"
 msgstr ""
 
-#: main.c:188
+#: main.c:196
 #, c-format
 msgid "Using GnuTLS. Features present:"
 msgstr ""
 
-#: main.c:197
+#: main.c:205
 msgid "OpenSSL ENGINE not present"
 msgstr ""
 
-#: main.c:209
+#: main.c:221
 msgid "using OpenSSL"
 msgstr ""
 
-#: main.c:213
+#: main.c:225
 #, c-format
 msgid ""
 "\n"
 "WARNING: No DTLS support in this binary. Performance will be impaired.\n"
 msgstr ""
 
-#: main.c:219
+#: main.c:231
 #, c-format
 msgid "Usage:  openconnect [options] <server>\n"
 msgstr ""
 
-#: main.c:220
+#: main.c:232
 #, c-format
 msgid ""
 "Open client for Cisco AnyConnect VPN, version %s\n"
 "\n"
 msgstr ""
 
-#: main.c:222
+#: main.c:234
 msgid "Read options from config file"
 msgstr ""
 
-#: main.c:223
+#: main.c:235
 msgid "Continue in background after startup"
 msgstr ""
 
-#: main.c:224
+#: main.c:236
 msgid "Write the daemon's PID to this file"
 msgstr ""
 
-#: main.c:225
+#: main.c:237
 msgid "Use SSL client certificate CERT"
 msgstr ""
 
-#: main.c:226
+#: main.c:238
 msgid "Warn when certificate lifetime < DAYS"
 msgstr ""
 
-#: main.c:227
+#: main.c:239
 msgid "Use SSL private key file KEY"
 msgstr ""
 
-#: main.c:228
-msgid "Private key type (PKCS#12 / TPM / PEM)"
-msgstr ""
-
-#: main.c:229
+#: main.c:240
 msgid "Use WebVPN cookie COOKIE"
 msgstr ""
 
-#: main.c:230
+#: main.c:241
 msgid "Read cookie from standard input"
 msgstr ""
 
-#: main.c:231
+#: main.c:242
 msgid "Enable compression (default)"
 msgstr ""
 
-#: main.c:232
+#: main.c:243
 msgid "Disable compression"
 msgstr ""
 
-#: main.c:233
+#: main.c:244
 msgid "Set minimum Dead Peer Detection interval"
 msgstr ""
 
-#: main.c:234
+#: main.c:245
 msgid "Set login usergroup"
 msgstr ""
 
-#: main.c:235
+#: main.c:246
 msgid "Display help text"
 msgstr ""
 
-#: main.c:236
+#: main.c:247
 msgid "Use IFNAME for tunnel interface"
 msgstr ""
 
-#: main.c:237
+#: main.c:248
 msgid "Use syslog for progress messages"
 msgstr ""
 
-#: main.c:238
+#: main.c:249
 msgid "Drop privileges after connecting"
 msgstr ""
 
-#: main.c:239
+#: main.c:250
 msgid "Drop privileges during CSD execution"
 msgstr ""
 
-#: main.c:240
+#: main.c:251
 msgid "Run SCRIPT instead of CSD binary"
 msgstr ""
 
-#: main.c:241
+#: main.c:252
 msgid "Request MTU from server"
 msgstr ""
 
-#: main.c:242
+#: main.c:253
 msgid "Indicate path MTU to/from server"
 msgstr ""
 
-#: main.c:243
+#: main.c:254
 msgid "Set key passphrase or TPM SRK PIN"
 msgstr ""
 
-#: main.c:244
+#: main.c:255
 msgid "Key passphrase is fsid of file system"
 msgstr ""
 
-#: main.c:245
+#: main.c:256
 msgid "Set proxy server"
 msgstr ""
 
-#: main.c:246
+#: main.c:257
 msgid "Disable proxy"
 msgstr ""
 
-#: main.c:247
+#: main.c:258
 msgid "Use libproxy to automatically configure proxy"
 msgstr ""
 
-#: main.c:249
+#: main.c:260
 msgid "(NOTE: libproxy disabled in this build)"
 msgstr ""
 
-#: main.c:251
+#: main.c:262
 msgid "Less output"
 msgstr ""
 
-#: main.c:252
+#: main.c:263
 msgid "Set packet queue limit to LEN pkts"
 msgstr ""
 
-#: main.c:253
+#: main.c:264
 msgid "Shell command line for using a vpnc-compatible config script"
 msgstr ""
 
-#: main.c:254
+#: main.c:265
 msgid "default"
 msgstr ""
 
-#: main.c:255
+#: main.c:266
 msgid "Pass traffic to 'script' program, not tun"
 msgstr ""
 
-#: main.c:256
+#: main.c:267
 msgid "Set login username"
 msgstr ""
 
-#: main.c:257
+#: main.c:268
 msgid "Report version number"
 msgstr ""
 
-#: main.c:258
+#: main.c:269
 msgid "More output"
 msgstr ""
 
-#: main.c:259
+#: main.c:270
 msgid "XML config file"
 msgstr ""
 
-#: main.c:260
+#: main.c:271
 msgid "Choose authentication login selection"
 msgstr ""
 
-#: main.c:261
+#: main.c:272
 msgid "Authenticate only and print login info"
 msgstr ""
 
-#: main.c:262
+#: main.c:273
 msgid "Fetch webvpn cookie only; don't connect"
 msgstr ""
 
-#: main.c:263
+#: main.c:274
 msgid "Print webvpn cookie before connecting"
 msgstr ""
 
-#: main.c:264
+#: main.c:275
 msgid "Cert file for server verification"
 msgstr ""
 
-#: main.c:265
+#: main.c:276
 msgid "Do not ask for IPv6 connectivity"
 msgstr ""
 
-#: main.c:266
+#: main.c:277
 msgid "OpenSSL ciphers to support for DTLS"
 msgstr ""
 
-#: main.c:267
+#: main.c:278
 msgid "Disable DTLS"
 msgstr ""
 
-#: main.c:268
+#: main.c:279
 msgid "Disable HTTP connection re-use"
 msgstr ""
 
-#: main.c:269
+#: main.c:280
 msgid "Disable password/SecurID authentication"
 msgstr ""
 
-#: main.c:270
+#: main.c:281
 msgid "Do not require server SSL cert to be valid"
 msgstr ""
 
-#: main.c:271
+#: main.c:282
 msgid "Do not expect user input; exit if it is required"
 msgstr ""
 
-#: main.c:272
+#: main.c:283
 msgid "Read password from standard input"
 msgstr ""
 
-#: main.c:273
+#: main.c:284
+msgid "Use software token to generate password"
+msgstr ""
+
+#: main.c:286
+msgid "(NOTE: libstoken disabled in this build)"
+msgstr ""
+
+#: main.c:288
 msgid "Connection retry timeout in seconds"
 msgstr ""
 
-#: main.c:274
+#: main.c:289
 msgid "Server's certificate SHA1 fingerprint"
 msgstr ""
 
-#: main.c:275
+#: main.c:290
 msgid "HTTP header User-Agent: field"
 msgstr ""
 
-#: main.c:286
+#: main.c:291
+msgid "OS type (linux,linux-64,mac,win) to report"
+msgstr ""
+
+#: main.c:292
+msgid "Set local port for DTLS datagrams"
+msgstr ""
+
+#: main.c:303
 #, c-format
 msgid "Allocation failure for string from stdin\n"
 msgstr ""
 
-#: main.c:290
+#: main.c:307
 msgid "fgets (stdin)"
 msgstr ""
 
-#: main.c:353
+#: main.c:370
 #, c-format
 msgid "Failed to get line from config file: %s\n"
 msgstr ""
 
-#: main.c:393
+#: main.c:410
 #, c-format
 msgid "Unrecognised option at line %d: '%s'\n"
 msgstr ""
 
-#: main.c:403
+#: main.c:420
 #, c-format
 msgid "Option '%s' does not take an argument at line %d\n"
 msgstr ""
 
-#: main.c:407
+#: main.c:424
 #, c-format
 msgid "Option '%s' requires an argument at line %d\n"
 msgstr ""
 
-#: main.c:439
+#: main.c:460
 #, c-format
 msgid ""
 "WARNING: This version of openconnect is %s but\n"
 "         the libopenconnect library is %s\n"
 msgstr ""
 
-#: main.c:448
+#: main.c:469
 #, c-format
 msgid "Failed to allocate vpninfo structure\n"
 msgstr ""
 
-#: main.c:484
+#: main.c:508
 #, c-format
 msgid "Cannot use 'config' option inside config file\n"
 msgstr ""
 
-#: main.c:489
+#: main.c:513
 #, c-format
 msgid "Cannot open config file '%s': %s\n"
 msgstr ""
 
-#: main.c:578 main.c:585
+#: main.c:602 main.c:609
 #, c-format
 msgid "MTU %d too small\n"
 msgstr ""
 
-#: main.c:605
+#: main.c:630
 #, c-format
 msgid ""
 "Disabling all HTTP connection re-use due to --no-http-keepalive option.\n"
 "If this helps, please report to <openconnect-devel@lists.infradead.org>.\n"
 msgstr ""
 
-#: main.c:627 main.c:641
+#: main.c:652 main.c:666
 #, c-format
 msgid "Invalid user \"%s\"\n"
 msgstr ""
 
-#: main.c:659
+#: main.c:684
 #, c-format
 msgid "Queue length zero not permitted; using 1\n"
 msgstr ""
 
-#: main.c:670
+#: main.c:695
 #, c-format
 msgid "OpenConnect version %s\n"
 msgstr ""
 
-#: main.c:693
+#: main.c:721
+#, c-format
+msgid "Invalid OS identity \"%s\"\n"
+msgstr ""
+
+#: main.c:732
 #, c-format
 msgid "Too many arguments on command line\n"
 msgstr ""
 
-#: main.c:696
+#: main.c:735
 #, c-format
 msgid "No server specified\n"
 msgstr ""
 
-#: main.c:709
+#: main.c:748
 #, c-format
 msgid "This version of openconnect was built without libproxy support\n"
 msgstr ""
 
-#: main.c:759
+#: main.c:805
 #, c-format
 msgid "Failed to obtain WebVPN cookie\n"
 msgstr ""
 
-#: main.c:783
+#: main.c:829
 #, c-format
 msgid "Creating SSL connection failed\n"
 msgstr ""
 
-#: main.c:788
+#: main.c:834
 #, c-format
 msgid "Set up tun device failed\n"
 msgstr ""
 
-#: main.c:801
+#: main.c:847
 #, c-format
 msgid "Set up DTLS failed; using SSL instead\n"
 msgstr ""
 
-#: main.c:804
+#: main.c:850
 #, c-format
 msgid "Connected %s as %s%s%s, using %s\n"
 msgstr ""
 
-#: main.c:814
+#: main.c:860
 msgid "No --script argument provided; DNS and routing are not configured\n"
 msgstr ""
 
-#: main.c:816
+#: main.c:862
 msgid "See http://www.infradead.org/openconnect/vpnc-script.html\n"
 msgstr ""
 
-#: main.c:828
+#: main.c:874
 #, c-format
 msgid "Failed to open '%s' for write: %s\n"
 msgstr ""
 
-#: main.c:839
+#: main.c:885
 #, c-format
 msgid "Continuing in background; pid %d\n"
 msgstr ""
 
-#: main.c:861
+#: main.c:907
 #, c-format
 msgid "Failed to open %s for write: %s\n"
 msgstr ""
 
-#: main.c:869
+#: main.c:915
 #, c-format
 msgid "Failed to write config to %s: %s\n"
 msgstr ""
 
-#: main.c:962
+#: main.c:1009
 #, c-format
 msgid ""
 "\n"
@@ -1663,56 +1748,72 @@ msgid ""
 "Reason: %s\n"
 msgstr ""
 
-#: main.c:968
+#: main.c:1015
 #, c-format
 msgid "Enter '%s' to accept, '%s' to abort; anything else to view: "
 msgstr ""
 
-#: main.c:969 main.c:987
+#: main.c:1016 main.c:1034
 msgid "no"
 msgstr ""
 
-#: main.c:969 main.c:976
+#: main.c:1016 main.c:1023
 msgid "yes"
 msgstr ""
 
-#: main.c:993
+#: main.c:1040
 #, c-format
 msgid "SHA1 fingerprint: %s\n"
 msgstr ""
 
-#: main.c:1043
+#: main.c:1090
 #, c-format
 msgid "Auth choice \"%s\" not available\n"
 msgstr ""
 
-#: main.c:1056 main.c:1104 main.c:1131
+#: main.c:1103 main.c:1151 main.c:1178
 msgid "User input required in non-interactive mode\n"
 msgstr ""
 
-#: main.c:1087
+#: main.c:1134
 #, c-format
 msgid "Auth choice \"%s\" not valid\n"
 msgstr ""
 
-#: mainloop.c:86
+#: main.c:1237
+#, c-format
+msgid "Soft token string is invalid\n"
+msgstr ""
+
+#: main.c:1240
+#, c-format
+msgid "Can't open ~/.stokenrc file\n"
+msgstr ""
+
+#: main.c:1243
+#, c-format
+msgid "OpenConnect was not built with soft token support\n"
+msgstr ""
+
+#: main.c:1246
+#, c-format
+msgid "General failure in libstoken\n"
+msgstr ""
+
+#: mainloop.c:87
 msgid "Attempt new DTLS connection\n"
 msgstr ""
 
-#: mainloop.c:119
+#: mainloop.c:120
 #, c-format
 msgid "No work to do; sleeping for %d ms...\n"
 msgstr ""
 
 #: openssl.c:110
-msgid "Failed to write to SSL socket"
-msgstr ""
-
-#: openssl.c:147
-msgid "Failed to read from SSL socket"
+msgid "Failed to write to SSL socket\n"
 msgstr ""
 
-#: openssl.c:204
+#: openssl.c:147 openssl.c:204
 msgid "Failed to read from SSL socket\n"
 msgstr ""
 
@@ -1895,17 +1996,17 @@ msgstr ""
 msgid "<error>"
 msgstr ""
 
-#: openssl.c:1337
+#: openssl.c:1342
 #, c-format
 msgid "Failed to read certs from CA file '%s'\n"
 msgstr ""
 
-#: openssl.c:1359
+#: openssl.c:1366
 #, c-format
 msgid "Failed to open CA file '%s'\n"
 msgstr ""
 
-#: openssl.c:1391
+#: openssl.c:1400
 msgid "SSL connection failure\n"
 msgstr ""
 
@@ -1923,200 +2024,215 @@ msgstr ""
 msgid "Failed to reconnect to host %s\n"
 msgstr ""
 
-#: ssl.c:181
+#: ssl.c:182
 #, c-format
 msgid "Proxy from libproxy: %s://%s:%d/\n"
 msgstr ""
 
-#: ssl.c:212
+#: ssl.c:211
 #, c-format
 msgid "getaddrinfo failed for host '%s': %s\n"
 msgstr ""
 
-#: ssl.c:223
+#: ssl.c:226
 #, c-format
-msgid "Attempting to connect to %s%s%s:%s\n"
+msgid "Attempting to connect to proxy %s%s%s:%s\n"
 msgstr ""
 
-#: ssl.c:239
+#: ssl.c:227
+#, c-format
+msgid "Attempting to connect to server %s%s%s:%s\n"
+msgstr ""
+
+#: ssl.c:243
 msgid "Failed to allocate sockaddr storage\n"
 msgstr ""
 
-#: ssl.c:254
+#: ssl.c:258
 #, c-format
 msgid "Failed to connect to host %s\n"
 msgstr ""
 
-#: ssl.c:329
+#: ssl.c:333
 #, c-format
 msgid "statvfs: %s\n"
 msgstr ""
 
-#: ssl.c:346
+#: ssl.c:350
 #, c-format
 msgid "statfs: %s\n"
 msgstr ""
 
-#: ssl.c:417
+#: ssl.c:421
 msgid "No error"
 msgstr ""
 
-#: ssl.c:418
+#: ssl.c:422
 msgid "Keystore locked"
 msgstr ""
 
-#: ssl.c:419
+#: ssl.c:423
 msgid "Keystore uninitialized"
 msgstr ""
 
-#: ssl.c:420
+#: ssl.c:424
 msgid "System error"
 msgstr ""
 
-#: ssl.c:421
+#: ssl.c:425
 msgid "Protocol error"
 msgstr ""
 
-#: ssl.c:422
+#: ssl.c:426
 msgid "Permission denied"
 msgstr ""
 
-#: ssl.c:423
+#: ssl.c:427
 msgid "Key not found"
 msgstr ""
 
-#: ssl.c:424
+#: ssl.c:428
 msgid "Value corrupted"
 msgstr ""
 
-#: ssl.c:425
+#: ssl.c:429
 msgid "Undefined action"
 msgstr ""
 
-#: ssl.c:429
+#: ssl.c:433
 msgid "Wrong password"
 msgstr ""
 
-#: ssl.c:430
+#: ssl.c:434
 msgid "Unknown error"
 msgstr ""
 
-#: tun.c:88
+#: tun.c:89
 msgid "open net"
 msgstr ""
 
-#: tun.c:97
+#: tun.c:98
 msgid "SIOCSIFMTU"
 msgstr ""
 
-#: tun.c:137
+#: tun.c:138
 #, c-format
 msgid "Discard bad split include: \"%s\"\n"
 msgstr ""
 
-#: tun.c:141
+#: tun.c:142
 #, c-format
 msgid "Discard bad split exclude: \"%s\"\n"
 msgstr ""
 
-#: tun.c:383
+#: tun.c:387
 #, c-format
 msgid "Failed to spawn script '%s' for %s: %s\n"
 msgstr ""
 
-#: tun.c:398
+#: tun.c:393
+#, c-format
+msgid "Script '%s' exited abnormally (%x)\n"
+msgstr ""
+
+#: tun.c:400
+#, c-format
+msgid "Script '%s' returned error %d\n"
+msgstr ""
+
+#: tun.c:415
 msgid "Could not open /dev/tun for plumbing"
 msgstr ""
 
-#: tun.c:402
+#: tun.c:419
 msgid "Can't push IP"
 msgstr ""
 
-#: tun.c:412
+#: tun.c:429
 msgid "Can't set ifname"
 msgstr ""
 
-#: tun.c:419
+#: tun.c:436
 #, c-format
 msgid "Can't open %s: %s"
 msgstr ""
 
-#: tun.c:427
+#: tun.c:444
 #, c-format
 msgid "Can't plumb %s for IPv%d: %s\n"
 msgstr ""
 
-#: tun.c:492
+#: tun.c:509
 #, c-format
 msgid "Failed to open tun device: %s\n"
 msgstr ""
 
-#: tun.c:503
+#: tun.c:520
 #, c-format
 msgid "TUNSETIFF failed: %s\n"
 msgstr ""
 
-#: tun.c:515
+#: tun.c:532
 msgid "open /dev/tun"
 msgstr ""
 
-#: tun.c:521
+#: tun.c:538
 msgid "Failed to create new tun"
 msgstr ""
 
-#: tun.c:527
+#: tun.c:544
 msgid "Failed to put tun file descriptor into message-discard mode"
 msgstr ""
 
-#: tun.c:562
+#: tun.c:579
 #, c-format
 msgid "Invalid interface name '%s'; must match 'tun%%d'\n"
 msgstr ""
 
-#: tun.c:572
+#: tun.c:589
 #, c-format
 msgid "Cannot open '%s': %s\n"
 msgstr ""
 
-#: tun.c:601
+#: tun.c:618
 msgid "open tun"
 msgstr ""
 
-#: tun.c:609
+#: tun.c:626
 msgid "TUNSIFHEAD"
 msgstr ""
 
-#: tun.c:629
+#: tun.c:646
 msgid "socketpair"
 msgstr ""
 
-#: tun.c:635
+#: tun.c:652
 msgid "fork"
 msgstr ""
 
-#: tun.c:641
+#: tun.c:658
 msgid "execl"
 msgstr ""
 
-#: tun.c:646
+#: tun.c:663
 msgid "(script)"
 msgstr ""
 
-#: tun.c:740
+#: tun.c:757
 #, c-format
 msgid "Unknown packet (len %d) received: %02x %02x %02x %02x...\n"
 msgstr ""
 
-#: tun.c:760
+#: tun.c:777
 #, c-format
 msgid "Failed to write incoming packet: %s\n"
 msgstr ""
 
 #: xml.c:53
 msgid "Open XML config file"
-msgstr ""
+msgstr "Åpne XML-konfigurasjonsfil"
 
-#: xml.c:54 xml.c:89
+#: xml.c:54 xml.c:90
 #, c-format
 msgid "Treating host \"%s\" as a raw hostname\n"
 msgstr ""
@@ -2125,36 +2241,36 @@ msgstr ""
 msgid "fstat XML config file"
 msgstr ""
 
-#: xml.c:66
+#: xml.c:67
 msgid "mmap XML config file"
 msgstr ""
 
-#: xml.c:72
+#: xml.c:73
 #, c-format
 msgid "Failed to SHA1 existing file\n"
 msgstr ""
 
-#: xml.c:80
+#: xml.c:81
 #, c-format
 msgid "XML config file SHA1: %s\n"
 msgstr ""
 
-#: xml.c:87
+#: xml.c:88
 #, c-format
 msgid "Failed to parse XML config file %s\n"
 msgstr ""
 
-#: xml.c:124
+#: xml.c:125
 #, c-format
 msgid "Host \"%s\" has address \"%s\"\n"
 msgstr ""
 
-#: xml.c:133
+#: xml.c:134
 #, c-format
 msgid "Host \"%s\" has UserGroup \"%s\"\n"
 msgstr ""
 
-#: xml.c:147
+#: xml.c:148
 #, c-format
 msgid "Host \"%s\" not listed in config; treating as raw hostname\n"
 msgstr ""
diff --git a/po/sl.po b/po/sl.po
index 986ecaf..d7b1cb9 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openconnect\n"
 "Report-Msgid-Bugs-To: openconnect-devel@lists.infradead.org\n"
-"POT-Creation-Date: 2012-11-05 20:45+0000\n"
+"POT-Creation-Date: 2012-11-07 13:21+0000\n"
 "Last-Translator: David Woodhouse <dwmw2@infradead.org>\n"
 "Language-Team: Slovenian <lugos-slo@lugos.si>\n"
 "Language: sl\n"
@@ -55,7 +55,7 @@ msgstr "Odziv  je: %s\n"
 
 #: auth.c:542
 msgid "XML response has no \"auth\" node\n"
-msgstr ""
+msgstr "Odziv XML je brez vozlišča \"auth\".\n"
 
 #: auth.c:574
 msgid "Asked for password but '--no-passwd' set\n"
@@ -1157,7 +1157,7 @@ msgstr "Odpiranje začasne datoteke skripta CSD je spodletelo: %s\n"
 msgid "Failed to write temporary CSD script file: %s\n"
 msgstr "Zapisovanje začasne datoteke skripta CSD je spodletelo: %s\n"
 
-#: http.c:554 main.c:839
+#: http.c:554 main.c:840
 #, c-format
 msgid "Failed to set uid %ld\n"
 msgstr "Nastavljanje UID %ld je spodletelo.\n"
@@ -1213,7 +1213,7 @@ msgstr "Neznan odgovor s strežnika.\n"
 
 #: http.c:977
 msgid "XML POST enabled\n"
-msgstr ""
+msgstr "Omogočena zmožnost XML POST\n"
 
 #: http.c:1031
 #, c-format
@@ -1624,66 +1624,70 @@ msgid "HTTP header User-Agent: field"
 msgstr "Glava HTTP uporabniškega posrednika: polje"
 
 #: main.c:291
+msgid "OS type (linux,linux-64,mac,win) to report"
+msgstr ""
+
+#: main.c:292
 msgid "Set local port for DTLS datagrams"
 msgstr "Določite krajevna vrata za datagrame DTLS"
 
-#: main.c:302
+#: main.c:303
 #, c-format
 msgid "Allocation failure for string from stdin\n"
 msgstr "Napaka dodeljevanja za niz s standardnega vhoda\n"
 
-#: main.c:306
+#: main.c:307
 msgid "fgets (stdin)"
 msgstr "fgets (stdin)"
 
-#: main.c:369
+#: main.c:370
 #, c-format
 msgid "Failed to get line from config file: %s\n"
 msgstr "Pridobivanje vrstice iz nastavitvene datoteke je spodletelo: %s\n"
 
-#: main.c:409
+#: main.c:410
 #, c-format
 msgid "Unrecognised option at line %d: '%s'\n"
 msgstr "Neprepoznana možnost v vrstici %d: '%s'\n"
 
-#: main.c:419
+#: main.c:420
 #, c-format
 msgid "Option '%s' does not take an argument at line %d\n"
 msgstr "Možnost '%s' ne sprejme argumenta v vrstici %d\n"
 
-#: main.c:423
+#: main.c:424
 #, c-format
 msgid "Option '%s' requires an argument at line %d\n"
 msgstr "Možnost '%s' zahteva argument v vrstici %d\n"
 
-#: main.c:459
+#: main.c:460
 #, c-format
 msgid ""
 "WARNING: This version of openconnect is %s but\n"
 "         the libopenconnect library is %s\n"
 msgstr ""
 
-#: main.c:468
+#: main.c:469
 #, c-format
 msgid "Failed to allocate vpninfo structure\n"
 msgstr "Strukture vpninfo ni mogoče dodeliti.\n"
 
-#: main.c:507
+#: main.c:508
 #, c-format
 msgid "Cannot use 'config' option inside config file\n"
 msgstr "Možnosti 'config' ni mogoče uporabiti znotraj nastavitvene datoteke\n"
 
-#: main.c:512
+#: main.c:513
 #, c-format
 msgid "Cannot open config file '%s': %s\n"
 msgstr "Ni mogoče odpreti nastavitvene datoteke '%s': %s\n"
 
-#: main.c:601 main.c:608
+#: main.c:602 main.c:609
 #, c-format
 msgid "MTU %d too small\n"
 msgstr "Vrednost MTU %d je premajhna.\n"
 
-#: main.c:629
+#: main.c:630
 #, c-format
 msgid ""
 "Disabling all HTTP connection re-use due to --no-http-keepalive option.\n"
@@ -1694,97 +1698,97 @@ msgstr ""
 "V kolikor možnost deluje, pošljite poročilo na <openconnect-devel@lists."
 "infradead.org>.\n"
 
-#: main.c:651 main.c:665
+#: main.c:652 main.c:666
 #, c-format
 msgid "Invalid user \"%s\"\n"
 msgstr "Neveljaven uporabnik \"%s\"\n"
 
-#: main.c:683
+#: main.c:684
 #, c-format
 msgid "Queue length zero not permitted; using 1\n"
 msgstr "Ničelna dolžina uvrstitve ni dovoljena; uporabljena bo 1\n"
 
-#: main.c:694
+#: main.c:695
 #, c-format
 msgid "OpenConnect version %s\n"
 msgstr "Različica OpenConnect %s\n"
 
-#: main.c:720
+#: main.c:721
 #, c-format
 msgid "Invalid OS identity \"%s\"\n"
-msgstr ""
+msgstr "Neveljavna istovetnost OS \"%s\"\n"
 
-#: main.c:731
+#: main.c:732
 #, c-format
 msgid "Too many arguments on command line\n"
 msgstr "Navedenih je preveč argumentov v ukazni vrstici.\n"
 
-#: main.c:734
+#: main.c:735
 #, c-format
 msgid "No server specified\n"
 msgstr "Ni določenega strežnika\n"
 
-#: main.c:747
+#: main.c:748
 #, c-format
 msgid "This version of openconnect was built without libproxy support\n"
 msgstr "Ta različica openconnect je zgrajena brez podpore libproxy\n"
 
-#: main.c:804
+#: main.c:805
 #, c-format
 msgid "Failed to obtain WebVPN cookie\n"
 msgstr "Pridobivanje piškotka WebVPN je spodletelo\n"
 
-#: main.c:828
+#: main.c:829
 #, c-format
 msgid "Creating SSL connection failed\n"
 msgstr "Ustvarjanje povezave SSL je spodletelo.\n"
 
-#: main.c:833
+#: main.c:834
 #, c-format
 msgid "Set up tun device failed\n"
 msgstr "Nastavitev naprave je spodletela\n"
 
-#: main.c:846
+#: main.c:847
 #, c-format
 msgid "Set up DTLS failed; using SSL instead\n"
 msgstr "Nastavitev DTLS je spodletela; namesto tega bo uporabljen SSL\n"
 
-#: main.c:849
+#: main.c:850
 #, c-format
 msgid "Connected %s as %s%s%s, using %s\n"
 msgstr "Povezava %s je vzpostavljena kot %s%s%s, z uporabo %s\n"
 
-#: main.c:859
+#: main.c:860
 msgid "No --script argument provided; DNS and routing are not configured\n"
 msgstr ""
 "Ni navedenega argumenta --script; Vrednosti DNS in nastavitve preusmerjanja "
 "niso nastavljene.\n"
 
-#: main.c:861
+#: main.c:862
 msgid "See http://www.infradead.org/openconnect/vpnc-script.html\n"
 msgstr "Oglejte si http://www.infradead.org/openconnect/vpnc-script.html\n"
 
-#: main.c:873
+#: main.c:874
 #, c-format
 msgid "Failed to open '%s' for write: %s\n"
 msgstr "Datoteke '%s' ni mogoče odpreti za pisanje: %s\n"
 
-#: main.c:884
+#: main.c:885
 #, c-format
 msgid "Continuing in background; pid %d\n"
 msgstr "Izvajanje programa je poslano v ozadje; pid %d\n"
 
-#: main.c:906
+#: main.c:907
 #, c-format
 msgid "Failed to open %s for write: %s\n"
 msgstr "Datoteke %s ni mogoče odpreti za pisanje: %s\n"
 
-#: main.c:914
+#: main.c:915
 #, c-format
 msgid "Failed to write config to %s: %s\n"
 msgstr "Zapisovanje nastavitev v %s je spodletelo: %s\n"
 
-#: main.c:1008
+#: main.c:1009
 #, c-format
 msgid ""
 "\n"
@@ -1795,55 +1799,55 @@ msgstr ""
 "Overjanje potrdila strežnika VPN \"%s\" je spodletelo.\n"
 "Vzrok: %s\n"
 
-#: main.c:1014
+#: main.c:1015
 #, c-format
 msgid "Enter '%s' to accept, '%s' to abort; anything else to view: "
 msgstr "Vnesite '%s' za sprejem, '%s' za prekinitev; vse drugo za pogled: "
 
-#: main.c:1015 main.c:1033
+#: main.c:1016 main.c:1034
 msgid "no"
 msgstr "ne"
 
-#: main.c:1015 main.c:1022
+#: main.c:1016 main.c:1023
 msgid "yes"
 msgstr "da"
 
-#: main.c:1039
+#: main.c:1040
 #, c-format
 msgid "SHA1 fingerprint: %s\n"
 msgstr "Prstni odtis SHA1: %s\n"
 
-#: main.c:1089
+#: main.c:1090
 #, c-format
 msgid "Auth choice \"%s\" not available\n"
 msgstr "Izbira overitve \"%s\" ni na voljo.\n"
 
-#: main.c:1102 main.c:1150 main.c:1177
+#: main.c:1103 main.c:1151 main.c:1178
 msgid "User input required in non-interactive mode\n"
 msgstr "Zahtevano je uporabniško posredovanje v načinu brez posredovanja.\n"
 
-#: main.c:1133
+#: main.c:1134
 #, c-format
 msgid "Auth choice \"%s\" not valid\n"
 msgstr "Izbira overitve \"%s\" ni veljavna.\n"
 
-#: main.c:1236
+#: main.c:1237
 #, c-format
 msgid "Soft token string is invalid\n"
 msgstr "Uporabniški prstni odtis je neveljaven\n"
 
-#: main.c:1239
+#: main.c:1240
 #, c-format
 msgid "Can't open ~/.stokenrc file\n"
 msgstr "Ni mogoče odpreti datoteke ~/.stokenrc.\n"
 
-#: main.c:1242
+#: main.c:1243
 #, c-format
 msgid "OpenConnect was not built with soft token support\n"
 msgstr ""
 "Program OpenConnect ni izgrajen s podporo za uporabniški prstni odtis\n"
 
-#: main.c:1245
+#: main.c:1246
 #, c-format
 msgid "General failure in libstoken\n"
 msgstr "Splošna napaka v knjižnici libstoken.\n"
@@ -1861,11 +1865,7 @@ msgstr "V pričakovanju novih nalog; stanje nedejavnosti je %d ms ...\n"
 msgid "Failed to write to SSL socket\n"
 msgstr "Pisanje v vtič SSL je spodletelo\n"
 
-#: openssl.c:147
-msgid "Failed to read from SSL socket"
-msgstr "Branje iz vtiča SSL je spodletelo"
-
-#: openssl.c:204
+#: openssl.c:147 openssl.c:204
 msgid "Failed to read from SSL socket\n"
 msgstr "Branje iz vtiča SSL je spodletelo\n"
 
@@ -2335,11 +2335,14 @@ msgstr ""
 "Gostitelj \"%s\" v datoteki config ni naveden; obravnavan bo kot "
 "neoblikovano ime gostitelja\n"
 
-#~ msgid "Failed to write to SSL socket"
-#~ msgstr "Zapisovanje v vtič SSL je spodletelo"
+#~ msgid "Fixed options give %s\n"
+#~ msgstr "Popravljene možnosti podajo %s\n"
 
 #~ msgid "XML response has no \"auth\" root node\n"
 #~ msgstr "Odziv XML je brez ustreznega korenskega vozlišča \"auth\"\n"
 
-#~ msgid "Fixed options give %s\n"
-#~ msgstr "Popravljene možnosti podajo %s\n"
+#~ msgid "Failed to write to SSL socket"
+#~ msgstr "Zapisovanje v vtič SSL je spodletelo"
+
+#~ msgid "Failed to read from SSL socket"
+#~ msgstr "Branje iz vtiča SSL je spodletelo"