From 4bb22b5c97e8adf69401aae4bffc51379b128d95 Mon Sep 17 00:00:00 2001
From: JC Brand <jc@opkode.com>
Date: Tue, 10 Sep 2013 22:52:15 +0200
Subject: [PATCH] Translated strings may not be broken up. Regenerated POT file

---
 converse.js         |  28 +---
 locale/converse.pot | 381 +++++++++++++++++++++++++++++++-------------
 2 files changed, 275 insertions(+), 134 deletions(-)

diff --git a/converse.js b/converse.js
index 8b646201c..e519bd6cb 100644
--- a/converse.js
+++ b/converse.js
@@ -337,10 +337,7 @@
                     }
                 } 
                 // We need to generate a new key and instance tag
-                result = alert(__(
-                    'Your browser needs to generate a private key, which will be used '+
-                    'in your encrypted chat session. This can take up to 30 seconds and '+
-                    'your browser might freeze and become unresponsive.'));
+                result = alert(__('Your browser needs to generate a private key, which will be used in your encrypted chat session. This can take up to 30 seconds during which your browser might freeze and become unresponsive.'));
                 instance_tag = otr.OTR.makeInstanceTag();
                 key = new otr.DSA();
                 // Encrypt the key and set in sessionStorage. Also store
@@ -380,9 +377,8 @@
                 switch (type) {
                     case 'question':
                         this.otr.smpSecret(prompt(__(
-                            'Authentication request from %1$s\n\n'+
-                            'Your buddy is attempting to verify your identity, by asking you the question below.\n\n'+
-                            '%2$s', [this.get('fullname'), data])));
+                            'Authentication request from %1$s\n\nYour buddy is attempting to verify your identity, by asking you the question below.\n\n%2$s',
+                            [this.get('fullname'), data])));
                         break;
                     case 'trust':
                         if (this.otr.trust === true) {
@@ -390,7 +386,7 @@
                         } else {
                             this.trigger(
                                 'showHelpMessages',
-                                [__("Could not verify identify via the Socialist's Millionaire Protocol.")],
+                                [__("Could not verify this user's identify.")],
                                 'error');
                             this.save({'otr_status': UNVERIFIED});
                         }
@@ -835,9 +831,7 @@
                 } else if (msg == 'Received an unencrypted message.') {
                     this.showHelpMessages(
                         [__('We received an unencrypted message')], 'error');
-                } else if (
-                    (msg == 'MACs do not match.') ||
-                    (msg == 'Received an unreadable encrypted message.')) {
+                } else if (msg == 'Received an unreadable encrypted message.') {
                     this.showHelpMessages(
                         [__('We received an unreadable encrypted message')],
                         'error');
@@ -866,11 +860,7 @@
                 var scheme = $(ev.target).data().scheme;
                 var result, question, answer;
                 if (scheme === 'fingerprint') {
-                    result = confirm(__(
-                        'Here are the fingerprints, please confirm them with %1$s, outside of this chat.\n\n'+
-                        'Fingerprint for you, %2$s: %3$s\n\n'+
-                        'Fingerprint for %1$s: %4$s\n\n'+
-                        'If you have confirmed that the fingerprints match, click OK, otherwise click Cancel.', [
+                    result = confirm(__('Here are the fingerprints, please confirm them with %1$s, outside of this chat.\n\nFingerprint for you, %2$s: %3$s\n\nFingerprint for %1$s: %4$s\n\nIf you have confirmed that the fingerprints match, click OK, otherwise click Cancel.', [
                             this.model.get('fullname'),
                             converse.xmppstatus.get('fullname')||converse.bare_jid,
                             this.model.otr.priv.fingerprint(),
@@ -883,9 +873,7 @@
                         this.model.save({'otr_status': UNVERIFIED});
                     }
                 } else if (scheme === 'smp') {
-                    alert(__('You will be prompted to provide a security question and then an answer to '+
-                             'that question.\n\nYour buddy will then be prompted the same question and if they '+
-                             'type the exact same answer (case sensitive), their identity will have been verified.'));
+                    alert(__('You will be prompted to provide a security question and then an answer to that question.\n\nYour buddy will then be prompted the same question and if they type the exact same answer (case sensitive), their identity will have been verified.'));
                     question = prompt(__('What is your security question?'));
                     if (question) {
                         answer = prompt(__('What is the answer to the security question?'));
@@ -2612,7 +2600,7 @@
                             // want to send a presence stanza, so we do it here.
                             converse.xmppstatus.sendPresence();
                         }
-                    },
+                    }
                 }); // Get the cached roster items from localstorage
             },
 
diff --git a/locale/converse.pot b/locale/converse.pot
index bb58c982b..527d96383 100644
--- a/locale/converse.pot
+++ b/locale/converse.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse.js 0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-26 16:15+0200\n"
+"POT-Creation-Date: 2013-09-10 22:51+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,445 +17,598 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: converse.js:130
+#: converse.js:125
+msgid "unencrypted"
+msgstr ""
+
+#: converse.js:126
+msgid "unverified"
+msgstr ""
+
+#: converse.js:127
+msgid "verified"
+msgstr ""
+
+#: converse.js:128
+msgid "finished"
+msgstr ""
+
+#: converse.js:161
 msgid "Disconnected"
 msgstr ""
 
-#: converse.js:134
+#: converse.js:165
 msgid "Error"
 msgstr ""
 
-#: converse.js:136
+#: converse.js:167
 msgid "Connecting"
 msgstr ""
 
-#: converse.js:139
+#: converse.js:170
 msgid "Connection Failed"
 msgstr ""
 
-#: converse.js:141
+#: converse.js:172
 msgid "Authenticating"
 msgstr ""
 
-#: converse.js:144
+#: converse.js:175
 msgid "Authentication Failed"
 msgstr ""
 
-#: converse.js:146
+#: converse.js:177
 msgid "Disconnecting"
 msgstr ""
 
-#: converse.js:456 converse.js:1175
-msgid "Show this menu"
+#: converse.js:332
+msgid "Re-establishing encrypted session"
 msgstr ""
 
-#: converse.js:457 converse.js:1176
-msgid "Write in the third person"
+#: converse.js:340
+msgid ""
+"Your browser needs to generate a private key, which will be used in your "
+"encrypted chat session. This can take up to 30 seconds during which your "
+"browser might freeze and become unresponsive."
 msgstr ""
 
-#: converse.js:458 converse.js:1180
-msgid "Remove messages"
+#: converse.js:349
+msgid "Private key generated."
 msgstr ""
 
-#: converse.js:598
+#: converse.js:380
+msgid ""
+"Authentication request from %1$s\n"
+"\n"
+"Your buddy is attempting to verify your identity, by asking you the question "
+"below.\n"
+"\n"
+"%2$s"
+msgstr ""
+
+#: converse.js:389
+msgid "Could not verify this user's identify."
+msgstr ""
+
+#: converse.js:537
 msgid "Personal message"
 msgstr ""
 
-#: converse.js:672
+#: converse.js:559
+msgid "Start encrypted conversation"
+msgstr ""
+
+#: converse.js:562
+msgid "Refresh encrypted conversation"
+msgstr ""
+
+#: converse.js:563
+msgid "End encrypted conversation"
+msgstr ""
+
+#: converse.js:564
+msgid "Verify with SMP"
+msgstr ""
+
+#: converse.js:567
+msgid "Verify with fingerprints"
+msgstr ""
+
+#: converse.js:569
+msgid "What's this?"
+msgstr ""
+
+#: converse.js:757 converse.js:1552
+msgid "Show this menu"
+msgstr ""
+
+#: converse.js:758 converse.js:1553
+msgid "Write in the third person"
+msgstr ""
+
+#: converse.js:759 converse.js:1557
+msgid "Remove messages"
+msgstr ""
+
+#: converse.js:830
+msgid "Your message could not be sent"
+msgstr ""
+
+#: converse.js:833
+msgid "We received an unencrypted message"
+msgstr ""
+
+#: converse.js:836
+msgid "We received an unreadable encrypted message"
+msgstr ""
+
+#: converse.js:845
+msgid "This user has requested an encrypted session."
+msgstr ""
+
+#: converse.js:863
+msgid ""
+"Here are the fingerprints, please confirm them with %1$s, outside of this "
+"chat.\n"
+"\n"
+"Fingerprint for you, %2$s: %3$s\n"
+"\n"
+"Fingerprint for %1$s: %4$s\n"
+"\n"
+"If you have confirmed that the fingerprints match, click OK, otherwise click "
+"Cancel."
+msgstr ""
+
+#: converse.js:876
+msgid ""
+"You will be prompted to provide a security question and then an answer to "
+"that question.\n"
+"\n"
+"Your buddy will then be prompted the same question and if they type the "
+"exact same answer (case sensitive), their identity will have been verified."
+msgstr ""
+
+#: converse.js:877
+msgid "What is your security question?"
+msgstr ""
+
+#: converse.js:879
+msgid "What is the answer to the security question?"
+msgstr ""
+
+#: converse.js:883
+msgid "Invalid authentication scheme provided"
+msgstr ""
+
+#: converse.js:953
+msgid "Your messages are not encrypted anymore"
+msgstr ""
+
+#: converse.js:955
+msgid ""
+"Your messages are now encrypted but your buddy's identity has not been "
+"verified."
+msgstr ""
+
+#: converse.js:957
+msgid "Your buddy's identify has been verified."
+msgstr ""
+
+#: converse.js:959
+msgid "Your buddy has ended encryption on their end, you should do the same."
+msgstr ""
+
+#: converse.js:968
+msgid "Your messages are not encrypted. Click here to enable OTR encryption."
+msgstr ""
+
+#: converse.js:970
+msgid "Your messages are encrypted, but your buddy has not been verified."
+msgstr ""
+
+#: converse.js:972
+msgid "Your messages are encrypted and your buddy verified."
+msgstr ""
+
+#: converse.js:974
+msgid ""
+"Your buddy has closed their end of the private session, you should do the "
+"same"
+msgstr ""
+
+#: converse.js:1049
 msgid "Contacts"
 msgstr ""
 
-#: converse.js:677
+#: converse.js:1054
 msgid "Online"
 msgstr ""
 
-#: converse.js:678
+#: converse.js:1055
 msgid "Busy"
 msgstr ""
 
-#: converse.js:679
+#: converse.js:1056
 msgid "Away"
 msgstr ""
 
-#: converse.js:680
+#: converse.js:1057
 msgid "Offline"
 msgstr ""
 
-#: converse.js:687
+#: converse.js:1064
 msgid "Click to add new chat contacts"
 msgstr ""
 
-#: converse.js:688
+#: converse.js:1065
 msgid "Add a contact"
 msgstr ""
 
-#: converse.js:697
+#: converse.js:1074
 msgid "Contact username"
 msgstr ""
 
-#: converse.js:698
+#: converse.js:1075
 msgid "Add"
 msgstr ""
 
-#: converse.js:706
+#: converse.js:1083
 msgid "Contact name"
 msgstr ""
 
-#: converse.js:707
+#: converse.js:1084
 msgid "Search"
 msgstr ""
 
-#: converse.js:747
+#: converse.js:1124
 msgid "No users found"
 msgstr ""
 
-#: converse.js:754
+#: converse.js:1131
 msgid "Click to add as a chat contact"
 msgstr ""
 
-#: converse.js:814
+#: converse.js:1191
 msgid "Click to open this room"
 msgstr ""
 
-#: converse.js:816
+#: converse.js:1193
 msgid "Show more information on this room"
 msgstr ""
 
-#: converse.js:822
+#: converse.js:1199
 msgid "Description:"
 msgstr ""
 
-#: converse.js:823
+#: converse.js:1200
 msgid "Occupants:"
 msgstr ""
 
-#: converse.js:824
+#: converse.js:1201
 msgid "Features:"
 msgstr ""
 
-#: converse.js:826
+#: converse.js:1203
 msgid "Requires authentication"
 msgstr ""
 
-#: converse.js:829
+#: converse.js:1206
 msgid "Hidden"
 msgstr ""
 
-#: converse.js:832
+#: converse.js:1209
 msgid "Requires an invitation"
 msgstr ""
 
-#: converse.js:835
+#: converse.js:1212
 msgid "Moderated"
 msgstr ""
 
-#: converse.js:838
+#: converse.js:1215
 msgid "Non-anonymous"
 msgstr ""
 
-#: converse.js:841
+#: converse.js:1218
 msgid "Open room"
 msgstr ""
 
-#: converse.js:844
+#: converse.js:1221
 msgid "Permanent room"
 msgstr ""
 
-#: converse.js:847
+#: converse.js:1224
 msgid "Public"
 msgstr ""
 
-#: converse.js:850
+#: converse.js:1227
 msgid "Semi-anonymous"
 msgstr ""
 
-#: converse.js:853
+#: converse.js:1230
 msgid "Temporary room"
 msgstr ""
 
-#: converse.js:856
+#: converse.js:1233
 msgid "Unmoderated"
 msgstr ""
 
-#: converse.js:862
+#: converse.js:1239
 msgid "Rooms"
 msgstr ""
 
-#: converse.js:866
+#: converse.js:1243
 msgid "Room name"
 msgstr ""
 
-#: converse.js:867
+#: converse.js:1244
 msgid "Nickname"
 msgstr ""
 
-#: converse.js:868
+#: converse.js:1245
 msgid "Server"
 msgstr ""
 
-#: converse.js:869
+#: converse.js:1246
 msgid "Join"
 msgstr ""
 
-#: converse.js:870
+#: converse.js:1247
 msgid "Show rooms"
 msgstr ""
 
 #. For translators: %1$s is a variable and will be replaced with the XMPP server name
-#: converse.js:905
+#: converse.js:1282
 msgid "No rooms on %1$s"
 msgstr ""
 
 #. For translators: %1$s is a variable and will be
 #. replaced with the XMPP server name
-#: converse.js:920
+#: converse.js:1297
 msgid "Rooms on %1$s"
 msgstr ""
 
-#: converse.js:1177
+#: converse.js:1554
 msgid "Set chatroom topic"
 msgstr ""
 
-#: converse.js:1178
+#: converse.js:1555
 msgid "Kick user from chatroom"
 msgstr ""
 
-#: converse.js:1179
+#: converse.js:1556
 msgid "Ban user from chatroom"
 msgstr ""
 
-#: converse.js:1206
+#: converse.js:1583
 msgid "Message"
 msgstr ""
 
-#: converse.js:1320 converse.js:2387
+#: converse.js:1697 converse.js:2780
 msgid "Save"
 msgstr ""
 
-#: converse.js:1321
+#: converse.js:1698
 msgid "Cancel"
 msgstr ""
 
-#: converse.js:1368
+#: converse.js:1745
 msgid "An error occurred while trying to save the form."
 msgstr ""
 
-#: converse.js:1414
+#: converse.js:1791
 msgid "This chatroom requires a password"
 msgstr ""
 
-#: converse.js:1415
+#: converse.js:1792
 msgid "Password: "
 msgstr ""
 
-#: converse.js:1416
+#: converse.js:1793
 msgid "Submit"
 msgstr ""
 
-#: converse.js:1430
+#: converse.js:1807
 msgid "This room is not anonymous"
 msgstr ""
 
-#: converse.js:1431
+#: converse.js:1808
 msgid "This room now shows unavailable members"
 msgstr ""
 
-#: converse.js:1432
+#: converse.js:1809
 msgid "This room does not show unavailable members"
 msgstr ""
 
-#: converse.js:1433
+#: converse.js:1810
 msgid "Non-privacy-related room configuration has changed"
 msgstr ""
 
-#: converse.js:1434
+#: converse.js:1811
 msgid "Room logging is now enabled"
 msgstr ""
 
-#: converse.js:1435
+#: converse.js:1812
 msgid "Room logging is now disabled"
 msgstr ""
 
-#: converse.js:1436
+#: converse.js:1813
 msgid "This room is now non-anonymous"
 msgstr ""
 
-#: converse.js:1437
+#: converse.js:1814
 msgid "This room is now semi-anonymous"
 msgstr ""
 
-#: converse.js:1438
+#: converse.js:1815
 msgid "This room is now fully-anonymous"
 msgstr ""
 
-#: converse.js:1439
+#: converse.js:1816
 msgid "A new room has been created"
 msgstr ""
 
-#: converse.js:1440
+#: converse.js:1817
 msgid "Your nickname has been changed"
 msgstr ""
 
-#: converse.js:1454
+#: converse.js:1831
 msgid "<strong>%1$s</strong> has been banned"
 msgstr ""
 
-#: converse.js:1455
+#: converse.js:1832
 msgid "<strong>%1$s</strong> has been kicked out"
 msgstr ""
 
-#: converse.js:1456
+#: converse.js:1833
 msgid "<strong>%1$s</strong> has been removed because of an affiliation change"
 msgstr ""
 
-#: converse.js:1457
+#: converse.js:1834
 msgid "<strong>%1$s</strong> has been removed for not being a member"
 msgstr ""
 
-#: converse.js:1461 converse.js:1521
+#: converse.js:1838 converse.js:1898
 msgid "You have been banned from this room"
 msgstr ""
 
-#: converse.js:1462
+#: converse.js:1839
 msgid "You have been kicked from this room"
 msgstr ""
 
-#: converse.js:1463
+#: converse.js:1840
 msgid "You have been removed from this room because of an affiliation change"
 msgstr ""
 
-#: converse.js:1464
+#: converse.js:1841
 msgid ""
 "You have been removed from this room because the room has changed to members-"
 "only and you're not a member"
 msgstr ""
 
-#: converse.js:1465
+#: converse.js:1842
 msgid ""
 "You have been removed from this room because the MUC (Multi-user chat) "
 "service is being shut down."
 msgstr ""
 
-#: converse.js:1519
+#: converse.js:1896
 msgid "You are not on the member list of this room"
 msgstr ""
 
-#: converse.js:1525
+#: converse.js:1902
 msgid "No nickname was specified"
 msgstr ""
 
-#: converse.js:1529
+#: converse.js:1906
 msgid "You are not allowed to create new rooms"
 msgstr ""
 
-#: converse.js:1531
+#: converse.js:1908
 msgid "Your nickname doesn't conform to this room's policies"
 msgstr ""
 
-#: converse.js:1533
+#: converse.js:1910
 msgid "Your nickname is already taken"
 msgstr ""
 
-#: converse.js:1535
+#: converse.js:1912
 msgid "This room does not (yet) exist"
 msgstr ""
 
-#: converse.js:1537
+#: converse.js:1914
 msgid "This room has reached it's maximum number of occupants"
 msgstr ""
 
-#. For translators: the %1$s and %2$s parts will get replaced by the user and topic text respectively
-#. Example: Topic set by JC Brand to: Hello World!
-#: converse.js:1614
+#: converse.js:1993
 msgid "Topic set by %1$s to: %2$s"
 msgstr ""
 
-#: converse.js:1630
+#: converse.js:2009
 msgid "This user is a moderator"
 msgstr ""
 
-#: converse.js:1633
+#: converse.js:2012
 msgid "This user can send messages in this room"
 msgstr ""
 
-#: converse.js:1636
+#: converse.js:2015
 msgid "This user can NOT send messages in this room"
 msgstr ""
 
-#: converse.js:1843
+#: converse.js:2225
 msgid "Click to chat with this contact"
 msgstr ""
 
-#: converse.js:1845 converse.js:1849
+#: converse.js:2228 converse.js:2232
 msgid "Click to remove this contact"
 msgstr ""
 
-#: converse.js:2231
+#: converse.js:2620
 msgid "Contact requests"
 msgstr ""
 
-#: converse.js:2232
+#: converse.js:2621
 msgid "My contacts"
 msgstr ""
 
-#: converse.js:2233
+#: converse.js:2622
 msgid "Pending contacts"
 msgstr ""
 
-#: converse.js:2386
+#: converse.js:2779
 msgid "Custom status"
 msgstr ""
 
-#: converse.js:2392
+#: converse.js:2785
 msgid "Click to change your chat status"
 msgstr ""
 
-#: converse.js:2396
+#: converse.js:2789
 msgid "Click here to write a custom status message"
 msgstr ""
 
-#: converse.js:2425 converse.js:2433
+#: converse.js:2818 converse.js:2826
 msgid "online"
 msgstr ""
 
-#: converse.js:2427
+#: converse.js:2820
 msgid "busy"
 msgstr ""
 
-#: converse.js:2429
+#: converse.js:2822
 msgid "away for long"
 msgstr ""
 
-#: converse.js:2431
+#: converse.js:2824
 msgid "away"
 msgstr ""
 
 #. For translators: the %1$s part gets replaced with the status
 #. Example, I am online
-#: converse.js:2445 converse.js:2482
+#: converse.js:2838 converse.js:2875
 msgid "I am %1$s"
 msgstr ""
 
-#: converse.js:2553
+#: converse.js:2946
 msgid "Sign in"
 msgstr ""
 
-#: converse.js:2556
+#: converse.js:2949
 msgid "XMPP/Jabber Username:"
 msgstr ""
 
-#: converse.js:2558
+#: converse.js:2951
 msgid "Password:"
 msgstr ""
 
-#: converse.js:2560
+#: converse.js:2953
 msgid "Log In"
 msgstr ""
 
-#: converse.js:2564
+#: converse.js:2957
 msgid "BOSH Service URL:"
 msgstr ""
 
-#: converse.js:2718
+#: converse.js:3110
 msgid "Online Contacts"
 msgstr ""