New release: 1.0.5

RELEASE.md

@@ -5,7 +5,9 @@
 3. Run `make release VERSION=1.0.5`
 4. Do a `git diff` to check if things look sane.
 4. Do a quick manual test with the `dist` files (via `index.html`)
-5. Run `git push && git push --tags`
-6. Update http://conversejs.org
-7. Create `1.0.5` directory for the CDN.
-8. Run `npm publish`
+5. `git commit -m "New release 1.0.5"`
+6. `git tag -s v1.0.5
+7. Run `git push && git push --tags`
+8. Update http://conversejs.org
+9. Create `1.0.5` directory for the CDN.
+10. Run `npm publish`

bower.json

@@ -1,7 +1,7 @@
 {
   "name": "converse.js",
   "description": "Web-based XMPP/Jabber chat client written in javascript",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "license": "MPL-2.0",
   "devDependencies": {
     "jasmine": "https://github.com/jcbrand/jasmine.git#1_3_x",

dist/templates.js

@@ -178,6 +178,24 @@ __p += '<div class="chatroom-form-container">\n    <form class="pure-form pure-f
 return __p
 };
 
+this["templates"]["chatroom_nickname_form"] = function(obj) {
+obj || (obj = {});
+var __t, __p = '', __e = _.escape;
+with (obj) {
+__p += '<div class="chatroom-form-container">\n    <form class="pure-form converse-form chatroom-form">\n        <fieldset>\n            <label>' +
+((__t = (heading)) == null ? '' : __t) +
+'</label>\n            <p class="validation-message">' +
+((__t = (validation_message)) == null ? '' : __t) +
+'</p>\n            <input type="text" required="required" name="nick" class="new-chatroom-nick" placeholder="' +
+((__t = (label_nickname)) == null ? '' : __t) +
+'"/>\n        </fieldset>\n        <fieldset>\n            <input type="submit" class="pure-button button-primary" name="join" value="' +
+((__t = (label_join)) == null ? '' : __t) +
+'"/>\n        </fieldset>\n    </form>\n</div>\n';
+
+}
+return __p
+};
+
 this["templates"]["chatroom_password_form"] = function(obj) {
 obj || (obj = {});
 var __t, __p = '', __e = _.escape;
@@ -616,25 +634,33 @@ function print() { __p += __j.call(arguments, '') }
 with (obj) {
 __p += '<li class="' +
 ((__t = (role)) == null ? '' : __t) +
+' occupant" id="' +
+((__t = (id)) == null ? '' : __t) +
 '"\n    ';
  if (role === "moderator") { ;
 __p += '\n       title="' +
 ((__t = (desc_moderator)) == null ? '' : __t) +
+' ' +
+((__t = (hint_occupant)) == null ? '' : __t) +
 '"\n    ';
  } ;
 __p += '\n    ';
  if (role === "occupant") { ;
 __p += '\n       title="' +
 ((__t = (desc_occupant)) == null ? '' : __t) +
+' ' +
+((__t = (hint_occupant)) == null ? '' : __t) +
 '"\n    ';
  } ;
 __p += '\n    ';
  if (role === "visitor") { ;
 __p += '\n       title="' +
 ((__t = (desc_visitor)) == null ? '' : __t) +
+' ' +
+((__t = (hint_occupant)) == null ? '' : __t) +
 '"\n    ';
  } ;
-__p += '\n>' +
+__p += '>' +
 ((__t = (nick)) == null ? '' : __t) +
 '</li>\n';
 
@@ -914,13 +940,7 @@ __p += '<form class="pure-form pure-form-stacked converse-form add-chatroom" act
 ((__t = (label_room_name)) == null ? '' : __t) +
 '</label>\n        <input type="text" name="chatroom" class="new-chatroom-name" placeholder="' +
 ((__t = (label_room_name)) == null ? '' : __t) +
-'"/>\n        <label>' +
-((__t = (label_nickname)) == null ? '' : __t) +
-'</label> <input type="text" name="nick" class="new-chatroom-nick" placeholder="' +
-((__t = (label_nickname)) == null ? '' : __t) +
-'"/>\n        <input type="submit" class="pure-button button-primary" name="join" value="' +
-((__t = (label_join)) == null ? '' : __t) +
-'"/>\n    </fieldset>\n    <fieldset>\n        ';
+'"/>\n        ';
  if (server_input_type != 'hidden') { ;
 __p += '\n            <label' +
 ((__t = (server_label_global_attr)) == null ? '' : __t) +
@@ -932,6 +952,8 @@ __p += '\n        <input type="' +
 ((__t = (server_input_type)) == null ? '' : __t) +
 '" name="server" class="new-chatroom-server" placeholder="' +
 ((__t = (label_server)) == null ? '' : __t) +
+'"/>\n        <input type="submit" class="pure-button button-primary" name="join" value="' +
+((__t = (label_join)) == null ? '' : __t) +
 '"/>\n        <input type="button" class="pure-button button-secondary" name="show" id="show-rooms" value="' +
 ((__t = (label_show_rooms)) == null ? '' : __t) +
 '"/>\n    </fieldset>\n</form>\n<dl id="available-chatrooms"></dl>\n';

docs/CHANGES.md

@@ -1,6 +1,6 @@
 # Changelog
 
-## 1.0.5 (Unreleased)
+## 1.0.5 (2016-07-28)
 - In case of nickname conflict when joining a room, allow the user to choose a new one.
   [jcbrand]
 - Check whether the user has a reserved nickname before entering a room, and if so,

docs/source/conf.py

@@ -48,9 +48,9 @@ copyright = u'2014, JC Brand'
 # built documents.
 #
 # The short X.Y version.
-version = '1.0.4'
+version = '1.0.5'
 # The full version, including alpha/beta/rc tags.
-release = '1.0.4'
+release = '1.0.5'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

locale/af/LC_MESSAGES/converse.json

@@ -326,6 +326,10 @@
             null,
             "A fout het voorgekom terwyl probeer is om die vorm te stoor."
          ],
+         "Nickname": [
+            null,
+            "Bynaam"
+         ],
          "This chatroom requires a password": [
             null,
             "Hiedie kletskamer benodig 'n wagwoord"
@@ -418,10 +422,6 @@
             null,
             "<strong>%1$s</strong> is nie 'n lid nie, en dus verwyder"
          ],
-         "Your nickname has been automatically changed to: <strong>%1$s</strong>": [
-            null,
-            "U bynaam is outomaties verander na: <strong>%1$s</strong>"
-         ],
          "Your nickname has been changed to: <strong>%1$s</strong>": [
             null,
             "U bynaam is verander na: <strong>%1$s</strong>"
@@ -446,9 +446,9 @@
             null,
             "Jou bynaam voldoen nie aan die kamer se beleid nie"
          ],
-         "Your nickname is already taken": [
+         "The nickname you chose is reserved or currently in use, please choose a different one.": [
             null,
-            "Jou bynaam is reeds geneem"
+            ""
          ],
          "This room does not (yet) exist": [
             null,
@@ -462,18 +462,6 @@
             null,
             "Onderwerp deur %1$s bygewerk na: %2$s"
          ],
-         "This user is a moderator": [
-            null,
-            "Hierdie gebruiker is 'n moderator"
-         ],
-         "This user can send messages in this room": [
-            null,
-            "Hierdie gebruiker kan boodskappe na die kamer stuur"
-         ],
-         "This user can NOT send messages in this room": [
-            null,
-            "Hierdie gebruiker kan NIE boodskappe na die kamer stuur nie"
-         ],
          "Invite": [
             null,
             "Nooi uit"
@@ -494,10 +482,6 @@
             null,
             "Kamer naam"
          ],
-         "Nickname": [
-            null,
-            "Bynaam"
-         ],
          "Server": [
             null,
             "Bediener"

locale/af/LC_MESSAGES/converse.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse.js 0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-26 05:57+0000\n"
+"POT-Creation-Date: 2016-07-28 16:03+0000\n"
 "PO-Revision-Date: 2016-04-07 10:34+0000\n"
 "Last-Translator: JC Brand <jc@opkode.com>\n"
 "Language-Team: Afrikaans\n"
@@ -20,7 +20,7 @@ msgstr ""
 "plural_forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/converse-chatview.js:103 src/converse-headline.js:99
-#: src/converse-muc.js:239
+#: src/converse-muc.js:246
 #, fuzzy
 msgid "You have unread messages"
 msgstr "Verwyder boodskappe"
@@ -45,13 +45,13 @@ msgstr "tik tans"
 msgid "has stopped typing"
 msgstr "het opgehou tik"
 
-#: src/converse-chatview.js:332 src/converse-chatview.js:588
+#: src/converse-chatview.js:332 src/converse-chatview.js:592
 #: src/converse-notification.js:171
 msgid "has gone away"
 msgstr "het weggegaan"
 
 # The last three values are needed by Jed (a Javascript translations library)
-#: src/converse-chatview.js:456 src/converse-muc.js:412
+#: src/converse-chatview.js:456 src/converse-muc.js:426
 msgid "Show this menu"
 msgstr "Vertoon hierdie keuselys"
 
@@ -59,7 +59,7 @@ msgstr "Vertoon hierdie keuselys"
 msgid "Write in the third person"
 msgstr "Skryf in die derde persoon"
 
-#: src/converse-chatview.js:458 src/converse-muc.js:410
+#: src/converse-chatview.js:458 src/converse-muc.js:424
 msgid "Remove messages"
 msgstr "Verwyder boodskappe"
 
@@ -67,27 +67,27 @@ msgstr "Verwyder boodskappe"
 msgid "Are you sure you want to clear the messages from this chat box?"
 msgstr "Is u seker u wil die boodskappe in hierdie kletskas uitvee?"
 
-#: src/converse-chatview.js:586 src/converse-notification.js:169
+#: src/converse-chatview.js:590 src/converse-notification.js:169
 msgid "has gone offline"
 msgstr "is nou aflyn"
 
-#: src/converse-chatview.js:590 src/converse-notification.js:173
+#: src/converse-chatview.js:594 src/converse-notification.js:173
 msgid "is busy"
 msgstr "is besig"
 
-#: src/converse-chatview.js:633
+#: src/converse-chatview.js:637
 msgid "Clear all messages"
 msgstr "Vee alle boodskappe uit"
 
-#: src/converse-chatview.js:634
+#: src/converse-chatview.js:638
 msgid "Hide the list of occupants"
 msgstr "Verskuil die lys van deelnemers"
 
-#: src/converse-chatview.js:635
+#: src/converse-chatview.js:639
 msgid "Insert a smiley"
 msgstr "Voeg 'n emotikon by"
 
-#: src/converse-chatview.js:636
+#: src/converse-chatview.js:640
 msgid "Start a call"
 msgstr "Begin 'n oproep"
 
@@ -150,7 +150,7 @@ msgstr "Klik om jou klets-status te verander"
 msgid "Custom status"
 msgstr "Doelgemaakte status"
 
-#: src/converse-controlbox.js:490 src/converse-muc.js:580
+#: src/converse-controlbox.js:490 src/converse-muc.js:591
 msgid "Save"
 msgstr "Stoor"
 
@@ -279,148 +279,162 @@ msgstr "Geminimaliseer"
 msgid "Minimize this chat box"
 msgstr "Minimeer hierdie kletskas"
 
-#: src/converse-muc.js:241
+#: src/converse-muc.js:248
 msgid "Message"
 msgstr "Boodskap"
 
-#: src/converse-muc.js:302
+#: src/converse-muc.js:316
 msgid "Error: could not execute the command"
 msgstr "Fout: kon nie die opdrag uitvoer nie"
 
-#: src/converse-muc.js:358
+#: src/converse-muc.js:372
 msgid "Error: the \""
 msgstr ""
 
-#: src/converse-muc.js:368
+#: src/converse-muc.js:382
 msgid "Are you sure you want to clear the messages from this room?"
 msgstr "Is u seker dat u die boodskappe in hierdie kamer wil verwyder?"
 
-#: src/converse-muc.js:408
+#: src/converse-muc.js:422
 msgid "Change user's affiliation to admin"
 msgstr "Verander die gebruiker se affiliasie na admin"
 
-#: src/converse-muc.js:409
+#: src/converse-muc.js:423
 msgid "Ban user from room"
 msgstr "Verban gebruiker uit hierdie kletskamer"
 
-#: src/converse-muc.js:411
+#: src/converse-muc.js:425
 msgid "Change user role to occupant"
 msgstr "Verander gebruiker se rol na lid"
 
-#: src/converse-muc.js:413
+#: src/converse-muc.js:427
 msgid "Kick user from room"
 msgstr "Skop gebruiker uit hierdie kletskamer"
 
-#: src/converse-muc.js:414
+#: src/converse-muc.js:428
 msgid "Write in 3rd person"
 msgstr "Skryf in die derde persoon"
 
-#: src/converse-muc.js:415
+#: src/converse-muc.js:429
 msgid "Grant membership to a user"
 msgstr "Verleen lidmaatskap aan 'n gebruiker"
 
-#: src/converse-muc.js:416
+#: src/converse-muc.js:430
 msgid "Remove user's ability to post messages"
 msgstr "Verwyder gebruiker se vermoë om boodskappe te plaas"
 
-#: src/converse-muc.js:417
+#: src/converse-muc.js:431
 msgid "Change your nickname"
 msgstr "Verander u bynaam"
 
-#: src/converse-muc.js:418
+#: src/converse-muc.js:432
 msgid "Grant moderator role to user"
 msgstr "Verleen moderator rol aan gebruiker"
 
-#: src/converse-muc.js:419
+#: src/converse-muc.js:433
 msgid "Grant ownership of this room"
 msgstr "Verleen eienaarskap van hierdie kamer"
 
-#: src/converse-muc.js:420
+#: src/converse-muc.js:434
 msgid "Revoke user's membership"
 msgstr "Herroep gebruiker se lidmaatskap"
 
-#: src/converse-muc.js:421
+#: src/converse-muc.js:435
 msgid "Set room topic"
 msgstr "Stel onderwerp vir kletskamer"
 
-#: src/converse-muc.js:422
+#: src/converse-muc.js:436
 msgid "Allow muted user to post messages"
 msgstr "Laat stilgemaakte gebruiker toe om weer boodskappe te plaas"
 
-#: src/converse-muc.js:581 src/converse-register.js:216
+#: src/converse-muc.js:592 src/converse-register.js:216
 #: src/converse-register.js:331
 msgid "Cancel"
 msgstr "Kanseleer"
 
-#: src/converse-muc.js:624
+#: src/converse-muc.js:635
 msgid "An error occurred while trying to save the form."
 msgstr "A fout het voorgekom terwyl probeer is om die vorm te stoor."
 
-#: src/converse-muc.js:666
+#: src/converse-muc.js:725
+#, fuzzy
+msgid "Please choose your nickname"
+msgstr "Verander u bynaam"
+
+#: src/converse-muc.js:726 src/converse-muc.js:1250
+msgid "Nickname"
+msgstr "Bynaam"
+
+#: src/converse-muc.js:727
+#, fuzzy
+msgid "Enter room"
+msgstr "Oop kletskamer"
+
+#: src/converse-muc.js:745
 msgid "This chatroom requires a password"
 msgstr "Hiedie kletskamer benodig 'n wagwoord"
 
-#: src/converse-muc.js:667
+#: src/converse-muc.js:746
 msgid "Password: "
 msgstr "Wagwoord:"
 
-#: src/converse-muc.js:668
+#: src/converse-muc.js:747
 msgid "Submit"
 msgstr "Dien in"
 
-#: src/converse-muc.js:703
+#: src/converse-muc.js:782
 msgid "This room is not anonymous"
 msgstr "Hierdie vertrek is nie anoniem nie"
 
-#: src/converse-muc.js:704
+#: src/converse-muc.js:783
 msgid "This room now shows unavailable members"
 msgstr "Hierdie vertrek wys nou onbeskikbare lede"
 
-#: src/converse-muc.js:705
+#: src/converse-muc.js:784
 msgid "This room does not show unavailable members"
 msgstr "Hierdie vertrek wys nie onbeskikbare lede nie"
 
-#: src/converse-muc.js:706
+#: src/converse-muc.js:785
 msgid "Non-privacy-related room configuration has changed"
 msgstr "Nie-privaatheidverwante kamer instellings het verander"
 
-#: src/converse-muc.js:707
+#: src/converse-muc.js:786
 msgid "Room logging is now enabled"
 msgstr "Kamer log is nou aangeskakel"
 
-#: src/converse-muc.js:708
+#: src/converse-muc.js:787
 msgid "Room logging is now disabled"
 msgstr "Kamer log is nou afgeskakel"
 
-#: src/converse-muc.js:709
+#: src/converse-muc.js:788
 msgid "This room is now non-anonymous"
 msgstr "Hiedie kamer is nou nie anoniem nie"
 
-#: src/converse-muc.js:710
+#: src/converse-muc.js:789
 msgid "This room is now semi-anonymous"
 msgstr "Hierdie kamer is nou gedeeltelik anoniem"
 
-#: src/converse-muc.js:711
+#: src/converse-muc.js:790
 msgid "This room is now fully-anonymous"
 msgstr "Hierdie kamer is nou ten volle anoniem"
 
-#: src/converse-muc.js:712
+#: src/converse-muc.js:791
 msgid "A new room has been created"
 msgstr "'n Nuwe kamer is geskep"
 
-#: src/converse-muc.js:716 src/converse-muc.js:816
+#: src/converse-muc.js:795 src/converse-muc.js:895
 msgid "You have been banned from this room"
 msgstr "Jy is uit die kamer verban"
 
-#: src/converse-muc.js:717
+#: src/converse-muc.js:796
 msgid "You have been kicked from this room"
 msgstr "Jy is uit die kamer geskop"
 
-#: src/converse-muc.js:718
+#: src/converse-muc.js:797
 msgid "You have been removed from this room because of an affiliation change"
 msgstr "Jy is vanuit die kamer verwyder a.g.v 'n verandering van affiliasie"
 
-#: src/converse-muc.js:719
+#: src/converse-muc.js:798
 msgid ""
 "You have been removed from this room because the room has changed to members-"
 "only and you're not a member"
@@ -428,7 +442,7 @@ msgstr ""
 "Jy is vanuit die kamer verwyder omdat die kamer nou slegs tot lede beperk "
 "word en jy nie 'n lid is nie."
 
-#: src/converse-muc.js:720
+#: src/converse-muc.js:799
 msgid ""
 "You have been removed from this room because the MUC (Multi-user chat) "
 "service is being shut down."
@@ -446,95 +460,106 @@ msgstr ""
 #. * can then at least tell gettext to scan for it so that these
 #. * strings are picked up by the translation machinery.
 #.
-#: src/converse-muc.js:734
+#: src/converse-muc.js:813
 msgid "<strong>%1$s</strong> has been banned"
 msgstr "<strong>%1$s</strong> is verban"
 
-#: src/converse-muc.js:735
+#: src/converse-muc.js:814
 msgid "<strong>%1$s</strong>'s nickname has changed"
 msgstr "<strong>%1$s</strong> se bynaam het verander"
 
-#: src/converse-muc.js:736
+#: src/converse-muc.js:815
 msgid "<strong>%1$s</strong> has been kicked out"
 msgstr "<strong>%1$s</strong> is uitgeskop"
 
-#: src/converse-muc.js:737
+#: src/converse-muc.js:816
 msgid "<strong>%1$s</strong> has been removed because of an affiliation change"
 msgstr "<strong>%1$s</strong> is verwyder a.g.v 'n verandering van affiliasie"
 
-#: src/converse-muc.js:738
+#: src/converse-muc.js:817
 msgid "<strong>%1$s</strong> has been removed for not being a member"
 msgstr "<strong>%1$s</strong> is nie 'n lid nie, en dus verwyder"
 
-#: src/converse-muc.js:742
-msgid "Your nickname has been automatically changed to: <strong>%1$s</strong>"
+#: src/converse-muc.js:821
+#, fuzzy
+msgid "Your nickname has been automatically set to: <strong>%1$s</strong>"
 msgstr "U bynaam is outomaties verander na: <strong>%1$s</strong>"
 
-#: src/converse-muc.js:743
+#: src/converse-muc.js:822
 msgid "Your nickname has been changed to: <strong>%1$s</strong>"
 msgstr "U bynaam is verander na: <strong>%1$s</strong>"
 
-#: src/converse-muc.js:790 src/converse-muc.js:799
+#: src/converse-muc.js:869 src/converse-muc.js:878
 msgid "The reason given is: \""
 msgstr "Die gegewe rede is: \""
 
-#: src/converse-muc.js:814
+#: src/converse-muc.js:893
 msgid "You are not on the member list of this room"
 msgstr "Jy is nie op die ledelys van hierdie kamer nie"
 
-#: src/converse-muc.js:820
+#: src/converse-muc.js:899
 msgid "No nickname was specified"
 msgstr "Geen bynaam verskaf nie"
 
-#: src/converse-muc.js:824
+#: src/converse-muc.js:903
 msgid "You are not allowed to create new rooms"
 msgstr "Jy word nie toegelaat om nog kletskamers te skep nie"
 
-#: src/converse-muc.js:826
+#: src/converse-muc.js:905
 msgid "Your nickname doesn't conform to this room's policies"
 msgstr "Jou bynaam voldoen nie aan die kamer se beleid nie"
 
-#: src/converse-muc.js:828
-msgid "Your nickname is already taken"
-msgstr "Jou bynaam is reeds geneem"
+#: src/converse-muc.js:907
+msgid ""
+"The nickname you chose is reserved or currently in use, please choose a "
+"different one."
+msgstr ""
 
-#: src/converse-muc.js:831
+#: src/converse-muc.js:909
 msgid "This room does not (yet) exist"
 msgstr "Hierdie kamer bestaan tans (nog) nie"
 
-#: src/converse-muc.js:833
+#: src/converse-muc.js:911
 msgid "This room has reached its maximum number of occupants"
 msgstr "Hierdie kletskamer het sy maksimum aantal deelnemers bereik"
 
-#: src/converse-muc.js:861
+#: src/converse-muc.js:961
 msgid "Topic set by %1$s to: %2$s"
 msgstr "Onderwerp deur %1$s bygewerk na: %2$s"
 
-#: src/converse-muc.js:941
-msgid "This user is a moderator"
+#: src/converse-muc.js:1048
+#, fuzzy
+msgid "Click to mention this user in your message."
+msgstr "Klik om hierdie kletskamer te open"
+
+#: src/converse-muc.js:1049
+#, fuzzy
+msgid "This user is a moderator."
 msgstr "Hierdie gebruiker is 'n moderator"
 
-#: src/converse-muc.js:942
-msgid "This user can send messages in this room"
+#: src/converse-muc.js:1050
+#, fuzzy
+msgid "This user can send messages in this room."
 msgstr "Hierdie gebruiker kan boodskappe na die kamer stuur"
 
-#: src/converse-muc.js:943
-msgid "This user can NOT send messages in this room"
+#: src/converse-muc.js:1051
+#, fuzzy
+msgid "This user can NOT send messages in this room."
 msgstr "Hierdie gebruiker kan NIE boodskappe na die kamer stuur nie"
 
-#: src/converse-muc.js:972
+#: src/converse-muc.js:1087
 msgid "Invite"
 msgstr "Nooi uit"
 
-#: src/converse-muc.js:973
+#: src/converse-muc.js:1088
 msgid "Occupants"
 msgstr "Deelnemers"
 
-#: src/converse-muc.js:1072
+#: src/converse-muc.js:1206
 msgid "You are about to invite %1$s to the chat room \"%2$s\". "
 msgstr "U is op die punt om %1$s na die kletskamer \"%2$s\" uit te nooi."
 
-#: src/converse-muc.js:1073
+#: src/converse-muc.js:1207
 msgid ""
 "You may optionally include a message, explaining the reason for the "
 "invitation."
@@ -542,110 +567,106 @@ msgstr ""
 "U mag na keuse 'n boodskap insluit, om bv. die rede vir die uitnodiging te "
 "staaf."
 
-#: src/converse-muc.js:1115
+#: src/converse-muc.js:1249
 msgid "Room name"
 msgstr "Kamer naam"
 
-#: src/converse-muc.js:1116
-msgid "Nickname"
-msgstr "Bynaam"
-
-#: src/converse-muc.js:1117
+#: src/converse-muc.js:1251
 msgid "Server"
 msgstr "Bediener"
 
-#: src/converse-muc.js:1118
+#: src/converse-muc.js:1252
 msgid "Join Room"
 msgstr "Betree kletskamer"
 
-#: src/converse-muc.js:1119
+#: src/converse-muc.js:1253
 msgid "Show rooms"
 msgstr "Wys kletskamers"
 
-#: src/converse-muc.js:1123
+#: src/converse-muc.js:1257
 msgid "Rooms"
 msgstr "Kletskamers"
 
 #. For translators: %1$s is a variable and will be replaced with the XMPP server name
-#: src/converse-muc.js:1143
+#: src/converse-muc.js:1277
 msgid "No rooms on %1$s"
 msgstr "Geen kletskamers op %1$s"
 
 #. For translators: %1$s is a variable and will be
 #. replaced with the XMPP server name
-#: src/converse-muc.js:1157
+#: src/converse-muc.js:1291
 msgid "Rooms on %1$s"
 msgstr "Kletskamers op %1$s"
 
-#: src/converse-muc.js:1166
+#: src/converse-muc.js:1300
 msgid "Click to open this room"
 msgstr "Klik om hierdie kletskamer te open"
 
-#: src/converse-muc.js:1167
+#: src/converse-muc.js:1301
 msgid "Show more information on this room"
 msgstr "Wys meer inligting aangaande hierdie kletskamer"
 
-#: src/converse-muc.js:1239
+#: src/converse-muc.js:1373
 msgid "Description:"
 msgstr "Beskrywing:"
 
-#: src/converse-muc.js:1240
+#: src/converse-muc.js:1374
 msgid "Occupants:"
 msgstr "Deelnemers:"
 
-#: src/converse-muc.js:1241
+#: src/converse-muc.js:1375
 msgid "Features:"
 msgstr "Eienskappe:"
 
-#: src/converse-muc.js:1242
+#: src/converse-muc.js:1376
 msgid "Requires authentication"
 msgstr "Benodig magtiging"
 
-#: src/converse-muc.js:1243
+#: src/converse-muc.js:1377
 msgid "Hidden"
 msgstr "Verskuil"
 
-#: src/converse-muc.js:1244
+#: src/converse-muc.js:1378
 msgid "Requires an invitation"
 msgstr "Benodig 'n uitnodiging"
 
-#: src/converse-muc.js:1245
+#: src/converse-muc.js:1379
 msgid "Moderated"
 msgstr "Gemodereer"
 
-#: src/converse-muc.js:1246
+#: src/converse-muc.js:1380
 msgid "Non-anonymous"
 msgstr "Nie-anoniem"
 
-#: src/converse-muc.js:1247
+#: src/converse-muc.js:1381
 msgid "Open room"
 msgstr "Oop kletskamer"
 
-#: src/converse-muc.js:1248
+#: src/converse-muc.js:1382
 msgid "Permanent room"
 msgstr "Permanente kamer"
 
-#: src/converse-muc.js:1249
+#: src/converse-muc.js:1383
 msgid "Public"
 msgstr "Publiek"
 
-#: src/converse-muc.js:1250
+#: src/converse-muc.js:1384
 msgid "Semi-anonymous"
 msgstr "Deels anoniem"
 
-#: src/converse-muc.js:1251
+#: src/converse-muc.js:1385
 msgid "Temporary room"
 msgstr "Tydelike kamer"
 
-#: src/converse-muc.js:1252
+#: src/converse-muc.js:1386
 msgid "Unmoderated"
 msgstr "Ongemodereer"
 
-#: src/converse-muc.js:1329
+#: src/converse-muc.js:1456
 msgid "%1$s has invited you to join a chat room: %2$s"
 msgstr "%1$s het u uitgenooi om die kletskamer %2$s te besoek"
 
-#: src/converse-muc.js:1334
+#: src/converse-muc.js:1461
 msgid ""
 "%1$s has invited you to join a chat room: %2$s, and left the following "
 "reason: \"%3$s\""
@@ -1021,6 +1042,9 @@ msgstr "Jammer, 'n fout het voorgekom tydens die verwydering van "
 msgid "Are you sure you want to decline this contact request?"
 msgstr "Is u seker dat u hierdie persoon se versoek wil afkeur?"
 
+#~ msgid "Your nickname is already taken"
+#~ msgstr "Jou bynaam is reeds geneem"
+
 #~ msgid "Disconnected"
 #~ msgstr "Ontkoppel"
 

locale/ca/LC_MESSAGES/converse.json

@@ -311,6 +311,10 @@
             null,
             "S'ha produït un error en intentar desar el formulari."
          ],
+         "Nickname": [
+            null,
+            "Àlies"
+         ],
          "This chatroom requires a password": [
             null,
             "Aquesta sala de xat requereix una contrasenya"
@@ -403,10 +407,6 @@
             null,
             "S'ha eliminat <strong>%1$s</strong> perquè no és membre"
          ],
-         "Your nickname has been automatically changed to: <strong>%1$s</strong>": [
-            null,
-            "El vostre àlies ha canviat automàticament a: <strong>%1$s</strong>"
-         ],
          "Your nickname has been changed to: <strong>%1$s</strong>": [
             null,
             "El vostre àlies ha canviat a: <strong>%1$s</strong>"
@@ -431,9 +431,9 @@
             null,
             "El vostre àlies no s'ajusta a les polítiques d'aquesta sala"
          ],
-         "Your nickname is already taken": [
+         "The nickname you chose is reserved or currently in use, please choose a different one.": [
             null,
-            "El vostre àlies ja està en ús"
+            ""
          ],
          "This room does not (yet) exist": [
             null,
@@ -443,18 +443,6 @@
             null,
             "Tema definit per %1$s en: %2$s"
          ],
-         "This user is a moderator": [
-            null,
-            "Aquest usuari és un moderador"
-         ],
-         "This user can send messages in this room": [
-            null,
-            "Aquest usuari pot enviar missatges a aquesta sala"
-         ],
-         "This user can NOT send messages in this room": [
-            null,
-            "Aquest usuari NO pot enviar missatges a aquesta sala"
-         ],
          "Occupants": [
             null,
             "Ocupants"
@@ -471,10 +459,6 @@
             null,
             "Nom de la sala"
          ],
-         "Nickname": [
-            null,
-            "Àlies"
-         ],
          "Server": [
             null,
             "Servidor"

locale/ca/LC_MESSAGES/converse.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse.js 0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-26 05:57+0000\n"
+"POT-Creation-Date: 2016-07-28 16:03+0000\n"
 "PO-Revision-Date: 2016-01-25 17:25+0100\n"
 "Last-Translator: Ruben Mansilla <ramansilla@gmail.com>\n"
 "Language-Team: CA <product@spamina.com>\n"
@@ -27,7 +27,7 @@ msgstr ""
 "X-Generator: Poedit 1.8.6\n"
 
 #: src/converse-chatview.js:103 src/converse-headline.js:99
-#: src/converse-muc.js:239
+#: src/converse-muc.js:246
 #, fuzzy
 msgid "You have unread messages"
 msgstr "Elimina els missatges"
@@ -52,12 +52,12 @@ msgstr "està escrivint"
 msgid "has stopped typing"
 msgstr "ha deixat d'escriure"
 
-#: src/converse-chatview.js:332 src/converse-chatview.js:588
+#: src/converse-chatview.js:332 src/converse-chatview.js:592
 #: src/converse-notification.js:171
 msgid "has gone away"
 msgstr "ha marxat"
 
-#: src/converse-chatview.js:456 src/converse-muc.js:412
+#: src/converse-chatview.js:456 src/converse-muc.js:426
 msgid "Show this menu"
 msgstr "Mostra aquest menú"
 
@@ -65,7 +65,7 @@ msgstr "Mostra aquest menú"
 msgid "Write in the third person"
 msgstr "Escriu en tercera persona"
 
-#: src/converse-chatview.js:458 src/converse-muc.js:410
+#: src/converse-chatview.js:458 src/converse-muc.js:424
 msgid "Remove messages"
 msgstr "Elimina els missatges"
 
@@ -73,27 +73,27 @@ msgstr "Elimina els missatges"
 msgid "Are you sure you want to clear the messages from this chat box?"
 msgstr "Segur que voleu esborrar els missatges d'aquest quadre del xat?"
 
-#: src/converse-chatview.js:586 src/converse-notification.js:169
+#: src/converse-chatview.js:590 src/converse-notification.js:169
 msgid "has gone offline"
 msgstr "s'ha desconnectat"
 
-#: src/converse-chatview.js:590 src/converse-notification.js:173
+#: src/converse-chatview.js:594 src/converse-notification.js:173
 msgid "is busy"
 msgstr "està ocupat"
 
-#: src/converse-chatview.js:633
+#: src/converse-chatview.js:637
 msgid "Clear all messages"
 msgstr "Esborra tots els missatges"
 
-#: src/converse-chatview.js:634
+#: src/converse-chatview.js:638
 msgid "Hide the list of occupants"
 msgstr "Amaga la llista d'ocupants"
 
-#: src/converse-chatview.js:635
+#: src/converse-chatview.js:639
 msgid "Insert a smiley"
 msgstr "Insereix una cara somrient"
 
-#: src/converse-chatview.js:636
+#: src/converse-chatview.js:640
 msgid "Start a call"
 msgstr "Inicia una trucada"
 
@@ -157,7 +157,7 @@ msgstr "Feu clic per canviar l'estat del xat"
 msgid "Custom status"
 msgstr "Estat personalitzat"
 
-#: src/converse-controlbox.js:490 src/converse-muc.js:580
+#: src/converse-controlbox.js:490 src/converse-muc.js:591
 msgid "Save"
 msgstr "Desa"
 
@@ -289,149 +289,163 @@ msgstr "Minimitzat"
 msgid "Minimize this chat box"
 msgstr "Minimitza aquest quadre del xat"
 
-#: src/converse-muc.js:241
+#: src/converse-muc.js:248
 msgid "Message"
 msgstr "Missatge"
 
-#: src/converse-muc.js:302
+#: src/converse-muc.js:316
 msgid "Error: could not execute the command"
 msgstr "Error: no s'ha pogut executar l'ordre"
 
-#: src/converse-muc.js:358
+#: src/converse-muc.js:372
 msgid "Error: the \""
 msgstr "Error: el \""
 
-#: src/converse-muc.js:368
+#: src/converse-muc.js:382
 msgid "Are you sure you want to clear the messages from this room?"
 msgstr "Segur que voleu esborrar els missatges d'aquesta sala?"
 
-#: src/converse-muc.js:408
+#: src/converse-muc.js:422
 msgid "Change user's affiliation to admin"
 msgstr "Canvia l'afiliació de l'usuari a administrador"
 
-#: src/converse-muc.js:409
+#: src/converse-muc.js:423
 msgid "Ban user from room"
 msgstr "Expulsa l'usuari de la sala"
 
-#: src/converse-muc.js:411
+#: src/converse-muc.js:425
 msgid "Change user role to occupant"
 msgstr "Canvia el rol de l'usuari a ocupant"
 
-#: src/converse-muc.js:413
+#: src/converse-muc.js:427
 msgid "Kick user from room"
 msgstr "Expulsa l'usuari de la sala"
 
-#: src/converse-muc.js:414
+#: src/converse-muc.js:428
 msgid "Write in 3rd person"
 msgstr "Escriu en tercera persona"
 
-#: src/converse-muc.js:415
+#: src/converse-muc.js:429
 msgid "Grant membership to a user"
 msgstr "Atorga una afiliació a un usuari"
 
-#: src/converse-muc.js:416
+#: src/converse-muc.js:430
 msgid "Remove user's ability to post messages"
 msgstr "Elimina la capacitat de l'usuari de publicar missatges"
 
-#: src/converse-muc.js:417
+#: src/converse-muc.js:431
 msgid "Change your nickname"
 msgstr "Canvieu el vostre àlies"
 
-#: src/converse-muc.js:418
+#: src/converse-muc.js:432
 msgid "Grant moderator role to user"
 msgstr "Atorga el rol de moderador a l'usuari"
 
-#: src/converse-muc.js:419
+#: src/converse-muc.js:433
 msgid "Grant ownership of this room"
 msgstr "Atorga la propietat d'aquesta sala"
 
-#: src/converse-muc.js:420
+#: src/converse-muc.js:434
 msgid "Revoke user's membership"
 msgstr "Revoca l'afiliació de l'usuari"
 
-#: src/converse-muc.js:421
+#: src/converse-muc.js:435
 msgid "Set room topic"
 msgstr "Defineix un tema per a la sala"
 
-#: src/converse-muc.js:422
+#: src/converse-muc.js:436
 msgid "Allow muted user to post messages"
 msgstr "Permet que un usuari silenciat publiqui missatges"
 
-#: src/converse-muc.js:581 src/converse-register.js:216
+#: src/converse-muc.js:592 src/converse-register.js:216
 #: src/converse-register.js:331
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#: src/converse-muc.js:624
+#: src/converse-muc.js:635
 msgid "An error occurred while trying to save the form."
 msgstr "S'ha produït un error en intentar desar el formulari."
 
-#: src/converse-muc.js:666
+#: src/converse-muc.js:725
+#, fuzzy
+msgid "Please choose your nickname"
+msgstr "Canvieu el vostre àlies"
+
+#: src/converse-muc.js:726 src/converse-muc.js:1250
+msgid "Nickname"
+msgstr "Àlies"
+
+#: src/converse-muc.js:727
+#, fuzzy
+msgid "Enter room"
+msgstr "Obre la sala"
+
+#: src/converse-muc.js:745
 msgid "This chatroom requires a password"
 msgstr "Aquesta sala de xat requereix una contrasenya"
 
-#: src/converse-muc.js:667
+#: src/converse-muc.js:746
 msgid "Password: "
 msgstr "Contrasenya:"
 
-#: src/converse-muc.js:668
+#: src/converse-muc.js:747
 msgid "Submit"
 msgstr "Envia"
 
-#: src/converse-muc.js:703
+#: src/converse-muc.js:782
 msgid "This room is not anonymous"
 msgstr "Aquesta sala no és anònima"
 
-#: src/converse-muc.js:704
+#: src/converse-muc.js:783
 msgid "This room now shows unavailable members"
 msgstr "Aquesta sala ara mostra membres no disponibles"
 
-#: src/converse-muc.js:705
+#: src/converse-muc.js:784
 msgid "This room does not show unavailable members"
 msgstr "Aquesta sala no mostra membres no disponibles"
 
-#: src/converse-muc.js:706
+#: src/converse-muc.js:785
 msgid "Non-privacy-related room configuration has changed"
 msgstr ""
 "S'ha canviat la configuració de la sala no relacionada amb la privadesa"
 
-#: src/converse-muc.js:707
+#: src/converse-muc.js:786
 msgid "Room logging is now enabled"
 msgstr "El registre de la sala està habilitat"
 
-#: src/converse-muc.js:708
+#: src/converse-muc.js:787
 msgid "Room logging is now disabled"
 msgstr "El registre de la sala està deshabilitat"
 
-#: src/converse-muc.js:709
+#: src/converse-muc.js:788
 msgid "This room is now non-anonymous"
 msgstr "Aquesta sala ara no és anònima"
 
-#: src/converse-muc.js:710
+#: src/converse-muc.js:789
 msgid "This room is now semi-anonymous"
 msgstr "Aquesta sala ara és parcialment anònima"
 
-#: src/converse-muc.js:711
+#: src/converse-muc.js:790
 msgid "This room is now fully-anonymous"
 msgstr "Aquesta sala ara és totalment anònima"
 
-#: src/converse-muc.js:712
+#: src/converse-muc.js:791
 msgid "A new room has been created"
 msgstr "S'ha creat una sala nova"
 
-#: src/converse-muc.js:716 src/converse-muc.js:816
+#: src/converse-muc.js:795 src/converse-muc.js:895
 msgid "You have been banned from this room"
 msgstr "Se us ha expulsat d'aquesta sala"
 
-#: src/converse-muc.js:717
+#: src/converse-muc.js:796
 msgid "You have been kicked from this room"
 msgstr "Se us ha expulsat d'aquesta sala"
 
-#: src/converse-muc.js:718
+#: src/converse-muc.js:797
 msgid "You have been removed from this room because of an affiliation change"
 msgstr "Se us ha eliminat d'aquesta sala a causa d'un canvi d'afiliació"
 
-#: src/converse-muc.js:719
+#: src/converse-muc.js:798
 msgid ""
 "You have been removed from this room because the room has changed to members-"
 "only and you're not a member"
@@ -439,7 +453,7 @@ msgstr ""
 "Se us ha eliminat d'aquesta sala perquè ara només permet membres i no en sou "
 "membre"
 
-#: src/converse-muc.js:720
+#: src/converse-muc.js:799
 msgid ""
 "You have been removed from this room because the MUC (Multi-user chat) "
 "service is being shut down."
@@ -457,207 +471,214 @@ msgstr ""
 #. * can then at least tell gettext to scan for it so that these
 #. * strings are picked up by the translation machinery.
 #.
-#: src/converse-muc.js:734
+#: src/converse-muc.js:813
 msgid "<strong>%1$s</strong> has been banned"
 msgstr "S'ha expulsat <strong>%1$s</strong>"
 
-#: src/converse-muc.js:735
+#: src/converse-muc.js:814
 msgid "<strong>%1$s</strong>'s nickname has changed"
 msgstr "L'àlies de <strong>%1$s</strong> ha canviat"
 
-#: src/converse-muc.js:736
+#: src/converse-muc.js:815
 msgid "<strong>%1$s</strong> has been kicked out"
 msgstr "S'ha expulsat <strong>%1$s</strong>"
 
-#: src/converse-muc.js:737
+#: src/converse-muc.js:816
 msgid "<strong>%1$s</strong> has been removed because of an affiliation change"
 msgstr "S'ha eliminat <strong>%1$s</strong> a causa d'un canvi d'afiliació"
 
-#: src/converse-muc.js:738
+#: src/converse-muc.js:817
 msgid "<strong>%1$s</strong> has been removed for not being a member"
 msgstr "S'ha eliminat <strong>%1$s</strong> perquè no és membre"
 
-#: src/converse-muc.js:742
-msgid "Your nickname has been automatically changed to: <strong>%1$s</strong>"
+#: src/converse-muc.js:821
+#, fuzzy
+msgid "Your nickname has been automatically set to: <strong>%1$s</strong>"
 msgstr "El vostre àlies ha canviat automàticament a: <strong>%1$s</strong>"
 
-#: src/converse-muc.js:743
+#: src/converse-muc.js:822
 msgid "Your nickname has been changed to: <strong>%1$s</strong>"
 msgstr "El vostre àlies ha canviat a: <strong>%1$s</strong>"
 
-#: src/converse-muc.js:790 src/converse-muc.js:799
+#: src/converse-muc.js:869 src/converse-muc.js:878
 msgid "The reason given is: \""
 msgstr "El motiu indicat és: \""
 
-#: src/converse-muc.js:814
+#: src/converse-muc.js:893
 msgid "You are not on the member list of this room"
 msgstr "No sou a la llista de membres d'aquesta sala"
 
-#: src/converse-muc.js:820
+#: src/converse-muc.js:899
 msgid "No nickname was specified"
 msgstr "No s'ha especificat cap àlies"
 
-#: src/converse-muc.js:824
+#: src/converse-muc.js:903
 msgid "You are not allowed to create new rooms"
 msgstr "No teniu permís per crear sales noves"
 
-#: src/converse-muc.js:826
+#: src/converse-muc.js:905
 msgid "Your nickname doesn't conform to this room's policies"
 msgstr "El vostre àlies no s'ajusta a les polítiques d'aquesta sala"
 
-#: src/converse-muc.js:828
-msgid "Your nickname is already taken"
-msgstr "El vostre àlies ja està en ús"
+#: src/converse-muc.js:907
+msgid ""
+"The nickname you chose is reserved or currently in use, please choose a "
+"different one."
+msgstr ""
 
-#: src/converse-muc.js:831
+#: src/converse-muc.js:909
 msgid "This room does not (yet) exist"
 msgstr "Aquesta sala (encara) no existeix"
 
-#: src/converse-muc.js:833
+#: src/converse-muc.js:911
 #, fuzzy
 msgid "This room has reached its maximum number of occupants"
 msgstr "Aquesta sala ha assolit el nombre màxim d'ocupants"
 
-#: src/converse-muc.js:861
+#: src/converse-muc.js:961
 msgid "Topic set by %1$s to: %2$s"
 msgstr "Tema definit per %1$s en: %2$s"
 
-#: src/converse-muc.js:941
-msgid "This user is a moderator"
+#: src/converse-muc.js:1048
+#, fuzzy
+msgid "Click to mention this user in your message."
+msgstr "Feu clic per obrir aquesta sala"
+
+#: src/converse-muc.js:1049
+#, fuzzy
+msgid "This user is a moderator."
 msgstr "Aquest usuari és un moderador"
 
-#: src/converse-muc.js:942
-msgid "This user can send messages in this room"
+#: src/converse-muc.js:1050
+#, fuzzy
+msgid "This user can send messages in this room."
 msgstr "Aquest usuari pot enviar missatges a aquesta sala"
 
-#: src/converse-muc.js:943
-msgid "This user can NOT send messages in this room"
+#: src/converse-muc.js:1051
+#, fuzzy
+msgid "This user can NOT send messages in this room."
 msgstr "Aquest usuari NO pot enviar missatges a aquesta sala"
 
-#: src/converse-muc.js:972
+#: src/converse-muc.js:1087
 #, fuzzy
 msgid "Invite"
 msgstr "Convida..."
 
-#: src/converse-muc.js:973
+#: src/converse-muc.js:1088
 msgid "Occupants"
 msgstr "Ocupants"
 
-#: src/converse-muc.js:1072
+#: src/converse-muc.js:1206
 msgid "You are about to invite %1$s to the chat room \"%2$s\". "
 msgstr "Esteu a punt de convidar %1$s a la sala de xat \"%2$s\". "
 
-#: src/converse-muc.js:1073
+#: src/converse-muc.js:1207
 msgid ""
 "You may optionally include a message, explaining the reason for the "
 "invitation."
 msgstr ""
 "Teniu l'opció d'incloure un missatge per explicar el motiu de la invitació."
 
-#: src/converse-muc.js:1115
+#: src/converse-muc.js:1249
 msgid "Room name"
 msgstr "Nom de la sala"
 
-#: src/converse-muc.js:1116
-msgid "Nickname"
-msgstr "Àlies"
-
-#: src/converse-muc.js:1117
+#: src/converse-muc.js:1251
 msgid "Server"
 msgstr "Servidor"
 
-#: src/converse-muc.js:1118
+#: src/converse-muc.js:1252
 msgid "Join Room"
 msgstr "Uneix-me a la sala"
 
-#: src/converse-muc.js:1119
+#: src/converse-muc.js:1253
 msgid "Show rooms"
 msgstr "Mostra les sales"
 
-#: src/converse-muc.js:1123
+#: src/converse-muc.js:1257
 msgid "Rooms"
 msgstr "Sales"
 
 #. For translators: %1$s is a variable and will be replaced with the XMPP server name
-#: src/converse-muc.js:1143
+#: src/converse-muc.js:1277
 msgid "No rooms on %1$s"
 msgstr "No hi ha cap sala a %1$s"
 
 #. For translators: %1$s is a variable and will be
 #. replaced with the XMPP server name
-#: src/converse-muc.js:1157
+#: src/converse-muc.js:1291
 msgid "Rooms on %1$s"
 msgstr "Sales a %1$s"
 
-#: src/converse-muc.js:1166
+#: src/converse-muc.js:1300
 msgid "Click to open this room"
 msgstr "Feu clic per obrir aquesta sala"
 
-#: src/converse-muc.js:1167
+#: src/converse-muc.js:1301
 msgid "Show more information on this room"
 msgstr "Mostra més informació d'aquesta sala"
 
-#: src/converse-muc.js:1239
+#: src/converse-muc.js:1373
 msgid "Description:"
 msgstr "Descripció:"
 
-#: src/converse-muc.js:1240
+#: src/converse-muc.js:1374
 msgid "Occupants:"
 msgstr "Ocupants:"
 
-#: src/converse-muc.js:1241
+#: src/converse-muc.js:1375
 msgid "Features:"
 msgstr "Característiques:"
 
-#: src/converse-muc.js:1242
+#: src/converse-muc.js:1376
 msgid "Requires authentication"
 msgstr "Cal autenticar-se"
 
-#: src/converse-muc.js:1243
+#: src/converse-muc.js:1377
 msgid "Hidden"
 msgstr "Amagat"
 
-#: src/converse-muc.js:1244
+#: src/converse-muc.js:1378
 msgid "Requires an invitation"
 msgstr "Cal tenir una invitació"
 
-#: src/converse-muc.js:1245
+#: src/converse-muc.js:1379
 msgid "Moderated"
 msgstr "Moderada"
 
-#: src/converse-muc.js:1246
+#: src/converse-muc.js:1380
 msgid "Non-anonymous"
 msgstr "No és anònima"
 
-#: src/converse-muc.js:1247
+#: src/converse-muc.js:1381
 msgid "Open room"
 msgstr "Obre la sala"
 
-#: src/converse-muc.js:1248
+#: src/converse-muc.js:1382
 msgid "Permanent room"
 msgstr "Sala permanent"
 
-#: src/converse-muc.js:1249
+#: src/converse-muc.js:1383
 msgid "Public"
 msgstr "Pública"
 
-#: src/converse-muc.js:1250
+#: src/converse-muc.js:1384
 msgid "Semi-anonymous"
 msgstr "Semianònima"
 
-#: src/converse-muc.js:1251
+#: src/converse-muc.js:1385
 msgid "Temporary room"
 msgstr "Sala temporal"
 
-#: src/converse-muc.js:1252
+#: src/converse-muc.js:1386
 msgid "Unmoderated"
 msgstr "No moderada"
 
-#: src/converse-muc.js:1329
+#: src/converse-muc.js:1456
 msgid "%1$s has invited you to join a chat room: %2$s"
 msgstr "%1$s us ha convidat a unir-vos a una sala de xat: %2$s"
 
-#: src/converse-muc.js:1334
+#: src/converse-muc.js:1461
 msgid ""
 "%1$s has invited you to join a chat room: %2$s, and left the following "
 "reason: \"%3$s\""
@@ -1033,6 +1054,9 @@ msgstr "S'ha produït un error en intentar eliminar "
 msgid "Are you sure you want to decline this contact request?"
 msgstr "Segur que voleu rebutjar aquesta sol·licitud de contacte?"
 
+#~ msgid "Your nickname is already taken"
+#~ msgstr "El vostre àlies ja està en ús"
+
 #~ msgid "View more information on this person"
 #~ msgstr "Mostra més informació d'aquesta persona"
 

locale/converse.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse.js 0.10.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-26 05:57+0000\n"
+"POT-Creation-Date: 2016-07-28 16:03+0000\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"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: src/converse-chatview.js:103 src/converse-headline.js:99
-#: src/converse-muc.js:239
+#: src/converse-muc.js:246
 msgid "You have unread messages"
 msgstr ""
 
@@ -42,12 +42,12 @@ msgstr ""
 msgid "has stopped typing"
 msgstr ""
 
-#: src/converse-chatview.js:332 src/converse-chatview.js:588
+#: src/converse-chatview.js:332 src/converse-chatview.js:592
 #: src/converse-notification.js:171
 msgid "has gone away"
 msgstr ""
 
-#: src/converse-chatview.js:456 src/converse-muc.js:412
+#: src/converse-chatview.js:456 src/converse-muc.js:426
 msgid "Show this menu"
 msgstr ""
 
@@ -55,7 +55,7 @@ msgstr ""
 msgid "Write in the third person"
 msgstr ""
 
-#: src/converse-chatview.js:458 src/converse-muc.js:410
+#: src/converse-chatview.js:458 src/converse-muc.js:424
 msgid "Remove messages"
 msgstr ""
 
@@ -63,27 +63,27 @@ msgstr ""
 msgid "Are you sure you want to clear the messages from this chat box?"
 msgstr ""
 
-#: src/converse-chatview.js:586 src/converse-notification.js:169
+#: src/converse-chatview.js:590 src/converse-notification.js:169
 msgid "has gone offline"
 msgstr ""
 
-#: src/converse-chatview.js:590 src/converse-notification.js:173
+#: src/converse-chatview.js:594 src/converse-notification.js:173
 msgid "is busy"
 msgstr ""
 
-#: src/converse-chatview.js:633
+#: src/converse-chatview.js:637
 msgid "Clear all messages"
 msgstr ""
 
-#: src/converse-chatview.js:634
+#: src/converse-chatview.js:638
 msgid "Hide the list of occupants"
 msgstr ""
 
-#: src/converse-chatview.js:635
+#: src/converse-chatview.js:639
 msgid "Insert a smiley"
 msgstr ""
 
-#: src/converse-chatview.js:636
+#: src/converse-chatview.js:640
 msgid "Start a call"
 msgstr ""
 
@@ -146,7 +146,7 @@ msgstr ""
 msgid "Custom status"
 msgstr ""
 
-#: src/converse-controlbox.js:490 src/converse-muc.js:580
+#: src/converse-controlbox.js:490 src/converse-muc.js:591
 msgid "Save"
 msgstr ""
 
@@ -274,154 +274,166 @@ msgstr ""
 msgid "Minimize this chat box"
 msgstr ""
 
-#: src/converse-muc.js:241
+#: src/converse-muc.js:248
 msgid "Message"
 msgstr ""
 
-#: src/converse-muc.js:302
+#: src/converse-muc.js:316
 msgid "Error: could not execute the command"
 msgstr ""
 
-#: src/converse-muc.js:358
+#: src/converse-muc.js:372
 msgid "Error: the \""
 msgstr ""
 
-#: src/converse-muc.js:368
+#: src/converse-muc.js:382
 msgid "Are you sure you want to clear the messages from this room?"
 msgstr ""
 
-#: src/converse-muc.js:408
+#: src/converse-muc.js:422
 msgid "Change user's affiliation to admin"
 msgstr ""
 
-#: src/converse-muc.js:409
+#: src/converse-muc.js:423
 msgid "Ban user from room"
 msgstr ""
 
-#: src/converse-muc.js:411
+#: src/converse-muc.js:425
 msgid "Change user role to occupant"
 msgstr ""
 
-#: src/converse-muc.js:413
+#: src/converse-muc.js:427
 msgid "Kick user from room"
 msgstr ""
 
-#: src/converse-muc.js:414
+#: src/converse-muc.js:428
 msgid "Write in 3rd person"
 msgstr ""
 
-#: src/converse-muc.js:415
+#: src/converse-muc.js:429
 msgid "Grant membership to a user"
 msgstr ""
 
-#: src/converse-muc.js:416
+#: src/converse-muc.js:430
 msgid "Remove user's ability to post messages"
 msgstr ""
 
-#: src/converse-muc.js:417
+#: src/converse-muc.js:431
 msgid "Change your nickname"
 msgstr ""
 
-#: src/converse-muc.js:418
+#: src/converse-muc.js:432
 msgid "Grant moderator role to user"
 msgstr ""
 
-#: src/converse-muc.js:419
+#: src/converse-muc.js:433
 msgid "Grant ownership of this room"
 msgstr ""
 
-#: src/converse-muc.js:420
+#: src/converse-muc.js:434
 msgid "Revoke user's membership"
 msgstr ""
 
-#: src/converse-muc.js:421
+#: src/converse-muc.js:435
 msgid "Set room topic"
 msgstr ""
 
-#: src/converse-muc.js:422
+#: src/converse-muc.js:436
 msgid "Allow muted user to post messages"
 msgstr ""
 
-#: src/converse-muc.js:581 src/converse-register.js:216
+#: src/converse-muc.js:592 src/converse-register.js:216
 #: src/converse-register.js:331
 msgid "Cancel"
 msgstr ""
 
-#: src/converse-muc.js:624
+#: src/converse-muc.js:635
 msgid "An error occurred while trying to save the form."
 msgstr ""
 
-#: src/converse-muc.js:666
+#: src/converse-muc.js:725
+msgid "Please choose your nickname"
+msgstr ""
+
+#: src/converse-muc.js:726 src/converse-muc.js:1250
+msgid "Nickname"
+msgstr ""
+
+#: src/converse-muc.js:727
+msgid "Enter room"
+msgstr ""
+
+#: src/converse-muc.js:745
 msgid "This chatroom requires a password"
 msgstr ""
 
-#: src/converse-muc.js:667
+#: src/converse-muc.js:746
 msgid "Password: "
 msgstr ""
 
-#: src/converse-muc.js:668
+#: src/converse-muc.js:747
 msgid "Submit"
 msgstr ""
 
-#: src/converse-muc.js:703
+#: src/converse-muc.js:782
 msgid "This room is not anonymous"
 msgstr ""
 
-#: src/converse-muc.js:704
+#: src/converse-muc.js:783
 msgid "This room now shows unavailable members"
 msgstr ""
 
-#: src/converse-muc.js:705
+#: src/converse-muc.js:784
 msgid "This room does not show unavailable members"
 msgstr ""
 
-#: src/converse-muc.js:706
+#: src/converse-muc.js:785
 msgid "Non-privacy-related room configuration has changed"
 msgstr ""
 
-#: src/converse-muc.js:707
+#: src/converse-muc.js:786
 msgid "Room logging is now enabled"
 msgstr ""
 
-#: src/converse-muc.js:708
+#: src/converse-muc.js:787
 msgid "Room logging is now disabled"
 msgstr ""
 
-#: src/converse-muc.js:709
+#: src/converse-muc.js:788
 msgid "This room is now non-anonymous"
 msgstr ""
 
-#: src/converse-muc.js:710
+#: src/converse-muc.js:789
 msgid "This room is now semi-anonymous"
 msgstr ""
 
-#: src/converse-muc.js:711
+#: src/converse-muc.js:790
 msgid "This room is now fully-anonymous"
 msgstr ""
 
-#: src/converse-muc.js:712
+#: src/converse-muc.js:791
 msgid "A new room has been created"
 msgstr ""
 
-#: src/converse-muc.js:716 src/converse-muc.js:816
+#: src/converse-muc.js:795 src/converse-muc.js:895
 msgid "You have been banned from this room"
 msgstr ""
 
-#: src/converse-muc.js:717
+#: src/converse-muc.js:796
 msgid "You have been kicked from this room"
 msgstr ""
 
-#: src/converse-muc.js:718
+#: src/converse-muc.js:797
 msgid "You have been removed from this room because of an affiliation change"
 msgstr ""
 
-#: src/converse-muc.js:719
+#: src/converse-muc.js:798
 msgid ""
 "You have been removed from this room because the room has changed to members-"
 "only and you're not a member"
 msgstr ""
 
-#: src/converse-muc.js:720
+#: src/converse-muc.js:799
 msgid ""
 "You have been removed from this room because the MUC (Multi-user chat) "
 "service is being shut down."
@@ -437,204 +449,206 @@ msgstr ""
 #. * can then at least tell gettext to scan for it so that these
 #. * strings are picked up by the translation machinery.
 #.
-#: src/converse-muc.js:734
+#: src/converse-muc.js:813
 msgid "<strong>%1$s</strong> has been banned"
 msgstr ""
 
-#: src/converse-muc.js:735
+#: src/converse-muc.js:814
 msgid "<strong>%1$s</strong>'s nickname has changed"
 msgstr ""
 
-#: src/converse-muc.js:736
+#: src/converse-muc.js:815
 msgid "<strong>%1$s</strong> has been kicked out"
 msgstr ""
 
-#: src/converse-muc.js:737
+#: src/converse-muc.js:816
 msgid "<strong>%1$s</strong> has been removed because of an affiliation change"
 msgstr ""
 
-#: src/converse-muc.js:738
+#: src/converse-muc.js:817
 msgid "<strong>%1$s</strong> has been removed for not being a member"
 msgstr ""
 
-#: src/converse-muc.js:742
-msgid "Your nickname has been automatically changed to: <strong>%1$s</strong>"
+#: src/converse-muc.js:821
+msgid "Your nickname has been automatically set to: <strong>%1$s</strong>"
 msgstr ""
 
-#: src/converse-muc.js:743
+#: src/converse-muc.js:822
 msgid "Your nickname has been changed to: <strong>%1$s</strong>"
 msgstr ""
 
-#: src/converse-muc.js:790 src/converse-muc.js:799
+#: src/converse-muc.js:869 src/converse-muc.js:878
 msgid "The reason given is: \""
 msgstr ""
 
-#: src/converse-muc.js:814
+#: src/converse-muc.js:893
 msgid "You are not on the member list of this room"
 msgstr ""
 
-#: src/converse-muc.js:820
+#: src/converse-muc.js:899
 msgid "No nickname was specified"
 msgstr ""
 
-#: src/converse-muc.js:824
+#: src/converse-muc.js:903
 msgid "You are not allowed to create new rooms"
 msgstr ""
 
-#: src/converse-muc.js:826
+#: src/converse-muc.js:905
 msgid "Your nickname doesn't conform to this room's policies"
 msgstr ""
 
-#: src/converse-muc.js:828
-msgid "Your nickname is already taken"
+#: src/converse-muc.js:907
+msgid ""
+"The nickname you chose is reserved or currently in use, please choose a "
+"different one."
 msgstr ""
 
-#: src/converse-muc.js:831
+#: src/converse-muc.js:909
 msgid "This room does not (yet) exist"
 msgstr ""
 
-#: src/converse-muc.js:833
+#: src/converse-muc.js:911
 msgid "This room has reached its maximum number of occupants"
 msgstr ""
 
-#: src/converse-muc.js:861
+#: src/converse-muc.js:961
 msgid "Topic set by %1$s to: %2$s"
 msgstr ""
 
-#: src/converse-muc.js:941
-msgid "This user is a moderator"
+#: src/converse-muc.js:1048
+msgid "Click to mention this user in your message."
 msgstr ""
 
-#: src/converse-muc.js:942
-msgid "This user can send messages in this room"
+#: src/converse-muc.js:1049
+msgid "This user is a moderator."
 msgstr ""
 
-#: src/converse-muc.js:943
-msgid "This user can NOT send messages in this room"
+#: src/converse-muc.js:1050
+msgid "This user can send messages in this room."
 msgstr ""
 
-#: src/converse-muc.js:972
+#: src/converse-muc.js:1051
+msgid "This user can NOT send messages in this room."
+msgstr ""
+
+#: src/converse-muc.js:1087
 msgid "Invite"
 msgstr ""
 
-#: src/converse-muc.js:973
+#: src/converse-muc.js:1088
 msgid "Occupants"
 msgstr ""
 
-#: src/converse-muc.js:1072
+#: src/converse-muc.js:1206
 msgid "You are about to invite %1$s to the chat room \"%2$s\". "
 msgstr ""
 
-#: src/converse-muc.js:1073
+#: src/converse-muc.js:1207
 msgid ""
 "You may optionally include a message, explaining the reason for the "
 "invitation."
 msgstr ""
 
-#: src/converse-muc.js:1115
+#: src/converse-muc.js:1249
 msgid "Room name"
 msgstr ""
 
-#: src/converse-muc.js:1116
-msgid "Nickname"
-msgstr ""
-
-#: src/converse-muc.js:1117
+#: src/converse-muc.js:1251
 msgid "Server"
 msgstr ""
 
-#: src/converse-muc.js:1118
+#: src/converse-muc.js:1252
 msgid "Join Room"
 msgstr ""
 
-#: src/converse-muc.js:1119
+#: src/converse-muc.js:1253
 msgid "Show rooms"
 msgstr ""
 
-#: src/converse-muc.js:1123
+#: src/converse-muc.js:1257
 msgid "Rooms"
 msgstr ""
 
 #. For translators: %1$s is a variable and will be replaced with the XMPP server name
-#: src/converse-muc.js:1143
+#: src/converse-muc.js:1277
 msgid "No rooms on %1$s"
 msgstr ""
 
 #. For translators: %1$s is a variable and will be
 #. replaced with the XMPP server name
-#: src/converse-muc.js:1157
+#: src/converse-muc.js:1291
 msgid "Rooms on %1$s"
 msgstr ""
 
-#: src/converse-muc.js:1166
+#: src/converse-muc.js:1300
 msgid "Click to open this room"
 msgstr ""
 
-#: src/converse-muc.js:1167
+#: src/converse-muc.js:1301
 msgid "Show more information on this room"
 msgstr ""
 
-#: src/converse-muc.js:1239
+#: src/converse-muc.js:1373
 msgid "Description:"
 msgstr ""
 
-#: src/converse-muc.js:1240
+#: src/converse-muc.js:1374
 msgid "Occupants:"
 msgstr ""
 
-#: src/converse-muc.js:1241
+#: src/converse-muc.js:1375
 msgid "Features:"
 msgstr ""
 
-#: src/converse-muc.js:1242
+#: src/converse-muc.js:1376
 msgid "Requires authentication"
 msgstr ""
 
-#: src/converse-muc.js:1243
+#: src/converse-muc.js:1377
 msgid "Hidden"
 msgstr ""
 
-#: src/converse-muc.js:1244
+#: src/converse-muc.js:1378
 msgid "Requires an invitation"
 msgstr ""
 
-#: src/converse-muc.js:1245
+#: src/converse-muc.js:1379
 msgid "Moderated"
 msgstr ""
 
-#: src/converse-muc.js:1246
+#: src/converse-muc.js:1380
 msgid "Non-anonymous"
 msgstr ""
 
-#: src/converse-muc.js:1247
+#: src/converse-muc.js:1381
 msgid "Open room"
 msgstr ""
 
-#: src/converse-muc.js:1248
+#: src/converse-muc.js:1382
 msgid "Permanent room"
 msgstr ""
 
-#: src/converse-muc.js:1249
+#: src/converse-muc.js:1383
 msgid "Public"
 msgstr ""
 
-#: src/converse-muc.js:1250
+#: src/converse-muc.js:1384
 msgid "Semi-anonymous"
 msgstr ""
 
-#: src/converse-muc.js:1251
+#: src/converse-muc.js:1385
 msgid "Temporary room"
 msgstr ""
 
-#: src/converse-muc.js:1252
+#: src/converse-muc.js:1386
 msgid "Unmoderated"
 msgstr ""
 
-#: src/converse-muc.js:1329
+#: src/converse-muc.js:1456
 msgid "%1$s has invited you to join a chat room: %2$s"
 msgstr ""
 
-#: src/converse-muc.js:1334
+#: src/converse-muc.js:1461
 msgid ""
 "%1$s has invited you to join a chat room: %2$s, and left the following "
 "reason: \"%3$s\""

locale/de/LC_MESSAGES/converse.json

@@ -295,6 +295,10 @@
             null,
             "Beim Speichern des Formulars ist ein Fehler aufgetreten."
          ],
+         "Nickname": [
+            null,
+            "Spitzname"
+         ],
          "This chatroom requires a password": [
             null,
             "Dieser Raum erfordert ein Passwort"
@@ -387,10 +391,6 @@
             null,
             "<strong>%1$s</strong> ist kein Mitglied und wurde daher entfernt"
          ],
-         "Your nickname has been automatically changed to: <strong>%1$s</strong>": [
-            null,
-            "Ihr Spitzname wurde automatisiert geändert zu: <strong>%1$s</strong>"
-         ],
          "Your nickname has been changed to: <strong>%1$s</strong>": [
             null,
             "Ihr Spitzname wurde geändert zu: <strong>%1$s</strong>"
@@ -415,9 +415,9 @@
             null,
             "Ungültiger Spitzname"
          ],
-         "Your nickname is already taken": [
+         "The nickname you chose is reserved or currently in use, please choose a different one.": [
             null,
-            "Ihre Spitzname existiert bereits."
+            ""
          ],
          "This room does not (yet) exist": [
             null,
@@ -427,18 +427,6 @@
             null,
             "%1$s hat das Thema zu \"%2$s\" geändert"
          ],
-         "This user is a moderator": [
-            null,
-            "Dieser Benutzer ist ein Moderator"
-         ],
-         "This user can send messages in this room": [
-            null,
-            "Dieser Benutzer kann Nachrichten in diesem Raum verschicken"
-         ],
-         "This user can NOT send messages in this room": [
-            null,
-            "Dieser Benutzer kann keine Nachrichten in diesem Raum verschicken"
-         ],
          "Invite": [
             null,
             "Einladen"
@@ -459,10 +447,6 @@
             null,
             "Raumname"
          ],
-         "Nickname": [
-            null,
-            "Spitzname"
-         ],
          "Server": [
             null,
             "Server"

locale/de/LC_MESSAGES/converse.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse.js 0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-26 05:57+0000\n"
+"POT-Creation-Date: 2016-07-28 16:03+0000\n"
 "PO-Revision-Date: 2016-04-07 10:20+0000\n"
 "Last-Translator: JC Brand <jc@opkode.com>\n"
 "Language-Team: German\n"
@@ -21,7 +21,7 @@ msgstr ""
 "plural_forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/converse-chatview.js:103 src/converse-headline.js:99
-#: src/converse-muc.js:239
+#: src/converse-muc.js:246
 #, fuzzy
 msgid "You have unread messages"
 msgstr "Nachrichten entfernen"
@@ -47,12 +47,12 @@ msgstr "tippt"
 msgid "has stopped typing"
 msgstr "tippt nicht mehr"
 
-#: src/converse-chatview.js:332 src/converse-chatview.js:588
+#: src/converse-chatview.js:332 src/converse-chatview.js:592
 #: src/converse-notification.js:171
 msgid "has gone away"
 msgstr "ist jetzt abwesend"
 
-#: src/converse-chatview.js:456 src/converse-muc.js:412
+#: src/converse-chatview.js:456 src/converse-muc.js:426
 msgid "Show this menu"
 msgstr "Dieses Menü anzeigen"
 
@@ -60,7 +60,7 @@ msgstr "Dieses Menü anzeigen"
 msgid "Write in the third person"
 msgstr "In der dritten Person schreiben"
 
-#: src/converse-chatview.js:458 src/converse-muc.js:410
+#: src/converse-chatview.js:458 src/converse-muc.js:424
 msgid "Remove messages"
 msgstr "Nachrichten entfernen"
 
@@ -69,29 +69,29 @@ msgid "Are you sure you want to clear the messages from this chat box?"
 msgstr ""
 "Sind Sie sicher, dass Sie alle Nachrichten dieses Chats löschen möchten?"
 
-#: src/converse-chatview.js:586 src/converse-notification.js:169
+#: src/converse-chatview.js:590 src/converse-notification.js:169
 #, fuzzy
 msgid "has gone offline"
 msgstr "Dieser Kontakt ist offline"
 
-#: src/converse-chatview.js:590 src/converse-notification.js:173
+#: src/converse-chatview.js:594 src/converse-notification.js:173
 msgid "is busy"
 msgstr "ist beschäftigt"
 
-#: src/converse-chatview.js:633
+#: src/converse-chatview.js:637
 msgid "Clear all messages"
 msgstr "Alle Nachrichten löschen"
 
-#: src/converse-chatview.js:634
+#: src/converse-chatview.js:638
 #, fuzzy
 msgid "Hide the list of occupants"
 msgstr "Teilnehmerliste ausblenden"
 
-#: src/converse-chatview.js:635
+#: src/converse-chatview.js:639
 msgid "Insert a smiley"
 msgstr ""
 
-#: src/converse-chatview.js:636
+#: src/converse-chatview.js:640
 msgid "Start a call"
 msgstr ""
 
@@ -156,7 +156,7 @@ msgstr "Hier klicken um Status zu ändern"
 msgid "Custom status"
 msgstr "Statusnachricht"
 
-#: src/converse-controlbox.js:490 src/converse-muc.js:580
+#: src/converse-controlbox.js:490 src/converse-muc.js:591
 msgid "Save"
 msgstr "Speichern"
 
@@ -287,156 +287,170 @@ msgstr "Minimiert"
 msgid "Minimize this chat box"
 msgstr ""
 
-#: src/converse-muc.js:241
+#: src/converse-muc.js:248
 msgid "Message"
 msgstr "Nachricht"
 
-#: src/converse-muc.js:302
+#: src/converse-muc.js:316
 msgid "Error: could not execute the command"
 msgstr "Fehler: Konnte den Befehl nicht ausführen"
 
-#: src/converse-muc.js:358
+#: src/converse-muc.js:372
 msgid "Error: the \""
 msgstr ""
 
-#: src/converse-muc.js:368
+#: src/converse-muc.js:382
 msgid "Are you sure you want to clear the messages from this room?"
 msgstr ""
 "Sind Sie sicher, dass Sie alle Nachrichten in diesem Raum löschen möchten?"
 
-#: src/converse-muc.js:408
+#: src/converse-muc.js:422
 msgid "Change user's affiliation to admin"
 msgstr ""
 
-#: src/converse-muc.js:409
+#: src/converse-muc.js:423
 msgid "Ban user from room"
 msgstr "Verbanne einen Benutzer aus dem Raum."
 
-#: src/converse-muc.js:411
+#: src/converse-muc.js:425
 #, fuzzy
 msgid "Change user role to occupant"
 msgstr "Benutzerrolle zu Teilnehmer ändern"
 
-#: src/converse-muc.js:413
+#: src/converse-muc.js:427
 msgid "Kick user from room"
 msgstr "Werfe einen Benutzer aus dem Raum."
 
-#: src/converse-muc.js:414
+#: src/converse-muc.js:428
 msgid "Write in 3rd person"
 msgstr "In der dritten Person schreiben"
 
-#: src/converse-muc.js:415
+#: src/converse-muc.js:429
 msgid "Grant membership to a user"
 msgstr ""
 
-#: src/converse-muc.js:416
+#: src/converse-muc.js:430
 msgid "Remove user's ability to post messages"
 msgstr ""
 
-#: src/converse-muc.js:417
+#: src/converse-muc.js:431
 msgid "Change your nickname"
 msgstr "Spitznamen ändern"
 
-#: src/converse-muc.js:418
+#: src/converse-muc.js:432
 msgid "Grant moderator role to user"
 msgstr ""
 
-#: src/converse-muc.js:419
+#: src/converse-muc.js:433
 msgid "Grant ownership of this room"
 msgstr "Besitzrechte an diesem Raum vergeben"
 
-#: src/converse-muc.js:420
+#: src/converse-muc.js:434
 msgid "Revoke user's membership"
 msgstr ""
 
-#: src/converse-muc.js:421
+#: src/converse-muc.js:435
 msgid "Set room topic"
 msgstr "Chatraum Thema festlegen"
 
-#: src/converse-muc.js:422
+#: src/converse-muc.js:436
 msgid "Allow muted user to post messages"
 msgstr ""
 
-#: src/converse-muc.js:581 src/converse-register.js:216
+#: src/converse-muc.js:592 src/converse-register.js:216
 #: src/converse-register.js:331
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: src/converse-muc.js:624
+#: src/converse-muc.js:635
 msgid "An error occurred while trying to save the form."
 msgstr "Beim Speichern des Formulars ist ein Fehler aufgetreten."
 
-#: src/converse-muc.js:666
+#: src/converse-muc.js:725
+#, fuzzy
+msgid "Please choose your nickname"
+msgstr "Spitznamen ändern"
+
+#: src/converse-muc.js:726 src/converse-muc.js:1250
+msgid "Nickname"
+msgstr "Spitzname"
+
+#: src/converse-muc.js:727
+#, fuzzy
+msgid "Enter room"
+msgstr "Offener Raum"
+
+#: src/converse-muc.js:745
 msgid "This chatroom requires a password"
 msgstr "Dieser Raum erfordert ein Passwort"
 
-#: src/converse-muc.js:667
+#: src/converse-muc.js:746
 msgid "Password: "
 msgstr "Passwort: "
 
-#: src/converse-muc.js:668
+#: src/converse-muc.js:747
 msgid "Submit"
 msgstr "Abschicken"
 
-#: src/converse-muc.js:703
+#: src/converse-muc.js:782
 msgid "This room is not anonymous"
 msgstr "Dieser Raum ist nicht anonym"
 
-#: src/converse-muc.js:704
+#: src/converse-muc.js:783
 msgid "This room now shows unavailable members"
 msgstr "Dieser Raum zeigt jetzt nicht verfügbare Mitglieder an"
 
-#: src/converse-muc.js:705
+#: src/converse-muc.js:784
 msgid "This room does not show unavailable members"
 msgstr "Dieser Raum zeigt jetzt nicht verfügbare Mitglieder nicht an"
 
-#: src/converse-muc.js:706
+#: src/converse-muc.js:785
 msgid "Non-privacy-related room configuration has changed"
 msgstr "Die Raumkonfiguration hat sich geändert (nicht Privatsphäre relevant)"
 
-#: src/converse-muc.js:707
+#: src/converse-muc.js:786
 msgid "Room logging is now enabled"
 msgstr "Nachrichten in diesem Raum werden ab jetzt protokolliert."
 
-#: src/converse-muc.js:708
+#: src/converse-muc.js:787
 msgid "Room logging is now disabled"
 msgstr "Nachrichten in diesem Raum werden nicht mehr protokolliert."
 
-#: src/converse-muc.js:709
+#: src/converse-muc.js:788
 msgid "This room is now non-anonymous"
 msgstr "Dieser Raum ist jetzt nicht anonym"
 
-#: src/converse-muc.js:710
+#: src/converse-muc.js:789
 msgid "This room is now semi-anonymous"
 msgstr "Dieser Raum ist jetzt teils anonym"
 
-#: src/converse-muc.js:711
+#: src/converse-muc.js:790
 msgid "This room is now fully-anonymous"
 msgstr "Dieser Raum ist jetzt anonym"
 
-#: src/converse-muc.js:712
+#: src/converse-muc.js:791
 msgid "A new room has been created"
 msgstr "Ein neuer Raum wurde erstellt"
 
-#: src/converse-muc.js:716 src/converse-muc.js:816
+#: src/converse-muc.js:795 src/converse-muc.js:895
 msgid "You have been banned from this room"
 msgstr "Sie sind aus diesem Raum verbannt worden"
 
-#: src/converse-muc.js:717
+#: src/converse-muc.js:796
 msgid "You have been kicked from this room"
 msgstr "Sie wurden aus diesem Raum hinausgeworfen"
 
-#: src/converse-muc.js:718
+#: src/converse-muc.js:797
 msgid "You have been removed from this room because of an affiliation change"
 msgstr "Sie wurden wegen einer Zugehörigkeitsänderung entfernt"
 
-#: src/converse-muc.js:719
+#: src/converse-muc.js:798
 msgid ""
 "You have been removed from this room because the room has changed to members-"
 "only and you're not a member"
 msgstr "Sie wurden aus diesem Raum entfernt, da Sie kein Mitglied sind."
 
-#: src/converse-muc.js:720
+#: src/converse-muc.js:799
 msgid ""
 "You have been removed from this room because the MUC (Multi-user chat) "
 "service is being shut down."
@@ -454,206 +468,213 @@ msgstr ""
 #. * can then at least tell gettext to scan for it so that these
 #. * strings are picked up by the translation machinery.
 #.
-#: src/converse-muc.js:734
+#: src/converse-muc.js:813
 msgid "<strong>%1$s</strong> has been banned"
 msgstr "<strong>%1$s</strong> ist verbannt worden"
 
-#: src/converse-muc.js:735
+#: src/converse-muc.js:814
 msgid "<strong>%1$s</strong>'s nickname has changed"
 msgstr "<strong>%1$s</strong> hat den Spitznamen geändert"
 
-#: src/converse-muc.js:736
+#: src/converse-muc.js:815
 msgid "<strong>%1$s</strong> has been kicked out"
 msgstr "<strong>%1$s</strong> wurde hinausgeworfen"
 
-#: src/converse-muc.js:737
+#: src/converse-muc.js:816
 msgid "<strong>%1$s</strong> has been removed because of an affiliation change"
 msgstr ""
 "<strong>%1$s</strong> wurde wegen einer Zugehörigkeitsänderung entfernt"
 
-#: src/converse-muc.js:738
+#: src/converse-muc.js:817
 msgid "<strong>%1$s</strong> has been removed for not being a member"
 msgstr "<strong>%1$s</strong> ist kein Mitglied und wurde daher entfernt"
 
-#: src/converse-muc.js:742
-msgid "Your nickname has been automatically changed to: <strong>%1$s</strong>"
+#: src/converse-muc.js:821
+#, fuzzy
+msgid "Your nickname has been automatically set to: <strong>%1$s</strong>"
 msgstr "Ihr Spitzname wurde automatisiert geändert zu: <strong>%1$s</strong>"
 
-#: src/converse-muc.js:743
+#: src/converse-muc.js:822
 msgid "Your nickname has been changed to: <strong>%1$s</strong>"
 msgstr "Ihr Spitzname wurde geändert zu: <strong>%1$s</strong>"
 
-#: src/converse-muc.js:790 src/converse-muc.js:799
+#: src/converse-muc.js:869 src/converse-muc.js:878
 msgid "The reason given is: \""
 msgstr "Die angegebene Begründung lautet: \""
 
-#: src/converse-muc.js:814
+#: src/converse-muc.js:893
 msgid "You are not on the member list of this room"
 msgstr "Sie sind nicht auf der Mitgliederliste dieses Raums"
 
-#: src/converse-muc.js:820
+#: src/converse-muc.js:899
 msgid "No nickname was specified"
 msgstr "Kein Spitzname festgelegt"
 
-#: src/converse-muc.js:824
+#: src/converse-muc.js:903
 msgid "You are not allowed to create new rooms"
 msgstr "Es ist Ihnen nicht erlaubt neue Räume anzulegen"
 
-#: src/converse-muc.js:826
+#: src/converse-muc.js:905
 msgid "Your nickname doesn't conform to this room's policies"
 msgstr "Ungültiger Spitzname"
 
-#: src/converse-muc.js:828
-msgid "Your nickname is already taken"
-msgstr "Ihre Spitzname existiert bereits."
+#: src/converse-muc.js:907
+msgid ""
+"The nickname you chose is reserved or currently in use, please choose a "
+"different one."
+msgstr ""
 
-#: src/converse-muc.js:831
+#: src/converse-muc.js:909
 msgid "This room does not (yet) exist"
 msgstr "Dieser Raum existiert (noch) nicht"
 
-#: src/converse-muc.js:833
+#: src/converse-muc.js:911
 #, fuzzy
 msgid "This room has reached its maximum number of occupants"
 msgstr "Dieser Raum hat die maximale Mitgliederanzahl erreicht"
 
-#: src/converse-muc.js:861
+#: src/converse-muc.js:961
 msgid "Topic set by %1$s to: %2$s"
 msgstr "%1$s hat das Thema zu \"%2$s\" geändert"
 
-#: src/converse-muc.js:941
-msgid "This user is a moderator"
+#: src/converse-muc.js:1048
+#, fuzzy
+msgid "Click to mention this user in your message."
+msgstr "Hier klicken um diesen Raum zu öffnen"
+
+#: src/converse-muc.js:1049
+#, fuzzy
+msgid "This user is a moderator."
 msgstr "Dieser Benutzer ist ein Moderator"
 
-#: src/converse-muc.js:942
-msgid "This user can send messages in this room"
+#: src/converse-muc.js:1050
+#, fuzzy
+msgid "This user can send messages in this room."
 msgstr "Dieser Benutzer kann Nachrichten in diesem Raum verschicken"
 
-#: src/converse-muc.js:943
-msgid "This user can NOT send messages in this room"
+#: src/converse-muc.js:1051
+#, fuzzy
+msgid "This user can NOT send messages in this room."
 msgstr "Dieser Benutzer kann keine Nachrichten in diesem Raum verschicken"
 
-#: src/converse-muc.js:972
+#: src/converse-muc.js:1087
 msgid "Invite"
 msgstr "Einladen"
 
-#: src/converse-muc.js:973
+#: src/converse-muc.js:1088
 msgid "Occupants"
 msgstr "Teilnehmer"
 
-#: src/converse-muc.js:1072
+#: src/converse-muc.js:1206
 msgid "You are about to invite %1$s to the chat room \"%2$s\". "
 msgstr ""
 
-#: src/converse-muc.js:1073
+#: src/converse-muc.js:1207
 msgid ""
 "You may optionally include a message, explaining the reason for the "
 "invitation."
 msgstr ""
 
-#: src/converse-muc.js:1115
+#: src/converse-muc.js:1249
 msgid "Room name"
 msgstr "Raumname"
 
-#: src/converse-muc.js:1116
-msgid "Nickname"
-msgstr "Spitzname"
-
-#: src/converse-muc.js:1117
+#: src/converse-muc.js:1251
 msgid "Server"
 msgstr "Server"
 
-#: src/converse-muc.js:1118
+#: src/converse-muc.js:1252
 msgid "Join Room"
 msgstr "Raum betreten"
 
-#: src/converse-muc.js:1119
+#: src/converse-muc.js:1253
 msgid "Show rooms"
 msgstr "Räume anzeigen"
 
-#: src/converse-muc.js:1123
+#: src/converse-muc.js:1257
 msgid "Rooms"
 msgstr "Räume"
 
 #. For translators: %1$s is a variable and will be replaced with the XMPP server name
-#: src/converse-muc.js:1143
+#: src/converse-muc.js:1277
 msgid "No rooms on %1$s"
 msgstr "Keine Räume auf %1$s"
 
 #. For translators: %1$s is a variable and will be
 #. replaced with the XMPP server name
-#: src/converse-muc.js:1157
+#: src/converse-muc.js:1291
 msgid "Rooms on %1$s"
 msgstr "Räume auf %1$s"
 
-#: src/converse-muc.js:1166
+#: src/converse-muc.js:1300
 msgid "Click to open this room"
 msgstr "Hier klicken um diesen Raum zu öffnen"
 
-#: src/converse-muc.js:1167
+#: src/converse-muc.js:1301
 msgid "Show more information on this room"
 msgstr "Mehr Information über diesen Raum zeigen"
 
-#: src/converse-muc.js:1239
+#: src/converse-muc.js:1373
 msgid "Description:"
 msgstr "Beschreibung"
 
-#: src/converse-muc.js:1240
+#: src/converse-muc.js:1374
 msgid "Occupants:"
 msgstr "Teilnehmer"
 
-#: src/converse-muc.js:1241
+#: src/converse-muc.js:1375
 msgid "Features:"
 msgstr "Funktionen:"
 
-#: src/converse-muc.js:1242
+#: src/converse-muc.js:1376
 msgid "Requires authentication"
 msgstr "Authentifizierung erforderlich"
 
-#: src/converse-muc.js:1243
+#: src/converse-muc.js:1377
 msgid "Hidden"
 msgstr "Versteckt"
 
-#: src/converse-muc.js:1244
+#: src/converse-muc.js:1378
 msgid "Requires an invitation"
 msgstr "Einladung erforderlich"
 
-#: src/converse-muc.js:1245
+#: src/converse-muc.js:1379
 msgid "Moderated"
 msgstr "Moderiert"
 
-#: src/converse-muc.js:1246
+#: src/converse-muc.js:1380
 msgid "Non-anonymous"
 msgstr "Nicht anonym"
 
-#: src/converse-muc.js:1247
+#: src/converse-muc.js:1381
 msgid "Open room"
 msgstr "Offener Raum"
 
-#: src/converse-muc.js:1248
+#: src/converse-muc.js:1382
 msgid "Permanent room"
 msgstr "Dauerhafter Raum"
 
-#: src/converse-muc.js:1249
+#: src/converse-muc.js:1383
 msgid "Public"
 msgstr "Öffentlich"
 
-#: src/converse-muc.js:1250
+#: src/converse-muc.js:1384
 msgid "Semi-anonymous"
 msgstr "Teils anonym"
 
-#: src/converse-muc.js:1251
+#: src/converse-muc.js:1385
 msgid "Temporary room"
 msgstr "Vorübergehender Raum"
 
-#: src/converse-muc.js:1252
+#: src/converse-muc.js:1386
 msgid "Unmoderated"
 msgstr "Unmoderiert"
 
-#: src/converse-muc.js:1329
+#: src/converse-muc.js:1456
 msgid "%1$s has invited you to join a chat room: %2$s"
 msgstr "%1$s hat Sie in den Raum \"%2$s\" eingeladen"
 
-#: src/converse-muc.js:1334
+#: src/converse-muc.js:1461
 msgid ""
 "%1$s has invited you to join a chat room: %2$s, and left the following "
 "reason: \"%3$s\""
@@ -1000,6 +1021,9 @@ msgstr ""
 msgid "Are you sure you want to decline this contact request?"
 msgstr "Wollen Sie diese Kontaktanfrage wirklich ablehnen?"
 
+#~ msgid "Your nickname is already taken"
+#~ msgstr "Ihre Spitzname existiert bereits."
+
 #~ msgid "Type to filter"
 #~ msgstr "Tippen um zu filtern"
 

locale/en/LC_MESSAGES/converse.json

@@ -323,6 +323,14 @@
             null,
             "An error occurred while trying to save the form."
          ],
+         "Please choose your nickname": [
+            null,
+            ""
+         ],
+         "Nickname": [
+            null,
+            ""
+         ],
          "This chatroom requires a password": [
             null,
             "This chatroom requires a password"
@@ -415,7 +423,7 @@
             null,
             "<strong>%1$s</strong> has been removed for not being a member"
          ],
-         "Your nickname has been automatically changed to: <strong>%1$s</strong>": [
+         "Your nickname has been automatically set to: <strong>%1$s</strong>": [
             null,
             ""
          ],
@@ -443,9 +451,9 @@
             null,
             "Your nickname doesn't conform to this room's policies"
          ],
-         "Your nickname is already taken": [
+         "The nickname you chose is reserved or currently in use, please choose a different one.": [
             null,
-            "Your nickname is already taken"
+            ""
          ],
          "This room does not (yet) exist": [
             null,
@@ -455,18 +463,6 @@
             null,
             "Topic set by %1$s to: %2$s"
          ],
-         "This user is a moderator": [
-            null,
-            "This user is a moderator"
-         ],
-         "This user can send messages in this room": [
-            null,
-            "This user can send messages in this room"
-         ],
-         "This user can NOT send messages in this room": [
-            null,
-            "This user can NOT send messages in this room"
-         ],
          "Invite": [
             null,
             ""
@@ -487,10 +483,6 @@
             null,
             ""
          ],
-         "Nickname": [
-            null,
-            ""
-         ],
          "Server": [
             null,
             "Server"

locale/en/LC_MESSAGES/converse.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse.js 0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-26 05:57+0000\n"
+"POT-Creation-Date: 2016-07-28 16:03+0000\n"
 "PO-Revision-Date: 2015-05-01 12:37+0200\n"
 "Last-Translator: JC Brand <jc@opkode.com>\n"
 "Language-Team: English\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/converse-chatview.js:103 src/converse-headline.js:99
-#: src/converse-muc.js:239
+#: src/converse-muc.js:246
 #, fuzzy
 msgid "You have unread messages"
 msgstr "Remove messages"
@@ -43,12 +43,12 @@ msgstr ""
 msgid "has stopped typing"
 msgstr ""
 
-#: src/converse-chatview.js:332 src/converse-chatview.js:588
+#: src/converse-chatview.js:332 src/converse-chatview.js:592
 #: src/converse-notification.js:171
 msgid "has gone away"
 msgstr ""
 
-#: src/converse-chatview.js:456 src/converse-muc.js:412
+#: src/converse-chatview.js:456 src/converse-muc.js:426
 msgid "Show this menu"
 msgstr "Show this menu"
 
@@ -56,7 +56,7 @@ msgstr "Show this menu"
 msgid "Write in the third person"
 msgstr "Write in the third person"
 
-#: src/converse-chatview.js:458 src/converse-muc.js:410
+#: src/converse-chatview.js:458 src/converse-muc.js:424
 msgid "Remove messages"
 msgstr "Remove messages"
 
@@ -64,27 +64,27 @@ msgstr "Remove messages"
 msgid "Are you sure you want to clear the messages from this chat box?"
 msgstr ""
 
-#: src/converse-chatview.js:586 src/converse-notification.js:169
+#: src/converse-chatview.js:590 src/converse-notification.js:169
 msgid "has gone offline"
 msgstr ""
 
-#: src/converse-chatview.js:590 src/converse-notification.js:173
+#: src/converse-chatview.js:594 src/converse-notification.js:173
 msgid "is busy"
 msgstr ""
 
-#: src/converse-chatview.js:633
+#: src/converse-chatview.js:637
 msgid "Clear all messages"
 msgstr ""
 
-#: src/converse-chatview.js:634
+#: src/converse-chatview.js:638
 msgid "Hide the list of occupants"
 msgstr ""
 
-#: src/converse-chatview.js:635
+#: src/converse-chatview.js:639
 msgid "Insert a smiley"
 msgstr ""
 
-#: src/converse-chatview.js:636
+#: src/converse-chatview.js:640
 msgid "Start a call"
 msgstr ""
 
@@ -148,7 +148,7 @@ msgstr "Click to change your chat status"
 msgid "Custom status"
 msgstr "Custom status"
 
-#: src/converse-controlbox.js:490 src/converse-muc.js:580
+#: src/converse-controlbox.js:490 src/converse-muc.js:591
 msgid "Save"
 msgstr "Save"
 
@@ -277,148 +277,161 @@ msgstr ""
 msgid "Minimize this chat box"
 msgstr ""
 
-#: src/converse-muc.js:241
+#: src/converse-muc.js:248
 msgid "Message"
 msgstr "Message"
 
-#: src/converse-muc.js:302
+#: src/converse-muc.js:316
 msgid "Error: could not execute the command"
 msgstr ""
 
-#: src/converse-muc.js:358
+#: src/converse-muc.js:372
 msgid "Error: the \""
 msgstr ""
 
-#: src/converse-muc.js:368
+#: src/converse-muc.js:382
 msgid "Are you sure you want to clear the messages from this room?"
 msgstr ""
 
-#: src/converse-muc.js:408
+#: src/converse-muc.js:422
 msgid "Change user's affiliation to admin"
 msgstr ""
 
-#: src/converse-muc.js:409
+#: src/converse-muc.js:423
 msgid "Ban user from room"
 msgstr ""
 
-#: src/converse-muc.js:411
+#: src/converse-muc.js:425
 msgid "Change user role to occupant"
 msgstr ""
 
-#: src/converse-muc.js:413
+#: src/converse-muc.js:427
 msgid "Kick user from room"
 msgstr ""
 
-#: src/converse-muc.js:414
+#: src/converse-muc.js:428
 msgid "Write in 3rd person"
 msgstr ""
 
-#: src/converse-muc.js:415
+#: src/converse-muc.js:429
 msgid "Grant membership to a user"
 msgstr ""
 
-#: src/converse-muc.js:416
+#: src/converse-muc.js:430
 msgid "Remove user's ability to post messages"
 msgstr ""
 
-#: src/converse-muc.js:417
+#: src/converse-muc.js:431
 msgid "Change your nickname"
 msgstr ""
 
-#: src/converse-muc.js:418
+#: src/converse-muc.js:432
 msgid "Grant moderator role to user"
 msgstr ""
 
-#: src/converse-muc.js:419
+#: src/converse-muc.js:433
 msgid "Grant ownership of this room"
 msgstr ""
 
-#: src/converse-muc.js:420
+#: src/converse-muc.js:434
 msgid "Revoke user's membership"
 msgstr ""
 
-#: src/converse-muc.js:421
+#: src/converse-muc.js:435
 msgid "Set room topic"
 msgstr ""
 
-#: src/converse-muc.js:422
+#: src/converse-muc.js:436
 msgid "Allow muted user to post messages"
 msgstr ""
 
-#: src/converse-muc.js:581 src/converse-register.js:216
+#: src/converse-muc.js:592 src/converse-register.js:216
 #: src/converse-register.js:331
 msgid "Cancel"
 msgstr "Cancel"
 
-#: src/converse-muc.js:624
+#: src/converse-muc.js:635
 msgid "An error occurred while trying to save the form."
 msgstr "An error occurred while trying to save the form."
 
-#: src/converse-muc.js:666
+#: src/converse-muc.js:725
+msgid "Please choose your nickname"
+msgstr ""
+
+#: src/converse-muc.js:726 src/converse-muc.js:1250
+msgid "Nickname"
+msgstr ""
+
+#: src/converse-muc.js:727
+#, fuzzy
+msgid "Enter room"
+msgstr "Open room"
+
+#: src/converse-muc.js:745
 msgid "This chatroom requires a password"
 msgstr "This chatroom requires a password"
 
-#: src/converse-muc.js:667
+#: src/converse-muc.js:746
 msgid "Password: "
 msgstr "Password: "
 
-#: src/converse-muc.js:668
+#: src/converse-muc.js:747
 msgid "Submit"
 msgstr "Submit"
 
-#: src/converse-muc.js:703
+#: src/converse-muc.js:782
 msgid "This room is not anonymous"
 msgstr "This room is not anonymous"
 
-#: src/converse-muc.js:704
+#: src/converse-muc.js:783
 msgid "This room now shows unavailable members"
 msgstr "This room now shows unavailable members"
 
-#: src/converse-muc.js:705
+#: src/converse-muc.js:784
 msgid "This room does not show unavailable members"
 msgstr "This room does not show unavailable members"
 
-#: src/converse-muc.js:706
+#: src/converse-muc.js:785
 msgid "Non-privacy-related room configuration has changed"
 msgstr "Non-privacy-related room configuration has changed"
 
-#: src/converse-muc.js:707
+#: src/converse-muc.js:786
 msgid "Room logging is now enabled"
 msgstr "Room logging is now enabled"
 
-#: src/converse-muc.js:708
+#: src/converse-muc.js:787
 msgid "Room logging is now disabled"
 msgstr "Room logging is now disabled"
 
-#: src/converse-muc.js:709
+#: src/converse-muc.js:788
 msgid "This room is now non-anonymous"
 msgstr "This room is now non-anonymous"
 
-#: src/converse-muc.js:710
+#: src/converse-muc.js:789
 msgid "This room is now semi-anonymous"
 msgstr "This room is now semi-anonymous"
 
-#: src/converse-muc.js:711
+#: src/converse-muc.js:790
 msgid "This room is now fully-anonymous"
 msgstr "This room is now fully-anonymous"
 
-#: src/converse-muc.js:712
+#: src/converse-muc.js:791
 msgid "A new room has been created"
 msgstr "A new room has been created"
 
-#: src/converse-muc.js:716 src/converse-muc.js:816
+#: src/converse-muc.js:795 src/converse-muc.js:895
 msgid "You have been banned from this room"
 msgstr "You have been banned from this room"
 
-#: src/converse-muc.js:717
+#: src/converse-muc.js:796
 msgid "You have been kicked from this room"
 msgstr "You have been kicked from this room"
 
-#: src/converse-muc.js:718
+#: src/converse-muc.js:797
 msgid "You have been removed from this room because of an affiliation change"
 msgstr "You have been removed from this room because of an affiliation change"
 
-#: src/converse-muc.js:719
+#: src/converse-muc.js:798
 msgid ""
 "You have been removed from this room because the room has changed to members-"
 "only and you're not a member"
@@ -426,7 +439,7 @@ msgstr ""
 "You have been removed from this room because the room has changed to members-"
 "only and you're not a member"
 
-#: src/converse-muc.js:720
+#: src/converse-muc.js:799
 msgid ""
 "You have been removed from this room because the MUC (Multi-user chat) "
 "service is being shut down."
@@ -444,206 +457,212 @@ msgstr ""
 #. * can then at least tell gettext to scan for it so that these
 #. * strings are picked up by the translation machinery.
 #.
-#: src/converse-muc.js:734
+#: src/converse-muc.js:813
 msgid "<strong>%1$s</strong> has been banned"
 msgstr "<strong>%1$s</strong> has been banned"
 
-#: src/converse-muc.js:735
+#: src/converse-muc.js:814
 msgid "<strong>%1$s</strong>'s nickname has changed"
 msgstr ""
 
-#: src/converse-muc.js:736
+#: src/converse-muc.js:815
 msgid "<strong>%1$s</strong> has been kicked out"
 msgstr "<strong>%1$s</strong> has been kicked out"
 
-#: src/converse-muc.js:737
+#: src/converse-muc.js:816
 msgid "<strong>%1$s</strong> has been removed because of an affiliation change"
 msgstr ""
 "<strong>%1$s</strong> has been removed because of an affiliation change"
 
-#: src/converse-muc.js:738
+#: src/converse-muc.js:817
 msgid "<strong>%1$s</strong> has been removed for not being a member"
 msgstr "<strong>%1$s</strong> has been removed for not being a member"
 
-#: src/converse-muc.js:742
-msgid "Your nickname has been automatically changed to: <strong>%1$s</strong>"
+#: src/converse-muc.js:821
+msgid "Your nickname has been automatically set to: <strong>%1$s</strong>"
 msgstr ""
 
-#: src/converse-muc.js:743
+#: src/converse-muc.js:822
 msgid "Your nickname has been changed to: <strong>%1$s</strong>"
 msgstr ""
 
-#: src/converse-muc.js:790 src/converse-muc.js:799
+#: src/converse-muc.js:869 src/converse-muc.js:878
 msgid "The reason given is: \""
 msgstr ""
 
-#: src/converse-muc.js:814
+#: src/converse-muc.js:893
 msgid "You are not on the member list of this room"
 msgstr "You are not on the member list of this room"
 
-#: src/converse-muc.js:820
+#: src/converse-muc.js:899
 msgid "No nickname was specified"
 msgstr "No nickname was specified"
 
-#: src/converse-muc.js:824
+#: src/converse-muc.js:903
 msgid "You are not allowed to create new rooms"
 msgstr "You are not allowed to create new rooms"
 
-#: src/converse-muc.js:826
+#: src/converse-muc.js:905
 msgid "Your nickname doesn't conform to this room's policies"
 msgstr "Your nickname doesn't conform to this room's policies"
 
-#: src/converse-muc.js:828
-msgid "Your nickname is already taken"
-msgstr "Your nickname is already taken"
+#: src/converse-muc.js:907
+msgid ""
+"The nickname you chose is reserved or currently in use, please choose a "
+"different one."
+msgstr ""
 
-#: src/converse-muc.js:831
+#: src/converse-muc.js:909
 msgid "This room does not (yet) exist"
 msgstr "This room does not (yet) exist"
 
-#: src/converse-muc.js:833
+#: src/converse-muc.js:911
 #, fuzzy
 msgid "This room has reached its maximum number of occupants"
 msgstr "This room has reached it's maximum number of occupants"
 
-#: src/converse-muc.js:861
+#: src/converse-muc.js:961
 msgid "Topic set by %1$s to: %2$s"
 msgstr "Topic set by %1$s to: %2$s"
 
-#: src/converse-muc.js:941
-msgid "This user is a moderator"
+#: src/converse-muc.js:1048
+#, fuzzy
+msgid "Click to mention this user in your message."
+msgstr "Click to open this room"
+
+#: src/converse-muc.js:1049
+#, fuzzy
+msgid "This user is a moderator."
 msgstr "This user is a moderator"
 
-#: src/converse-muc.js:942
-msgid "This user can send messages in this room"
+#: src/converse-muc.js:1050
+#, fuzzy
+msgid "This user can send messages in this room."
 msgstr "This user can send messages in this room"
 
-#: src/converse-muc.js:943
-msgid "This user can NOT send messages in this room"
+#: src/converse-muc.js:1051
+#, fuzzy
+msgid "This user can NOT send messages in this room."
 msgstr "This user can NOT send messages in this room"
 
-#: src/converse-muc.js:972
+#: src/converse-muc.js:1087
 msgid "Invite"
 msgstr ""
 
-#: src/converse-muc.js:973
+#: src/converse-muc.js:1088
 msgid "Occupants"
 msgstr ""
 
-#: src/converse-muc.js:1072
+#: src/converse-muc.js:1206
 msgid "You are about to invite %1$s to the chat room \"%2$s\". "
 msgstr ""
 
-#: src/converse-muc.js:1073
+#: src/converse-muc.js:1207
 msgid ""
 "You may optionally include a message, explaining the reason for the "
 "invitation."
 msgstr ""
 
-#: src/converse-muc.js:1115
+#: src/converse-muc.js:1249
 msgid "Room name"
 msgstr ""
 
-#: src/converse-muc.js:1116
-msgid "Nickname"
-msgstr ""
-
-#: src/converse-muc.js:1117
+#: src/converse-muc.js:1251
 msgid "Server"
 msgstr "Server"
 
-#: src/converse-muc.js:1118
+#: src/converse-muc.js:1252
 msgid "Join Room"
 msgstr ""
 
-#: src/converse-muc.js:1119
+#: src/converse-muc.js:1253
 msgid "Show rooms"
 msgstr ""
 
-#: src/converse-muc.js:1123
+#: src/converse-muc.js:1257
 msgid "Rooms"
 msgstr ""
 
 #. For translators: %1$s is a variable and will be replaced with the XMPP server name
-#: src/converse-muc.js:1143
+#: src/converse-muc.js:1277
 msgid "No rooms on %1$s"
 msgstr ""
 
 #. For translators: %1$s is a variable and will be
 #. replaced with the XMPP server name
-#: src/converse-muc.js:1157
+#: src/converse-muc.js:1291
 msgid "Rooms on %1$s"
 msgstr "Rooms on %1$s"
 
-#: src/converse-muc.js:1166
+#: src/converse-muc.js:1300
 msgid "Click to open this room"
 msgstr "Click to open this room"
 
-#: src/converse-muc.js:1167
+#: src/converse-muc.js:1301
 msgid "Show more information on this room"
 msgstr "Show more information on this room"
 
-#: src/converse-muc.js:1239
+#: src/converse-muc.js:1373
 msgid "Description:"
 msgstr "Description:"
 
-#: src/converse-muc.js:1240
+#: src/converse-muc.js:1374
 msgid "Occupants:"
 msgstr "Occupants:"
 
-#: src/converse-muc.js:1241
+#: src/converse-muc.js:1375
 msgid "Features:"
 msgstr "Features:"
 
-#: src/converse-muc.js:1242
+#: src/converse-muc.js:1376
 msgid "Requires authentication"
 msgstr "Requires authentication"
 
-#: src/converse-muc.js:1243
+#: src/converse-muc.js:1377
 msgid "Hidden"
 msgstr "Hidden"
 
-#: src/converse-muc.js:1244
+#: src/converse-muc.js:1378
 msgid "Requires an invitation"
 msgstr "Requires an invitation"
 
-#: src/converse-muc.js:1245
+#: src/converse-muc.js:1379
 msgid "Moderated"
 msgstr "Moderated"
 
-#: src/converse-muc.js:1246
+#: src/converse-muc.js:1380
 msgid "Non-anonymous"
 msgstr "Non-anonymous"
 
-#: src/converse-muc.js:1247
+#: src/converse-muc.js:1381
 msgid "Open room"
 msgstr "Open room"
 
-#: src/converse-muc.js:1248
+#: src/converse-muc.js:1382
 msgid "Permanent room"
 msgstr "Permanent room"
 
-#: src/converse-muc.js:1249
+#: src/converse-muc.js:1383
 msgid "Public"
 msgstr "Public"
 
-#: src/converse-muc.js:1250
+#: src/converse-muc.js:1384
 msgid "Semi-anonymous"
 msgstr "Semi-anonymous"
 
-#: src/converse-muc.js:1251
+#: src/converse-muc.js:1385
 msgid "Temporary room"
 msgstr "Temporary room"
 
-#: src/converse-muc.js:1252
+#: src/converse-muc.js:1386
 msgid "Unmoderated"
 msgstr "Unmoderated"
 
-#: src/converse-muc.js:1329
+#: src/converse-muc.js:1456
 msgid "%1$s has invited you to join a chat room: %2$s"
 msgstr ""
 
-#: src/converse-muc.js:1334
+#: src/converse-muc.js:1461
 msgid ""
 "%1$s has invited you to join a chat room: %2$s, and left the following "
 "reason: \"%3$s\""
@@ -984,6 +1003,9 @@ msgstr ""
 msgid "Are you sure you want to decline this contact request?"
 msgstr ""
 
+#~ msgid "Your nickname is already taken"
+#~ msgstr "Your nickname is already taken"
+
 #, fuzzy
 #~ msgid "View more information on this person"
 #~ msgstr "Show more information on this room"

locale/es/LC_MESSAGES/converse.json

@@ -255,6 +255,14 @@
             null,
             "Un error ocurrío mientras se guardaba el formulario."
          ],
+         "Please choose your nickname": [
+            null,
+            ""
+         ],
+         "Nickname": [
+            null,
+            "Apodo"
+         ],
          "This chatroom requires a password": [
             null,
             "Esta sala de chat requiere una contraseña."
@@ -363,9 +371,9 @@
             null,
             "Su apodo no se ajusta a la política de esta sala"
          ],
-         "Your nickname is already taken": [
+         "The nickname you chose is reserved or currently in use, please choose a different one.": [
             null,
-            "Su apodo ya ha sido tomando por otro usuario"
+            ""
          ],
          "This room does not (yet) exist": [
             null,
@@ -375,18 +383,6 @@
             null,
             "Tema fijado por %1$s a: %2$s"
          ],
-         "This user is a moderator": [
-            null,
-            "Este usuario es un moderador"
-         ],
-         "This user can send messages in this room": [
-            null,
-            "Este usuario puede enviar mensajes en esta sala"
-         ],
-         "This user can NOT send messages in this room": [
-            null,
-            "Este usuario NO puede enviar mensajes en esta"
-         ],
          "Invite": [
             null,
             ""
@@ -407,10 +403,6 @@
             null,
             "Nombre de sala"
          ],
-         "Nickname": [
-            null,
-            "Apodo"
-         ],
          "Server": [
             null,
             "Servidor"

locale/es/LC_MESSAGES/converse.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse.js 0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-26 05:57+0000\n"
+"POT-Creation-Date: 2016-07-28 16:03+0000\n"
 "PO-Revision-Date: 2016-04-07 10:21+0000\n"
 "Last-Translator: Javier Lopez <m@javier.io>\n"
 "Language-Team: ES <LL@li.org>\n"
@@ -26,7 +26,7 @@ msgstr ""
 "gt es-hn es-mx es-ni es-pa es-py es-pe es-pr es-us es-uy es-ve\n"
 
 #: src/converse-chatview.js:103 src/converse-headline.js:99
-#: src/converse-muc.js:239
+#: src/converse-muc.js:246
 #, fuzzy
 msgid "You have unread messages"
 msgstr "Eliminar mensajes"
@@ -52,13 +52,13 @@ msgstr ""
 msgid "has stopped typing"
 msgstr ""
 
-#: src/converse-chatview.js:332 src/converse-chatview.js:588
+#: src/converse-chatview.js:332 src/converse-chatview.js:592
 #: src/converse-notification.js:171
 #, fuzzy
 msgid "has gone away"
 msgstr "Este contacto está ausente"
 
-#: src/converse-chatview.js:456 src/converse-muc.js:412
+#: src/converse-chatview.js:456 src/converse-muc.js:426
 msgid "Show this menu"
 msgstr "Mostrar este menú"
 
@@ -66,7 +66,7 @@ msgstr "Mostrar este menú"
 msgid "Write in the third person"
 msgstr "Escribir en tercera persona"
 
-#: src/converse-chatview.js:458 src/converse-muc.js:410
+#: src/converse-chatview.js:458 src/converse-muc.js:424
 msgid "Remove messages"
 msgstr "Eliminar mensajes"
 
@@ -74,30 +74,30 @@ msgstr "Eliminar mensajes"
 msgid "Are you sure you want to clear the messages from this chat box?"
 msgstr "¿Está seguro de querer limpiar los mensajes de esta conversación?"
 
-#: src/converse-chatview.js:586 src/converse-notification.js:169
+#: src/converse-chatview.js:590 src/converse-notification.js:169
 #, fuzzy
 msgid "has gone offline"
 msgstr "Este contacto está desconectado"
 
-#: src/converse-chatview.js:590 src/converse-notification.js:173
+#: src/converse-chatview.js:594 src/converse-notification.js:173
 #, fuzzy
 msgid "is busy"
 msgstr "ocupado"
 
-#: src/converse-chatview.js:633
+#: src/converse-chatview.js:637
 #, fuzzy
 msgid "Clear all messages"
 msgstr "Mensaje personal"
 
-#: src/converse-chatview.js:634
+#: src/converse-chatview.js:638
 msgid "Hide the list of occupants"
 msgstr ""
 
-#: src/converse-chatview.js:635
+#: src/converse-chatview.js:639
 msgid "Insert a smiley"
 msgstr ""
 
-#: src/converse-chatview.js:636
+#: src/converse-chatview.js:640
 msgid "Start a call"
 msgstr ""
 
@@ -164,7 +164,7 @@ msgstr "Haga click para cambiar su estatus de chat"
 msgid "Custom status"
 msgstr "Personalizar estatus"
 
-#: src/converse-controlbox.js:490 src/converse-muc.js:580
+#: src/converse-controlbox.js:490 src/converse-muc.js:591
 msgid "Save"
 msgstr "Guardar"
 
@@ -297,155 +297,168 @@ msgstr "Minimizado"
 msgid "Minimize this chat box"
 msgstr ""
 
-#: src/converse-muc.js:241
+#: src/converse-muc.js:248
 msgid "Message"
 msgstr "Mensaje"
 
-#: src/converse-muc.js:302
+#: src/converse-muc.js:316
 msgid "Error: could not execute the command"
 msgstr ""
 
-#: src/converse-muc.js:358
+#: src/converse-muc.js:372
 msgid "Error: the \""
 msgstr ""
 
-#: src/converse-muc.js:368
+#: src/converse-muc.js:382
 msgid "Are you sure you want to clear the messages from this room?"
 msgstr "¿Está seguro de querer limpiar los mensajes de esta sala?"
 
-#: src/converse-muc.js:408
+#: src/converse-muc.js:422
 msgid "Change user's affiliation to admin"
 msgstr ""
 
-#: src/converse-muc.js:409
+#: src/converse-muc.js:423
 #, fuzzy
 msgid "Ban user from room"
 msgstr "Prohibir usuario de sala de chat."
 
-#: src/converse-muc.js:411
+#: src/converse-muc.js:425
 msgid "Change user role to occupant"
 msgstr ""
 
-#: src/converse-muc.js:413
+#: src/converse-muc.js:427
 #, fuzzy
 msgid "Kick user from room"
 msgstr "Expulsar usuario de sala de chat."
 
-#: src/converse-muc.js:414
+#: src/converse-muc.js:428
 #, fuzzy
 msgid "Write in 3rd person"
 msgstr "Escribir en tercera persona"
 
-#: src/converse-muc.js:415
+#: src/converse-muc.js:429
 msgid "Grant membership to a user"
 msgstr ""
 
-#: src/converse-muc.js:416
+#: src/converse-muc.js:430
 msgid "Remove user's ability to post messages"
 msgstr ""
 
-#: src/converse-muc.js:417
+#: src/converse-muc.js:431
 msgid "Change your nickname"
 msgstr ""
 
-#: src/converse-muc.js:418
+#: src/converse-muc.js:432
 msgid "Grant moderator role to user"
 msgstr ""
 
-#: src/converse-muc.js:419
+#: src/converse-muc.js:433
 #, fuzzy
 msgid "Grant ownership of this room"
 msgstr "Usted no está en la lista de miembros de esta sala"
 
-#: src/converse-muc.js:420
+#: src/converse-muc.js:434
 msgid "Revoke user's membership"
 msgstr ""
 
-#: src/converse-muc.js:421
+#: src/converse-muc.js:435
 #, fuzzy
 msgid "Set room topic"
 msgstr "Definir tema de sala de chat"
 
-#: src/converse-muc.js:422
+#: src/converse-muc.js:436
 msgid "Allow muted user to post messages"
 msgstr ""
 
-#: src/converse-muc.js:581 src/converse-register.js:216
+#: src/converse-muc.js:592 src/converse-register.js:216
 #: src/converse-register.js:331
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/converse-muc.js:624
+#: src/converse-muc.js:635
 msgid "An error occurred while trying to save the form."
 msgstr "Un error ocurrío mientras se guardaba el formulario."
 
-#: src/converse-muc.js:666
+#: src/converse-muc.js:725
+msgid "Please choose your nickname"
+msgstr ""
+
+#: src/converse-muc.js:726 src/converse-muc.js:1250
+msgid "Nickname"
+msgstr "Apodo"
+
+#: src/converse-muc.js:727
+#, fuzzy
+msgid "Enter room"
+msgstr "Abrir sala"
+
+#: src/converse-muc.js:745
 msgid "This chatroom requires a password"
 msgstr "Esta sala de chat requiere una contraseña."
 
-#: src/converse-muc.js:667
+#: src/converse-muc.js:746
 msgid "Password: "
 msgstr "Contraseña: "
 
-#: src/converse-muc.js:668
+#: src/converse-muc.js:747
 msgid "Submit"
 msgstr "Enviar"
 
-#: src/converse-muc.js:703
+#: src/converse-muc.js:782
 msgid "This room is not anonymous"
 msgstr "Esta sala no es para usuarios anónimos"
 
-#: src/converse-muc.js:704
+#: src/converse-muc.js:783
 msgid "This room now shows unavailable members"
 msgstr "Esta sala ahora muestra los miembros no disponibles"
 
-#: src/converse-muc.js:705
+#: src/converse-muc.js:784
 msgid "This room does not show unavailable members"
 msgstr "Esta sala no muestra los miembros no disponibles"
 
-#: src/converse-muc.js:706
+#: src/converse-muc.js:785
 msgid "Non-privacy-related room configuration has changed"
 msgstr ""
 "Una configuración de la sala no relacionada con la privacidad ha sido "
 "cambiada"
 
-#: src/converse-muc.js:707
+#: src/converse-muc.js:786
 msgid "Room logging is now enabled"
 msgstr "El registro de la sala ahora está habilitado"
 
-#: src/converse-muc.js:708
+#: src/converse-muc.js:787
 msgid "Room logging is now disabled"
 msgstr "El registro de la sala ahora está deshabilitado"
 
-#: src/converse-muc.js:709
+#: src/converse-muc.js:788
 msgid "This room is now non-anonymous"
 msgstr "Esta sala ahora es pública"
 
-#: src/converse-muc.js:710
+#: src/converse-muc.js:789
 msgid "This room is now semi-anonymous"
 msgstr "Esta sala ahora es semi-anónima"
 
-#: src/converse-muc.js:711
+#: src/converse-muc.js:790
 msgid "This room is now fully-anonymous"
 msgstr "Esta sala ahora es completamente anónima"
 
-#: src/converse-muc.js:712
+#: src/converse-muc.js:791
 msgid "A new room has been created"
 msgstr "Una nueva sala ha sido creada"
 
-#: src/converse-muc.js:716 src/converse-muc.js:816
+#: src/converse-muc.js:795 src/converse-muc.js:895
 msgid "You have been banned from this room"
 msgstr "Usted ha sido bloqueado de esta sala"
 
-#: src/converse-muc.js:717
+#: src/converse-muc.js:796
 msgid "You have been kicked from this room"
 msgstr "Usted ha sido expulsado de esta sala"
 
-#: src/converse-muc.js:718
+#: src/converse-muc.js:797
 msgid "You have been removed from this room because of an affiliation change"
 msgstr "Usted ha sido eliminado de esta sala debido a un cambio de afiliación"
 
-#: src/converse-muc.js:719
+#: src/converse-muc.js:798
 msgid ""
 "You have been removed from this room because the room has changed to members-"
 "only and you're not a member"
@@ -453,7 +466,7 @@ msgstr ""
 "Usted ha sido eliminado de esta sala debido a que la sala cambio su "
 "configuración a solo-miembros y usted no es un miembro"
 
-#: src/converse-muc.js:720
+#: src/converse-muc.js:799
 msgid ""
 "You have been removed from this room because the MUC (Multi-user chat) "
 "service is being shut down."
@@ -471,210 +484,216 @@ msgstr ""
 #. * can then at least tell gettext to scan for it so that these
 #. * strings are picked up by the translation machinery.
 #.
-#: src/converse-muc.js:734
+#: src/converse-muc.js:813
 msgid "<strong>%1$s</strong> has been banned"
 msgstr "<strong>%1$s</strong> ha sido bloqueado"
 
-#: src/converse-muc.js:735
+#: src/converse-muc.js:814
 #, fuzzy
 msgid "<strong>%1$s</strong>'s nickname has changed"
 msgstr "<strong>%1$s</strong> ha sido bloqueado"
 
-#: src/converse-muc.js:736
+#: src/converse-muc.js:815
 msgid "<strong>%1$s</strong> has been kicked out"
 msgstr "<strong>%1$s</strong> ha sido expulsado"
 
-#: src/converse-muc.js:737
+#: src/converse-muc.js:816
 msgid "<strong>%1$s</strong> has been removed because of an affiliation change"
 msgstr ""
 "<strong>%1$s</strong> ha sido eliminado debido a un cambio de afiliación"
 
-#: src/converse-muc.js:738
+#: src/converse-muc.js:817
 msgid "<strong>%1$s</strong> has been removed for not being a member"
 msgstr "<strong>%1$s</strong> ha sido eliminado debido a que no es miembro"
 
-#: src/converse-muc.js:742
+#: src/converse-muc.js:821
 #, fuzzy
-msgid "Your nickname has been automatically changed to: <strong>%1$s</strong>"
+msgid "Your nickname has been automatically set to: <strong>%1$s</strong>"
 msgstr "Su apodo ha sido cambiado"
 
-#: src/converse-muc.js:743
+#: src/converse-muc.js:822
 #, fuzzy
 msgid "Your nickname has been changed to: <strong>%1$s</strong>"
 msgstr "Su apodo ha sido cambiado"
 
-#: src/converse-muc.js:790 src/converse-muc.js:799
+#: src/converse-muc.js:869 src/converse-muc.js:878
 msgid "The reason given is: \""
 msgstr ""
 
-#: src/converse-muc.js:814
+#: src/converse-muc.js:893
 msgid "You are not on the member list of this room"
 msgstr "Usted no está en la lista de miembros de esta sala"
 
-#: src/converse-muc.js:820
+#: src/converse-muc.js:899
 msgid "No nickname was specified"
 msgstr "Sin apodo especificado"
 
-#: src/converse-muc.js:824
+#: src/converse-muc.js:903
 msgid "You are not allowed to create new rooms"
 msgstr "Usted no esta autorizado para crear nuevas salas"
 
-#: src/converse-muc.js:826
+#: src/converse-muc.js:905
 msgid "Your nickname doesn't conform to this room's policies"
 msgstr "Su apodo no se ajusta a la política de esta sala"
 
-#: src/converse-muc.js:828
-msgid "Your nickname is already taken"
-msgstr "Su apodo ya ha sido tomando por otro usuario"
+#: src/converse-muc.js:907
+msgid ""
+"The nickname you chose is reserved or currently in use, please choose a "
+"different one."
+msgstr ""
 
-#: src/converse-muc.js:831
+#: src/converse-muc.js:909
 msgid "This room does not (yet) exist"
 msgstr "Esta sala (aún) no existe"
 
-#: src/converse-muc.js:833
+#: src/converse-muc.js:911
 #, fuzzy
 msgid "This room has reached its maximum number of occupants"
 msgstr "Esta sala ha alcanzado su número máximo de ocupantes"
 
-#: src/converse-muc.js:861
+#: src/converse-muc.js:961
 msgid "Topic set by %1$s to: %2$s"
 msgstr "Tema fijado por %1$s a: %2$s"
 
-#: src/converse-muc.js:941
-msgid "This user is a moderator"
+#: src/converse-muc.js:1048
+#, fuzzy
+msgid "Click to mention this user in your message."
+msgstr "Haga click para abrir esta sala"
+
+#: src/converse-muc.js:1049
+#, fuzzy
+msgid "This user is a moderator."
 msgstr "Este usuario es un moderador"
 
-#: src/converse-muc.js:942
-msgid "This user can send messages in this room"
+#: src/converse-muc.js:1050
+#, fuzzy
+msgid "This user can send messages in this room."
 msgstr "Este usuario puede enviar mensajes en esta sala"
 
-#: src/converse-muc.js:943
-msgid "This user can NOT send messages in this room"
+#: src/converse-muc.js:1051
+#, fuzzy
+msgid "This user can NOT send messages in this room."
 msgstr "Este usuario NO puede enviar mensajes en esta"
 
-#: src/converse-muc.js:972
+#: src/converse-muc.js:1087
 msgid "Invite"
 msgstr ""
 
-#: src/converse-muc.js:973
+#: src/converse-muc.js:1088
 msgid "Occupants"
 msgstr "Ocupantes"
 
-#: src/converse-muc.js:1072
+#: src/converse-muc.js:1206
 msgid "You are about to invite %1$s to the chat room \"%2$s\". "
 msgstr ""
 
-#: src/converse-muc.js:1073
+#: src/converse-muc.js:1207
 msgid ""
 "You may optionally include a message, explaining the reason for the "
 "invitation."
 msgstr ""
 
-#: src/converse-muc.js:1115
+#: src/converse-muc.js:1249
 msgid "Room name"
 msgstr "Nombre de sala"
 
-#: src/converse-muc.js:1116
-msgid "Nickname"
-msgstr "Apodo"
-
-#: src/converse-muc.js:1117
+#: src/converse-muc.js:1251
 msgid "Server"
 msgstr "Servidor"
 
-#: src/converse-muc.js:1118
+#: src/converse-muc.js:1252
 #, fuzzy
 msgid "Join Room"
 msgstr "Unirse"
 
-#: src/converse-muc.js:1119
+#: src/converse-muc.js:1253
 msgid "Show rooms"
 msgstr "Mostrar salas"
 
-#: src/converse-muc.js:1123
+#: src/converse-muc.js:1257
 msgid "Rooms"
 msgstr "Salas"
 
 #. For translators: %1$s is a variable and will be replaced with the XMPP server name
-#: src/converse-muc.js:1143
+#: src/converse-muc.js:1277
 msgid "No rooms on %1$s"
 msgstr "Sin salas en %1$s"
 
 #. For translators: %1$s is a variable and will be
 #. replaced with the XMPP server name
-#: src/converse-muc.js:1157
+#: src/converse-muc.js:1291
 msgid "Rooms on %1$s"
 msgstr "Salas en %1$s"
 
-#: src/converse-muc.js:1166
+#: src/converse-muc.js:1300
 msgid "Click to open this room"
 msgstr "Haga click para abrir esta sala"
 
-#: src/converse-muc.js:1167
+#: src/converse-muc.js:1301
 msgid "Show more information on this room"
 msgstr "Mostrar más información en esta sala"
 
-#: src/converse-muc.js:1239
+#: src/converse-muc.js:1373
 msgid "Description:"
 msgstr "Descripción"
 
-#: src/converse-muc.js:1240
+#: src/converse-muc.js:1374
 msgid "Occupants:"
 msgstr "Ocupantes:"
 
-#: src/converse-muc.js:1241
+#: src/converse-muc.js:1375
 msgid "Features:"
 msgstr "Características:"
 
-#: src/converse-muc.js:1242
+#: src/converse-muc.js:1376
 msgid "Requires authentication"
 msgstr "Autenticación requerida"
 
-#: src/converse-muc.js:1243
+#: src/converse-muc.js:1377
 msgid "Hidden"
 msgstr "Oculto"
 
-#: src/converse-muc.js:1244
+#: src/converse-muc.js:1378
 msgid "Requires an invitation"
 msgstr "Requiere una invitación"
 
-#: src/converse-muc.js:1245
+#: src/converse-muc.js:1379
 msgid "Moderated"
 msgstr "Moderado"
 
-#: src/converse-muc.js:1246
+#: src/converse-muc.js:1380
 msgid "Non-anonymous"
 msgstr "No anónimo"
 
-#: src/converse-muc.js:1247
+#: src/converse-muc.js:1381
 msgid "Open room"
 msgstr "Abrir sala"
 
-#: src/converse-muc.js:1248
+#: src/converse-muc.js:1382
 msgid "Permanent room"
 msgstr "Sala permanente"
 
-#: src/converse-muc.js:1249
+#: src/converse-muc.js:1383
 msgid "Public"
 msgstr "Pública"
 
-#: src/converse-muc.js:1250
+#: src/converse-muc.js:1384
 msgid "Semi-anonymous"
 msgstr "Semi anónimo"
 
-#: src/converse-muc.js:1251
+#: src/converse-muc.js:1385
 msgid "Temporary room"
 msgstr "Sala temporal"
 
-#: src/converse-muc.js:1252
+#: src/converse-muc.js:1386
 msgid "Unmoderated"
 msgstr "Sin moderar"
 
-#: src/converse-muc.js:1329
+#: src/converse-muc.js:1456
 msgid "%1$s has invited you to join a chat room: %2$s"
 msgstr ""
 
-#: src/converse-muc.js:1334
+#: src/converse-muc.js:1461
 msgid ""
 "%1$s has invited you to join a chat room: %2$s, and left the following "
 "reason: \"%3$s\""
@@ -1050,6 +1069,9 @@ msgstr ""
 msgid "Are you sure you want to decline this contact request?"
 msgstr "¿Esta seguro de querer eliminar este contacto?"
 
+#~ msgid "Your nickname is already taken"
+#~ msgstr "Su apodo ya ha sido tomando por otro usuario"
+
 #~ msgid "Disconnected"
 #~ msgstr "Desconectado"
 

locale/fr/LC_MESSAGES/converse.json

@@ -299,6 +299,10 @@
             null,
             "Une erreur est survenue lors de l'enregistrement du formulaire."
          ],
+         "Nickname": [
+            null,
+            "Alias"
+         ],
          "This chatroom requires a password": [
             null,
             "Ce salon nécessite un mot de passe."
@@ -391,10 +395,6 @@
             null,
             "<strong>%1$s</strong> a été supprimé car il n'est pas membre"
          ],
-         "Your nickname has been automatically changed to: <strong>%1$s</strong>": [
-            null,
-            "Votre alias a été modifié automatiquement en: <strong>%1$s</strong>"
-         ],
          "Your nickname has been changed to: <strong>%1$s</strong>": [
             null,
             "Votre alias a été modifié en: <strong>%1$s</strong>"
@@ -419,9 +419,9 @@
             null,
             "Votre alias n'est pas conforme à la politique de ce salon"
          ],
-         "Your nickname is already taken": [
+         "The nickname you chose is reserved or currently in use, please choose a different one.": [
             null,
-            "Votre alias est déjà utilisé"
+            ""
          ],
          "This room does not (yet) exist": [
             null,
@@ -431,18 +431,6 @@
             null,
             "Le sujet '%2$s' a été défini par %1$s"
          ],
-         "This user is a moderator": [
-            null,
-            "Cet utilisateur est modérateur"
-         ],
-         "This user can send messages in this room": [
-            null,
-            "Cet utilisateur peut envoyer des messages dans ce salon"
-         ],
-         "This user can NOT send messages in this room": [
-            null,
-            "Cet utilisateur ne peut PAS envoyer de messages dans ce salon"
-         ],
          "Invite": [
             null,
             "Inviter"
@@ -463,10 +451,6 @@
             null,
             "Nom du salon"
          ],
-         "Nickname": [
-            null,
-            "Alias"
-         ],
          "Server": [
             null,
             "Serveur"

locale/fr/LC_MESSAGES/converse.po

@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse.js 0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-26 05:57+0000\n"
+"POT-Creation-Date: 2016-07-28 16:03+0000\n"
 "PO-Revision-Date: 2016-04-07 10:22+0000\n"
 "Language-Team: FR <LL@li.org>\n"
 "Language: fr\n"
@@ -21,7 +21,7 @@ msgstr ""
 "domain: converse\n"
 
 #: src/converse-chatview.js:103 src/converse-headline.js:99
-#: src/converse-muc.js:239
+#: src/converse-muc.js:246
 #, fuzzy
 msgid "You have unread messages"
 msgstr "Effacer les messages"
@@ -47,12 +47,12 @@ msgstr "écrit"
 msgid "has stopped typing"
 msgstr "a arrêté d'écrire"
 
-#: src/converse-chatview.js:332 src/converse-chatview.js:588
+#: src/converse-chatview.js:332 src/converse-chatview.js:592
 #: src/converse-notification.js:171
 msgid "has gone away"
 msgstr "est parti"
 
-#: src/converse-chatview.js:456 src/converse-muc.js:412
+#: src/converse-chatview.js:456 src/converse-muc.js:426
 msgid "Show this menu"
 msgstr "Afficher ce menu"
 
@@ -60,7 +60,7 @@ msgstr "Afficher ce menu"
 msgid "Write in the third person"
 msgstr "Écrire à la troisième personne"
 
-#: src/converse-chatview.js:458 src/converse-muc.js:410
+#: src/converse-chatview.js:458 src/converse-muc.js:424
 msgid "Remove messages"
 msgstr "Effacer les messages"
 
@@ -68,28 +68,28 @@ msgstr "Effacer les messages"
 msgid "Are you sure you want to clear the messages from this chat box?"
 msgstr "Êtes-vous sûr de vouloir supprimer les messages de cette conversation?"
 
-#: src/converse-chatview.js:586 src/converse-notification.js:169
+#: src/converse-chatview.js:590 src/converse-notification.js:169
 msgid "has gone offline"
 msgstr "s'est déconnecté"
 
-#: src/converse-chatview.js:590 src/converse-notification.js:173
+#: src/converse-chatview.js:594 src/converse-notification.js:173
 msgid "is busy"
 msgstr "est occupé"
 
-#: src/converse-chatview.js:633
+#: src/converse-chatview.js:637
 msgid "Clear all messages"
 msgstr "Supprimer tous les messages"
 
-#: src/converse-chatview.js:634
+#: src/converse-chatview.js:638
 #, fuzzy
 msgid "Hide the list of occupants"
 msgstr "Cacher la liste des participants"
 
-#: src/converse-chatview.js:635
+#: src/converse-chatview.js:639
 msgid "Insert a smiley"
 msgstr ""
 
-#: src/converse-chatview.js:636
+#: src/converse-chatview.js:640
 msgid "Start a call"
 msgstr "Démarrer un appel"
 
@@ -154,7 +154,7 @@ msgstr "Cliquez pour changer votre statut"
 msgid "Custom status"
 msgstr "Statut personnel"
 
-#: src/converse-controlbox.js:490 src/converse-muc.js:580
+#: src/converse-controlbox.js:490 src/converse-muc.js:591
 msgid "Save"
 msgstr "Enregistrer"
 
@@ -285,149 +285,163 @@ msgstr "Réduit(s)"
 msgid "Minimize this chat box"
 msgstr ""
 
-#: src/converse-muc.js:241
+#: src/converse-muc.js:248
 msgid "Message"
 msgstr "Message"
 
-#: src/converse-muc.js:302
+#: src/converse-muc.js:316
 msgid "Error: could not execute the command"
 msgstr "Erreur: la commande ne peut pas être exécutée"
 
-#: src/converse-muc.js:358
+#: src/converse-muc.js:372
 msgid "Error: the \""
 msgstr ""
 
-#: src/converse-muc.js:368
+#: src/converse-muc.js:382
 msgid "Are you sure you want to clear the messages from this room?"
 msgstr "Etes-vous sûr de vouloir supprimer les messages de ce salon ?"
 
-#: src/converse-muc.js:408
+#: src/converse-muc.js:422
 msgid "Change user's affiliation to admin"
 msgstr "Changer le rôle  de l'utilisateur en administrateur"
 
-#: src/converse-muc.js:409
+#: src/converse-muc.js:423
 msgid "Ban user from room"
 msgstr "Bannir l'utilisateur du salon"
 
-#: src/converse-muc.js:411
+#: src/converse-muc.js:425
 #, fuzzy
 msgid "Change user role to occupant"
 msgstr "Changer le rôle  de l'utilisateur en participant"
 
-#: src/converse-muc.js:413
+#: src/converse-muc.js:427
 msgid "Kick user from room"
 msgstr "Expulser l'utilisateur du salon"
 
-#: src/converse-muc.js:414
+#: src/converse-muc.js:428
 msgid "Write in 3rd person"
 msgstr "Écrire à la troisième personne"
 
-#: src/converse-muc.js:415
+#: src/converse-muc.js:429
 msgid "Grant membership to a user"
 msgstr "Autoriser l'utilisateur à être membre"
 
-#: src/converse-muc.js:416
+#: src/converse-muc.js:430
 msgid "Remove user's ability to post messages"
 msgstr "Retirer le droit d'envoyer des messages"
 
-#: src/converse-muc.js:417
+#: src/converse-muc.js:431
 msgid "Change your nickname"
 msgstr "Changer votre alias"
 
-#: src/converse-muc.js:418
+#: src/converse-muc.js:432
 msgid "Grant moderator role to user"
 msgstr "Changer le rôle de l'utilisateur en modérateur"
 
-#: src/converse-muc.js:419
+#: src/converse-muc.js:433
 msgid "Grant ownership of this room"
 msgstr "Accorder la propriété à ce salon"
 
-#: src/converse-muc.js:420
+#: src/converse-muc.js:434
 msgid "Revoke user's membership"
 msgstr "Révoquer l'utilisateur des membres"
 
-#: src/converse-muc.js:421
+#: src/converse-muc.js:435
 msgid "Set room topic"
 msgstr "Indiquer le sujet du salon"
 
-#: src/converse-muc.js:422
+#: src/converse-muc.js:436
 msgid "Allow muted user to post messages"
 msgstr "Autoriser les utilisateurs muets à poster des messages"
 
-#: src/converse-muc.js:581 src/converse-register.js:216
+#: src/converse-muc.js:592 src/converse-register.js:216
 #: src/converse-register.js:331
 msgid "Cancel"
 msgstr "Annuler"
 
-#: src/converse-muc.js:624
+#: src/converse-muc.js:635
 msgid "An error occurred while trying to save the form."
 msgstr "Une erreur est survenue lors de l'enregistrement du formulaire."
 
-#: src/converse-muc.js:666
+#: src/converse-muc.js:725
+#, fuzzy
+msgid "Please choose your nickname"
+msgstr "Changer votre alias"
+
+#: src/converse-muc.js:726 src/converse-muc.js:1250
+msgid "Nickname"
+msgstr "Alias"
+
+#: src/converse-muc.js:727
+#, fuzzy
+msgid "Enter room"
+msgstr "Ouvrir un salon"
+
+#: src/converse-muc.js:745
 msgid "This chatroom requires a password"
 msgstr "Ce salon nécessite un mot de passe."
 
-#: src/converse-muc.js:667
+#: src/converse-muc.js:746
 msgid "Password: "
 msgstr "Mot de passe: "
 
-#: src/converse-muc.js:668
+#: src/converse-muc.js:747
 msgid "Submit"
 msgstr "Soumettre"
 
-#: src/converse-muc.js:703
+#: src/converse-muc.js:782
 msgid "This room is not anonymous"
 msgstr "Ce salon n'est pas anonyme"
 
-#: src/converse-muc.js:704
+#: src/converse-muc.js:783
 msgid "This room now shows unavailable members"
 msgstr "Ce salon affiche maintenant les membres indisponibles"
 
-#: src/converse-muc.js:705
+#: src/converse-muc.js:784
 msgid "This room does not show unavailable members"
 msgstr "Ce salon n'affiche pas les membres indisponibles"
 
-#: src/converse-muc.js:706
+#: src/converse-muc.js:785
 msgid "Non-privacy-related room configuration has changed"
 msgstr "Les paramètres du salon non liés à la confidentialité ont été modifiés"
 
-#: src/converse-muc.js:707
+#: src/converse-muc.js:786
 msgid "Room logging is now enabled"
 msgstr "Le logging du salon est activé"
 
-#: src/converse-muc.js:708
+#: src/converse-muc.js:787
 msgid "Room logging is now disabled"
 msgstr "Le logging du salon est désactivé"
 
-#: src/converse-muc.js:709
+#: src/converse-muc.js:788
 msgid "This room is now non-anonymous"
 msgstr "Ce salon est maintenant non-anonyme"
 
-#: src/converse-muc.js:710
+#: src/converse-muc.js:789
 msgid "This room is now semi-anonymous"
 msgstr "Ce salon est maintenant semi-anonyme"
 
-#: src/converse-muc.js:711
+#: src/converse-muc.js:790
 msgid "This room is now fully-anonymous"
 msgstr "Ce salon est maintenant entièrement anonyme"
 
-#: src/converse-muc.js:712
+#: src/converse-muc.js:791
 msgid "A new room has been created"
 msgstr "Un nouveau salon a été créé"
 
-#: src/converse-muc.js:716 src/converse-muc.js:816
+#: src/converse-muc.js:795 src/converse-muc.js:895
 msgid "You have been banned from this room"
 msgstr "Vous avez été banni de ce salon"
 
-#: src/converse-muc.js:717
+#: src/converse-muc.js:796
 msgid "You have been kicked from this room"
 msgstr "Vous avez été expulsé de ce salon"
 
-#: src/converse-muc.js:718
+#: src/converse-muc.js:797
 msgid "You have been removed from this room because of an affiliation change"
 msgstr "Vous avez été retiré de ce salon du fait d'un changement d'affiliation"
 
-#: src/converse-muc.js:719
+#: src/converse-muc.js:798
 msgid ""
 "You have been removed from this room because the room has changed to members-"
 "only and you're not a member"
@@ -435,7 +449,7 @@ msgstr ""
 "Vous avez été retiré de ce salon parce que ce salon est devenu réservé aux "
 "membres et vous n'êtes pas membre"
 
-#: src/converse-muc.js:720
+#: src/converse-muc.js:799
 msgid ""
 "You have been removed from this room because the MUC (Multi-user chat) "
 "service is being shut down."
@@ -453,97 +467,108 @@ msgstr ""
 #. * can then at least tell gettext to scan for it so that these
 #. * strings are picked up by the translation machinery.
 #.
-#: src/converse-muc.js:734
+#: src/converse-muc.js:813
 msgid "<strong>%1$s</strong> has been banned"
 msgstr "<strong>%1$s</strong> a été banni"
 
-#: src/converse-muc.js:735
+#: src/converse-muc.js:814
 msgid "<strong>%1$s</strong>'s nickname has changed"
 msgstr "<strong>%1$s</strong> a changé son nom"
 
-#: src/converse-muc.js:736
+#: src/converse-muc.js:815
 msgid "<strong>%1$s</strong> has been kicked out"
 msgstr "<strong>%1$s</strong> a été expulsé"
 
-#: src/converse-muc.js:737
+#: src/converse-muc.js:816
 msgid "<strong>%1$s</strong> has been removed because of an affiliation change"
 msgstr ""
 "<strong>%1$s</strong> a été supprimé à cause d'un changement d'affiliation"
 
-#: src/converse-muc.js:738
+#: src/converse-muc.js:817
 msgid "<strong>%1$s</strong> has been removed for not being a member"
 msgstr "<strong>%1$s</strong> a été supprimé car il n'est pas membre"
 
-#: src/converse-muc.js:742
-msgid "Your nickname has been automatically changed to: <strong>%1$s</strong>"
+#: src/converse-muc.js:821
+#, fuzzy
+msgid "Your nickname has been automatically set to: <strong>%1$s</strong>"
 msgstr "Votre alias a été modifié automatiquement en: <strong>%1$s</strong>"
 
-#: src/converse-muc.js:743
+#: src/converse-muc.js:822
 msgid "Your nickname has been changed to: <strong>%1$s</strong>"
 msgstr "Votre alias a été modifié en: <strong>%1$s</strong>"
 
-#: src/converse-muc.js:790 src/converse-muc.js:799
+#: src/converse-muc.js:869 src/converse-muc.js:878
 msgid "The reason given is: \""
 msgstr "La raison indiquée est: \""
 
-#: src/converse-muc.js:814
+#: src/converse-muc.js:893
 msgid "You are not on the member list of this room"
 msgstr "Vous n'êtes pas dans la liste des membres de ce salon"
 
-#: src/converse-muc.js:820
+#: src/converse-muc.js:899
 msgid "No nickname was specified"
 msgstr "Aucun alias n'a été indiqué"
 
-#: src/converse-muc.js:824
+#: src/converse-muc.js:903
 msgid "You are not allowed to create new rooms"
 msgstr "Vous n'êtes pas autorisé à créer des salons"
 
-#: src/converse-muc.js:826
+#: src/converse-muc.js:905
 msgid "Your nickname doesn't conform to this room's policies"
 msgstr "Votre alias n'est pas conforme à la politique de ce salon"
 
-#: src/converse-muc.js:828
-msgid "Your nickname is already taken"
-msgstr "Votre alias est déjà utilisé"
+#: src/converse-muc.js:907
+msgid ""
+"The nickname you chose is reserved or currently in use, please choose a "
+"different one."
+msgstr ""
 
-#: src/converse-muc.js:831
+#: src/converse-muc.js:909
 msgid "This room does not (yet) exist"
 msgstr "Ce salon n'existe pas encore"
 
-#: src/converse-muc.js:833
+#: src/converse-muc.js:911
 #, fuzzy
 msgid "This room has reached its maximum number of occupants"
 msgstr "Ce salon a atteint la limite maximale d'occupants"
 
-#: src/converse-muc.js:861
+#: src/converse-muc.js:961
 msgid "Topic set by %1$s to: %2$s"
 msgstr "Le sujet '%2$s' a été défini par %1$s"
 
-#: src/converse-muc.js:941
-msgid "This user is a moderator"
+#: src/converse-muc.js:1048
+#, fuzzy
+msgid "Click to mention this user in your message."
+msgstr "Cliquer pour ouvrir ce salon"
+
+#: src/converse-muc.js:1049
+#, fuzzy
+msgid "This user is a moderator."
 msgstr "Cet utilisateur est modérateur"
 
-#: src/converse-muc.js:942
-msgid "This user can send messages in this room"
+#: src/converse-muc.js:1050
+#, fuzzy
+msgid "This user can send messages in this room."
 msgstr "Cet utilisateur peut envoyer des messages dans ce salon"
 
-#: src/converse-muc.js:943
-msgid "This user can NOT send messages in this room"
+#: src/converse-muc.js:1051
+#, fuzzy
+msgid "This user can NOT send messages in this room."
 msgstr "Cet utilisateur ne peut PAS envoyer de messages dans ce salon"
 
-#: src/converse-muc.js:972
+#: src/converse-muc.js:1087
 msgid "Invite"
 msgstr "Inviter"
 
-#: src/converse-muc.js:973
+#: src/converse-muc.js:1088
 msgid "Occupants"
 msgstr "Participants:"
 
-#: src/converse-muc.js:1072
+#: src/converse-muc.js:1206
 msgid "You are about to invite %1$s to the chat room \"%2$s\". "
 msgstr "Vous vous apprêtez à inviter %1$s dans le salon \"%2$s\". "
 
-#: src/converse-muc.js:1073
+#: src/converse-muc.js:1207
 msgid ""
 "You may optionally include a message, explaining the reason for the "
 "invitation."
@@ -551,110 +576,106 @@ msgstr ""
 "Vous pouvez facultativement ajouter un message, expliquant la raison de "
 "cette invitation."
 
-#: src/converse-muc.js:1115
+#: src/converse-muc.js:1249
 msgid "Room name"
 msgstr "Nom du salon"
 
-#: src/converse-muc.js:1116
-msgid "Nickname"
-msgstr "Alias"
-
-#: src/converse-muc.js:1117
+#: src/converse-muc.js:1251
 msgid "Server"
 msgstr "Serveur"
 
-#: src/converse-muc.js:1118
+#: src/converse-muc.js:1252
 msgid "Join Room"
 msgstr "Rejoindre"
 
-#: src/converse-muc.js:1119
+#: src/converse-muc.js:1253
 msgid "Show rooms"
 msgstr "Afficher les salons"
 
-#: src/converse-muc.js:1123
+#: src/converse-muc.js:1257
 msgid "Rooms"
 msgstr "Salons"
 
 #. For translators: %1$s is a variable and will be replaced with the XMPP server name
-#: src/converse-muc.js:1143
+#: src/converse-muc.js:1277
 msgid "No rooms on %1$s"
 msgstr "Aucun salon dans %1$s"
 
 #. For translators: %1$s is a variable and will be
 #. replaced with the XMPP server name
-#: src/converse-muc.js:1157
+#: src/converse-muc.js:1291
 msgid "Rooms on %1$s"
 msgstr "Salons dans %1$s"
 
-#: src/converse-muc.js:1166
+#: src/converse-muc.js:1300
 msgid "Click to open this room"
 msgstr "Cliquer pour ouvrir ce salon"
 
-#: src/converse-muc.js:1167
+#: src/converse-muc.js:1301
 msgid "Show more information on this room"
 msgstr "Afficher davantage d'informations sur ce salon"
 
-#: src/converse-muc.js:1239
+#: src/converse-muc.js:1373
 msgid "Description:"
 msgstr "Description:"
 
-#: src/converse-muc.js:1240
+#: src/converse-muc.js:1374
 msgid "Occupants:"
 msgstr "Participants:"
 
-#: src/converse-muc.js:1241
+#: src/converse-muc.js:1375
 msgid "Features:"
 msgstr "Caractéristiques:"
 
-#: src/converse-muc.js:1242
+#: src/converse-muc.js:1376
 msgid "Requires authentication"
 msgstr "Nécessite une authentification"
 
-#: src/converse-muc.js:1243
+#: src/converse-muc.js:1377
 msgid "Hidden"
 msgstr "Masqué"
 
-#: src/converse-muc.js:1244
+#: src/converse-muc.js:1378
 msgid "Requires an invitation"
 msgstr "Nécessite une invitation"
 
-#: src/converse-muc.js:1245
+#: src/converse-muc.js:1379
 msgid "Moderated"
 msgstr "Modéré"
 
-#: src/converse-muc.js:1246
+#: src/converse-muc.js:1380
 msgid "Non-anonymous"
 msgstr "Non-anonyme"
 
-#: src/converse-muc.js:1247
+#: src/converse-muc.js:1381
 msgid "Open room"
 msgstr "Ouvrir un salon"
 
-#: src/converse-muc.js:1248
+#: src/converse-muc.js:1382
 msgid "Permanent room"
 msgstr "Salon permanent"
 
-#: src/converse-muc.js:1249
+#: src/converse-muc.js:1383
 msgid "Public"
 msgstr "Public"
 
-#: src/converse-muc.js:1250
+#: src/converse-muc.js:1384
 msgid "Semi-anonymous"
 msgstr "Semi-anonyme"
 
-#: src/converse-muc.js:1251
+#: src/converse-muc.js:1385
 msgid "Temporary room"
 msgstr "Salon temporaire"
 
-#: src/converse-muc.js:1252
+#: src/converse-muc.js:1386
 msgid "Unmoderated"
 msgstr "Non modéré"
 
-#: src/converse-muc.js:1329
+#: src/converse-muc.js:1456
 msgid "%1$s has invited you to join a chat room: %2$s"
 msgstr "%1$s vous invite à rejoindre le salon: %2$s"
 
-#: src/converse-muc.js:1334
+#: src/converse-muc.js:1461
 msgid ""
 "%1$s has invited you to join a chat room: %2$s, and left the following "
 "reason: \"%3$s\""
@@ -1028,6 +1049,9 @@ msgstr ""
 msgid "Are you sure you want to decline this contact request?"
 msgstr "Êtes-vous sûr de vouloir refuser la demande de ce contact?"
 
+#~ msgid "Your nickname is already taken"
+#~ msgstr "Votre alias est déjà utilisé"
+
 #~ msgid "Disconnected"
 #~ msgstr "Déconnecté"
 

locale/he/LC_MESSAGES/converse.json

@@ -299,6 +299,10 @@
             null,
             "אירעה שגיאה במהלך ניסיון שמירת הטופס."
          ],
+         "Nickname": [
+            null,
+            "שם כינוי"
+         ],
          "This chatroom requires a password": [
             null,
             "חדר שיחה זה מצריך סיסמה"
@@ -391,10 +395,6 @@
             null,
             "<strong>%1$s</strong> הוסר(ה) משום אי הימצאות במסגרת מעמד של חבר"
          ],
-         "Your nickname has been automatically changed to: <strong>%1$s</strong>": [
-            null,
-            "השם כינוי שלך שונה אוטומטית בשם: <strong>%1$s</strong>"
-         ],
          "Your nickname has been changed to: <strong>%1$s</strong>": [
             null,
             "השם כינוי שלך שונה בשם: <strong>%1$s</strong>"
@@ -419,9 +419,9 @@
             null,
             "השם כינוי שלך לא תואם את המדינויות של חדר זה"
          ],
-         "Your nickname is already taken": [
+         "The nickname you chose is reserved or currently in use, please choose a different one.": [
             null,
-            "השם כינוי שלך הינו תפוס"
+            ""
          ],
          "This room does not (yet) exist": [
             null,
@@ -431,18 +431,6 @@
             null,
             "נושא חדר זה נקבע על ידי %1$s אל: %2$s"
          ],
-         "This user is a moderator": [
-            null,
-            "משתמש זה הינו אחראי"
-         ],
-         "This user can send messages in this room": [
-            null,
-            "משתמש זה מסוגל לשלוח הודעות בתוך חדר זה"
-         ],
-         "This user can NOT send messages in this room": [
-            null,
-            "משתמש זה ﬥﬡ מסוגל לשלוח הודעות בתוך חדר זה"
-         ],
          "Invite": [
             null,
             "הזמנה"
@@ -463,10 +451,6 @@
             null,
             "שם חדר"
          ],
-         "Nickname": [
-            null,
-            "שם כינוי"
-         ],
          "Server": [
             null,
             "שרת"

locale/he/LC_MESSAGES/converse.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse.js 0.8.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-26 05:57+0000\n"
+"POT-Creation-Date: 2016-07-28 16:03+0000\n"
 "PO-Revision-Date: 2016-04-07 10:21+0000\n"
 "Last-Translator: GreenLunar <https://github.com/GreenLunar>\n"
 "Language-Team: Rahut <http://sourceforge.net/projects/rahut/>\n"
@@ -21,7 +21,7 @@ msgstr ""
 "X-Source-Language: en\n"
 
 #: src/converse-chatview.js:103 src/converse-headline.js:99
-#: src/converse-muc.js:239
+#: src/converse-muc.js:246
 #, fuzzy
 msgid "You have unread messages"
 msgstr "הסר הודעות"
@@ -47,12 +47,12 @@ msgstr "מקליד(ה) כעת"
 msgid "has stopped typing"
 msgstr "חדל(ה) להקליד"
 
-#: src/converse-chatview.js:332 src/converse-chatview.js:588
+#: src/converse-chatview.js:332 src/converse-chatview.js:592
 #: src/converse-notification.js:171
 msgid "has gone away"
 msgstr "נעדר(ת)"
 
-#: src/converse-chatview.js:456 src/converse-muc.js:412
+#: src/converse-chatview.js:456 src/converse-muc.js:426
 msgid "Show this menu"
 msgstr "הצג את תפריט זה"
 
@@ -60,7 +60,7 @@ msgstr "הצג את תפריט זה"
 msgid "Write in the third person"
 msgstr "כתוב בגוף השלישי"
 
-#: src/converse-chatview.js:458 src/converse-muc.js:410
+#: src/converse-chatview.js:458 src/converse-muc.js:424
 msgid "Remove messages"
 msgstr "הסר הודעות"
 
@@ -68,28 +68,28 @@ msgstr "הסר הודעות"
 msgid "Are you sure you want to clear the messages from this chat box?"
 msgstr "האם אתה בטוח כי ברצונך לטהר את ההודעות מתוך תיבת שיחה זה?"
 
-#: src/converse-chatview.js:586 src/converse-notification.js:169
+#: src/converse-chatview.js:590 src/converse-notification.js:169
 msgid "has gone offline"
 msgstr "כבר לא מקוון"
 
-#: src/converse-chatview.js:590 src/converse-notification.js:173
+#: src/converse-chatview.js:594 src/converse-notification.js:173
 msgid "is busy"
 msgstr "עסוק(ה) כעת"
 
-#: src/converse-chatview.js:633
+#: src/converse-chatview.js:637
 msgid "Clear all messages"
 msgstr "טהר את כל ההודעות"
 
-#: src/converse-chatview.js:634
+#: src/converse-chatview.js:638
 #, fuzzy
 msgid "Hide the list of occupants"
 msgstr "הסתר רשימת משתתפים"
 
-#: src/converse-chatview.js:635
+#: src/converse-chatview.js:639
 msgid "Insert a smiley"
 msgstr "הכנס סמיילי"
 
-#: src/converse-chatview.js:636
+#: src/converse-chatview.js:640
 msgid "Start a call"
 msgstr "התחל שיחה"
 
@@ -154,7 +154,7 @@ msgstr "לחץ כדי לשנות את הודעת השיחה שלך"
 msgid "Custom status"
 msgstr "מצב מותאם"
 
-#: src/converse-controlbox.js:490 src/converse-muc.js:580
+#: src/converse-controlbox.js:490 src/converse-muc.js:591
 msgid "Save"
 msgstr "שמור"
 
@@ -286,157 +286,171 @@ msgstr "ממוזער"
 msgid "Minimize this chat box"
 msgstr ""
 
-#: src/converse-muc.js:241
+#: src/converse-muc.js:248
 msgid "Message"
 msgstr "הודעה"
 
-#: src/converse-muc.js:302
+#: src/converse-muc.js:316
 msgid "Error: could not execute the command"
 msgstr "שגיאה: לא היתה אפשרות לבצע פקודה"
 
-#: src/converse-muc.js:358
+#: src/converse-muc.js:372
 msgid "Error: the \""
 msgstr ""
 
-#: src/converse-muc.js:368
+#: src/converse-muc.js:382
 msgid "Are you sure you want to clear the messages from this room?"
 msgstr "האם אתה בטוח כי ברצונך לטהר את ההודעות מתוך חדר זה?"
 
 # שייכות
-#: src/converse-muc.js:408
+#: src/converse-muc.js:422
 msgid "Change user's affiliation to admin"
 msgstr "שנה סינוף משתמש למנהל"
 
-#: src/converse-muc.js:409
+#: src/converse-muc.js:423
 msgid "Ban user from room"
 msgstr "אסור משתמש מתוך חדר"
 
-#: src/converse-muc.js:411
+#: src/converse-muc.js:425
 #, fuzzy
 msgid "Change user role to occupant"
 msgstr "שנה תפקיד משתמש למשתתף"
 
-#: src/converse-muc.js:413
+#: src/converse-muc.js:427
 msgid "Kick user from room"
 msgstr "בעט משתמש מתוך חדר"
 
-#: src/converse-muc.js:414
+#: src/converse-muc.js:428
 msgid "Write in 3rd person"
 msgstr "כתוב בגוף שלישי"
 
-#: src/converse-muc.js:415
+#: src/converse-muc.js:429
 msgid "Grant membership to a user"
 msgstr "הענק חברות למשתמש"
 
-#: src/converse-muc.js:416
+#: src/converse-muc.js:430
 msgid "Remove user's ability to post messages"
 msgstr "הסר יכולת משתמש לפרסם הודעות"
 
-#: src/converse-muc.js:417
+#: src/converse-muc.js:431
 msgid "Change your nickname"
 msgstr "שנה את השם כינוי שלך"
 
-#: src/converse-muc.js:418
+#: src/converse-muc.js:432
 msgid "Grant moderator role to user"
 msgstr "הענק תפקיד אחראי למשתמש"
 
-#: src/converse-muc.js:419
+#: src/converse-muc.js:433
 msgid "Grant ownership of this room"
 msgstr "הענק בעלות על חדר זה"
 
-#: src/converse-muc.js:420
+#: src/converse-muc.js:434
 msgid "Revoke user's membership"
 msgstr "שלול חברות משתמש"
 
-#: src/converse-muc.js:421
+#: src/converse-muc.js:435
 msgid "Set room topic"
 msgstr "קבע נושא חדר"
 
-#: src/converse-muc.js:422
+#: src/converse-muc.js:436
 msgid "Allow muted user to post messages"
 msgstr "התר למשתמש מושתק לפרסם הודעות"
 
-#: src/converse-muc.js:581 src/converse-register.js:216
+#: src/converse-muc.js:592 src/converse-register.js:216
 #: src/converse-register.js:331
 msgid "Cancel"
 msgstr "ביטול"
 
-#: src/converse-muc.js:624
+#: src/converse-muc.js:635
 msgid "An error occurred while trying to save the form."
 msgstr "אירעה שגיאה במהלך ניסיון שמירת הטופס."
 
-#: src/converse-muc.js:666
+#: src/converse-muc.js:725
+#, fuzzy
+msgid "Please choose your nickname"
+msgstr "שנה את השם כינוי שלך"
+
+#: src/converse-muc.js:726 src/converse-muc.js:1250
+msgid "Nickname"
+msgstr "שם כינוי"
+
+#: src/converse-muc.js:727
+#, fuzzy
+msgid "Enter room"
+msgstr "חדר פתוח"
+
+#: src/converse-muc.js:745
 msgid "This chatroom requires a password"
 msgstr "חדר שיחה זה מצריך סיסמה"
 
-#: src/converse-muc.js:667
+#: src/converse-muc.js:746
 msgid "Password: "
 msgstr "סיסמה: "
 
-#: src/converse-muc.js:668
+#: src/converse-muc.js:747
 msgid "Submit"
 msgstr "שלח"
 
 # חדר זה אינו עלום
-#: src/converse-muc.js:703
+#: src/converse-muc.js:782
 msgid "This room is not anonymous"
 msgstr "חדר זה אינו אנונימי"
 
-#: src/converse-muc.js:704
+#: src/converse-muc.js:783
 msgid "This room now shows unavailable members"
 msgstr "חדר זה כעת מציג חברים לא זמינים"
 
-#: src/converse-muc.js:705
+#: src/converse-muc.js:784
 msgid "This room does not show unavailable members"
 msgstr "חדר זה לא מציג חברים לא זמינים"
 
-#: src/converse-muc.js:706
+#: src/converse-muc.js:785
 msgid "Non-privacy-related room configuration has changed"
 msgstr "תצורת חדר אשר לא-קשורה-בפרטיות שונתה"
 
-#: src/converse-muc.js:707
+#: src/converse-muc.js:786
 msgid "Room logging is now enabled"
 msgstr "יומן חדר הינו מופעל כעת"
 
-#: src/converse-muc.js:708
+#: src/converse-muc.js:787
 msgid "Room logging is now disabled"
 msgstr "יומן חדר הינו מנוטרל כעת"
 
-#: src/converse-muc.js:709
+#: src/converse-muc.js:788
 msgid "This room is now non-anonymous"
 msgstr "חדר זה אינו אנונימי כעת"
 
-#: src/converse-muc.js:710
+#: src/converse-muc.js:789
 msgid "This room is now semi-anonymous"
 msgstr "חדר זה הינו אנונימי-למחצה כעת"
 
-#: src/converse-muc.js:711
+#: src/converse-muc.js:790
 msgid "This room is now fully-anonymous"
 msgstr "חדר זה הינו אנונימי-לחלוטין כעת"
 
-#: src/converse-muc.js:712
+#: src/converse-muc.js:791
 msgid "A new room has been created"
 msgstr "חדר חדש נוצר"
 
-#: src/converse-muc.js:716 src/converse-muc.js:816
+#: src/converse-muc.js:795 src/converse-muc.js:895
 msgid "You have been banned from this room"
 msgstr "נאסרת מתוך חדר זה"
 
-#: src/converse-muc.js:717
+#: src/converse-muc.js:796
 msgid "You have been kicked from this room"
 msgstr "נבעטת מתוך חדר זה"
 
-#: src/converse-muc.js:718
+#: src/converse-muc.js:797
 msgid "You have been removed from this room because of an affiliation change"
 msgstr "הוסרת מתוך חדר זה משום שינוי שיוך"
 
-#: src/converse-muc.js:719
+#: src/converse-muc.js:798
 msgid ""
 "You have been removed from this room because the room has changed to members-"
 "only and you're not a member"
 msgstr "הוסרת מתוך חדר זה משום שהחדר שונה לחברים-בלבד ואינך במעמד של חבר"
 
-#: src/converse-muc.js:720
+#: src/converse-muc.js:799
 msgid ""
 "You have been removed from this room because the MUC (Multi-user chat) "
 "service is being shut down."
@@ -454,211 +468,217 @@ msgstr ""
 #. * can then at least tell gettext to scan for it so that these
 #. * strings are picked up by the translation machinery.
 #.
-#: src/converse-muc.js:734
+#: src/converse-muc.js:813
 msgid "<strong>%1$s</strong> has been banned"
 msgstr "<strong>%1$s</strong> נאסר(ה)"
 
-#: src/converse-muc.js:735
+#: src/converse-muc.js:814
 msgid "<strong>%1$s</strong>'s nickname has changed"
 msgstr "השם כינוי של<strong>%1$s</strong> השתנה"
 
-#: src/converse-muc.js:736
+#: src/converse-muc.js:815
 msgid "<strong>%1$s</strong> has been kicked out"
 msgstr "<strong>%1$s</strong> נבעט(ה)"
 
-#: src/converse-muc.js:737
+#: src/converse-muc.js:816
 msgid "<strong>%1$s</strong> has been removed because of an affiliation change"
 msgstr "<strong>%1$s</strong> הוסרה(ה) משום שינוי שיוך"
 
 # היותו(ה)
-#: src/converse-muc.js:738
+#: src/converse-muc.js:817
 msgid "<strong>%1$s</strong> has been removed for not being a member"
 msgstr "<strong>%1$s</strong> הוסר(ה) משום אי הימצאות במסגרת מעמד של חבר"
 
-#: src/converse-muc.js:742
-msgid "Your nickname has been automatically changed to: <strong>%1$s</strong>"
+#: src/converse-muc.js:821
+#, fuzzy
+msgid "Your nickname has been automatically set to: <strong>%1$s</strong>"
 msgstr "השם כינוי שלך שונה אוטומטית בשם: <strong>%1$s</strong>"
 
-#: src/converse-muc.js:743
+#: src/converse-muc.js:822
 msgid "Your nickname has been changed to: <strong>%1$s</strong>"
 msgstr "השם כינוי שלך שונה בשם: <strong>%1$s</strong>"
 
-#: src/converse-muc.js:790 src/converse-muc.js:799
+#: src/converse-muc.js:869 src/converse-muc.js:878
 msgid "The reason given is: \""
 msgstr "הסיבה שניתנה היא: \""
 
-#: src/converse-muc.js:814
+#: src/converse-muc.js:893
 msgid "You are not on the member list of this room"
 msgstr "אינך ברשימת החברים של חדר זה"
 
 # אף שם כינוי לא צוין
-#: src/converse-muc.js:820
+#: src/converse-muc.js:899
 msgid "No nickname was specified"
 msgstr "לא צוין שום שם כינוי"
 
 # אינך מורשה
-#: src/converse-muc.js:824
+#: src/converse-muc.js:903
 msgid "You are not allowed to create new rooms"
 msgstr "אין לך רשות ליצור חדרים חדשים"
 
-#: src/converse-muc.js:826
+#: src/converse-muc.js:905
 msgid "Your nickname doesn't conform to this room's policies"
 msgstr "השם כינוי שלך לא תואם את המדינויות של חדר זה"
 
-# נלקח כבר
-#: src/converse-muc.js:828
-msgid "Your nickname is already taken"
-msgstr "השם כינוי שלך הינו תפוס"
+#: src/converse-muc.js:907
+msgid ""
+"The nickname you chose is reserved or currently in use, please choose a "
+"different one."
+msgstr ""
 
-#: src/converse-muc.js:831
+#: src/converse-muc.js:909
 msgid "This room does not (yet) exist"
 msgstr "חדר זה (עדיין) לא קיים"
 
-#: src/converse-muc.js:833
+#: src/converse-muc.js:911
 #, fuzzy
 msgid "This room has reached its maximum number of occupants"
 msgstr "חדר זה הגיע לסף הנוכחים המרבי שלו"
 
-#: src/converse-muc.js:861
+#: src/converse-muc.js:961
 msgid "Topic set by %1$s to: %2$s"
 msgstr "נושא חדר זה נקבע על ידי %1$s אל: %2$s"
 
-#: src/converse-muc.js:941
-msgid "This user is a moderator"
+#: src/converse-muc.js:1048
+#, fuzzy
+msgid "Click to mention this user in your message."
+msgstr "לחץ כדי לפתוח את חדר זה"
+
+#: src/converse-muc.js:1049
+#, fuzzy
+msgid "This user is a moderator."
 msgstr "משתמש זה הינו אחראי"
 
-#: src/converse-muc.js:942
-msgid "This user can send messages in this room"
+#: src/converse-muc.js:1050
+#, fuzzy
+msgid "This user can send messages in this room."
 msgstr "משתמש זה מסוגל לשלוח הודעות בתוך חדר זה"
 
-#: src/converse-muc.js:943
-msgid "This user can NOT send messages in this room"
+#: src/converse-muc.js:1051
+#, fuzzy
+msgid "This user can NOT send messages in this room."
 msgstr "משתמש זה ﬥﬡ מסוגל לשלוח הודעות בתוך חדר זה"
 
-#: src/converse-muc.js:972
+#: src/converse-muc.js:1087
 msgid "Invite"
 msgstr "הזמנה"
 
-#: src/converse-muc.js:973
+#: src/converse-muc.js:1088
 msgid "Occupants"
 msgstr "נוכחים"
 
-#: src/converse-muc.js:1072
+#: src/converse-muc.js:1206
 msgid "You are about to invite %1$s to the chat room \"%2$s\". "
 msgstr "אתה עומד להזמין את %1$s לחדר שיחה \"%2$s\". "
 
-#: src/converse-muc.js:1073
+#: src/converse-muc.js:1207
 msgid ""
 "You may optionally include a message, explaining the reason for the "
 "invitation."
 msgstr "באפשרותך להכליל הודעה, אשר  מסבירה את הסיבה להזמנה."
 
-#: src/converse-muc.js:1115
+#: src/converse-muc.js:1249
 msgid "Room name"
 msgstr "שם חדר"
 
-#: src/converse-muc.js:1116
-msgid "Nickname"
-msgstr "שם כינוי"
-
-#: src/converse-muc.js:1117
+#: src/converse-muc.js:1251
 msgid "Server"
 msgstr "שרת"
 
-#: src/converse-muc.js:1118
+#: src/converse-muc.js:1252
 msgid "Join Room"
 msgstr "הצטרף לחדר"
 
-#: src/converse-muc.js:1119
+#: src/converse-muc.js:1253
 msgid "Show rooms"
 msgstr "הצג חדרים"
 
-#: src/converse-muc.js:1123
+#: src/converse-muc.js:1257
 msgid "Rooms"
 msgstr "חדרים"
 
 #. For translators: %1$s is a variable and will be replaced with the XMPP server name
-#: src/converse-muc.js:1143
+#: src/converse-muc.js:1277
 msgid "No rooms on %1$s"
 msgstr "אין חדרים על %1$s"
 
 #. For translators: %1$s is a variable and will be
 #. replaced with the XMPP server name
-#: src/converse-muc.js:1157
+#: src/converse-muc.js:1291
 msgid "Rooms on %1$s"
 msgstr "חדרים על %1$s"
 
-#: src/converse-muc.js:1166
+#: src/converse-muc.js:1300
 msgid "Click to open this room"
 msgstr "לחץ כדי לפתוח את חדר זה"
 
-#: src/converse-muc.js:1167
+#: src/converse-muc.js:1301
 msgid "Show more information on this room"
 msgstr "הצג עוד מידע אודות חדר זה"
 
-#: src/converse-muc.js:1239
+#: src/converse-muc.js:1373
 msgid "Description:"
 msgstr "תיאור:"
 
-#: src/converse-muc.js:1240
+#: src/converse-muc.js:1374
 msgid "Occupants:"
 msgstr "נוכחים:"
 
-#: src/converse-muc.js:1241
+#: src/converse-muc.js:1375
 msgid "Features:"
 msgstr "תכונות:"
 
-#: src/converse-muc.js:1242
+#: src/converse-muc.js:1376
 msgid "Requires authentication"
 msgstr "מצריך אישור"
 
-#: src/converse-muc.js:1243
+#: src/converse-muc.js:1377
 msgid "Hidden"
 msgstr "נסתר"
 
-#: src/converse-muc.js:1244
+#: src/converse-muc.js:1378
 msgid "Requires an invitation"
 msgstr "מצריך הזמנה"
 
-#: src/converse-muc.js:1245
+#: src/converse-muc.js:1379
 msgid "Moderated"
 msgstr "מבוקר"
 
 # לא-עלום
-#: src/converse-muc.js:1246
+#: src/converse-muc.js:1380
 msgid "Non-anonymous"
 msgstr "לא-אנונימי"
 
-#: src/converse-muc.js:1247
+#: src/converse-muc.js:1381
 msgid "Open room"
 msgstr "חדר פתוח"
 
-#: src/converse-muc.js:1248
+#: src/converse-muc.js:1382
 msgid "Permanent room"
 msgstr "חדר צמיתה"
 
-#: src/converse-muc.js:1249
+#: src/converse-muc.js:1383
 msgid "Public"
 msgstr "פומבי"
 
 # עלום-למחצה
-#: src/converse-muc.js:1250
+#: src/converse-muc.js:1384
 msgid "Semi-anonymous"
 msgstr "אנונימי-למחצה"
 
-#: src/converse-muc.js:1251
+#: src/converse-muc.js:1385
 msgid "Temporary room"
 msgstr "חדר זמני"
 
-#: src/converse-muc.js:1252
+#: src/converse-muc.js:1386
 msgid "Unmoderated"
 msgstr "לא מבוקר"
 
-#: src/converse-muc.js:1329
+#: src/converse-muc.js:1456
 msgid "%1$s has invited you to join a chat room: %2$s"
 msgstr "%1$s הזמינך להצטרף לחדר שיחה: %2$s"
 
-#: src/converse-muc.js:1334
+#: src/converse-muc.js:1461
 msgid ""
 "%1$s has invited you to join a chat room: %2$s, and left the following "
 "reason: \"%3$s\""
@@ -1021,6 +1041,10 @@ msgstr "מצטערים, היתה שגיאה במהלך ניסיון להסיר
 msgid "Are you sure you want to decline this contact request?"
 msgstr "האם אתה בטוח כי ברצונך לסרב את בקשת איש קשר זה?"
 
+# נלקח כבר
+#~ msgid "Your nickname is already taken"
+#~ msgstr "השם כינוי שלך הינו תפוס"
+
 #~ msgid "Disconnected"
 #~ msgstr "מנותק"
 

locale/hu/LC_MESSAGES/converse.json

@@ -310,6 +310,10 @@
             null,
             "Hiba történt az adatok mentése közben."
          ],
+         "Nickname": [
+            null,
+            "Becenév"
+         ],
          "This chatroom requires a password": [
             null,
             "A csevegőszobába belépéshez jelszó szükséges"
@@ -402,10 +406,6 @@
             null,
             "A taglistán nem szerepel, így a szobából kiléptetve: <strong>%1$s</strong>"
          ],
-         "Your nickname has been automatically changed to: <strong>%1$s</strong>": [
-            null,
-            "A beceneved módosításra került a következőre: <strong>%1$s</strong>"
-         ],
          "Your nickname has been changed to: <strong>%1$s</strong>": [
             null,
             "A beceneved a következőre módosult: <strong>%1$s</strong>"
@@ -430,9 +430,9 @@
             null,
             "A beceneved ütközik a csevegőszoba szabályzataival"
          ],
-         "Your nickname is already taken": [
+         "The nickname you chose is reserved or currently in use, please choose a different one.": [
             null,
-            "A becenevedet már valaki használja"
+            ""
          ],
          "This room does not (yet) exist": [
             null,
@@ -442,18 +442,6 @@
             null,
             "A következő témát állította be %1$s: %2$s"
          ],
-         "This user is a moderator": [
-            null,
-            "Ez a felhasználó egy moderátor"
-         ],
-         "This user can send messages in this room": [
-            null,
-            "Ez a felhasználó küldhet üzenetet ebbe a szobába"
-         ],
-         "This user can NOT send messages in this room": [
-            null,
-            "Ez a felhasználó NEM küldhet üzenetet ebbe a szobába"
-         ],
          "Invite": [
             null,
             "Meghívás"
@@ -474,10 +462,6 @@
             null,
             "Szoba neve"
          ],
-         "Nickname": [
-            null,
-            "Becenév"
-         ],
          "Server": [
             null,
             "Szerver"

locale/hu/LC_MESSAGES/converse.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse.js 0.8.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-26 05:57+0000\n"
+"POT-Creation-Date: 2016-07-28 16:03+0000\n"
 "PO-Revision-Date: 2016-04-07 10:23+0000\n"
 "Last-Translator: Meskó Balázs <meskobalazs@gmail.com>\n"
 "Language-Team: Hungarian\n"
@@ -21,7 +21,7 @@ msgstr ""
 "X-Generator: Poedit 1.8.5\n"
 
 #: src/converse-chatview.js:103 src/converse-headline.js:99
-#: src/converse-muc.js:239
+#: src/converse-muc.js:246
 #, fuzzy
 msgid "You have unread messages"
 msgstr "Üzenetek törlése"
@@ -46,12 +46,12 @@ msgstr "gépel..."
 msgid "has stopped typing"
 msgstr "már nem gépel"
 
-#: src/converse-chatview.js:332 src/converse-chatview.js:588
+#: src/converse-chatview.js:332 src/converse-chatview.js:592
 #: src/converse-notification.js:171
 msgid "has gone away"
 msgstr "távol van"
 
-#: src/converse-chatview.js:456 src/converse-muc.js:412
+#: src/converse-chatview.js:456 src/converse-muc.js:426
 msgid "Show this menu"
 msgstr "Mutasd a menüt"
 
@@ -59,7 +59,7 @@ msgstr "Mutasd a menüt"
 msgid "Write in the third person"
 msgstr "Írjon egyes szám harmadik személyben"
 
-#: src/converse-chatview.js:458 src/converse-muc.js:410
+#: src/converse-chatview.js:458 src/converse-muc.js:424
 msgid "Remove messages"
 msgstr "Üzenetek törlése"
 
@@ -67,27 +67,27 @@ msgstr "Üzenetek törlése"
 msgid "Are you sure you want to clear the messages from this chat box?"
 msgstr "Törölni szeretné az eddigi üzeneteket?"
 
-#: src/converse-chatview.js:586 src/converse-notification.js:169
+#: src/converse-chatview.js:590 src/converse-notification.js:169
 msgid "has gone offline"
 msgstr "kijelentkezett"
 
-#: src/converse-chatview.js:590 src/converse-notification.js:173
+#: src/converse-chatview.js:594 src/converse-notification.js:173
 msgid "is busy"
 msgstr "elfoglalt"
 
-#: src/converse-chatview.js:633
+#: src/converse-chatview.js:637
 msgid "Clear all messages"
 msgstr "Üzenetek törlése"
 
-#: src/converse-chatview.js:634
+#: src/converse-chatview.js:638
 msgid "Hide the list of occupants"
 msgstr "A résztvevők listájának elrejtése"
 
-#: src/converse-chatview.js:635
+#: src/converse-chatview.js:639
 msgid "Insert a smiley"
 msgstr "Hangulatjel beszúrása"
 
-#: src/converse-chatview.js:636
+#: src/converse-chatview.js:640
 msgid "Start a call"
 msgstr "Hívás indítása"
 
@@ -151,7 +151,7 @@ msgstr "Saját státusz beállítása"
 msgid "Custom status"
 msgstr "Egyedi státusz"
 
-#: src/converse-controlbox.js:490 src/converse-muc.js:580
+#: src/converse-controlbox.js:490 src/converse-muc.js:591
 msgid "Save"
 msgstr "Ment"
 
@@ -283,148 +283,162 @@ msgstr "Minimalizálva"
 msgid "Minimize this chat box"
 msgstr "A csevegés minimalizálása"
 
-#: src/converse-muc.js:241
+#: src/converse-muc.js:248
 msgid "Message"
 msgstr "Üzenet"
 
-#: src/converse-muc.js:302
+#: src/converse-muc.js:316
 msgid "Error: could not execute the command"
 msgstr "Hiba: A parancs nem értelmezett"
 
-#: src/converse-muc.js:358
+#: src/converse-muc.js:372
 msgid "Error: the \""
 msgstr "Hiba: a \""
 
-#: src/converse-muc.js:368
+#: src/converse-muc.js:382
 msgid "Are you sure you want to clear the messages from this room?"
 msgstr "Törölni szeretné az üzeneteket ebből a szobából?"
 
-#: src/converse-muc.js:408
+#: src/converse-muc.js:422
 msgid "Change user's affiliation to admin"
 msgstr "A felhasználó adminisztrátorrá tétele"
 
-#: src/converse-muc.js:409
+#: src/converse-muc.js:423
 msgid "Ban user from room"
 msgstr "Felhasználó kitíltása a csevegőszobából"
 
-#: src/converse-muc.js:411
+#: src/converse-muc.js:425
 msgid "Change user role to occupant"
 msgstr "A felhasználó taggá tétele"
 
-#: src/converse-muc.js:413
+#: src/converse-muc.js:427
 msgid "Kick user from room"
 msgstr "Felhasználó kiléptetése a csevegőszobából"
 
-#: src/converse-muc.js:414
+#: src/converse-muc.js:428
 msgid "Write in 3rd person"
 msgstr "Írjon egyes szám harmadik személyben"
 
-#: src/converse-muc.js:415
+#: src/converse-muc.js:429
 msgid "Grant membership to a user"
 msgstr "Tagság megadása a felhasználónak"
 
-#: src/converse-muc.js:416
+#: src/converse-muc.js:430
 msgid "Remove user's ability to post messages"
 msgstr "A felhasználó nem küldhet üzeneteket"
 
-#: src/converse-muc.js:417
+#: src/converse-muc.js:431
 msgid "Change your nickname"
 msgstr "Becenév módosítása"
 
-#: src/converse-muc.js:418
+#: src/converse-muc.js:432
 msgid "Grant moderator role to user"
 msgstr "Moderátori jog adása a felhasználónak"
 
-#: src/converse-muc.js:419
+#: src/converse-muc.js:433
 msgid "Grant ownership of this room"
 msgstr "A szoba tulajdonjogának megadása"
 
-#: src/converse-muc.js:420
+#: src/converse-muc.js:434
 msgid "Revoke user's membership"
 msgstr "Tagság megvonása a felhasználótól"
 
-#: src/converse-muc.js:421
+#: src/converse-muc.js:435
 msgid "Set room topic"
 msgstr "Csevegőszoba téma beállítása"
 
-#: src/converse-muc.js:422
+#: src/converse-muc.js:436
 msgid "Allow muted user to post messages"
 msgstr "Elnémított felhasználók is küldhetnek üzeneteket"
 
-#: src/converse-muc.js:581 src/converse-register.js:216
+#: src/converse-muc.js:592 src/converse-register.js:216
 #: src/converse-register.js:331
 msgid "Cancel"
 msgstr "Mégsem"
 
-#: src/converse-muc.js:624
+#: src/converse-muc.js:635
 msgid "An error occurred while trying to save the form."
 msgstr "Hiba történt az adatok mentése közben."
 
-#: src/converse-muc.js:666
+#: src/converse-muc.js:725
+#, fuzzy
+msgid "Please choose your nickname"
+msgstr "Becenév módosítása"
+
+#: src/converse-muc.js:726 src/converse-muc.js:1250
+msgid "Nickname"
+msgstr "Becenév"
+
+#: src/converse-muc.js:727
+#, fuzzy
+msgid "Enter room"
+msgstr "Nyitott szoba"
+
+#: src/converse-muc.js:745
 msgid "This chatroom requires a password"
 msgstr "A csevegőszobába belépéshez jelszó szükséges"
 
-#: src/converse-muc.js:667
+#: src/converse-muc.js:746
 msgid "Password: "
 msgstr "Jelszó: "
 
-#: src/converse-muc.js:668
+#: src/converse-muc.js:747
 msgid "Submit"
 msgstr "Küldés"
 
-#: src/converse-muc.js:703
+#: src/converse-muc.js:782
 msgid "This room is not anonymous"
 msgstr "Ez a szoba NEM névtelen"
 
-#: src/converse-muc.js:704
+#: src/converse-muc.js:783
 msgid "This room now shows unavailable members"
 msgstr "Ez a szoba mutatja az elérhetetlen tagokat"
 
-#: src/converse-muc.js:705
+#: src/converse-muc.js:784
 msgid "This room does not show unavailable members"
 msgstr "Ez a szoba nem mutatja az elérhetetlen tagokat"
 
-#: src/converse-muc.js:706
+#: src/converse-muc.js:785
 msgid "Non-privacy-related room configuration has changed"
 msgstr "A szoba általános konfigurációja módosult"
 
-#: src/converse-muc.js:707
+#: src/converse-muc.js:786
 msgid "Room logging is now enabled"
 msgstr "A szobába a belépés lehetséges"
 
-#: src/converse-muc.js:708
+#: src/converse-muc.js:787
 msgid "Room logging is now disabled"
 msgstr "A szobába a belépés szünetel"
 
-#: src/converse-muc.js:709
+#: src/converse-muc.js:788
 msgid "This room is now non-anonymous"
 msgstr "Ez a szoba most NEM névtelen"
 
-#: src/converse-muc.js:710
+#: src/converse-muc.js:789
 msgid "This room is now semi-anonymous"
 msgstr "Ez a szoba most félig névtelen"
 
-#: src/converse-muc.js:711
+#: src/converse-muc.js:790
 msgid "This room is now fully-anonymous"
 msgstr "Ez a szoba most teljesen névtelen"
 
-#: src/converse-muc.js:712
+#: src/converse-muc.js:791
 msgid "A new room has been created"
 msgstr "Létrejött egy új csevegőszoba"
 
-#: src/converse-muc.js:716 src/converse-muc.js:816
+#: src/converse-muc.js:795 src/converse-muc.js:895
 msgid "You have been banned from this room"
 msgstr "Ki lettél tíltva ebből a szobából"
 
-#: src/converse-muc.js:717
+#: src/converse-muc.js:796
 msgid "You have been kicked from this room"
 msgstr "Ki lettél dobva ebből a szobából"
 
-#: src/converse-muc.js:718
+#: src/converse-muc.js:797
 msgid "You have been removed from this room because of an affiliation change"
 msgstr "Taglista módosítás miatt kiléptettünk a csevegőszobából"
 
-#: src/converse-muc.js:719
+#: src/converse-muc.js:798
 msgid ""
 "You have been removed from this room because the room has changed to members-"
 "only and you're not a member"
@@ -432,7 +446,7 @@ msgstr ""
 "Kiléptettünk a csevegőszobából, mert mostantól csak a taglistán szereplők "
 "lehetnek jelen"
 
-#: src/converse-muc.js:720
+#: src/converse-muc.js:799
 msgid ""
 "You have been removed from this room because the MUC (Multi-user chat) "
 "service is being shut down."
@@ -450,206 +464,213 @@ msgstr ""
 #. * can then at least tell gettext to scan for it so that these
 #. * strings are picked up by the translation machinery.
 #.
-#: src/converse-muc.js:734
+#: src/converse-muc.js:813
 msgid "<strong>%1$s</strong> has been banned"
 msgstr "A szobából kitíltva: <strong>%1$s</strong>"
 
-#: src/converse-muc.js:735
+#: src/converse-muc.js:814
 msgid "<strong>%1$s</strong>'s nickname has changed"
 msgstr "<strong>%1$s</strong> beceneve módosult"
 
-#: src/converse-muc.js:736
+#: src/converse-muc.js:815
 msgid "<strong>%1$s</strong> has been kicked out"
 msgstr "A szobából kidobva: <strong>%1$s</strong>"
 
-#: src/converse-muc.js:737
+#: src/converse-muc.js:816
 msgid "<strong>%1$s</strong> has been removed because of an affiliation change"
 msgstr "Taglista módosítás miatt a szobából kiléptetve: <strong>%1$s</strong>"
 
-#: src/converse-muc.js:738
+#: src/converse-muc.js:817
 msgid "<strong>%1$s</strong> has been removed for not being a member"
 msgstr ""
 "A taglistán nem szerepel, így a szobából kiléptetve: <strong>%1$s</strong>"
 
-#: src/converse-muc.js:742
-msgid "Your nickname has been automatically changed to: <strong>%1$s</strong>"
+#: src/converse-muc.js:821
+#, fuzzy
+msgid "Your nickname has been automatically set to: <strong>%1$s</strong>"
 msgstr "A beceneved módosításra került a következőre: <strong>%1$s</strong>"
 
-#: src/converse-muc.js:743
+#: src/converse-muc.js:822
 msgid "Your nickname has been changed to: <strong>%1$s</strong>"
 msgstr "A beceneved a következőre módosult: <strong>%1$s</strong>"
 
-#: src/converse-muc.js:790 src/converse-muc.js:799
+#: src/converse-muc.js:869 src/converse-muc.js:878
 msgid "The reason given is: \""
 msgstr "Az indok: \""
 
-#: src/converse-muc.js:814
+#: src/converse-muc.js:893
 msgid "You are not on the member list of this room"
 msgstr "Nem szerepelsz a csevegőszoba taglistáján"
 
-#: src/converse-muc.js:820
+#: src/converse-muc.js:899
 msgid "No nickname was specified"
 msgstr "Nem lett megadva becenév"
 
-#: src/converse-muc.js:824
+#: src/converse-muc.js:903
 msgid "You are not allowed to create new rooms"
 msgstr "Nem lehet új csevegőszobát létrehozni"
 
-#: src/converse-muc.js:826
+#: src/converse-muc.js:905
 msgid "Your nickname doesn't conform to this room's policies"
 msgstr "A beceneved ütközik a csevegőszoba szabályzataival"
 
-#: src/converse-muc.js:828
-msgid "Your nickname is already taken"
-msgstr "A becenevedet már valaki használja"
+#: src/converse-muc.js:907
+msgid ""
+"The nickname you chose is reserved or currently in use, please choose a "
+"different one."
+msgstr ""
 
-#: src/converse-muc.js:831
+#: src/converse-muc.js:909
 msgid "This room does not (yet) exist"
 msgstr "Ez a szoba (még) nem létezik"
 
-#: src/converse-muc.js:833
+#: src/converse-muc.js:911
 #, fuzzy
 msgid "This room has reached its maximum number of occupants"
 msgstr "Ez a csevegőszoba elérte a maximális jelenlévők számát"
 
-#: src/converse-muc.js:861
+#: src/converse-muc.js:961
 msgid "Topic set by %1$s to: %2$s"
 msgstr "A következő témát állította be %1$s: %2$s"
 
-#: src/converse-muc.js:941
-msgid "This user is a moderator"
+#: src/converse-muc.js:1048
+#, fuzzy
+msgid "Click to mention this user in your message."
+msgstr "Belépés a csevegőszobába"
+
+#: src/converse-muc.js:1049
+#, fuzzy
+msgid "This user is a moderator."
 msgstr "Ez a felhasználó egy moderátor"
 
-#: src/converse-muc.js:942
-msgid "This user can send messages in this room"
+#: src/converse-muc.js:1050
+#, fuzzy
+msgid "This user can send messages in this room."
 msgstr "Ez a felhasználó küldhet üzenetet ebbe a szobába"
 
-#: src/converse-muc.js:943
-msgid "This user can NOT send messages in this room"
+#: src/converse-muc.js:1051
+#, fuzzy
+msgid "This user can NOT send messages in this room."
 msgstr "Ez a felhasználó NEM küldhet üzenetet ebbe a szobába"
 
-#: src/converse-muc.js:972
+#: src/converse-muc.js:1087
 msgid "Invite"
 msgstr "Meghívás"
 
-#: src/converse-muc.js:973
+#: src/converse-muc.js:1088
 msgid "Occupants"
 msgstr "Jelenlevők"
 
-#: src/converse-muc.js:1072
+#: src/converse-muc.js:1206
 msgid "You are about to invite %1$s to the chat room \"%2$s\". "
 msgstr "%1$s meghívott a(z) \"%2$s\" csevegőszobába. "
 
-#: src/converse-muc.js:1073
+#: src/converse-muc.js:1207
 msgid ""
 "You may optionally include a message, explaining the reason for the "
 "invitation."
 msgstr "Megadhat egy üzenet a meghívás okaként."
 
-#: src/converse-muc.js:1115
+#: src/converse-muc.js:1249
 msgid "Room name"
 msgstr "Szoba neve"
 
-#: src/converse-muc.js:1116
-msgid "Nickname"
-msgstr "Becenév"
-
-#: src/converse-muc.js:1117
+#: src/converse-muc.js:1251
 msgid "Server"
 msgstr "Szerver"
 
-#: src/converse-muc.js:1118
+#: src/converse-muc.js:1252
 msgid "Join Room"
 msgstr "Csatlakozás"
 
-#: src/converse-muc.js:1119
+#: src/converse-muc.js:1253
 msgid "Show rooms"
 msgstr "Létező szobák"
 
-#: src/converse-muc.js:1123
+#: src/converse-muc.js:1257
 msgid "Rooms"
 msgstr "Szobák"
 
 #. For translators: %1$s is a variable and will be replaced with the XMPP server name
-#: src/converse-muc.js:1143
+#: src/converse-muc.js:1277
 msgid "No rooms on %1$s"
 msgstr "Nincs csevegőszoba a(z) %1$s szerveren"
 
 #. For translators: %1$s is a variable and will be
 #. replaced with the XMPP server name
-#: src/converse-muc.js:1157
+#: src/converse-muc.js:1291
 msgid "Rooms on %1$s"
 msgstr "Csevegőszobák a(z) %1$s szerveren:"
 
-#: src/converse-muc.js:1166
+#: src/converse-muc.js:1300
 msgid "Click to open this room"
 msgstr "Belépés a csevegőszobába"
 
-#: src/converse-muc.js:1167
+#: src/converse-muc.js:1301
 msgid "Show more information on this room"
 msgstr "További információk a csevegőszobáról"
 
-#: src/converse-muc.js:1239
+#: src/converse-muc.js:1373
 msgid "Description:"
 msgstr "Leírás:"
 
-#: src/converse-muc.js:1240
+#: src/converse-muc.js:1374
 msgid "Occupants:"
 msgstr "Jelenlevők:"
 
-#: src/converse-muc.js:1241
+#: src/converse-muc.js:1375
 msgid "Features:"
 msgstr "Tulajdonságok:"
 
-#: src/converse-muc.js:1242
+#: src/converse-muc.js:1376
 msgid "Requires authentication"
 msgstr "Azonosítás szükséges"
 
-#: src/converse-muc.js:1243
+#: src/converse-muc.js:1377
 msgid "Hidden"
 msgstr "Rejtett"
 
-#: src/converse-muc.js:1244
+#: src/converse-muc.js:1378
 msgid "Requires an invitation"
 msgstr "Meghívás szükséges"
 
-#: src/converse-muc.js:1245
+#: src/converse-muc.js:1379
 msgid "Moderated"
 msgstr "Moderált"
 
-#: src/converse-muc.js:1246
+#: src/converse-muc.js:1380
 msgid "Non-anonymous"
 msgstr "NEM névtelen"
 
-#: src/converse-muc.js:1247
+#: src/converse-muc.js:1381
 msgid "Open room"
 msgstr "Nyitott szoba"
 
-#: src/converse-muc.js:1248
+#: src/converse-muc.js:1382
 msgid "Permanent room"
 msgstr "Állandó szoba"
 
-#: src/converse-muc.js:1249
+#: src/converse-muc.js:1383
 msgid "Public"
 msgstr "Nyílvános"
 
-#: src/converse-muc.js:1250
+#: src/converse-muc.js:1384
 msgid "Semi-anonymous"
 msgstr "Félig névtelen"
 
-#: src/converse-muc.js:1251
+#: src/converse-muc.js:1385
 msgid "Temporary room"
 msgstr "Ideiglenes szoba"
 
-#: src/converse-muc.js:1252
+#: src/converse-muc.js:1386
 msgid "Unmoderated"
 msgstr "Moderálatlan"
 
-#: src/converse-muc.js:1329
+#: src/converse-muc.js:1456
 msgid "%1$s has invited you to join a chat room: %2$s"
 msgstr "%1$s meghívott a(z) %2$s csevegőszobába"
 
-#: src/converse-muc.js:1334
+#: src/converse-muc.js:1461
 msgid ""
 "%1$s has invited you to join a chat room: %2$s, and left the following "
 "reason: \"%3$s\""
@@ -1016,6 +1037,9 @@ msgstr "Sajnáljuk, hiba történt a törlés során"
 msgid "Are you sure you want to decline this contact request?"
 msgstr "Valóban elutasítja ezt a partnerkérelmet?"
 
+#~ msgid "Your nickname is already taken"
+#~ msgstr "A becenevedet már valaki használja"
+
 #~ msgid "Disconnected"
 #~ msgstr "Szétkapcsolva"
 

locale/id/LC_MESSAGES/converse.json

@@ -250,6 +250,14 @@
             null,
             "Kesalahan terjadi saat menyimpan formulir ini."
          ],
+         "Please choose your nickname": [
+            null,
+            ""
+         ],
+         "Nickname": [
+            null,
+            "Nama panggilan"
+         ],
          "This chatroom requires a password": [
             null,
             "Ruangan ini membutuhkan kata sandi"
@@ -358,9 +366,9 @@
             null,
             "Nama panggilan anda tidak sesuai aturan ruangan ini"
          ],
-         "Your nickname is already taken": [
+         "The nickname you chose is reserved or currently in use, please choose a different one.": [
             null,
-            "Nama panggilan anda telah digunakan orang lain"
+            ""
          ],
          "This room does not (yet) exist": [
             null,
@@ -370,18 +378,6 @@
             null,
             "Topik diganti oleh %1$s menjadi: %2$s"
          ],
-         "This user is a moderator": [
-            null,
-            "Pengguna ini adalah moderator"
-         ],
-         "This user can send messages in this room": [
-            null,
-            "Pengguna ini dapat mengirim pesan di ruangan ini"
-         ],
-         "This user can NOT send messages in this room": [
-            null,
-            "Pengguna ini tak dapat mengirim pesan di ruangan ini"
-         ],
          "Invite": [
             null,
             ""
@@ -398,10 +394,6 @@
             null,
             "Nama ruangan"
          ],
-         "Nickname": [
-            null,
-            "Nama panggilan"
-         ],
          "Server": [
             null,
             "Server"

locale/id/LC_MESSAGES/converse.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse.js 0.7.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-26 05:57+0000\n"
+"POT-Creation-Date: 2016-07-28 16:03+0000\n"
 "PO-Revision-Date: 2014-01-25 21:30+0700\n"
 "Last-Translator: Priyadi Iman Nurcahyo <priyadi@priyadi.net>\n"
 "Language-Team: Bahasa Indonesia\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: src/converse-chatview.js:103 src/converse-headline.js:99
-#: src/converse-muc.js:239
+#: src/converse-muc.js:246
 #, fuzzy
 msgid "You have unread messages"
 msgstr "Hapus pesan"
@@ -44,13 +44,13 @@ msgstr ""
 msgid "has stopped typing"
 msgstr ""
 
-#: src/converse-chatview.js:332 src/converse-chatview.js:588
+#: src/converse-chatview.js:332 src/converse-chatview.js:592
 #: src/converse-notification.js:171
 #, fuzzy
 msgid "has gone away"
 msgstr "Teman ini tidak di tempat"
 
-#: src/converse-chatview.js:456 src/converse-muc.js:412
+#: src/converse-chatview.js:456 src/converse-muc.js:426
 msgid "Show this menu"
 msgstr "Tampilkan menu ini"
 
@@ -58,7 +58,7 @@ msgstr "Tampilkan menu ini"
 msgid "Write in the third person"
 msgstr "Tulis ini menggunakan bahasa pihak ketiga"
 
-#: src/converse-chatview.js:458 src/converse-muc.js:410
+#: src/converse-chatview.js:458 src/converse-muc.js:424
 msgid "Remove messages"
 msgstr "Hapus pesan"
 
@@ -66,30 +66,30 @@ msgstr "Hapus pesan"
 msgid "Are you sure you want to clear the messages from this chat box?"
 msgstr ""
 
-#: src/converse-chatview.js:586 src/converse-notification.js:169
+#: src/converse-chatview.js:590 src/converse-notification.js:169
 #, fuzzy
 msgid "has gone offline"
 msgstr "Teman ini tidak terhubung"
 
-#: src/converse-chatview.js:590 src/converse-notification.js:173
+#: src/converse-chatview.js:594 src/converse-notification.js:173
 #, fuzzy
 msgid "is busy"
 msgstr "sibuk"
 
-#: src/converse-chatview.js:633
+#: src/converse-chatview.js:637
 #, fuzzy
 msgid "Clear all messages"
 msgstr "Pesan pribadi"
 
-#: src/converse-chatview.js:634
+#: src/converse-chatview.js:638
 msgid "Hide the list of occupants"
 msgstr ""
 
-#: src/converse-chatview.js:635
+#: src/converse-chatview.js:639
 msgid "Insert a smiley"
 msgstr ""
 
-#: src/converse-chatview.js:636
+#: src/converse-chatview.js:640
 msgid "Start a call"
 msgstr ""
 
@@ -156,7 +156,7 @@ msgstr "Klik untuk mengganti status"
 msgid "Custom status"
 msgstr "Status kustom"
 
-#: src/converse-controlbox.js:490 src/converse-muc.js:580
+#: src/converse-controlbox.js:490 src/converse-muc.js:591
 msgid "Save"
 msgstr "Simpan"
 
@@ -289,154 +289,167 @@ msgstr ""
 msgid "Minimize this chat box"
 msgstr ""
 
-#: src/converse-muc.js:241
+#: src/converse-muc.js:248
 msgid "Message"
 msgstr "Pesan"
 
-#: src/converse-muc.js:302
+#: src/converse-muc.js:316
 msgid "Error: could not execute the command"
 msgstr ""
 
-#: src/converse-muc.js:358
+#: src/converse-muc.js:372
 msgid "Error: the \""
 msgstr ""
 
-#: src/converse-muc.js:368
+#: src/converse-muc.js:382
 #, fuzzy
 msgid "Are you sure you want to clear the messages from this room?"
 msgstr "Anda bukan anggota dari ruangan ini"
 
-#: src/converse-muc.js:408
+#: src/converse-muc.js:422
 msgid "Change user's affiliation to admin"
 msgstr ""
 
-#: src/converse-muc.js:409
+#: src/converse-muc.js:423
 #, fuzzy
 msgid "Ban user from room"
 msgstr "Larang pengguna dari ruangan"
 
-#: src/converse-muc.js:411
+#: src/converse-muc.js:425
 msgid "Change user role to occupant"
 msgstr ""
 
-#: src/converse-muc.js:413
+#: src/converse-muc.js:427
 #, fuzzy
 msgid "Kick user from room"
 msgstr "Tendang pengguna dari ruangan"
 
-#: src/converse-muc.js:414
+#: src/converse-muc.js:428
 #, fuzzy
 msgid "Write in 3rd person"
 msgstr "Tulis ini menggunakan bahasa pihak ketiga"
 
-#: src/converse-muc.js:415
+#: src/converse-muc.js:429
 msgid "Grant membership to a user"
 msgstr ""
 
-#: src/converse-muc.js:416
+#: src/converse-muc.js:430
 msgid "Remove user's ability to post messages"
 msgstr ""
 
-#: src/converse-muc.js:417
+#: src/converse-muc.js:431
 msgid "Change your nickname"
 msgstr ""
 
-#: src/converse-muc.js:418
+#: src/converse-muc.js:432
 msgid "Grant moderator role to user"
 msgstr ""
 
-#: src/converse-muc.js:419
+#: src/converse-muc.js:433
 #, fuzzy
 msgid "Grant ownership of this room"
 msgstr "Anda bukan anggota dari ruangan ini"
 
-#: src/converse-muc.js:420
+#: src/converse-muc.js:434
 msgid "Revoke user's membership"
 msgstr ""
 
-#: src/converse-muc.js:421
+#: src/converse-muc.js:435
 #, fuzzy
 msgid "Set room topic"
 msgstr "Setel topik ruangan"
 
-#: src/converse-muc.js:422
+#: src/converse-muc.js:436
 msgid "Allow muted user to post messages"
 msgstr ""
 
-#: src/converse-muc.js:581 src/converse-register.js:216
+#: src/converse-muc.js:592 src/converse-register.js:216
 #: src/converse-register.js:331
 msgid "Cancel"
 msgstr "Batal"
 
-#: src/converse-muc.js:624
+#: src/converse-muc.js:635
 msgid "An error occurred while trying to save the form."
 msgstr "Kesalahan terjadi saat menyimpan formulir ini."
 
-#: src/converse-muc.js:666
+#: src/converse-muc.js:725
+msgid "Please choose your nickname"
+msgstr ""
+
+#: src/converse-muc.js:726 src/converse-muc.js:1250
+msgid "Nickname"
+msgstr "Nama panggilan"
+
+#: src/converse-muc.js:727
+#, fuzzy
+msgid "Enter room"
+msgstr "Ruangan terbuka"
+
+#: src/converse-muc.js:745
 msgid "This chatroom requires a password"
 msgstr "Ruangan ini membutuhkan kata sandi"
 
-#: src/converse-muc.js:667
+#: src/converse-muc.js:746
 msgid "Password: "
 msgstr "Kata sandi: "
 
-#: src/converse-muc.js:668
+#: src/converse-muc.js:747
 msgid "Submit"
 msgstr "Kirim"
 
-#: src/converse-muc.js:703
+#: src/converse-muc.js:782
 msgid "This room is not anonymous"
 msgstr "Ruangan ini tidak anonim"
 
-#: src/converse-muc.js:704
+#: src/converse-muc.js:783
 msgid "This room now shows unavailable members"
 msgstr "Ruangan ini menampilkan anggota yang tak tersedia"
 
-#: src/converse-muc.js:705
+#: src/converse-muc.js:784
 msgid "This room does not show unavailable members"
 msgstr "Ruangan ini tidak menampilkan anggota yang tak tersedia"
 
-#: src/converse-muc.js:706
+#: src/converse-muc.js:785
 msgid "Non-privacy-related room configuration has changed"
 msgstr "Konfigurasi ruangan yang tak berhubungan dengan privasi telah diubah"
 
-#: src/converse-muc.js:707
+#: src/converse-muc.js:786
 msgid "Room logging is now enabled"
 msgstr "Pencatatan di ruangan ini sekarang dinyalakan"
 
-#: src/converse-muc.js:708
+#: src/converse-muc.js:787
 msgid "Room logging is now disabled"
 msgstr "Pencatatan di ruangan ini sekarang dimatikan"
 
-#: src/converse-muc.js:709
+#: src/converse-muc.js:788
 msgid "This room is now non-anonymous"
 msgstr "Ruangan ini sekarang tak-anonim"
 
-#: src/converse-muc.js:710
+#: src/converse-muc.js:789
 msgid "This room is now semi-anonymous"
 msgstr "Ruangan ini sekarang semi-anonim"
 
-#: src/converse-muc.js:711
+#: src/converse-muc.js:790
 msgid "This room is now fully-anonymous"
 msgstr "Ruangan ini sekarang anonim"
 
-#: src/converse-muc.js:712
+#: src/converse-muc.js:791
 msgid "A new room has been created"
 msgstr "Ruangan baru telah dibuat"
 
-#: src/converse-muc.js:716 src/converse-muc.js:816
+#: src/converse-muc.js:795 src/converse-muc.js:895
 msgid "You have been banned from this room"
 msgstr "Anda telah dicekal dari ruangan ini"
 
-#: src/converse-muc.js:717
+#: src/converse-muc.js:796
 msgid "You have been kicked from this room"
 msgstr "Anda telah ditendang dari ruangan ini"
 
-#: src/converse-muc.js:718
+#: src/converse-muc.js:797
 msgid "You have been removed from this room because of an affiliation change"
 msgstr "Anda telah dihapus dari ruangan ini karena perubahan afiliasi"
 
-#: src/converse-muc.js:719
+#: src/converse-muc.js:798
 msgid ""
 "You have been removed from this room because the room has changed to members-"
 "only and you're not a member"
@@ -444,7 +457,7 @@ msgstr ""
 "Anda telah dihapus dari ruangan ini karena ruangan ini hanya terbuka untuk "
 "anggota dan anda bukan anggota"
 
-#: src/converse-muc.js:720
+#: src/converse-muc.js:799
 msgid ""
 "You have been removed from this room because the MUC (Multi-user chat) "
 "service is being shut down."
@@ -462,210 +475,216 @@ msgstr ""
 #. * can then at least tell gettext to scan for it so that these
 #. * strings are picked up by the translation machinery.
 #.
-#: src/converse-muc.js:734
+#: src/converse-muc.js:813
 msgid "<strong>%1$s</strong> has been banned"
 msgstr "<strong>%1$s</strong> telah dicekal"
 
-#: src/converse-muc.js:735
+#: src/converse-muc.js:814
 #, fuzzy
 msgid "<strong>%1$s</strong>'s nickname has changed"
 msgstr "<strong>%1$s</strong> telah dicekal"
 
-#: src/converse-muc.js:736
+#: src/converse-muc.js:815
 msgid "<strong>%1$s</strong> has been kicked out"
 msgstr "<strong>%1$s</strong> telah ditendang keluar"
 
-#: src/converse-muc.js:737
+#: src/converse-muc.js:816
 msgid "<strong>%1$s</strong> has been removed because of an affiliation change"
 msgstr "<strong>%1$s</strong> telah dihapus karena perubahan afiliasi"
 
-#: src/converse-muc.js:738
+#: src/converse-muc.js:817
 msgid "<strong>%1$s</strong> has been removed for not being a member"
 msgstr "<strong>%1$s</strong> telah dihapus karena bukan anggota"
 
-#: src/converse-muc.js:742
+#: src/converse-muc.js:821
 #, fuzzy
-msgid "Your nickname has been automatically changed to: <strong>%1$s</strong>"
+msgid "Your nickname has been automatically set to: <strong>%1$s</strong>"
 msgstr "Nama panggilan anda telah diubah"
 
-#: src/converse-muc.js:743
+#: src/converse-muc.js:822
 #, fuzzy
 msgid "Your nickname has been changed to: <strong>%1$s</strong>"
 msgstr "Nama panggilan anda telah diubah"
 
-#: src/converse-muc.js:790 src/converse-muc.js:799
+#: src/converse-muc.js:869 src/converse-muc.js:878
 msgid "The reason given is: \""
 msgstr ""
 
-#: src/converse-muc.js:814
+#: src/converse-muc.js:893
 msgid "You are not on the member list of this room"
 msgstr "Anda bukan anggota dari ruangan ini"
 
-#: src/converse-muc.js:820
+#: src/converse-muc.js:899
 msgid "No nickname was specified"
 msgstr "Nama panggilan belum ditentukan"
 
-#: src/converse-muc.js:824
+#: src/converse-muc.js:903
 msgid "You are not allowed to create new rooms"
 msgstr "Anda tak diizinkan untuk membuat ruangan baru"
 
-#: src/converse-muc.js:826
+#: src/converse-muc.js:905
 msgid "Your nickname doesn't conform to this room's policies"
 msgstr "Nama panggilan anda tidak sesuai aturan ruangan ini"
 
-#: src/converse-muc.js:828
-msgid "Your nickname is already taken"
-msgstr "Nama panggilan anda telah digunakan orang lain"
+#: src/converse-muc.js:907
+msgid ""
+"The nickname you chose is reserved or currently in use, please choose a "
+"different one."
+msgstr ""
 
-#: src/converse-muc.js:831
+#: src/converse-muc.js:909
 msgid "This room does not (yet) exist"
 msgstr "Ruangan ini belum dibuat"
 
-#: src/converse-muc.js:833
+#: src/converse-muc.js:911
 #, fuzzy
 msgid "This room has reached its maximum number of occupants"
 msgstr "Ruangan ini telah mencapai jumlah penghuni maksimum"
 
-#: src/converse-muc.js:861
+#: src/converse-muc.js:961
 msgid "Topic set by %1$s to: %2$s"
 msgstr "Topik diganti oleh %1$s menjadi: %2$s"
 
-#: src/converse-muc.js:941
-msgid "This user is a moderator"
+#: src/converse-muc.js:1048
+#, fuzzy
+msgid "Click to mention this user in your message."
+msgstr "Klik untuk membuka ruangan ini"
+
+#: src/converse-muc.js:1049
+#, fuzzy
+msgid "This user is a moderator."
 msgstr "Pengguna ini adalah moderator"
 
-#: src/converse-muc.js:942
-msgid "This user can send messages in this room"
+#: src/converse-muc.js:1050
+#, fuzzy
+msgid "This user can send messages in this room."
 msgstr "Pengguna ini dapat mengirim pesan di ruangan ini"
 
-#: src/converse-muc.js:943
-msgid "This user can NOT send messages in this room"
+#: src/converse-muc.js:1051
+#, fuzzy
+msgid "This user can NOT send messages in this room."
 msgstr "Pengguna ini tak dapat mengirim pesan di ruangan ini"
 
-#: src/converse-muc.js:972
+#: src/converse-muc.js:1087
 msgid "Invite"
 msgstr ""
 
-#: src/converse-muc.js:973
+#: src/converse-muc.js:1088
 #, fuzzy
 msgid "Occupants"
 msgstr "Penghuni:"
 
-#: src/converse-muc.js:1072
+#: src/converse-muc.js:1206
 msgid "You are about to invite %1$s to the chat room \"%2$s\". "
 msgstr ""
 
-#: src/converse-muc.js:1073
+#: src/converse-muc.js:1207
 msgid ""
 "You may optionally include a message, explaining the reason for the "
 "invitation."
 msgstr ""
 
-#: src/converse-muc.js:1115
+#: src/converse-muc.js:1249
 msgid "Room name"
 msgstr "Nama ruangan"
 
-#: src/converse-muc.js:1116
-msgid "Nickname"
-msgstr "Nama panggilan"
-
-#: src/converse-muc.js:1117
+#: src/converse-muc.js:1251
 msgid "Server"
 msgstr "Server"
 
-#: src/converse-muc.js:1118
+#: src/converse-muc.js:1252
 #, fuzzy
 msgid "Join Room"
 msgstr "Ikuti"
 
-#: src/converse-muc.js:1119
+#: src/converse-muc.js:1253
 msgid "Show rooms"
 msgstr "Perlihatkan ruangan"
 
-#: src/converse-muc.js:1123
+#: src/converse-muc.js:1257
 msgid "Rooms"
 msgstr "Ruangan"
 
 #. For translators: %1$s is a variable and will be replaced with the XMPP server name
-#: src/converse-muc.js:1143
+#: src/converse-muc.js:1277
 msgid "No rooms on %1$s"
 msgstr "Tak ada ruangan di %1$s"
 
 #. For translators: %1$s is a variable and will be
 #. replaced with the XMPP server name
-#: src/converse-muc.js:1157
+#: src/converse-muc.js:1291
 msgid "Rooms on %1$s"
 msgstr "Ruangan di %1$s"
 
-#: src/converse-muc.js:1166
+#: src/converse-muc.js:1300
 msgid "Click to open this room"
 msgstr "Klik untuk membuka ruangan ini"
 
-#: src/converse-muc.js:1167
+#: src/converse-muc.js:1301
 msgid "Show more information on this room"
 msgstr "Tampilkan informasi ruangan ini"
 
-#: src/converse-muc.js:1239
+#: src/converse-muc.js:1373
 msgid "Description:"
 msgstr "Keterangan:"
 
-#: src/converse-muc.js:1240
+#: src/converse-muc.js:1374
 msgid "Occupants:"
 msgstr "Penghuni:"
 
-#: src/converse-muc.js:1241
+#: src/converse-muc.js:1375
 msgid "Features:"
 msgstr "Fitur:"
 
-#: src/converse-muc.js:1242
+#: src/converse-muc.js:1376
 msgid "Requires authentication"
 msgstr "Membutuhkan otentikasi"
 
-#: src/converse-muc.js:1243
+#: src/converse-muc.js:1377
 msgid "Hidden"
 msgstr "Tersembunyi"
 
-#: src/converse-muc.js:1244
+#: src/converse-muc.js:1378
 msgid "Requires an invitation"
 msgstr "Membutuhkan undangan"
 
-#: src/converse-muc.js:1245
+#: src/converse-muc.js:1379
 msgid "Moderated"
 msgstr "Dimoderasi"
 
-#: src/converse-muc.js:1246
+#: src/converse-muc.js:1380
 msgid "Non-anonymous"
 msgstr "Tidak anonim"
 
-#: src/converse-muc.js:1247
+#: src/converse-muc.js:1381
 msgid "Open room"
 msgstr "Ruangan terbuka"
 
-#: src/converse-muc.js:1248
+#: src/converse-muc.js:1382
 msgid "Permanent room"
 msgstr "Ruangan permanen"
 
-#: src/converse-muc.js:1249
+#: src/converse-muc.js:1383
 msgid "Public"
 msgstr "Umum"
 
-#: src/converse-muc.js:1250
+#: src/converse-muc.js:1384
 msgid "Semi-anonymous"
 msgstr "Semi-anonim"
 
-#: src/converse-muc.js:1251
+#: src/converse-muc.js:1385
 msgid "Temporary room"
 msgstr "Ruangan sementara"
 
-#: src/converse-muc.js:1252
+#: src/converse-muc.js:1386
 msgid "Unmoderated"
 msgstr "Tak dimoderasi"
 
-#: src/converse-muc.js:1329
+#: src/converse-muc.js:1456
 msgid "%1$s has invited you to join a chat room: %2$s"
 msgstr ""
 
-#: src/converse-muc.js:1334
+#: src/converse-muc.js:1461
 msgid ""
 "%1$s has invited you to join a chat room: %2$s, and left the following "
 "reason: \"%3$s\""
@@ -1047,6 +1066,9 @@ msgstr ""
 msgid "Are you sure you want to decline this contact request?"
 msgstr "Klik untuk menghapus teman ini"
 
+#~ msgid "Your nickname is already taken"
+#~ msgstr "Nama panggilan anda telah digunakan orang lain"
+
 #~ msgid "Disconnected"
 #~ msgstr "Terputus"
 

locale/it/LC_MESSAGES/converse.json

@@ -303,6 +303,14 @@
             null,
             "Errore durante il salvataggio del modulo"
          ],
+         "Please choose your nickname": [
+            null,
+            ""
+         ],
+         "Nickname": [
+            null,
+            "Soprannome"
+         ],
          "This chatroom requires a password": [
             null,
             "Questa stanza richiede una password"
@@ -395,10 +403,6 @@
             null,
             "<strong>%1$s</strong> è stato rimosso in quanto non membro"
          ],
-         "Your nickname has been automatically changed to: <strong>%1$s</strong>": [
-            null,
-            "Il tuo nickname è stato cambiato automaticamente in: <strong>%1$s</strong>"
-         ],
          "Your nickname has been changed to: <strong>%1$s</strong>": [
             null,
             "Il tuo nickname è stato cambiato: <strong>%1$s</strong>"
@@ -423,9 +427,9 @@
             null,
             "Il tuo soprannome non è conforme alle regole di questa stanza"
          ],
-         "Your nickname is already taken": [
+         "The nickname you chose is reserved or currently in use, please choose a different one.": [
             null,
-            "Il tuo soprannome è già utilizzato"
+            ""
          ],
          "This room does not (yet) exist": [
             null,
@@ -435,18 +439,6 @@
             null,
             "Topic impostato da %1$s a: %2$s"
          ],
-         "This user is a moderator": [
-            null,
-            "Questo utente è un moderatore"
-         ],
-         "This user can send messages in this room": [
-            null,
-            "Questo utente può inviare messaggi in questa stanza"
-         ],
-         "This user can NOT send messages in this room": [
-            null,
-            "Questo utente NON può inviare messaggi in questa stanza"
-         ],
          "Invite": [
             null,
             "Invita"
@@ -467,10 +459,6 @@
             null,
             "Nome stanza"
          ],
-         "Nickname": [
-            null,
-            "Soprannome"
-         ],
          "Server": [
             null,
             "Server"

locale/it/LC_MESSAGES/converse.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse.js 0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-26 05:57+0000\n"
+"POT-Creation-Date: 2016-07-28 16:03+0000\n"
 "PO-Revision-Date: 2016-04-07 10:23+0000\n"
 "Last-Translator: Fabio Bas <ctrlaltca@gmail.com>\n"
 "Language-Team: Italian\n"
@@ -22,7 +22,7 @@ msgstr ""
 "X-Generator: Poedit 1.8.4\n"
 
 #: src/converse-chatview.js:103 src/converse-headline.js:99
-#: src/converse-muc.js:239
+#: src/converse-muc.js:246
 #, fuzzy
 msgid "You have unread messages"
 msgstr "Rimuovi messaggi"
@@ -48,12 +48,12 @@ msgstr "sta scrivendo"
 msgid "has stopped typing"
 msgstr "ha smesso di scrivere"
 
-#: src/converse-chatview.js:332 src/converse-chatview.js:588
+#: src/converse-chatview.js:332 src/converse-chatview.js:592
 #: src/converse-notification.js:171
 msgid "has gone away"
 msgstr ""
 
-#: src/converse-chatview.js:456 src/converse-muc.js:412
+#: src/converse-chatview.js:456 src/converse-muc.js:426
 msgid "Show this menu"
 msgstr "Mostra questo menu"
 
@@ -61,7 +61,7 @@ msgstr "Mostra questo menu"
 msgid "Write in the third person"
 msgstr "Scrivi in terza persona"
 
-#: src/converse-chatview.js:458 src/converse-muc.js:410
+#: src/converse-chatview.js:458 src/converse-muc.js:424
 msgid "Remove messages"
 msgstr "Rimuovi messaggi"
 
@@ -69,27 +69,27 @@ msgstr "Rimuovi messaggi"
 msgid "Are you sure you want to clear the messages from this chat box?"
 msgstr ""
 
-#: src/converse-chatview.js:586 src/converse-notification.js:169
+#: src/converse-chatview.js:590 src/converse-notification.js:169
 msgid "has gone offline"
 msgstr ""
 
-#: src/converse-chatview.js:590 src/converse-notification.js:173
+#: src/converse-chatview.js:594 src/converse-notification.js:173
 msgid "is busy"
 msgstr "è occupato"
 
-#: src/converse-chatview.js:633
+#: src/converse-chatview.js:637
 msgid "Clear all messages"
 msgstr "Pulisci tutti i messaggi"
 
-#: src/converse-chatview.js:634
+#: src/converse-chatview.js:638
 msgid "Hide the list of occupants"
 msgstr ""
 
-#: src/converse-chatview.js:635
+#: src/converse-chatview.js:639
 msgid "Insert a smiley"
 msgstr ""
 
-#: src/converse-chatview.js:636
+#: src/converse-chatview.js:640
 msgid "Start a call"
 msgstr ""
 
@@ -153,7 +153,7 @@ msgstr "Clicca per cambiare il tuo stato"
 msgid "Custom status"
 msgstr "Stato personalizzato"
 
-#: src/converse-controlbox.js:490 src/converse-muc.js:580
+#: src/converse-controlbox.js:490 src/converse-muc.js:591
 msgid "Save"
 msgstr "Salva"
 
@@ -285,158 +285,171 @@ msgstr "Ridotto"
 msgid "Minimize this chat box"
 msgstr ""
 
-#: src/converse-muc.js:241
+#: src/converse-muc.js:248
 msgid "Message"
 msgstr "Messaggio"
 
-#: src/converse-muc.js:302
+#: src/converse-muc.js:316
 msgid "Error: could not execute the command"
 msgstr ""
 
-#: src/converse-muc.js:358
+#: src/converse-muc.js:372
 msgid "Error: the \""
 msgstr ""
 
-#: src/converse-muc.js:368
+#: src/converse-muc.js:382
 msgid "Are you sure you want to clear the messages from this room?"
 msgstr "Sei sicuro di voler pulire i messaggi da questa stanza?"
 
-#: src/converse-muc.js:408
+#: src/converse-muc.js:422
 msgid "Change user's affiliation to admin"
 msgstr ""
 
-#: src/converse-muc.js:409
+#: src/converse-muc.js:423
 msgid "Ban user from room"
 msgstr "Bandisci utente dalla stanza"
 
-#: src/converse-muc.js:411
+#: src/converse-muc.js:425
 msgid "Change user role to occupant"
 msgstr ""
 
-#: src/converse-muc.js:413
+#: src/converse-muc.js:427
 msgid "Kick user from room"
 msgstr "Espelli utente dalla stanza"
 
-#: src/converse-muc.js:414
+#: src/converse-muc.js:428
 msgid "Write in 3rd person"
 msgstr "Scrivi in terza persona"
 
-#: src/converse-muc.js:415
+#: src/converse-muc.js:429
 msgid "Grant membership to a user"
 msgstr ""
 
-#: src/converse-muc.js:416
+#: src/converse-muc.js:430
 msgid "Remove user's ability to post messages"
 msgstr ""
 
-#: src/converse-muc.js:417
+#: src/converse-muc.js:431
 msgid "Change your nickname"
 msgstr ""
 
-#: src/converse-muc.js:418
+#: src/converse-muc.js:432
 msgid "Grant moderator role to user"
 msgstr ""
 
-#: src/converse-muc.js:419
+#: src/converse-muc.js:433
 #, fuzzy
 msgid "Grant ownership of this room"
 msgstr "Non sei nella lista dei membri di questa stanza"
 
-#: src/converse-muc.js:420
+#: src/converse-muc.js:434
 msgid "Revoke user's membership"
 msgstr ""
 
-#: src/converse-muc.js:421
+#: src/converse-muc.js:435
 msgid "Set room topic"
 msgstr "Cambia oggetto della stanza"
 
-#: src/converse-muc.js:422
+#: src/converse-muc.js:436
 msgid "Allow muted user to post messages"
 msgstr ""
 
-#: src/converse-muc.js:581 src/converse-register.js:216
+#: src/converse-muc.js:592 src/converse-register.js:216
 #: src/converse-register.js:331
 msgid "Cancel"
 msgstr "Annulla"
 
-#: src/converse-muc.js:624
+#: src/converse-muc.js:635
 msgid "An error occurred while trying to save the form."
 msgstr "Errore durante il salvataggio del modulo"
 
-#: src/converse-muc.js:666
+#: src/converse-muc.js:725
+msgid "Please choose your nickname"
+msgstr ""
+
+#: src/converse-muc.js:726 src/converse-muc.js:1250
+msgid "Nickname"
+msgstr "Soprannome"
+
+#: src/converse-muc.js:727
+#, fuzzy
+msgid "Enter room"
+msgstr "Stanza aperta"
+
+#: src/converse-muc.js:745
 msgid "This chatroom requires a password"
 msgstr "Questa stanza richiede una password"
 
-#: src/converse-muc.js:667
+#: src/converse-muc.js:746
 msgid "Password: "
 msgstr "Password: "
 
-#: src/converse-muc.js:668
+#: src/converse-muc.js:747
 msgid "Submit"
 msgstr "Invia"
 
-#: src/converse-muc.js:703
+#: src/converse-muc.js:782
 msgid "This room is not anonymous"
 msgstr "Questa stanza non è anonima"
 
-#: src/converse-muc.js:704
+#: src/converse-muc.js:783
 msgid "This room now shows unavailable members"
 msgstr "Questa stanza mostra i membri non disponibili al momento"
 
-#: src/converse-muc.js:705
+#: src/converse-muc.js:784
 msgid "This room does not show unavailable members"
 msgstr "Questa stanza non mostra i membri non disponibili"
 
-#: src/converse-muc.js:706
+#: src/converse-muc.js:785
 msgid "Non-privacy-related room configuration has changed"
 msgstr ""
 "Una configurazione della stanza non legata alla privacy è stata modificata"
 
-#: src/converse-muc.js:707
+#: src/converse-muc.js:786
 msgid "Room logging is now enabled"
 msgstr "La registrazione è abilitata nella stanza"
 
-#: src/converse-muc.js:708
+#: src/converse-muc.js:787
 msgid "Room logging is now disabled"
 msgstr "La registrazione è disabilitata nella stanza"
 
-#: src/converse-muc.js:709
+#: src/converse-muc.js:788
 msgid "This room is now non-anonymous"
 msgstr "Questa stanza è non-anonima"
 
-#: src/converse-muc.js:710
+#: src/converse-muc.js:789
 msgid "This room is now semi-anonymous"
 msgstr "Questa stanza è semi-anonima"
 
-#: src/converse-muc.js:711
+#: src/converse-muc.js:790
 msgid "This room is now fully-anonymous"
 msgstr "Questa stanza è completamente-anonima"
 
-#: src/converse-muc.js:712
+#: src/converse-muc.js:791
 msgid "A new room has been created"
 msgstr "Una nuova stanza è stata creata"
 
-#: src/converse-muc.js:716 src/converse-muc.js:816
+#: src/converse-muc.js:795 src/converse-muc.js:895
 msgid "You have been banned from this room"
 msgstr "Sei stato bandito da questa stanza"
 
-#: src/converse-muc.js:717
+#: src/converse-muc.js:796
 msgid "You have been kicked from this room"
 msgstr "Sei stato espulso da questa stanza"
 
-#: src/converse-muc.js:718
+#: src/converse-muc.js:797
 msgid "You have been removed from this room because of an affiliation change"
 msgstr ""
 "Sei stato rimosso da questa stanza a causa di un cambio di affiliazione"
 
-#: src/converse-muc.js:719
+#: src/converse-muc.js:798
 msgid ""
 "You have been removed from this room because the room has changed to members-"
 "only and you're not a member"
 msgstr ""
 "Sei stato rimosso da questa stanza poiché ora la stanza accetta solo membri"
 
-#: src/converse-muc.js:720
+#: src/converse-muc.js:799
 msgid ""
 "You have been removed from this room because the MUC (Multi-user chat) "
 "service is being shut down."
@@ -454,207 +467,214 @@ msgstr ""
 #. * can then at least tell gettext to scan for it so that these
 #. * strings are picked up by the translation machinery.
 #.
-#: src/converse-muc.js:734
+#: src/converse-muc.js:813
 msgid "<strong>%1$s</strong> has been banned"
 msgstr "<strong>%1$s</strong> è stato bandito"
 
-#: src/converse-muc.js:735
+#: src/converse-muc.js:814
 msgid "<strong>%1$s</strong>'s nickname has changed"
 msgstr "<strong>%1$s</strong> nickname è cambiato"
 
-#: src/converse-muc.js:736
+#: src/converse-muc.js:815
 msgid "<strong>%1$s</strong> has been kicked out"
 msgstr "<strong>%1$s</strong> è stato espulso"
 
-#: src/converse-muc.js:737
+#: src/converse-muc.js:816
 msgid "<strong>%1$s</strong> has been removed because of an affiliation change"
 msgstr ""
 "<strong>%1$s</strong> è stato rimosso a causa di un cambio di affiliazione"
 
-#: src/converse-muc.js:738
+#: src/converse-muc.js:817
 msgid "<strong>%1$s</strong> has been removed for not being a member"
 msgstr "<strong>%1$s</strong> è stato rimosso in quanto non membro"
 
-#: src/converse-muc.js:742
-msgid "Your nickname has been automatically changed to: <strong>%1$s</strong>"
+#: src/converse-muc.js:821
+#, fuzzy
+msgid "Your nickname has been automatically set to: <strong>%1$s</strong>"
 msgstr ""
 "Il tuo nickname è stato cambiato automaticamente in: <strong>%1$s</strong>"
 
-#: src/converse-muc.js:743
+#: src/converse-muc.js:822
 msgid "Your nickname has been changed to: <strong>%1$s</strong>"
 msgstr "Il tuo nickname è stato cambiato: <strong>%1$s</strong>"
 
-#: src/converse-muc.js:790 src/converse-muc.js:799
+#: src/converse-muc.js:869 src/converse-muc.js:878
 msgid "The reason given is: \""
 msgstr ""
 
-#: src/converse-muc.js:814
+#: src/converse-muc.js:893
 msgid "You are not on the member list of this room"
 msgstr "Non sei nella lista dei membri di questa stanza"
 
-#: src/converse-muc.js:820
+#: src/converse-muc.js:899
 msgid "No nickname was specified"
 msgstr "Nessun soprannome specificato"
 
-#: src/converse-muc.js:824
+#: src/converse-muc.js:903
 msgid "You are not allowed to create new rooms"
 msgstr "Non ti è permesso creare nuove stanze"
 
-#: src/converse-muc.js:826
+#: src/converse-muc.js:905
 msgid "Your nickname doesn't conform to this room's policies"
 msgstr "Il tuo soprannome non è conforme alle regole di questa stanza"
 
-#: src/converse-muc.js:828
-msgid "Your nickname is already taken"
-msgstr "Il tuo soprannome è già utilizzato"
+#: src/converse-muc.js:907
+msgid ""
+"The nickname you chose is reserved or currently in use, please choose a "
+"different one."
+msgstr ""
 
-#: src/converse-muc.js:831
+#: src/converse-muc.js:909
 msgid "This room does not (yet) exist"
 msgstr "Questa stanza non esiste (per ora)"
 
-#: src/converse-muc.js:833
+#: src/converse-muc.js:911
 #, fuzzy
 msgid "This room has reached its maximum number of occupants"
 msgstr "Questa stanza ha raggiunto il limite massimo di utenti"
 
-#: src/converse-muc.js:861
+#: src/converse-muc.js:961
 msgid "Topic set by %1$s to: %2$s"
 msgstr "Topic impostato da %1$s a: %2$s"
 
-#: src/converse-muc.js:941
-msgid "This user is a moderator"
+#: src/converse-muc.js:1048
+#, fuzzy
+msgid "Click to mention this user in your message."
+msgstr "Clicca per aprire questa stanza"
+
+#: src/converse-muc.js:1049
+#, fuzzy
+msgid "This user is a moderator."
 msgstr "Questo utente è un moderatore"
 
-#: src/converse-muc.js:942
-msgid "This user can send messages in this room"
+#: src/converse-muc.js:1050
+#, fuzzy
+msgid "This user can send messages in this room."
 msgstr "Questo utente può inviare messaggi in questa stanza"
 
-#: src/converse-muc.js:943
-msgid "This user can NOT send messages in this room"
+#: src/converse-muc.js:1051
+#, fuzzy
+msgid "This user can NOT send messages in this room."
 msgstr "Questo utente NON può inviare messaggi in questa stanza"
 
-#: src/converse-muc.js:972
+#: src/converse-muc.js:1087
 msgid "Invite"
 msgstr "Invita"
 
-#: src/converse-muc.js:973
+#: src/converse-muc.js:1088
 msgid "Occupants"
 msgstr "Occupanti"
 
-#: src/converse-muc.js:1072
+#: src/converse-muc.js:1206
 msgid "You are about to invite %1$s to the chat room \"%2$s\". "
 msgstr ""
 
-#: src/converse-muc.js:1073
+#: src/converse-muc.js:1207
 msgid ""
 "You may optionally include a message, explaining the reason for the "
 "invitation."
 msgstr ""
 
-#: src/converse-muc.js:1115
+#: src/converse-muc.js:1249
 msgid "Room name"
 msgstr "Nome stanza"
 
-#: src/converse-muc.js:1116
-msgid "Nickname"
-msgstr "Soprannome"
-
-#: src/converse-muc.js:1117
+#: src/converse-muc.js:1251
 msgid "Server"
 msgstr "Server"
 
-#: src/converse-muc.js:1118
+#: src/converse-muc.js:1252
 msgid "Join Room"
 msgstr "Entra nella Stanza"
 
-#: src/converse-muc.js:1119
+#: src/converse-muc.js:1253
 msgid "Show rooms"
 msgstr "Mostra stanze"
 
-#: src/converse-muc.js:1123
+#: src/converse-muc.js:1257
 msgid "Rooms"
 msgstr "Stanze"
 
 #. For translators: %1$s is a variable and will be replaced with the XMPP server name
-#: src/converse-muc.js:1143
+#: src/converse-muc.js:1277
 msgid "No rooms on %1$s"
 msgstr "Nessuna stanza su %1$s"
 
 #. For translators: %1$s is a variable and will be
 #. replaced with the XMPP server name
-#: src/converse-muc.js:1157
+#: src/converse-muc.js:1291
 msgid "Rooms on %1$s"
 msgstr "Stanze su %1$s"
 
-#: src/converse-muc.js:1166
+#: src/converse-muc.js:1300
 msgid "Click to open this room"
 msgstr "Clicca per aprire questa stanza"
 
-#: src/converse-muc.js:1167
+#: src/converse-muc.js:1301
 msgid "Show more information on this room"
 msgstr "Mostra più informazioni su questa stanza"
 
-#: src/converse-muc.js:1239
+#: src/converse-muc.js:1373
 msgid "Description:"
 msgstr "Descrizione:"
 
-#: src/converse-muc.js:1240
+#: src/converse-muc.js:1374
 msgid "Occupants:"
 msgstr "Utenti presenti:"
 
-#: src/converse-muc.js:1241
+#: src/converse-muc.js:1375
 msgid "Features:"
 msgstr "Funzionalità:"
 
-#: src/converse-muc.js:1242
+#: src/converse-muc.js:1376
 msgid "Requires authentication"
 msgstr "Richiede autenticazione"
 
-#: src/converse-muc.js:1243
+#: src/converse-muc.js:1377
 msgid "Hidden"
 msgstr "Nascosta"
 
-#: src/converse-muc.js:1244
+#: src/converse-muc.js:1378
 msgid "Requires an invitation"
 msgstr "Richiede un invito"
 
-#: src/converse-muc.js:1245
+#: src/converse-muc.js:1379
 msgid "Moderated"
 msgstr "Moderata"
 
-#: src/converse-muc.js:1246
+#: src/converse-muc.js:1380
 msgid "Non-anonymous"
 msgstr "Non-anonima"
 
-#: src/converse-muc.js:1247
+#: src/converse-muc.js:1381
 msgid "Open room"
 msgstr "Stanza aperta"
 
-#: src/converse-muc.js:1248
+#: src/converse-muc.js:1382
 msgid "Permanent room"
 msgstr "Stanza permanente"
 
-#: src/converse-muc.js:1249
+#: src/converse-muc.js:1383
 msgid "Public"
 msgstr "Pubblica"
 
-#: src/converse-muc.js:1250
+#: src/converse-muc.js:1384
 msgid "Semi-anonymous"
 msgstr "Semi-anonima"
 
-#: src/converse-muc.js:1251
+#: src/converse-muc.js:1385
 msgid "Temporary room"
 msgstr "Stanza temporanea"
 
-#: src/converse-muc.js:1252
+#: src/converse-muc.js:1386
 msgid "Unmoderated"
 msgstr "Non moderata"
 
-#: src/converse-muc.js:1329
+#: src/converse-muc.js:1456
 msgid "%1$s has invited you to join a chat room: %2$s"
 msgstr "%1$s ti ha invitato a partecipare a una chat room: %2$s"
 
-#: src/converse-muc.js:1334
+#: src/converse-muc.js:1461
 msgid ""
 "%1$s has invited you to join a chat room: %2$s, and left the following "
 "reason: \"%3$s\""
@@ -1003,6 +1023,9 @@ msgstr "Si è verificato un errore durante il tentativo di rimozione"
 msgid "Are you sure you want to decline this contact request?"
 msgstr "Sei sicuro dirifiutare questa richiesta di contatto?"
 
+#~ msgid "Your nickname is already taken"
+#~ msgstr "Il tuo soprannome è già utilizzato"
+
 #~ msgid "Disconnected"
 #~ msgstr "Disconnesso"
 

locale/ja/LC_MESSAGES/converse.json

@@ -251,6 +251,14 @@
             null,
             "フォームを保存する際にエラーが発生しました。"
          ],
+         "Please choose your nickname": [
+            null,
+            ""
+         ],
+         "Nickname": [
+            null,
+            "ニックネーム"
+         ],
          "This chatroom requires a password": [
             null,
             "この談話室にはパスワードが必要です"
@@ -359,9 +367,9 @@
             null,
             "ニックネームがこの談話室のポリシーに従っていません"
          ],
-         "Your nickname is already taken": [
+         "The nickname you chose is reserved or currently in use, please choose a different one.": [
             null,
-            "ニックネームは既に使われています"
+            ""
          ],
          "This room does not (yet) exist": [
             null,
@@ -371,18 +379,6 @@
             null,
             "%1$s が話題を設定しました: %2$s"
          ],
-         "This user is a moderator": [
-            null,
-            "このユーザーは司会者です"
-         ],
-         "This user can send messages in this room": [
-            null,
-            "このユーザーはこの談話室で発言できます"
-         ],
-         "This user can NOT send messages in this room": [
-            null,
-            "このユーザーはこの談話室で発言できません"
-         ],
          "Invite": [
             null,
             ""
@@ -399,10 +395,6 @@
             null,
             "談話室の名前"
          ],
-         "Nickname": [
-            null,
-            "ニックネーム"
-         ],
          "Server": [
             null,
             "サーバー"

locale/ja/LC_MESSAGES/converse.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse.js 0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-26 05:57+0000\n"
+"POT-Creation-Date: 2016-07-28 16:03+0000\n"
 "PO-Revision-Date: 2014-01-07 11:32+0900\n"
 "Last-Translator: Mako N <mako@pasero.net>\n"
 "Language-Team: Language JA\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: src/converse-chatview.js:103 src/converse-headline.js:99
-#: src/converse-muc.js:239
+#: src/converse-muc.js:246
 #, fuzzy
 msgid "You have unread messages"
 msgstr "メッセージを削除"
@@ -44,13 +44,13 @@ msgstr ""
 msgid "has stopped typing"
 msgstr ""
 
-#: src/converse-chatview.js:332 src/converse-chatview.js:588
+#: src/converse-chatview.js:332 src/converse-chatview.js:592
 #: src/converse-notification.js:171
 #, fuzzy
 msgid "has gone away"
 msgstr "この相手先は離席中です"
 
-#: src/converse-chatview.js:456 src/converse-muc.js:412
+#: src/converse-chatview.js:456 src/converse-muc.js:426
 msgid "Show this menu"
 msgstr "このメニューを表示"
 
@@ -58,7 +58,7 @@ msgstr "このメニューを表示"
 msgid "Write in the third person"
 msgstr "第三者に書く"
 
-#: src/converse-chatview.js:458 src/converse-muc.js:410
+#: src/converse-chatview.js:458 src/converse-muc.js:424
 msgid "Remove messages"
 msgstr "メッセージを削除"
 
@@ -66,30 +66,30 @@ msgstr "メッセージを削除"
 msgid "Are you sure you want to clear the messages from this chat box?"
 msgstr ""
 
-#: src/converse-chatview.js:586 src/converse-notification.js:169
+#: src/converse-chatview.js:590 src/converse-notification.js:169
 #, fuzzy
 msgid "has gone offline"
 msgstr "この相手先はオフラインです"
 
-#: src/converse-chatview.js:590 src/converse-notification.js:173
+#: src/converse-chatview.js:594 src/converse-notification.js:173
 #, fuzzy
 msgid "is busy"
 msgstr "取り込み中"
 
-#: src/converse-chatview.js:633
+#: src/converse-chatview.js:637
 #, fuzzy
 msgid "Clear all messages"
 msgstr "私信"
 
-#: src/converse-chatview.js:634
+#: src/converse-chatview.js:638
 msgid "Hide the list of occupants"
 msgstr ""
 
-#: src/converse-chatview.js:635
+#: src/converse-chatview.js:639
 msgid "Insert a smiley"
 msgstr ""
 
-#: src/converse-chatview.js:636
+#: src/converse-chatview.js:640
 msgid "Start a call"
 msgstr ""
 
@@ -156,7 +156,7 @@ msgstr "クリックして、在席状況を変更"
 msgid "Custom status"
 msgstr "独自の在席状況"
 
-#: src/converse-controlbox.js:490 src/converse-muc.js:580
+#: src/converse-controlbox.js:490 src/converse-muc.js:591
 msgid "Save"
 msgstr "保存"
 
@@ -289,154 +289,167 @@ msgstr ""
 msgid "Minimize this chat box"
 msgstr ""
 
-#: src/converse-muc.js:241
+#: src/converse-muc.js:248
 msgid "Message"
 msgstr "メッセージ"
 
-#: src/converse-muc.js:302
+#: src/converse-muc.js:316
 msgid "Error: could not execute the command"
 msgstr ""
 
-#: src/converse-muc.js:358
+#: src/converse-muc.js:372
 msgid "Error: the \""
 msgstr ""
 
-#: src/converse-muc.js:368
+#: src/converse-muc.js:382
 #, fuzzy
 msgid "Are you sure you want to clear the messages from this room?"
 msgstr "この談話室のメンバー一覧にいません"
 
-#: src/converse-muc.js:408
+#: src/converse-muc.js:422
 msgid "Change user's affiliation to admin"
 msgstr ""
 
-#: src/converse-muc.js:409
+#: src/converse-muc.js:423
 #, fuzzy
 msgid "Ban user from room"
 msgstr "ユーザーを談話室から締め出す"
 
-#: src/converse-muc.js:411
+#: src/converse-muc.js:425
 msgid "Change user role to occupant"
 msgstr ""
 
-#: src/converse-muc.js:413
+#: src/converse-muc.js:427
 #, fuzzy
 msgid "Kick user from room"
 msgstr "ユーザーを談話室から蹴り出す"
 
-#: src/converse-muc.js:414
+#: src/converse-muc.js:428
 #, fuzzy
 msgid "Write in 3rd person"
 msgstr "第三者に書く"
 
-#: src/converse-muc.js:415
+#: src/converse-muc.js:429
 msgid "Grant membership to a user"
 msgstr ""
 
-#: src/converse-muc.js:416
+#: src/converse-muc.js:430
 msgid "Remove user's ability to post messages"
 msgstr ""
 
-#: src/converse-muc.js:417
+#: src/converse-muc.js:431
 msgid "Change your nickname"
 msgstr ""
 
-#: src/converse-muc.js:418
+#: src/converse-muc.js:432
 msgid "Grant moderator role to user"
 msgstr ""
 
-#: src/converse-muc.js:419
+#: src/converse-muc.js:433
 #, fuzzy
 msgid "Grant ownership of this room"
 msgstr "この談話室のメンバー一覧にいません"
 
-#: src/converse-muc.js:420
+#: src/converse-muc.js:434
 msgid "Revoke user's membership"
 msgstr ""
 
-#: src/converse-muc.js:421
+#: src/converse-muc.js:435
 #, fuzzy
 msgid "Set room topic"
 msgstr "談話室の話題を設定"
 
-#: src/converse-muc.js:422
+#: src/converse-muc.js:436
 msgid "Allow muted user to post messages"
 msgstr ""
 
-#: src/converse-muc.js:581 src/converse-register.js:216
+#: src/converse-muc.js:592 src/converse-register.js:216
 #: src/converse-register.js:331
 msgid "Cancel"
 msgstr "キャンセル"
 
-#: src/converse-muc.js:624
+#: src/converse-muc.js:635
 msgid "An error occurred while trying to save the form."
 msgstr "フォームを保存する際にエラーが発生しました。"
 
-#: src/converse-muc.js:666
+#: src/converse-muc.js:725
+msgid "Please choose your nickname"
+msgstr ""
+
+#: src/converse-muc.js:726 src/converse-muc.js:1250
+msgid "Nickname"
+msgstr "ニックネーム"
+
+#: src/converse-muc.js:727
+#, fuzzy
+msgid "Enter room"
+msgstr "開放談話室"
+
+#: src/converse-muc.js:745
 msgid "This chatroom requires a password"
 msgstr "この談話室にはパスワードが必要です"
 
-#: src/converse-muc.js:667
+#: src/converse-muc.js:746
 msgid "Password: "
 msgstr "パスワード:"
 
-#: src/converse-muc.js:668
+#: src/converse-muc.js:747
 msgid "Submit"
 msgstr "送信"
 
-#: src/converse-muc.js:703
+#: src/converse-muc.js:782
 msgid "This room is not anonymous"
 msgstr "この談話室は非匿名です"
 
-#: src/converse-muc.js:704
+#: src/converse-muc.js:783
 msgid "This room now shows unavailable members"
 msgstr "この談話室はメンバー以外にも見えます"
 
-#: src/converse-muc.js:705
+#: src/converse-muc.js:784
 msgid "This room does not show unavailable members"
 msgstr "この談話室はメンバー以外には見えません"
 
-#: src/converse-muc.js:706
+#: src/converse-muc.js:785
 msgid "Non-privacy-related room configuration has changed"
 msgstr "談話室の設定(プライバシーに無関係)が変更されました"
 
-#: src/converse-muc.js:707
+#: src/converse-muc.js:786
 msgid "Room logging is now enabled"
 msgstr "談話室の記録を取りはじめます"
 
-#: src/converse-muc.js:708
+#: src/converse-muc.js:787
 msgid "Room logging is now disabled"
 msgstr "談話室の記録を止めます"
 
-#: src/converse-muc.js:709
+#: src/converse-muc.js:788
 msgid "This room is now non-anonymous"
 msgstr "この談話室はただいま非匿名です"
 
-#: src/converse-muc.js:710
+#: src/converse-muc.js:789
 msgid "This room is now semi-anonymous"
 msgstr "この談話室はただいま半匿名です"
 
-#: src/converse-muc.js:711
+#: src/converse-muc.js:790
 msgid "This room is now fully-anonymous"
 msgstr "この談話室はただいま匿名です"
 
-#: src/converse-muc.js:712
+#: src/converse-muc.js:791
 msgid "A new room has been created"
 msgstr "新しい談話室が作成されました"
 
-#: src/converse-muc.js:716 src/converse-muc.js:816
+#: src/converse-muc.js:795 src/converse-muc.js:895
 msgid "You have been banned from this room"
 msgstr "この談話室から締め出されました"
 
-#: src/converse-muc.js:717
+#: src/converse-muc.js:796
 msgid "You have been kicked from this room"
 msgstr "この談話室から蹴り出されました"
 
-#: src/converse-muc.js:718
+#: src/converse-muc.js:797
 msgid "You have been removed from this room because of an affiliation change"
 msgstr "分掌の変更のため、この談話室から削除されました"
 
-#: src/converse-muc.js:719
+#: src/converse-muc.js:798
 msgid ""
 "You have been removed from this room because the room has changed to members-"
 "only and you're not a member"
@@ -444,7 +457,7 @@ msgstr ""
 "談話室がメンバー制に変更されました。メンバーではないため、この談話室から削除"
 "されました"
 
-#: src/converse-muc.js:720
+#: src/converse-muc.js:799
 msgid ""
 "You have been removed from this room because the MUC (Multi-user chat) "
 "service is being shut down."
@@ -461,210 +474,216 @@ msgstr ""
 #. * can then at least tell gettext to scan for it so that these
 #. * strings are picked up by the translation machinery.
 #.
-#: src/converse-muc.js:734
+#: src/converse-muc.js:813
 msgid "<strong>%1$s</strong> has been banned"
 msgstr "<strong>%1$s</strong> を締め出しました"
 
-#: src/converse-muc.js:735
+#: src/converse-muc.js:814
 #, fuzzy
 msgid "<strong>%1$s</strong>'s nickname has changed"
 msgstr "<strong>%1$s</strong> を締め出しました"
 
-#: src/converse-muc.js:736
+#: src/converse-muc.js:815
 msgid "<strong>%1$s</strong> has been kicked out"
 msgstr "<strong>%1$s</strong> を蹴り出しました"
 
-#: src/converse-muc.js:737
+#: src/converse-muc.js:816
 msgid "<strong>%1$s</strong> has been removed because of an affiliation change"
 msgstr "分掌の変更のため、<strong>%1$s</strong> を削除しました"
 
-#: src/converse-muc.js:738
+#: src/converse-muc.js:817
 msgid "<strong>%1$s</strong> has been removed for not being a member"
 msgstr "メンバーでなくなったため、<strong>%1$s</strong> を削除しました"
 
-#: src/converse-muc.js:742
+#: src/converse-muc.js:821
 #, fuzzy
-msgid "Your nickname has been automatically changed to: <strong>%1$s</strong>"
+msgid "Your nickname has been automatically set to: <strong>%1$s</strong>"
 msgstr "ニックネームを変更しました"
 
-#: src/converse-muc.js:743
+#: src/converse-muc.js:822
 #, fuzzy
 msgid "Your nickname has been changed to: <strong>%1$s</strong>"
 msgstr "ニックネームを変更しました"
 
-#: src/converse-muc.js:790 src/converse-muc.js:799
+#: src/converse-muc.js:869 src/converse-muc.js:878
 msgid "The reason given is: \""
 msgstr ""
 
-#: src/converse-muc.js:814
+#: src/converse-muc.js:893
 msgid "You are not on the member list of this room"
 msgstr "この談話室のメンバー一覧にいません"
 
-#: src/converse-muc.js:820
+#: src/converse-muc.js:899
 msgid "No nickname was specified"
 msgstr "ニックネームがありません"
 
-#: src/converse-muc.js:824
+#: src/converse-muc.js:903
 msgid "You are not allowed to create new rooms"
 msgstr "新しい談話室を作成する権限がありません"
 
-#: src/converse-muc.js:826
+#: src/converse-muc.js:905
 msgid "Your nickname doesn't conform to this room's policies"
 msgstr "ニックネームがこの談話室のポリシーに従っていません"
 
-#: src/converse-muc.js:828
-msgid "Your nickname is already taken"
-msgstr "ニックネームは既に使われています"
+#: src/converse-muc.js:907
+msgid ""
+"The nickname you chose is reserved or currently in use, please choose a "
+"different one."
+msgstr ""
 
-#: src/converse-muc.js:831
+#: src/converse-muc.js:909
 msgid "This room does not (yet) exist"
 msgstr "この談話室は存在しません"
 
-#: src/converse-muc.js:833
+#: src/converse-muc.js:911
 #, fuzzy
 msgid "This room has reached its maximum number of occupants"
 msgstr "この談話室は入室者数の上限に達しています"
 
-#: src/converse-muc.js:861
+#: src/converse-muc.js:961
 msgid "Topic set by %1$s to: %2$s"
 msgstr "%1$s が話題を設定しました: %2$s"
 
-#: src/converse-muc.js:941
-msgid "This user is a moderator"
+#: src/converse-muc.js:1048
+#, fuzzy
+msgid "Click to mention this user in your message."
+msgstr "クリックしてこの談話室を開く"
+
+#: src/converse-muc.js:1049
+#, fuzzy
+msgid "This user is a moderator."
 msgstr "このユーザーは司会者です"
 
-#: src/converse-muc.js:942
-msgid "This user can send messages in this room"
+#: src/converse-muc.js:1050
+#, fuzzy
+msgid "This user can send messages in this room."
 msgstr "このユーザーはこの談話室で発言できます"
 
-#: src/converse-muc.js:943
-msgid "This user can NOT send messages in this room"
+#: src/converse-muc.js:1051
+#, fuzzy
+msgid "This user can NOT send messages in this room."
 msgstr "このユーザーはこの談話室で発言できません"
 
-#: src/converse-muc.js:972
+#: src/converse-muc.js:1087
 msgid "Invite"
 msgstr ""
 
-#: src/converse-muc.js:973
+#: src/converse-muc.js:1088
 #, fuzzy
 msgid "Occupants"
 msgstr "入室者:"
 
-#: src/converse-muc.js:1072
+#: src/converse-muc.js:1206
 msgid "You are about to invite %1$s to the chat room \"%2$s\". "
 msgstr ""
 
-#: src/converse-muc.js:1073
+#: src/converse-muc.js:1207
 msgid ""
 "You may optionally include a message, explaining the reason for the "
 "invitation."
 msgstr ""
 
-#: src/converse-muc.js:1115
+#: src/converse-muc.js:1249
 msgid "Room name"
 msgstr "談話室の名前"
 
-#: src/converse-muc.js:1116
-msgid "Nickname"
-msgstr "ニックネーム"
-
-#: src/converse-muc.js:1117
+#: src/converse-muc.js:1251
 msgid "Server"
 msgstr "サーバー"
 
-#: src/converse-muc.js:1118
+#: src/converse-muc.js:1252
 #, fuzzy
 msgid "Join Room"
 msgstr "入室"
 
-#: src/converse-muc.js:1119
+#: src/converse-muc.js:1253
 msgid "Show rooms"
 msgstr "談話室一覧を見る"
 
-#: src/converse-muc.js:1123
+#: src/converse-muc.js:1257
 msgid "Rooms"
 msgstr "談話室"
 
 #. For translators: %1$s is a variable and will be replaced with the XMPP server name
-#: src/converse-muc.js:1143
+#: src/converse-muc.js:1277
 msgid "No rooms on %1$s"
 msgstr "%1$s に談話室はありません"
 
 #. For translators: %1$s is a variable and will be
 #. replaced with the XMPP server name
-#: src/converse-muc.js:1157
+#: src/converse-muc.js:1291
 msgid "Rooms on %1$s"
 msgstr "%1$s の談話室一覧"
 
-#: src/converse-muc.js:1166
+#: src/converse-muc.js:1300
 msgid "Click to open this room"
 msgstr "クリックしてこの談話室を開く"
 
-#: src/converse-muc.js:1167
+#: src/converse-muc.js:1301
 msgid "Show more information on this room"
 msgstr "この談話室についての詳細を見る"
 
-#: src/converse-muc.js:1239
+#: src/converse-muc.js:1373
 msgid "Description:"
 msgstr "説明: "
 
-#: src/converse-muc.js:1240
+#: src/converse-muc.js:1374
 msgid "Occupants:"
 msgstr "入室者:"
 
-#: src/converse-muc.js:1241
+#: src/converse-muc.js:1375
 msgid "Features:"
 msgstr "特徴:"
 
-#: src/converse-muc.js:1242
+#: src/converse-muc.js:1376
 msgid "Requires authentication"
 msgstr "認証の要求"
 
-#: src/converse-muc.js:1243
+#: src/converse-muc.js:1377
 msgid "Hidden"
 msgstr "非表示"
 
-#: src/converse-muc.js:1244
+#: src/converse-muc.js:1378
 msgid "Requires an invitation"
 msgstr "招待の要求"
 
-#: src/converse-muc.js:1245
+#: src/converse-muc.js:1379
 msgid "Moderated"
 msgstr "発言制限"
 
-#: src/converse-muc.js:1246
+#: src/converse-muc.js:1380
 msgid "Non-anonymous"
 msgstr "非匿名"
 
-#: src/converse-muc.js:1247
+#: src/converse-muc.js:1381
 msgid "Open room"
 msgstr "開放談話室"
 
-#: src/converse-muc.js:1248
+#: src/converse-muc.js:1382
 msgid "Permanent room"
 msgstr "常設談話室"
 
-#: src/converse-muc.js:1249
+#: src/converse-muc.js:1383
 msgid "Public"
 msgstr "公開談話室"
 
-#: src/converse-muc.js:1250
+#: src/converse-muc.js:1384
 msgid "Semi-anonymous"
 msgstr "半匿名"
 
-#: src/converse-muc.js:1251
+#: src/converse-muc.js:1385
 msgid "Temporary room"
 msgstr "臨時談話室"
 
-#: src/converse-muc.js:1252
+#: src/converse-muc.js:1386
 msgid "Unmoderated"
 msgstr "発言制限なし"
 
-#: src/converse-muc.js:1329
+#: src/converse-muc.js:1456
 msgid "%1$s has invited you to join a chat room: %2$s"
 msgstr ""
 
-#: src/converse-muc.js:1334
+#: src/converse-muc.js:1461
 msgid ""
 "%1$s has invited you to join a chat room: %2$s, and left the following "
 "reason: \"%3$s\""
@@ -1038,6 +1057,9 @@ msgstr ""
 msgid "Are you sure you want to decline this contact request?"
 msgstr "クリックしてこの相手先を削除"
 
+#~ msgid "Your nickname is already taken"
+#~ msgstr "ニックネームは既に使われています"
+
 #~ msgid "Disconnected"
 #~ msgstr "切断中"
 

locale/nb/LC_MESSAGES/converse.json

@@ -279,6 +279,10 @@
             null,
             "En feil skjedde under lagring av skjemaet."
          ],
+         "Nickname": [
+            null,
+            "Kallenavn"
+         ],
          "This chatroom requires a password": [
             null,
             "Dette rommet krever et passord"
@@ -371,10 +375,6 @@
             null,
             "<strong>%1$s</strong> har blitt fjernet på grunn av at han/hun ikke er medlem"
          ],
-         "Your nickname has been automatically changed to: <strong>%1$s</strong>": [
-            null,
-            "Ditt kallenavn har blitt automatisk endret til <strong>%1$s</strong> "
-         ],
          "Your nickname has been changed to: <strong>%1$s</strong>": [
             null,
             "Ditt kallenavn har blitt endret til <strong>%1$s</strong> "
@@ -399,9 +399,9 @@
             null,
             "Ditt kallenavn er ikke i samsvar med rommets regler"
          ],
-         "Your nickname is already taken": [
+         "The nickname you chose is reserved or currently in use, please choose a different one.": [
             null,
-            "Kallenavnet er allerede tatt"
+            ""
          ],
          "This room does not (yet) exist": [
             null,
@@ -411,18 +411,6 @@
             null,
             "Emnet ble endret den %1$s til: %2$s"
          ],
-         "This user is a moderator": [
-            null,
-            "Denne brukeren er moderator"
-         ],
-         "This user can send messages in this room": [
-            null,
-            "Denne brukeren kan skrive meldinger i dette rommet"
-         ],
-         "This user can NOT send messages in this room": [
-            null,
-            "Denne brukeren kan IKKE sende meldinger i dette rommet"
-         ],
          "Invite": [
             null,
             "Invitér"
@@ -443,10 +431,6 @@
             null,
             "Romnavn"
          ],
-         "Nickname": [
-            null,
-            "Kallenavn"
-         ],
          "Server": [
             null,
             "Server"

locale/nb/LC_MESSAGES/converse.po

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse JS 0.8.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-26 05:57+0000\n"
+"POT-Creation-Date: 2016-07-28 16:03+0000\n"
 "PO-Revision-Date: 2016-04-07 10:23+0000\n"
 "Last-Translator: Andreas Lorentsen <andreas.lorentsen@gmail.com>\n"
 "Language-Team: \n"
@@ -19,7 +19,7 @@ msgstr ""
 "plural_forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/converse-chatview.js:103 src/converse-headline.js:99
-#: src/converse-muc.js:239
+#: src/converse-muc.js:246
 #, fuzzy
 msgid "You have unread messages"
 msgstr "Fjern meldinger"
@@ -45,13 +45,13 @@ msgstr "skriver"
 msgid "has stopped typing"
 msgstr "har stoppet å skrive"
 
-#: src/converse-chatview.js:332 src/converse-chatview.js:588
+#: src/converse-chatview.js:332 src/converse-chatview.js:592
 #: src/converse-notification.js:171
 #, fuzzy
 msgid "has gone away"
 msgstr "Kontakten er borte"
 
-#: src/converse-chatview.js:456 src/converse-muc.js:412
+#: src/converse-chatview.js:456 src/converse-muc.js:426
 msgid "Show this menu"
 msgstr "Viser denne menyen"
 
@@ -59,7 +59,7 @@ msgstr "Viser denne menyen"
 msgid "Write in the third person"
 msgstr "Skriv i tredjeperson"
 
-#: src/converse-chatview.js:458 src/converse-muc.js:410
+#: src/converse-chatview.js:458 src/converse-muc.js:424
 msgid "Remove messages"
 msgstr "Fjern meldinger"
 
@@ -67,30 +67,30 @@ msgstr "Fjern meldinger"
 msgid "Are you sure you want to clear the messages from this chat box?"
 msgstr "Er du sikker på at du vil fjerne meldingene fra denne meldingsboksen?"
 
-#: src/converse-chatview.js:586 src/converse-notification.js:169
+#: src/converse-chatview.js:590 src/converse-notification.js:169
 #, fuzzy
 msgid "has gone offline"
 msgstr "Kontakten er avlogget"
 
-#: src/converse-chatview.js:590 src/converse-notification.js:173
+#: src/converse-chatview.js:594 src/converse-notification.js:173
 #, fuzzy
 msgid "is busy"
 msgstr "opptatt"
 
-#: src/converse-chatview.js:633
+#: src/converse-chatview.js:637
 msgid "Clear all messages"
 msgstr "Fjern alle meldinger"
 
-#: src/converse-chatview.js:634
+#: src/converse-chatview.js:638
 #, fuzzy
 msgid "Hide the list of occupants"
 msgstr "Skjul deltakerlisten"
 
-#: src/converse-chatview.js:635
+#: src/converse-chatview.js:639
 msgid "Insert a smiley"
 msgstr ""
 
-#: src/converse-chatview.js:636
+#: src/converse-chatview.js:640
 msgid "Start a call"
 msgstr "Start en samtale"
 
@@ -156,7 +156,7 @@ msgstr "Klikk for å endre din meldingsstatus"
 msgid "Custom status"
 msgstr "Personlig status"
 
-#: src/converse-controlbox.js:490 src/converse-muc.js:580
+#: src/converse-controlbox.js:490 src/converse-muc.js:591
 msgid "Save"
 msgstr "Lagre"
 
@@ -287,150 +287,164 @@ msgstr "Minimert"
 msgid "Minimize this chat box"
 msgstr ""
 
-#: src/converse-muc.js:241
+#: src/converse-muc.js:248
 msgid "Message"
 msgstr "Melding"
 
-#: src/converse-muc.js:302
+#: src/converse-muc.js:316
 msgid "Error: could not execute the command"
 msgstr "Feil: kunne ikke utføre kommandoen"
 
-#: src/converse-muc.js:358
+#: src/converse-muc.js:372
 msgid "Error: the \""
 msgstr ""
 
-#: src/converse-muc.js:368
+#: src/converse-muc.js:382
 msgid "Are you sure you want to clear the messages from this room?"
 msgstr "Er du sikker på at du vil fjerne meldingene fra dette rommet?"
 
-#: src/converse-muc.js:408
+#: src/converse-muc.js:422
 msgid "Change user's affiliation to admin"
 msgstr ""
 
-#: src/converse-muc.js:409
+#: src/converse-muc.js:423
 msgid "Ban user from room"
 msgstr "Utesteng bruker fra rommet"
 
-#: src/converse-muc.js:411
+#: src/converse-muc.js:425
 #, fuzzy
 msgid "Change user role to occupant"
 msgstr "Skjul deltakerlisten"
 
-#: src/converse-muc.js:413
+#: src/converse-muc.js:427
 msgid "Kick user from room"
 msgstr "Kast ut bruker fra rommet"
 
-#: src/converse-muc.js:414
+#: src/converse-muc.js:428
 msgid "Write in 3rd person"
 msgstr "Skriv i tredjeperson"
 
-#: src/converse-muc.js:415
+#: src/converse-muc.js:429
 msgid "Grant membership to a user"
 msgstr ""
 
-#: src/converse-muc.js:416
+#: src/converse-muc.js:430
 msgid "Remove user's ability to post messages"
 msgstr "Fjern brukerens muligheter til å skrive meldinger"
 
-#: src/converse-muc.js:417
+#: src/converse-muc.js:431
 msgid "Change your nickname"
 msgstr "Endre ditt kallenavn"
 
-#: src/converse-muc.js:418
+#: src/converse-muc.js:432
 msgid "Grant moderator role to user"
 msgstr ""
 
-#: src/converse-muc.js:419
+#: src/converse-muc.js:433
 #, fuzzy
 msgid "Grant ownership of this room"
 msgstr "Du er ikke på medlemslisten til dette rommet"
 
-#: src/converse-muc.js:420
+#: src/converse-muc.js:434
 msgid "Revoke user's membership"
 msgstr ""
 
-#: src/converse-muc.js:421
+#: src/converse-muc.js:435
 msgid "Set room topic"
 msgstr "Endre rommets emne"
 
-#: src/converse-muc.js:422
+#: src/converse-muc.js:436
 msgid "Allow muted user to post messages"
 msgstr "Tillat stumme brukere å skrive meldinger"
 
-#: src/converse-muc.js:581 src/converse-register.js:216
+#: src/converse-muc.js:592 src/converse-register.js:216
 #: src/converse-register.js:331
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: src/converse-muc.js:624
+#: src/converse-muc.js:635
 msgid "An error occurred while trying to save the form."
 msgstr "En feil skjedde under lagring av skjemaet."
 
-#: src/converse-muc.js:666
+#: src/converse-muc.js:725
+#, fuzzy
+msgid "Please choose your nickname"
+msgstr "Endre ditt kallenavn"
+
+#: src/converse-muc.js:726 src/converse-muc.js:1250
+msgid "Nickname"
+msgstr "Kallenavn"
+
+#: src/converse-muc.js:727
+#, fuzzy
+msgid "Enter room"
+msgstr "Åpent Rom"
+
+#: src/converse-muc.js:745
 msgid "This chatroom requires a password"
 msgstr "Dette rommet krever et passord"
 
-#: src/converse-muc.js:667
+#: src/converse-muc.js:746
 msgid "Password: "
 msgstr "Passord:"
 
-#: src/converse-muc.js:668
+#: src/converse-muc.js:747
 msgid "Submit"
 msgstr "Send"
 
-#: src/converse-muc.js:703
+#: src/converse-muc.js:782
 msgid "This room is not anonymous"
 msgstr "Dette rommet er ikke anonymt"
 
-#: src/converse-muc.js:704
+#: src/converse-muc.js:783
 msgid "This room now shows unavailable members"
 msgstr "Dette rommet viser nå utilgjengelige medlemmer"
 
-#: src/converse-muc.js:705
+#: src/converse-muc.js:784
 msgid "This room does not show unavailable members"
 msgstr "Dette rommet viser ikke utilgjengelige medlemmer"
 
-#: src/converse-muc.js:706
+#: src/converse-muc.js:785
 msgid "Non-privacy-related room configuration has changed"
 msgstr "Ikke-personvernsrelatert romkonfigurasjon har blitt endret"
 
-#: src/converse-muc.js:707
+#: src/converse-muc.js:786
 msgid "Room logging is now enabled"
 msgstr "Romlogging er nå aktivert"
 
-#: src/converse-muc.js:708
+#: src/converse-muc.js:787
 msgid "Room logging is now disabled"
 msgstr "Romlogging er nå deaktivert"
 
-#: src/converse-muc.js:709
+#: src/converse-muc.js:788
 msgid "This room is now non-anonymous"
 msgstr "Dette rommet er nå ikke-anonymt"
 
-#: src/converse-muc.js:710
+#: src/converse-muc.js:789
 msgid "This room is now semi-anonymous"
 msgstr "Dette rommet er nå semi-anonymt"
 
-#: src/converse-muc.js:711
+#: src/converse-muc.js:790
 msgid "This room is now fully-anonymous"
 msgstr "Dette rommet er nå totalt anonymt"
 
-#: src/converse-muc.js:712
+#: src/converse-muc.js:791
 msgid "A new room has been created"
 msgstr "Et nytt rom har blitt opprettet"
 
-#: src/converse-muc.js:716 src/converse-muc.js:816
+#: src/converse-muc.js:795 src/converse-muc.js:895
 msgid "You have been banned from this room"
 msgstr "Du har blitt utestengt fra dette rommet"
 
-#: src/converse-muc.js:717
+#: src/converse-muc.js:796
 msgid "You have been kicked from this room"
 msgstr "Du ble kastet ut av dette rommet"
 
-#: src/converse-muc.js:718
+#: src/converse-muc.js:797
 msgid "You have been removed from this room because of an affiliation change"
 msgstr "Du har blitt fjernet fra dette rommet på grunn av en holdningsendring"
 
-#: src/converse-muc.js:719
+#: src/converse-muc.js:798
 msgid ""
 "You have been removed from this room because the room has changed to members-"
 "only and you're not a member"
@@ -438,7 +452,7 @@ msgstr ""
 "Du har blitt fjernet fra dette rommet fordi rommet nå kun tillater "
 "medlemmer, noe du ikke er."
 
-#: src/converse-muc.js:720
+#: src/converse-muc.js:799
 msgid ""
 "You have been removed from this room because the MUC (Multi-user chat) "
 "service is being shut down."
@@ -456,209 +470,216 @@ msgstr ""
 #. * can then at least tell gettext to scan for it so that these
 #. * strings are picked up by the translation machinery.
 #.
-#: src/converse-muc.js:734
+#: src/converse-muc.js:813
 msgid "<strong>%1$s</strong> has been banned"
 msgstr "<strong>%1$s</strong>  har blitt utestengt"
 
-#: src/converse-muc.js:735
+#: src/converse-muc.js:814
 msgid "<strong>%1$s</strong>'s nickname has changed"
 msgstr "<strong>%1$s</strong> sitt kallenavn er endret"
 
-#: src/converse-muc.js:736
+#: src/converse-muc.js:815
 msgid "<strong>%1$s</strong> has been kicked out"
 msgstr "<strong>%1$s</strong>  ble kastet ut"
 
-#: src/converse-muc.js:737
+#: src/converse-muc.js:816
 msgid "<strong>%1$s</strong> has been removed because of an affiliation change"
 msgstr ""
 "<strong>%1$s</strong> har blitt fjernet på grunn av en holdningsendring"
 
-#: src/converse-muc.js:738
+#: src/converse-muc.js:817
 msgid "<strong>%1$s</strong> has been removed for not being a member"
 msgstr ""
 "<strong>%1$s</strong> har blitt fjernet på grunn av at han/hun ikke er medlem"
 
-#: src/converse-muc.js:742
-msgid "Your nickname has been automatically changed to: <strong>%1$s</strong>"
+#: src/converse-muc.js:821
+#, fuzzy
+msgid "Your nickname has been automatically set to: <strong>%1$s</strong>"
 msgstr "Ditt kallenavn har blitt automatisk endret til <strong>%1$s</strong> "
 
-#: src/converse-muc.js:743
+#: src/converse-muc.js:822
 msgid "Your nickname has been changed to: <strong>%1$s</strong>"
 msgstr "Ditt kallenavn har blitt endret til <strong>%1$s</strong> "
 
-#: src/converse-muc.js:790 src/converse-muc.js:799
+#: src/converse-muc.js:869 src/converse-muc.js:878
 msgid "The reason given is: \""
 msgstr "Årsaken som er oppgitt er: \""
 
-#: src/converse-muc.js:814
+#: src/converse-muc.js:893
 msgid "You are not on the member list of this room"
 msgstr "Du er ikke på medlemslisten til dette rommet"
 
-#: src/converse-muc.js:820
+#: src/converse-muc.js:899
 msgid "No nickname was specified"
 msgstr "Ingen kallenavn var spesifisert"
 
-#: src/converse-muc.js:824
+#: src/converse-muc.js:903
 msgid "You are not allowed to create new rooms"
 msgstr "Du har ikke tillatelse til å opprette nye rom"
 
-#: src/converse-muc.js:826
+#: src/converse-muc.js:905
 msgid "Your nickname doesn't conform to this room's policies"
 msgstr "Ditt kallenavn er ikke i samsvar med rommets regler"
 
-#: src/converse-muc.js:828
-msgid "Your nickname is already taken"
-msgstr "Kallenavnet er allerede tatt"
+#: src/converse-muc.js:907
+msgid ""
+"The nickname you chose is reserved or currently in use, please choose a "
+"different one."
+msgstr ""
 
-#: src/converse-muc.js:831
+#: src/converse-muc.js:909
 msgid "This room does not (yet) exist"
 msgstr "Dette rommet eksisterer ikke (enda)"
 
-#: src/converse-muc.js:833
+#: src/converse-muc.js:911
 #, fuzzy
 msgid "This room has reached its maximum number of occupants"
 msgstr "Dette rommet har nådd maksimalt antall brukere"
 
-#: src/converse-muc.js:861
+#: src/converse-muc.js:961
 msgid "Topic set by %1$s to: %2$s"
 msgstr "Emnet ble endret den %1$s til: %2$s"
 
-#: src/converse-muc.js:941
-msgid "This user is a moderator"
+#: src/converse-muc.js:1048
+#, fuzzy
+msgid "Click to mention this user in your message."
+msgstr "Klikk for å åpne dette rommet"
+
+#: src/converse-muc.js:1049
+#, fuzzy
+msgid "This user is a moderator."
 msgstr "Denne brukeren er moderator"
 
-#: src/converse-muc.js:942
-msgid "This user can send messages in this room"
+#: src/converse-muc.js:1050
+#, fuzzy
+msgid "This user can send messages in this room."
 msgstr "Denne brukeren kan skrive meldinger i dette rommet"
 
-#: src/converse-muc.js:943
-msgid "This user can NOT send messages in this room"
+#: src/converse-muc.js:1051
+#, fuzzy
+msgid "This user can NOT send messages in this room."
 msgstr "Denne brukeren kan IKKE sende meldinger i dette rommet"
 
-#: src/converse-muc.js:972
+#: src/converse-muc.js:1087
 msgid "Invite"
 msgstr "Invitér"
 
-#: src/converse-muc.js:973
+#: src/converse-muc.js:1088
 msgid "Occupants"
 msgstr "Brukere her:"
 
-#: src/converse-muc.js:1072
+#: src/converse-muc.js:1206
 msgid "You are about to invite %1$s to the chat room \"%2$s\". "
 msgstr "Du er i ferd med å invitere %1$s til samtalerommet \"%2$s\". "
 
-#: src/converse-muc.js:1073
+#: src/converse-muc.js:1207
 msgid ""
 "You may optionally include a message, explaining the reason for the "
 "invitation."
 msgstr ""
 "Du kan eventuelt inkludere en melding og forklare årsaken til invitasjonen."
 
-#: src/converse-muc.js:1115
+#: src/converse-muc.js:1249
 msgid "Room name"
 msgstr "Romnavn"
 
-#: src/converse-muc.js:1116
-msgid "Nickname"
-msgstr "Kallenavn"
-
-#: src/converse-muc.js:1117
+#: src/converse-muc.js:1251
 msgid "Server"
 msgstr "Server"
 
-#: src/converse-muc.js:1118
+#: src/converse-muc.js:1252
 #, fuzzy
 msgid "Join Room"
 msgstr "Koble til"
 
-#: src/converse-muc.js:1119
+#: src/converse-muc.js:1253
 msgid "Show rooms"
 msgstr "Vis Rom"
 
-#: src/converse-muc.js:1123
+#: src/converse-muc.js:1257
 msgid "Rooms"
 msgstr "Rom"
 
 #. For translators: %1$s is a variable and will be replaced with the XMPP server name
-#: src/converse-muc.js:1143
+#: src/converse-muc.js:1277
 msgid "No rooms on %1$s"
 msgstr "Ingen rom på %1$s"
 
 #. For translators: %1$s is a variable and will be
 #. replaced with the XMPP server name
-#: src/converse-muc.js:1157
+#: src/converse-muc.js:1291
 msgid "Rooms on %1$s"
 msgstr "Rom på %1$s"
 
-#: src/converse-muc.js:1166
+#: src/converse-muc.js:1300
 msgid "Click to open this room"
 msgstr "Klikk for å åpne dette rommet"
 
-#: src/converse-muc.js:1167
+#: src/converse-muc.js:1301
 msgid "Show more information on this room"
 msgstr "Vis mer informasjon om dette rommet"
 
-#: src/converse-muc.js:1239
+#: src/converse-muc.js:1373
 msgid "Description:"
 msgstr "Beskrivelse:"
 
-#: src/converse-muc.js:1240
+#: src/converse-muc.js:1374
 msgid "Occupants:"
 msgstr "Brukere her:"
 
-#: src/converse-muc.js:1241
+#: src/converse-muc.js:1375
 msgid "Features:"
 msgstr "Egenskaper:"
 
-#: src/converse-muc.js:1242
+#: src/converse-muc.js:1376
 msgid "Requires authentication"
 msgstr "Krever Godkjenning"
 
-#: src/converse-muc.js:1243
+#: src/converse-muc.js:1377
 msgid "Hidden"
 msgstr "Skjult"
 
-#: src/converse-muc.js:1244
+#: src/converse-muc.js:1378
 msgid "Requires an invitation"
 msgstr "Krever en invitasjon"
 
-#: src/converse-muc.js:1245
+#: src/converse-muc.js:1379
 msgid "Moderated"
 msgstr "Moderert"
 
-#: src/converse-muc.js:1246
+#: src/converse-muc.js:1380
 msgid "Non-anonymous"
 msgstr "Ikke-Anonym"
 
-#: src/converse-muc.js:1247
+#: src/converse-muc.js:1381
 msgid "Open room"
 msgstr "Åpent Rom"
 
-#: src/converse-muc.js:1248
+#: src/converse-muc.js:1382
 msgid "Permanent room"
 msgstr "Permanent Rom"
 
-#: src/converse-muc.js:1249
+#: src/converse-muc.js:1383
 msgid "Public"
 msgstr "Alle"
 
-#: src/converse-muc.js:1250
+#: src/converse-muc.js:1384
 msgid "Semi-anonymous"
 msgstr "Semi-anonymt"
 
-#: src/converse-muc.js:1251
+#: src/converse-muc.js:1385
 msgid "Temporary room"
 msgstr "Midlertidig Rom"
 
-#: src/converse-muc.js:1252
+#: src/converse-muc.js:1386
 msgid "Unmoderated"
 msgstr "Umoderert"
 
-#: src/converse-muc.js:1329
+#: src/converse-muc.js:1456
 msgid "%1$s has invited you to join a chat room: %2$s"
 msgstr "%1$s har invitert deg til å bli med i chatterommet: %2$s"
 
-#: src/converse-muc.js:1334
+#: src/converse-muc.js:1461
 msgid ""
 "%1$s has invited you to join a chat room: %2$s, and left the following "
 "reason: \"%3$s\""
@@ -1033,6 +1054,9 @@ msgstr ""
 msgid "Are you sure you want to decline this contact request?"
 msgstr "Er du sikker på at du vil avslå denne kontaktforespørselen?"
 
+#~ msgid "Your nickname is already taken"
+#~ msgstr "Kallenavnet er allerede tatt"
+
 #~ msgid "Type to filter"
 #~ msgstr "Skriv til filter"
 

locale/nl/LC_MESSAGES/converse.json

@@ -243,6 +243,14 @@
             null,
             "Een error tijdens het opslaan van het formulier."
          ],
+         "Please choose your nickname": [
+            null,
+            ""
+         ],
+         "Nickname": [
+            null,
+            "Nickname"
+         ],
          "This chatroom requires a password": [
             null,
             "Chatroom heeft een wachtwoord"
@@ -351,9 +359,9 @@
             null,
             "Je nickname is niet conform policy"
          ],
-         "Your nickname is already taken": [
+         "The nickname you chose is reserved or currently in use, please choose a different one.": [
             null,
-            "Je nickname bestaat al"
+            ""
          ],
          "This room does not (yet) exist": [
             null,
@@ -363,18 +371,6 @@
             null,
             ""
          ],
-         "This user is a moderator": [
-            null,
-            "Dit is een moderator"
-         ],
-         "This user can send messages in this room": [
-            null,
-            "Deze gebruiker kan berichten sturen in deze room"
-         ],
-         "This user can NOT send messages in this room": [
-            null,
-            "Deze gebruiker kan NIET een bericht sturen in deze room"
-         ],
          "Invite": [
             null,
             ""
@@ -391,10 +387,6 @@
             null,
             "Room naam"
          ],
-         "Nickname": [
-            null,
-            "Nickname"
-         ],
          "Server": [
             null,
             "Server"

locale/nl/LC_MESSAGES/converse.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse.js 0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-26 05:57+0000\n"
+"POT-Creation-Date: 2016-07-28 16:03+0000\n"
 "PO-Revision-Date: 2016-04-07 10:21+0000\n"
 "Last-Translator: Maarten Kling <maarten@fourdigits.nl>\n"
 "Language-Team: Dutch\n"
@@ -21,7 +21,7 @@ msgstr ""
 "plural_forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/converse-chatview.js:103 src/converse-headline.js:99
-#: src/converse-muc.js:239
+#: src/converse-muc.js:246
 #, fuzzy
 msgid "You have unread messages"
 msgstr "Verwijder bericht"
@@ -49,13 +49,13 @@ msgstr "%1$s is aan typen"
 msgid "has stopped typing"
 msgstr "%1$s is aan typen"
 
-#: src/converse-chatview.js:332 src/converse-chatview.js:588
+#: src/converse-chatview.js:332 src/converse-chatview.js:592
 #: src/converse-notification.js:171
 #, fuzzy
 msgid "has gone away"
 msgstr "Conact is afwezig"
 
-#: src/converse-chatview.js:456 src/converse-muc.js:412
+#: src/converse-chatview.js:456 src/converse-muc.js:426
 msgid "Show this menu"
 msgstr "Toon dit menu"
 
@@ -63,7 +63,7 @@ msgstr "Toon dit menu"
 msgid "Write in the third person"
 msgstr "Schrijf in de 3de persoon"
 
-#: src/converse-chatview.js:458 src/converse-muc.js:410
+#: src/converse-chatview.js:458 src/converse-muc.js:424
 msgid "Remove messages"
 msgstr "Verwijder bericht"
 
@@ -71,30 +71,30 @@ msgstr "Verwijder bericht"
 msgid "Are you sure you want to clear the messages from this chat box?"
 msgstr ""
 
-#: src/converse-chatview.js:586 src/converse-notification.js:169
+#: src/converse-chatview.js:590 src/converse-notification.js:169
 #, fuzzy
 msgid "has gone offline"
 msgstr "Contact is offline"
 
-#: src/converse-chatview.js:590 src/converse-notification.js:173
+#: src/converse-chatview.js:594 src/converse-notification.js:173
 #, fuzzy
 msgid "is busy"
 msgstr "bezet"
 
-#: src/converse-chatview.js:633
+#: src/converse-chatview.js:637
 #, fuzzy
 msgid "Clear all messages"
 msgstr "Persoonlijk bericht"
 
-#: src/converse-chatview.js:634
+#: src/converse-chatview.js:638
 msgid "Hide the list of occupants"
 msgstr ""
 
-#: src/converse-chatview.js:635
+#: src/converse-chatview.js:639
 msgid "Insert a smiley"
 msgstr ""
 
-#: src/converse-chatview.js:636
+#: src/converse-chatview.js:640
 msgid "Start a call"
 msgstr ""
 
@@ -161,7 +161,7 @@ msgstr "Klik hier om status te wijzigen"
 msgid "Custom status"
 msgstr ""
 
-#: src/converse-controlbox.js:490 src/converse-muc.js:580
+#: src/converse-controlbox.js:490 src/converse-muc.js:591
 msgid "Save"
 msgstr "Opslaan"
 
@@ -294,160 +294,173 @@ msgstr ""
 msgid "Minimize this chat box"
 msgstr ""
 
-#: src/converse-muc.js:241
+#: src/converse-muc.js:248
 msgid "Message"
 msgstr "Bericht"
 
-#: src/converse-muc.js:302
+#: src/converse-muc.js:316
 msgid "Error: could not execute the command"
 msgstr ""
 
-#: src/converse-muc.js:358
+#: src/converse-muc.js:372
 msgid "Error: the \""
 msgstr ""
 
-#: src/converse-muc.js:368
+#: src/converse-muc.js:382
 #, fuzzy
 msgid "Are you sure you want to clear the messages from this room?"
 msgstr "Je bent niet een gebruiker van deze room"
 
-#: src/converse-muc.js:408
+#: src/converse-muc.js:422
 msgid "Change user's affiliation to admin"
 msgstr ""
 
-#: src/converse-muc.js:409
+#: src/converse-muc.js:423
 #, fuzzy
 msgid "Ban user from room"
 msgstr "Ban gebruiker van chatroom"
 
-#: src/converse-muc.js:411
+#: src/converse-muc.js:425
 msgid "Change user role to occupant"
 msgstr ""
 
-#: src/converse-muc.js:413
+#: src/converse-muc.js:427
 #, fuzzy
 msgid "Kick user from room"
 msgstr "Goei gebruiker uit chatroom"
 
-#: src/converse-muc.js:414
+#: src/converse-muc.js:428
 #, fuzzy
 msgid "Write in 3rd person"
 msgstr "Schrijf in de 3de persoon"
 
-#: src/converse-muc.js:415
+#: src/converse-muc.js:429
 msgid "Grant membership to a user"
 msgstr ""
 
-#: src/converse-muc.js:416
+#: src/converse-muc.js:430
 msgid "Remove user's ability to post messages"
 msgstr ""
 
-#: src/converse-muc.js:417
+#: src/converse-muc.js:431
 msgid "Change your nickname"
 msgstr ""
 
-#: src/converse-muc.js:418
+#: src/converse-muc.js:432
 msgid "Grant moderator role to user"
 msgstr ""
 
-#: src/converse-muc.js:419
+#: src/converse-muc.js:433
 #, fuzzy
 msgid "Grant ownership of this room"
 msgstr "Je bent niet een gebruiker van deze room"
 
-#: src/converse-muc.js:420
+#: src/converse-muc.js:434
 msgid "Revoke user's membership"
 msgstr ""
 
-#: src/converse-muc.js:421
+#: src/converse-muc.js:435
 #, fuzzy
 msgid "Set room topic"
 msgstr "Zet chatroom topic"
 
-#: src/converse-muc.js:422
+#: src/converse-muc.js:436
 msgid "Allow muted user to post messages"
 msgstr ""
 
-#: src/converse-muc.js:581 src/converse-register.js:216
+#: src/converse-muc.js:592 src/converse-register.js:216
 #: src/converse-register.js:331
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: src/converse-muc.js:624
+#: src/converse-muc.js:635
 msgid "An error occurred while trying to save the form."
 msgstr "Een error tijdens het opslaan van het formulier."
 
-#: src/converse-muc.js:666
+#: src/converse-muc.js:725
+msgid "Please choose your nickname"
+msgstr ""
+
+#: src/converse-muc.js:726 src/converse-muc.js:1250
+msgid "Nickname"
+msgstr "Nickname"
+
+#: src/converse-muc.js:727
+#, fuzzy
+msgid "Enter room"
+msgstr "Open room"
+
+#: src/converse-muc.js:745
 msgid "This chatroom requires a password"
 msgstr "Chatroom heeft een wachtwoord"
 
-#: src/converse-muc.js:667
+#: src/converse-muc.js:746
 msgid "Password: "
 msgstr "Wachtwoord: "
 
-#: src/converse-muc.js:668
+#: src/converse-muc.js:747
 msgid "Submit"
 msgstr "Indienen"
 
-#: src/converse-muc.js:703
+#: src/converse-muc.js:782
 msgid "This room is not anonymous"
 msgstr "Deze room is niet annoniem"
 
-#: src/converse-muc.js:704
+#: src/converse-muc.js:783
 msgid "This room now shows unavailable members"
 msgstr ""
 
-#: src/converse-muc.js:705
+#: src/converse-muc.js:784
 msgid "This room does not show unavailable members"
 msgstr ""
 
-#: src/converse-muc.js:706
+#: src/converse-muc.js:785
 msgid "Non-privacy-related room configuration has changed"
 msgstr ""
 
-#: src/converse-muc.js:707
+#: src/converse-muc.js:786
 msgid "Room logging is now enabled"
 msgstr ""
 
-#: src/converse-muc.js:708
+#: src/converse-muc.js:787
 msgid "Room logging is now disabled"
 msgstr ""
 
-#: src/converse-muc.js:709
+#: src/converse-muc.js:788
 msgid "This room is now non-anonymous"
 msgstr "Deze room is nu niet annoniem"
 
-#: src/converse-muc.js:710
+#: src/converse-muc.js:789
 msgid "This room is now semi-anonymous"
 msgstr "Deze room is nu semie annoniem"
 
-#: src/converse-muc.js:711
+#: src/converse-muc.js:790
 msgid "This room is now fully-anonymous"
 msgstr "Deze room is nu volledig annoniem"
 
-#: src/converse-muc.js:712
+#: src/converse-muc.js:791
 msgid "A new room has been created"
 msgstr "Een nieuwe room is gemaakt"
 
-#: src/converse-muc.js:716 src/converse-muc.js:816
+#: src/converse-muc.js:795 src/converse-muc.js:895
 msgid "You have been banned from this room"
 msgstr "Je bent verbannen uit deze room"
 
-#: src/converse-muc.js:717
+#: src/converse-muc.js:796
 msgid "You have been kicked from this room"
 msgstr "Je bent uit de room gegooid"
 
-#: src/converse-muc.js:718
+#: src/converse-muc.js:797
 msgid "You have been removed from this room because of an affiliation change"
 msgstr ""
 
-#: src/converse-muc.js:719
+#: src/converse-muc.js:798
 msgid ""
 "You have been removed from this room because the room has changed to members-"
 "only and you're not a member"
 msgstr ""
 
-#: src/converse-muc.js:720
+#: src/converse-muc.js:799
 msgid ""
 "You have been removed from this room because the MUC (Multi-user chat) "
 "service is being shut down."
@@ -463,210 +476,216 @@ msgstr ""
 #. * can then at least tell gettext to scan for it so that these
 #. * strings are picked up by the translation machinery.
 #.
-#: src/converse-muc.js:734
+#: src/converse-muc.js:813
 msgid "<strong>%1$s</strong> has been banned"
 msgstr "<strong>%1$s</strong> is verbannen"
 
-#: src/converse-muc.js:735
+#: src/converse-muc.js:814
 #, fuzzy
 msgid "<strong>%1$s</strong>'s nickname has changed"
 msgstr "<strong>%1$s</strong> is verbannen"
 
-#: src/converse-muc.js:736
+#: src/converse-muc.js:815
 msgid "<strong>%1$s</strong> has been kicked out"
 msgstr "<strong>%1$s</strong> has been kicked out"
 
-#: src/converse-muc.js:737
+#: src/converse-muc.js:816
 msgid "<strong>%1$s</strong> has been removed because of an affiliation change"
 msgstr ""
 
-#: src/converse-muc.js:738
+#: src/converse-muc.js:817
 msgid "<strong>%1$s</strong> has been removed for not being a member"
 msgstr ""
 
-#: src/converse-muc.js:742
+#: src/converse-muc.js:821
 #, fuzzy
-msgid "Your nickname has been automatically changed to: <strong>%1$s</strong>"
+msgid "Your nickname has been automatically set to: <strong>%1$s</strong>"
 msgstr "Je nickname is veranderd"
 
-#: src/converse-muc.js:743
+#: src/converse-muc.js:822
 #, fuzzy
 msgid "Your nickname has been changed to: <strong>%1$s</strong>"
 msgstr "Je nickname is veranderd"
 
-#: src/converse-muc.js:790 src/converse-muc.js:799
+#: src/converse-muc.js:869 src/converse-muc.js:878
 msgid "The reason given is: \""
 msgstr ""
 
-#: src/converse-muc.js:814
+#: src/converse-muc.js:893
 msgid "You are not on the member list of this room"
 msgstr "Je bent niet een gebruiker van deze room"
 
-#: src/converse-muc.js:820
+#: src/converse-muc.js:899
 msgid "No nickname was specified"
 msgstr "Geen nickname ingegeven"
 
-#: src/converse-muc.js:824
+#: src/converse-muc.js:903
 msgid "You are not allowed to create new rooms"
 msgstr "Je bent niet toegestaan nieuwe rooms te maken"
 
-#: src/converse-muc.js:826
+#: src/converse-muc.js:905
 msgid "Your nickname doesn't conform to this room's policies"
 msgstr "Je nickname is niet conform policy"
 
-#: src/converse-muc.js:828
-msgid "Your nickname is already taken"
-msgstr "Je nickname bestaat al"
+#: src/converse-muc.js:907
+msgid ""
+"The nickname you chose is reserved or currently in use, please choose a "
+"different one."
+msgstr ""
 
-#: src/converse-muc.js:831
+#: src/converse-muc.js:909
 msgid "This room does not (yet) exist"
 msgstr "Deze room bestaat niet"
 
-#: src/converse-muc.js:833
+#: src/converse-muc.js:911
 #, fuzzy
 msgid "This room has reached its maximum number of occupants"
 msgstr "Deze room heeft het maximale aantal gebruikers"
 
-#: src/converse-muc.js:861
+#: src/converse-muc.js:961
 msgid "Topic set by %1$s to: %2$s"
 msgstr ""
 
-#: src/converse-muc.js:941
-msgid "This user is a moderator"
+#: src/converse-muc.js:1048
+#, fuzzy
+msgid "Click to mention this user in your message."
+msgstr "Klik om room te openen"
+
+#: src/converse-muc.js:1049
+#, fuzzy
+msgid "This user is a moderator."
 msgstr "Dit is een moderator"
 
-#: src/converse-muc.js:942
-msgid "This user can send messages in this room"
+#: src/converse-muc.js:1050
+#, fuzzy
+msgid "This user can send messages in this room."
 msgstr "Deze gebruiker kan berichten sturen in deze room"
 
-#: src/converse-muc.js:943
-msgid "This user can NOT send messages in this room"
+#: src/converse-muc.js:1051
+#, fuzzy
+msgid "This user can NOT send messages in this room."
 msgstr "Deze gebruiker kan NIET een bericht sturen in deze room"
 
-#: src/converse-muc.js:972
+#: src/converse-muc.js:1087
 msgid "Invite"
 msgstr ""
 
-#: src/converse-muc.js:973
+#: src/converse-muc.js:1088
 #, fuzzy
 msgid "Occupants"
 msgstr "Deelnemers:"
 
-#: src/converse-muc.js:1072
+#: src/converse-muc.js:1206
 msgid "You are about to invite %1$s to the chat room \"%2$s\". "
 msgstr ""
 
-#: src/converse-muc.js:1073
+#: src/converse-muc.js:1207
 msgid ""
 "You may optionally include a message, explaining the reason for the "
 "invitation."
 msgstr ""
 
-#: src/converse-muc.js:1115
+#: src/converse-muc.js:1249
 msgid "Room name"
 msgstr "Room naam"
 
-#: src/converse-muc.js:1116
-msgid "Nickname"
-msgstr "Nickname"
-
-#: src/converse-muc.js:1117
+#: src/converse-muc.js:1251
 msgid "Server"
 msgstr "Server"
 
-#: src/converse-muc.js:1118
+#: src/converse-muc.js:1252
 #, fuzzy
 msgid "Join Room"
 msgstr "Deelnemen"
 
-#: src/converse-muc.js:1119
+#: src/converse-muc.js:1253
 msgid "Show rooms"
 msgstr "Toon rooms"
 
-#: src/converse-muc.js:1123
+#: src/converse-muc.js:1257
 msgid "Rooms"
 msgstr "Rooms"
 
 #. For translators: %1$s is a variable and will be replaced with the XMPP server name
-#: src/converse-muc.js:1143
+#: src/converse-muc.js:1277
 msgid "No rooms on %1$s"
 msgstr "Geen room op %1$s"
 
 #. For translators: %1$s is a variable and will be
 #. replaced with the XMPP server name
-#: src/converse-muc.js:1157
+#: src/converse-muc.js:1291
 msgid "Rooms on %1$s"
 msgstr "Room op %1$s"
 
-#: src/converse-muc.js:1166
+#: src/converse-muc.js:1300
 msgid "Click to open this room"
 msgstr "Klik om room te openen"
 
-#: src/converse-muc.js:1167
+#: src/converse-muc.js:1301
 msgid "Show more information on this room"
 msgstr "Toon meer informatie over deze room"
 
-#: src/converse-muc.js:1239
+#: src/converse-muc.js:1373
 msgid "Description:"
 msgstr "Beschrijving"
 
-#: src/converse-muc.js:1240
+#: src/converse-muc.js:1374
 msgid "Occupants:"
 msgstr "Deelnemers:"
 
-#: src/converse-muc.js:1241
+#: src/converse-muc.js:1375
 msgid "Features:"
 msgstr "Functies:"
 
-#: src/converse-muc.js:1242
+#: src/converse-muc.js:1376
 msgid "Requires authentication"
 msgstr "Verificatie vereist"
 
-#: src/converse-muc.js:1243
+#: src/converse-muc.js:1377
 msgid "Hidden"
 msgstr "Verborgen"
 
-#: src/converse-muc.js:1244
+#: src/converse-muc.js:1378
 msgid "Requires an invitation"
 msgstr "Veriest een uitnodiging"
 
-#: src/converse-muc.js:1245
+#: src/converse-muc.js:1379
 msgid "Moderated"
 msgstr "Gemodereerd"
 
-#: src/converse-muc.js:1246
+#: src/converse-muc.js:1380
 msgid "Non-anonymous"
 msgstr "Niet annoniem"
 
-#: src/converse-muc.js:1247
+#: src/converse-muc.js:1381
 msgid "Open room"
 msgstr "Open room"
 
-#: src/converse-muc.js:1248
+#: src/converse-muc.js:1382
 msgid "Permanent room"
 msgstr "Blijvend room"
 
-#: src/converse-muc.js:1249
+#: src/converse-muc.js:1383
 msgid "Public"
 msgstr "Publiek"
 
-#: src/converse-muc.js:1250
+#: src/converse-muc.js:1384
 msgid "Semi-anonymous"
 msgstr "Semi annoniem"
 
-#: src/converse-muc.js:1251
+#: src/converse-muc.js:1385
 msgid "Temporary room"
 msgstr "Tijdelijke room"
 
-#: src/converse-muc.js:1252
+#: src/converse-muc.js:1386
 msgid "Unmoderated"
 msgstr "Niet gemodereerd"
 
-#: src/converse-muc.js:1329
+#: src/converse-muc.js:1456
 msgid "%1$s has invited you to join a chat room: %2$s"
 msgstr ""
 
-#: src/converse-muc.js:1334
+#: src/converse-muc.js:1461
 msgid ""
 "%1$s has invited you to join a chat room: %2$s, and left the following "
 "reason: \"%3$s\""
@@ -1019,6 +1038,9 @@ msgstr ""
 msgid "Are you sure you want to decline this contact request?"
 msgstr "Klik om contact te verwijderen"
 
+#~ msgid "Your nickname is already taken"
+#~ msgstr "Je nickname bestaat al"
+
 #~ msgid "Disconnected"
 #~ msgstr "Verbinding verbroken."
 

locale/pl/LC_MESSAGES/converse.json

@@ -303,6 +303,10 @@
             null,
             "Wystąpił błąd w czasie próby zachowania formularza."
          ],
+         "Nickname": [
+            null,
+            "Ksywka"
+         ],
          "This chatroom requires a password": [
             null,
             "Pokój rozmów wymaga podania hasła"
@@ -395,10 +399,6 @@
             null,
             "<strong>%1$s</strong> został usunięty ze względu na to, że nie jest członkiem"
          ],
-         "Your nickname has been automatically changed to: <strong>%1$s</strong>": [
-            null,
-            "Twoja ksywka została automatycznie zmieniona na: <strong>%1$s</strong>"
-         ],
          "Your nickname has been changed to: <strong>%1$s</strong>": [
             null,
             "Twoja ksywka została zmieniona na: <strong>%1$s</strong>"
@@ -423,9 +423,9 @@
             null,
             "Twoja ksywka nie jest zgodna z regulaminem pokoju"
          ],
-         "Your nickname is already taken": [
+         "The nickname you chose is reserved or currently in use, please choose a different one.": [
             null,
-            "Twoja ksywka jest już w użyciu"
+            ""
          ],
          "This room does not (yet) exist": [
             null,
@@ -435,18 +435,6 @@
             null,
             "Temat ustawiony przez %1$s na: %2$s"
          ],
-         "This user is a moderator": [
-            null,
-            "Ten człowiek jest moderatorem"
-         ],
-         "This user can send messages in this room": [
-            null,
-            "Ten człowiek może rozmawiać w niejszym pokoju"
-         ],
-         "This user can NOT send messages in this room": [
-            null,
-            "Ten człowiek nie może rozmawiać w niniejszym pokoju"
-         ],
          "Invite": [
             null,
             "Zaproś"
@@ -467,10 +455,6 @@
             null,
             "Nazwa pokoju"
          ],
-         "Nickname": [
-            null,
-            "Ksywka"
-         ],
          "Server": [
             null,
             "Serwer"

locale/pl/LC_MESSAGES/converse.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse.js 0.9.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-26 05:57+0000\n"
+"POT-Creation-Date: 2016-07-28 16:03+0000\n"
 "PO-Revision-Date: 2016-04-07 10:22+0000\n"
 "Last-Translator: Serge Victor <converse.js@random.re>\n"
 "Language-Team: Polish\n"
@@ -20,7 +20,7 @@ msgstr ""
 "|| n%100>=20) ? 1 : 2);\n"
 
 #: src/converse-chatview.js:103 src/converse-headline.js:99
-#: src/converse-muc.js:239
+#: src/converse-muc.js:246
 #, fuzzy
 msgid "You have unread messages"
 msgstr "Usuń wiadomość"
@@ -46,12 +46,12 @@ msgstr "pisze"
 msgid "has stopped typing"
 msgstr "przestał pisać"
 
-#: src/converse-chatview.js:332 src/converse-chatview.js:588
+#: src/converse-chatview.js:332 src/converse-chatview.js:592
 #: src/converse-notification.js:171
 msgid "has gone away"
 msgstr "uciekł"
 
-#: src/converse-chatview.js:456 src/converse-muc.js:412
+#: src/converse-chatview.js:456 src/converse-muc.js:426
 msgid "Show this menu"
 msgstr "Pokaż menu"
 
@@ -59,7 +59,7 @@ msgstr "Pokaż menu"
 msgid "Write in the third person"
 msgstr "Pisz w trzeciej osobie"
 
-#: src/converse-chatview.js:458 src/converse-muc.js:410
+#: src/converse-chatview.js:458 src/converse-muc.js:424
 msgid "Remove messages"
 msgstr "Usuń wiadomość"
 
@@ -68,28 +68,28 @@ msgid "Are you sure you want to clear the messages from this chat box?"
 msgstr ""
 "Potwierdź czy rzeczywiście chcesz wyczyścić wiadomości z okienka rozmowy?"
 
-#: src/converse-chatview.js:586 src/converse-notification.js:169
+#: src/converse-chatview.js:590 src/converse-notification.js:169
 msgid "has gone offline"
 msgstr "wyłączył się"
 
-#: src/converse-chatview.js:590 src/converse-notification.js:173
+#: src/converse-chatview.js:594 src/converse-notification.js:173
 msgid "is busy"
 msgstr "zajęty"
 
-#: src/converse-chatview.js:633
+#: src/converse-chatview.js:637
 msgid "Clear all messages"
 msgstr "Wyczyść wszystkie wiadomości"
 
-#: src/converse-chatview.js:634
+#: src/converse-chatview.js:638
 #, fuzzy
 msgid "Hide the list of occupants"
 msgstr "Ukryj listę rozmówców"
 
-#: src/converse-chatview.js:635
+#: src/converse-chatview.js:639
 msgid "Insert a smiley"
 msgstr "Wstaw uśmieszek"
 
-#: src/converse-chatview.js:636
+#: src/converse-chatview.js:640
 msgid "Start a call"
 msgstr "Zadzwoń"
 
@@ -153,7 +153,7 @@ msgstr "Kliknij aby zmienić status rozmowy"
 msgid "Custom status"
 msgstr "Własny status"
 
-#: src/converse-controlbox.js:490 src/converse-muc.js:580
+#: src/converse-controlbox.js:490 src/converse-muc.js:591
 msgid "Save"
 msgstr "Zachowaj"
 
@@ -284,149 +284,163 @@ msgstr "Zminimalizowany"
 msgid "Minimize this chat box"
 msgstr ""
 
-#: src/converse-muc.js:241
+#: src/converse-muc.js:248
 msgid "Message"
 msgstr "Wiadomość:"
 
-#: src/converse-muc.js:302
+#: src/converse-muc.js:316
 msgid "Error: could not execute the command"
 msgstr "Błąd: nie potrafię uruchomić polecenia"
 
-#: src/converse-muc.js:358
+#: src/converse-muc.js:372
 msgid "Error: the \""
 msgstr "Błąd: \""
 
-#: src/converse-muc.js:368
+#: src/converse-muc.js:382
 msgid "Are you sure you want to clear the messages from this room?"
 msgstr "Potwierdź czy rzeczywiście chcesz wyczyścić wiadomości z tego pokoju?"
 
-#: src/converse-muc.js:408
+#: src/converse-muc.js:422
 msgid "Change user's affiliation to admin"
 msgstr "Przyznaj prawa administratora"
 
-#: src/converse-muc.js:409
+#: src/converse-muc.js:423
 msgid "Ban user from room"
 msgstr "Zablokuj dostępu do pokoju"
 
-#: src/converse-muc.js:411
+#: src/converse-muc.js:425
 #, fuzzy
 msgid "Change user role to occupant"
 msgstr "Zmień prawa dostępu na zwykłego uczestnika"
 
-#: src/converse-muc.js:413
+#: src/converse-muc.js:427
 msgid "Kick user from room"
 msgstr "Wykop z pokoju"
 
-#: src/converse-muc.js:414
+#: src/converse-muc.js:428
 msgid "Write in 3rd person"
 msgstr "Pisz w trzeciej osobie"
 
-#: src/converse-muc.js:415
+#: src/converse-muc.js:429
 msgid "Grant membership to a user"
 msgstr "Przyznaj członkowstwo "
 
-#: src/converse-muc.js:416
+#: src/converse-muc.js:430
 msgid "Remove user's ability to post messages"
 msgstr "Zablokuj człowiekowi możliwość rozmowy"
 
-#: src/converse-muc.js:417
+#: src/converse-muc.js:431
 msgid "Change your nickname"
 msgstr "Zmień ksywkę"
 
-#: src/converse-muc.js:418
+#: src/converse-muc.js:432
 msgid "Grant moderator role to user"
 msgstr "Przyznaj prawa moderatora"
 
-#: src/converse-muc.js:419
+#: src/converse-muc.js:433
 msgid "Grant ownership of this room"
 msgstr "Uczyń właścicielem pokoju"
 
-#: src/converse-muc.js:420
+#: src/converse-muc.js:434
 msgid "Revoke user's membership"
 msgstr "Usuń z listy członków"
 
-#: src/converse-muc.js:421
+#: src/converse-muc.js:435
 msgid "Set room topic"
 msgstr "Ustaw temat pokoju"
 
-#: src/converse-muc.js:422
+#: src/converse-muc.js:436
 msgid "Allow muted user to post messages"
 msgstr "Pozwól uciszonemu człowiekowi na rozmowę"
 
-#: src/converse-muc.js:581 src/converse-register.js:216
+#: src/converse-muc.js:592 src/converse-register.js:216
 #: src/converse-register.js:331
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: src/converse-muc.js:624
+#: src/converse-muc.js:635
 msgid "An error occurred while trying to save the form."
 msgstr "Wystąpił błąd w czasie próby zachowania formularza."
 
-#: src/converse-muc.js:666
+#: src/converse-muc.js:725
+#, fuzzy
+msgid "Please choose your nickname"
+msgstr "Zmień ksywkę"
+
+#: src/converse-muc.js:726 src/converse-muc.js:1250
+msgid "Nickname"
+msgstr "Ksywka"
+
+#: src/converse-muc.js:727
+#, fuzzy
+msgid "Enter room"
+msgstr "Otwarty pokój"
+
+#: src/converse-muc.js:745
 msgid "This chatroom requires a password"
 msgstr "Pokój rozmów wymaga podania hasła"
 
-#: src/converse-muc.js:667
+#: src/converse-muc.js:746
 msgid "Password: "
 msgstr "Hasło:"
 
-#: src/converse-muc.js:668
+#: src/converse-muc.js:747
 msgid "Submit"
 msgstr "Wyślij"
 
-#: src/converse-muc.js:703
+#: src/converse-muc.js:782
 msgid "This room is not anonymous"
 msgstr "Pokój nie jest anonimowy"
 
-#: src/converse-muc.js:704
+#: src/converse-muc.js:783
 msgid "This room now shows unavailable members"
 msgstr "Pokój pokazuje niedostępnych rozmówców"
 
-#: src/converse-muc.js:705
+#: src/converse-muc.js:784
 msgid "This room does not show unavailable members"
 msgstr "Ten pokój nie wyświetla niedostępnych członków"
 
-#: src/converse-muc.js:706
+#: src/converse-muc.js:785
 msgid "Non-privacy-related room configuration has changed"
 msgstr "Ustawienia pokoju nie związane z prywatnością zostały zmienione"
 
-#: src/converse-muc.js:707
+#: src/converse-muc.js:786
 msgid "Room logging is now enabled"
 msgstr "Zostało włączone zapisywanie rozmów w pokoju"
 
-#: src/converse-muc.js:708
+#: src/converse-muc.js:787
 msgid "Room logging is now disabled"
 msgstr "Zostało wyłączone zapisywanie rozmów w pokoju"
 
-#: src/converse-muc.js:709
+#: src/converse-muc.js:788
 msgid "This room is now non-anonymous"
 msgstr "Pokój stał się nieanonimowy"
 
-#: src/converse-muc.js:710
+#: src/converse-muc.js:789
 msgid "This room is now semi-anonymous"
 msgstr "Pokój stał się półanonimowy"
 
-#: src/converse-muc.js:711
+#: src/converse-muc.js:790
 msgid "This room is now fully-anonymous"
 msgstr "Pokój jest teraz w pełni anonimowy"
 
-#: src/converse-muc.js:712
+#: src/converse-muc.js:791
 msgid "A new room has been created"
 msgstr "Został utworzony nowy pokój"
 
-#: src/converse-muc.js:716 src/converse-muc.js:816
+#: src/converse-muc.js:795 src/converse-muc.js:895
 msgid "You have been banned from this room"
 msgstr "Jesteś niemile widziany w tym pokoju"
 
-#: src/converse-muc.js:717
+#: src/converse-muc.js:796
 msgid "You have been kicked from this room"
 msgstr "Zostałeś wykopany z pokoju"
 
-#: src/converse-muc.js:718
+#: src/converse-muc.js:797
 msgid "You have been removed from this room because of an affiliation change"
 msgstr "Zostałeś usunięty z pokoju ze względu na zmianę przynależności"
 
-#: src/converse-muc.js:719
+#: src/converse-muc.js:798
 msgid ""
 "You have been removed from this room because the room has changed to members-"
 "only and you're not a member"
@@ -434,7 +448,7 @@ msgstr ""
 "Zostałeś usunięty z pokoju ze względu na to, że pokój zmienił się na "
 "wymagający członkowstwa, a ty nie jesteś członkiem"
 
-#: src/converse-muc.js:720
+#: src/converse-muc.js:799
 msgid ""
 "You have been removed from this room because the MUC (Multi-user chat) "
 "service is being shut down."
@@ -452,97 +466,108 @@ msgstr ""
 #. * can then at least tell gettext to scan for it so that these
 #. * strings are picked up by the translation machinery.
 #.
-#: src/converse-muc.js:734
+#: src/converse-muc.js:813
 msgid "<strong>%1$s</strong> has been banned"
 msgstr "<strong>%1$s</strong> został zbanowany"
 
-#: src/converse-muc.js:735
+#: src/converse-muc.js:814
 msgid "<strong>%1$s</strong>'s nickname has changed"
 msgstr "<strong>%1$s</strong> zmienił ksywkę"
 
-#: src/converse-muc.js:736
+#: src/converse-muc.js:815
 msgid "<strong>%1$s</strong> has been kicked out"
 msgstr "<strong>%1$s</strong> został wykopany"
 
-#: src/converse-muc.js:737
+#: src/converse-muc.js:816
 msgid "<strong>%1$s</strong> has been removed because of an affiliation change"
 msgstr "<strong>%1$s</strong> został usunięty z powodu zmiany przynależności"
 
-#: src/converse-muc.js:738
+#: src/converse-muc.js:817
 msgid "<strong>%1$s</strong> has been removed for not being a member"
 msgstr ""
 "<strong>%1$s</strong> został usunięty ze względu na to, że nie jest członkiem"
 
-#: src/converse-muc.js:742
-msgid "Your nickname has been automatically changed to: <strong>%1$s</strong>"
+#: src/converse-muc.js:821
+#, fuzzy
+msgid "Your nickname has been automatically set to: <strong>%1$s</strong>"
 msgstr "Twoja ksywka została automatycznie zmieniona na: <strong>%1$s</strong>"
 
-#: src/converse-muc.js:743
+#: src/converse-muc.js:822
 msgid "Your nickname has been changed to: <strong>%1$s</strong>"
 msgstr "Twoja ksywka została zmieniona na: <strong>%1$s</strong>"
 
-#: src/converse-muc.js:790 src/converse-muc.js:799
+#: src/converse-muc.js:869 src/converse-muc.js:878
 msgid "The reason given is: \""
 msgstr "Podana przyczyna to: \""
 
-#: src/converse-muc.js:814
+#: src/converse-muc.js:893
 msgid "You are not on the member list of this room"
 msgstr "Nie jesteś członkiem tego pokoju rozmów"
 
-#: src/converse-muc.js:820
+#: src/converse-muc.js:899
 msgid "No nickname was specified"
 msgstr "Nie podałeś ksywki"
 
-#: src/converse-muc.js:824
+#: src/converse-muc.js:903
 msgid "You are not allowed to create new rooms"
 msgstr "Nie masz uprawnień do tworzenia nowych pokojów rozmów"
 
-#: src/converse-muc.js:826
+#: src/converse-muc.js:905
 msgid "Your nickname doesn't conform to this room's policies"
 msgstr "Twoja ksywka nie jest zgodna z regulaminem pokoju"
 
-#: src/converse-muc.js:828
-msgid "Your nickname is already taken"
-msgstr "Twoja ksywka jest już w użyciu"
+#: src/converse-muc.js:907
+msgid ""
+"The nickname you chose is reserved or currently in use, please choose a "
+"different one."
+msgstr ""
 
-#: src/converse-muc.js:831
+#: src/converse-muc.js:909
 msgid "This room does not (yet) exist"
 msgstr "Ten pokój (jeszcze) nie istnieje"
 
-#: src/converse-muc.js:833
+#: src/converse-muc.js:911
 #, fuzzy
 msgid "This room has reached its maximum number of occupants"
 msgstr "Pokój przekroczył dozwoloną ilość rozmówców"
 
-#: src/converse-muc.js:861
+#: src/converse-muc.js:961
 msgid "Topic set by %1$s to: %2$s"
 msgstr "Temat ustawiony przez %1$s na: %2$s"
 
-#: src/converse-muc.js:941
-msgid "This user is a moderator"
+#: src/converse-muc.js:1048
+#, fuzzy
+msgid "Click to mention this user in your message."
+msgstr "Kliknij aby wejść do pokoju"
+
+#: src/converse-muc.js:1049
+#, fuzzy
+msgid "This user is a moderator."
 msgstr "Ten człowiek jest moderatorem"
 
-#: src/converse-muc.js:942
-msgid "This user can send messages in this room"
+#: src/converse-muc.js:1050
+#, fuzzy
+msgid "This user can send messages in this room."
 msgstr "Ten człowiek może rozmawiać w niejszym pokoju"
 
-#: src/converse-muc.js:943
-msgid "This user can NOT send messages in this room"
+#: src/converse-muc.js:1051
+#, fuzzy
+msgid "This user can NOT send messages in this room."
 msgstr "Ten człowiek nie może rozmawiać w niniejszym pokoju"
 
-#: src/converse-muc.js:972
+#: src/converse-muc.js:1087
 msgid "Invite"
 msgstr "Zaproś"
 
-#: src/converse-muc.js:973
+#: src/converse-muc.js:1088
 msgid "Occupants"
 msgstr "Uczestników"
 
-#: src/converse-muc.js:1072
+#: src/converse-muc.js:1206
 msgid "You are about to invite %1$s to the chat room \"%2$s\". "
 msgstr "Zamierzasz zaprosić %1$s do pokoju rozmów \"%2$s\". "
 
-#: src/converse-muc.js:1073
+#: src/converse-muc.js:1207
 msgid ""
 "You may optionally include a message, explaining the reason for the "
 "invitation."
@@ -550,110 +575,106 @@ msgstr ""
 "Masz opcjonalną możliwość dołączenia wiadomości, która wyjaśni przyczynę "
 "zaproszenia."
 
-#: src/converse-muc.js:1115
+#: src/converse-muc.js:1249
 msgid "Room name"
 msgstr "Nazwa pokoju"
 
-#: src/converse-muc.js:1116
-msgid "Nickname"
-msgstr "Ksywka"
-
-#: src/converse-muc.js:1117
+#: src/converse-muc.js:1251
 msgid "Server"
 msgstr "Serwer"
 
-#: src/converse-muc.js:1118
+#: src/converse-muc.js:1252
 msgid "Join Room"
 msgstr "Wejdź do pokoju"
 
-#: src/converse-muc.js:1119
+#: src/converse-muc.js:1253
 msgid "Show rooms"
 msgstr "Pokaż pokoje"
 
-#: src/converse-muc.js:1123
+#: src/converse-muc.js:1257
 msgid "Rooms"
 msgstr "Pokoje"
 
 #. For translators: %1$s is a variable and will be replaced with the XMPP server name
-#: src/converse-muc.js:1143
+#: src/converse-muc.js:1277
 msgid "No rooms on %1$s"
 msgstr "Brak jest pokojów na %1$s"
 
 #. For translators: %1$s is a variable and will be
 #. replaced with the XMPP server name
-#: src/converse-muc.js:1157
+#: src/converse-muc.js:1291
 msgid "Rooms on %1$s"
 msgstr "Pokoje na %1$s"
 
-#: src/converse-muc.js:1166
+#: src/converse-muc.js:1300
 msgid "Click to open this room"
 msgstr "Kliknij aby wejść do pokoju"
 
-#: src/converse-muc.js:1167
+#: src/converse-muc.js:1301
 msgid "Show more information on this room"
 msgstr "Pokaż więcej informacji o pokoju"
 
-#: src/converse-muc.js:1239
+#: src/converse-muc.js:1373
 msgid "Description:"
 msgstr "Opis:"
 
-#: src/converse-muc.js:1240
+#: src/converse-muc.js:1374
 msgid "Occupants:"
 msgstr "Uczestnicy:"
 
-#: src/converse-muc.js:1241
+#: src/converse-muc.js:1375
 msgid "Features:"
 msgstr "Możliwości:"
 
-#: src/converse-muc.js:1242
+#: src/converse-muc.js:1376
 msgid "Requires authentication"
 msgstr "Wymaga autoryzacji"
 
-#: src/converse-muc.js:1243
+#: src/converse-muc.js:1377
 msgid "Hidden"
 msgstr "Ukryty"
 
-#: src/converse-muc.js:1244
+#: src/converse-muc.js:1378
 msgid "Requires an invitation"
 msgstr "Wymaga zaproszenia"
 
-#: src/converse-muc.js:1245
+#: src/converse-muc.js:1379
 msgid "Moderated"
 msgstr "Moderowany"
 
-#: src/converse-muc.js:1246
+#: src/converse-muc.js:1380
 msgid "Non-anonymous"
 msgstr "Nieanonimowy"
 
-#: src/converse-muc.js:1247
+#: src/converse-muc.js:1381
 msgid "Open room"
 msgstr "Otwarty pokój"
 
-#: src/converse-muc.js:1248
+#: src/converse-muc.js:1382
 msgid "Permanent room"
 msgstr "Stały pokój"
 
-#: src/converse-muc.js:1249
+#: src/converse-muc.js:1383
 msgid "Public"
 msgstr "Publiczny"
 
-#: src/converse-muc.js:1250
+#: src/converse-muc.js:1384
 msgid "Semi-anonymous"
 msgstr "Półanonimowy"
 
-#: src/converse-muc.js:1251
+#: src/converse-muc.js:1385
 msgid "Temporary room"
 msgstr "Pokój tymczasowy"
 
-#: src/converse-muc.js:1252
+#: src/converse-muc.js:1386
 msgid "Unmoderated"
 msgstr "Niemoderowany"
 
-#: src/converse-muc.js:1329
+#: src/converse-muc.js:1456
 msgid "%1$s has invited you to join a chat room: %2$s"
 msgstr "%1$s zaprosił(a) cię do wejścia do pokoju rozmów %2$s"
 
-#: src/converse-muc.js:1334
+#: src/converse-muc.js:1461
 msgid ""
 "%1$s has invited you to join a chat room: %2$s, and left the following "
 "reason: \"%3$s\""
@@ -1024,6 +1045,9 @@ msgstr "Wystąpił błąd w trakcie próby usunięcia "
 msgid "Are you sure you want to decline this contact request?"
 msgstr "Czy potwierdzasz odrzucenie chęci nawiązania kontaktu?"
 
+#~ msgid "Your nickname is already taken"
+#~ msgstr "Twoja ksywka jest już w użyciu"
+
 #~ msgid "Type to filter"
 #~ msgstr "Zacznij pisać, aby odfiltrować"
 

locale/pt_BR/LC_MESSAGES/converse.json

@@ -239,6 +239,14 @@
             null,
             "Ocorreu um erro enquanto tentava salvar o formulário"
          ],
+         "Please choose your nickname": [
+            null,
+            ""
+         ],
+         "Nickname": [
+            null,
+            "Apelido"
+         ],
          "This chatroom requires a password": [
             null,
             "Esse chat precisa de senha"
@@ -347,9 +355,9 @@
             null,
             "Seu apelido não está de acordo com as regras da sala"
          ],
-         "Your nickname is already taken": [
+         "The nickname you chose is reserved or currently in use, please choose a different one.": [
             null,
-            "Seu apelido já foi escolhido"
+            ""
          ],
          "This room does not (yet) exist": [
             null,
@@ -359,18 +367,6 @@
             null,
             "Topico definido por %1$s para: %2$s"
          ],
-         "This user is a moderator": [
-            null,
-            "Esse usuário é o moderador"
-         ],
-         "This user can send messages in this room": [
-            null,
-            "Esse usuário pode enviar mensagens nessa sala"
-         ],
-         "This user can NOT send messages in this room": [
-            null,
-            "Esse usuário NÃO pode enviar mensagens nessa sala"
-         ],
          "Invite": [
             null,
             ""
@@ -387,10 +383,6 @@
             null,
             "Nome da sala"
          ],
-         "Nickname": [
-            null,
-            "Apelido"
-         ],
          "Server": [
             null,
             "Server"

locale/pt_BR/LC_MESSAGES/converse.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse.js 0.6.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-26 05:57+0000\n"
+"POT-Creation-Date: 2016-07-28 16:03+0000\n"
 "PO-Revision-Date: 2016-04-07 10:23+0000\n"
 "Last-Translator: Alan Meira <alan@engarte.com>\n"
 "Language-Team: Brazilian Portuguese\n"
@@ -21,7 +21,7 @@ msgstr ""
 "plural_forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/converse-chatview.js:103 src/converse-headline.js:99
-#: src/converse-muc.js:239
+#: src/converse-muc.js:246
 #, fuzzy
 msgid "You have unread messages"
 msgstr "Remover mensagens"
@@ -49,13 +49,13 @@ msgstr "%1$s está digitando"
 msgid "has stopped typing"
 msgstr "%1$s está digitando"
 
-#: src/converse-chatview.js:332 src/converse-chatview.js:588
+#: src/converse-chatview.js:332 src/converse-chatview.js:592
 #: src/converse-notification.js:171
 #, fuzzy
 msgid "has gone away"
 msgstr "Este contato está ausente"
 
-#: src/converse-chatview.js:456 src/converse-muc.js:412
+#: src/converse-chatview.js:456 src/converse-muc.js:426
 msgid "Show this menu"
 msgstr "Mostrar o menu"
 
@@ -63,7 +63,7 @@ msgstr "Mostrar o menu"
 msgid "Write in the third person"
 msgstr "Escrever em terceira pessoa"
 
-#: src/converse-chatview.js:458 src/converse-muc.js:410
+#: src/converse-chatview.js:458 src/converse-muc.js:424
 msgid "Remove messages"
 msgstr "Remover mensagens"
 
@@ -71,30 +71,30 @@ msgstr "Remover mensagens"
 msgid "Are you sure you want to clear the messages from this chat box?"
 msgstr "Tem certeza que deseja limpar as mensagens dessa caixa?"
 
-#: src/converse-chatview.js:586 src/converse-notification.js:169
+#: src/converse-chatview.js:590 src/converse-notification.js:169
 #, fuzzy
 msgid "has gone offline"
 msgstr "Este contato está offline"
 
-#: src/converse-chatview.js:590 src/converse-notification.js:173
+#: src/converse-chatview.js:594 src/converse-notification.js:173
 #, fuzzy
 msgid "is busy"
 msgstr "ocupado"
 
-#: src/converse-chatview.js:633
+#: src/converse-chatview.js:637
 #, fuzzy
 msgid "Clear all messages"
 msgstr "Mensagem pessoal"
 
-#: src/converse-chatview.js:634
+#: src/converse-chatview.js:638
 msgid "Hide the list of occupants"
 msgstr ""
 
-#: src/converse-chatview.js:635
+#: src/converse-chatview.js:639
 msgid "Insert a smiley"
 msgstr ""
 
-#: src/converse-chatview.js:636
+#: src/converse-chatview.js:640
 msgid "Start a call"
 msgstr ""
 
@@ -161,7 +161,7 @@ msgstr "Clique para mudar seu status no chat"
 msgid "Custom status"
 msgstr "Status customizado"
 
-#: src/converse-controlbox.js:490 src/converse-muc.js:580
+#: src/converse-controlbox.js:490 src/converse-muc.js:591
 msgid "Save"
 msgstr "Salvar"
 
@@ -295,154 +295,167 @@ msgstr "Minimizado"
 msgid "Minimize this chat box"
 msgstr ""
 
-#: src/converse-muc.js:241
+#: src/converse-muc.js:248
 msgid "Message"
 msgstr "Mensagem"
 
-#: src/converse-muc.js:302
+#: src/converse-muc.js:316
 msgid "Error: could not execute the command"
 msgstr ""
 
-#: src/converse-muc.js:358
+#: src/converse-muc.js:372
 msgid "Error: the \""
 msgstr ""
 
-#: src/converse-muc.js:368
+#: src/converse-muc.js:382
 #, fuzzy
 msgid "Are you sure you want to clear the messages from this room?"
 msgstr "Você não é membro dessa sala"
 
-#: src/converse-muc.js:408
+#: src/converse-muc.js:422
 msgid "Change user's affiliation to admin"
 msgstr ""
 
-#: src/converse-muc.js:409
+#: src/converse-muc.js:423
 #, fuzzy
 msgid "Ban user from room"
 msgstr "Banir usuário do chat"
 
-#: src/converse-muc.js:411
+#: src/converse-muc.js:425
 msgid "Change user role to occupant"
 msgstr ""
 
-#: src/converse-muc.js:413
+#: src/converse-muc.js:427
 #, fuzzy
 msgid "Kick user from room"
 msgstr "Expulsar usuário do chat"
 
-#: src/converse-muc.js:414
+#: src/converse-muc.js:428
 #, fuzzy
 msgid "Write in 3rd person"
 msgstr "Escrever em terceira pessoa"
 
-#: src/converse-muc.js:415
+#: src/converse-muc.js:429
 msgid "Grant membership to a user"
 msgstr ""
 
-#: src/converse-muc.js:416
+#: src/converse-muc.js:430
 msgid "Remove user's ability to post messages"
 msgstr ""
 
-#: src/converse-muc.js:417
+#: src/converse-muc.js:431
 msgid "Change your nickname"
 msgstr ""
 
-#: src/converse-muc.js:418
+#: src/converse-muc.js:432
 msgid "Grant moderator role to user"
 msgstr ""
 
-#: src/converse-muc.js:419
+#: src/converse-muc.js:433
 #, fuzzy
 msgid "Grant ownership of this room"
 msgstr "Você não é membro dessa sala"
 
-#: src/converse-muc.js:420
+#: src/converse-muc.js:434
 msgid "Revoke user's membership"
 msgstr ""
 
-#: src/converse-muc.js:421
+#: src/converse-muc.js:435
 #, fuzzy
 msgid "Set room topic"
 msgstr "Definir tópico do chat"
 
-#: src/converse-muc.js:422
+#: src/converse-muc.js:436
 msgid "Allow muted user to post messages"
 msgstr ""
 
-#: src/converse-muc.js:581 src/converse-register.js:216
+#: src/converse-muc.js:592 src/converse-register.js:216
 #: src/converse-register.js:331
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/converse-muc.js:624
+#: src/converse-muc.js:635
 msgid "An error occurred while trying to save the form."
 msgstr "Ocorreu um erro enquanto tentava salvar o formulário"
 
-#: src/converse-muc.js:666
+#: src/converse-muc.js:725
+msgid "Please choose your nickname"
+msgstr ""
+
+#: src/converse-muc.js:726 src/converse-muc.js:1250
+msgid "Nickname"
+msgstr "Apelido"
+
+#: src/converse-muc.js:727
+#, fuzzy
+msgid "Enter room"
+msgstr "Sala aberta"
+
+#: src/converse-muc.js:745
 msgid "This chatroom requires a password"
 msgstr "Esse chat precisa de senha"
 
-#: src/converse-muc.js:667
+#: src/converse-muc.js:746
 msgid "Password: "
 msgstr "Senha: "
 
-#: src/converse-muc.js:668
+#: src/converse-muc.js:747
 msgid "Submit"
 msgstr "Enviar"
 
-#: src/converse-muc.js:703
+#: src/converse-muc.js:782
 msgid "This room is not anonymous"
 msgstr "Essa sala não é anônima"
 
-#: src/converse-muc.js:704
+#: src/converse-muc.js:783
 msgid "This room now shows unavailable members"
 msgstr "Agora esta sala mostra membros indisponíveis"
 
-#: src/converse-muc.js:705
+#: src/converse-muc.js:784
 msgid "This room does not show unavailable members"
 msgstr "Essa sala não mostra membros indisponíveis"
 
-#: src/converse-muc.js:706
+#: src/converse-muc.js:785
 msgid "Non-privacy-related room configuration has changed"
 msgstr "Configuraçõs não relacionadas à privacidade mudaram"
 
-#: src/converse-muc.js:707
+#: src/converse-muc.js:786
 msgid "Room logging is now enabled"
 msgstr "O log da sala está ativado"
 
-#: src/converse-muc.js:708
+#: src/converse-muc.js:787
 msgid "Room logging is now disabled"
 msgstr "O log da sala está desativado"
 
-#: src/converse-muc.js:709
+#: src/converse-muc.js:788
 msgid "This room is now non-anonymous"
 msgstr "Esse sala é não anônima"
 
-#: src/converse-muc.js:710
+#: src/converse-muc.js:789
 msgid "This room is now semi-anonymous"
 msgstr "Essa sala agora é semi anônima"
 
-#: src/converse-muc.js:711
+#: src/converse-muc.js:790
 msgid "This room is now fully-anonymous"
 msgstr "Essa sala agora é totalmente anônima"
 
-#: src/converse-muc.js:712
+#: src/converse-muc.js:791
 msgid "A new room has been created"
 msgstr "Uma nova sala foi criada"
 
-#: src/converse-muc.js:716 src/converse-muc.js:816
+#: src/converse-muc.js:795 src/converse-muc.js:895
 msgid "You have been banned from this room"
 msgstr "Você foi banido dessa sala"
 
-#: src/converse-muc.js:717
+#: src/converse-muc.js:796
 msgid "You have been kicked from this room"
 msgstr "Você foi expulso dessa sala"
 
-#: src/converse-muc.js:718
+#: src/converse-muc.js:797
 msgid "You have been removed from this room because of an affiliation change"
 msgstr "Você foi removido da sala devido a uma mudança de associação"
 
-#: src/converse-muc.js:719
+#: src/converse-muc.js:798
 msgid ""
 "You have been removed from this room because the room has changed to members-"
 "only and you're not a member"
@@ -450,7 +463,7 @@ msgstr ""
 "Você foi removido da sala porque ela foi mudada para somente membrose você "
 "não é um membro"
 
-#: src/converse-muc.js:720
+#: src/converse-muc.js:799
 msgid ""
 "You have been removed from this room because the MUC (Multi-user chat) "
 "service is being shut down."
@@ -468,210 +481,216 @@ msgstr ""
 #. * can then at least tell gettext to scan for it so that these
 #. * strings are picked up by the translation machinery.
 #.
-#: src/converse-muc.js:734
+#: src/converse-muc.js:813
 msgid "<strong>%1$s</strong> has been banned"
 msgstr "<strong>%1$s</strong> foi banido"
 
-#: src/converse-muc.js:735
+#: src/converse-muc.js:814
 #, fuzzy
 msgid "<strong>%1$s</strong>'s nickname has changed"
 msgstr "<strong>%1$s</strong> foi banido"
 
-#: src/converse-muc.js:736
+#: src/converse-muc.js:815
 msgid "<strong>%1$s</strong> has been kicked out"
 msgstr "<strong>%1$s</strong> foi expulso"
 
-#: src/converse-muc.js:737
+#: src/converse-muc.js:816
 msgid "<strong>%1$s</strong> has been removed because of an affiliation change"
 msgstr "<srtong>%1$s</strong> foi removido por causa de troca de associação"
 
-#: src/converse-muc.js:738
+#: src/converse-muc.js:817
 msgid "<strong>%1$s</strong> has been removed for not being a member"
 msgstr "<strong>%1$s</strong> foi removido por não ser um membro"
 
-#: src/converse-muc.js:742
+#: src/converse-muc.js:821
 #, fuzzy
-msgid "Your nickname has been automatically changed to: <strong>%1$s</strong>"
+msgid "Your nickname has been automatically set to: <strong>%1$s</strong>"
 msgstr "Seu apelido foi mudado"
 
-#: src/converse-muc.js:743
+#: src/converse-muc.js:822
 #, fuzzy
 msgid "Your nickname has been changed to: <strong>%1$s</strong>"
 msgstr "Seu apelido foi mudado"
 
-#: src/converse-muc.js:790 src/converse-muc.js:799
+#: src/converse-muc.js:869 src/converse-muc.js:878
 msgid "The reason given is: \""
 msgstr ""
 
-#: src/converse-muc.js:814
+#: src/converse-muc.js:893
 msgid "You are not on the member list of this room"
 msgstr "Você não é membro dessa sala"
 
-#: src/converse-muc.js:820
+#: src/converse-muc.js:899
 msgid "No nickname was specified"
 msgstr "Você não escolheu um apelido "
 
-#: src/converse-muc.js:824
+#: src/converse-muc.js:903
 msgid "You are not allowed to create new rooms"
 msgstr "Você não tem permitição de criar novas salas"
 
-#: src/converse-muc.js:826
+#: src/converse-muc.js:905
 msgid "Your nickname doesn't conform to this room's policies"
 msgstr "Seu apelido não está de acordo com as regras da sala"
 
-#: src/converse-muc.js:828
-msgid "Your nickname is already taken"
-msgstr "Seu apelido já foi escolhido"
+#: src/converse-muc.js:907
+msgid ""
+"The nickname you chose is reserved or currently in use, please choose a "
+"different one."
+msgstr ""
 
-#: src/converse-muc.js:831
+#: src/converse-muc.js:909
 msgid "This room does not (yet) exist"
 msgstr "A sala não existe (ainda)"
 
-#: src/converse-muc.js:833
+#: src/converse-muc.js:911
 #, fuzzy
 msgid "This room has reached its maximum number of occupants"
 msgstr "A sala atingiu o número máximo de ocupantes"
 
-#: src/converse-muc.js:861
+#: src/converse-muc.js:961
 msgid "Topic set by %1$s to: %2$s"
 msgstr "Topico definido por %1$s para: %2$s"
 
-#: src/converse-muc.js:941
-msgid "This user is a moderator"
+#: src/converse-muc.js:1048
+#, fuzzy
+msgid "Click to mention this user in your message."
+msgstr "CLique para abrir a sala"
+
+#: src/converse-muc.js:1049
+#, fuzzy
+msgid "This user is a moderator."
 msgstr "Esse usuário é o moderador"
 
-#: src/converse-muc.js:942
-msgid "This user can send messages in this room"
+#: src/converse-muc.js:1050
+#, fuzzy
+msgid "This user can send messages in this room."
 msgstr "Esse usuário pode enviar mensagens nessa sala"
 
-#: src/converse-muc.js:943
-msgid "This user can NOT send messages in this room"
+#: src/converse-muc.js:1051
+#, fuzzy
+msgid "This user can NOT send messages in this room."
 msgstr "Esse usuário NÃO pode enviar mensagens nessa sala"
 
-#: src/converse-muc.js:972
+#: src/converse-muc.js:1087
 msgid "Invite"
 msgstr ""
 
-#: src/converse-muc.js:973
+#: src/converse-muc.js:1088
 #, fuzzy
 msgid "Occupants"
 msgstr "Ocupantes:"
 
-#: src/converse-muc.js:1072
+#: src/converse-muc.js:1206
 msgid "You are about to invite %1$s to the chat room \"%2$s\". "
 msgstr ""
 
-#: src/converse-muc.js:1073
+#: src/converse-muc.js:1207
 msgid ""
 "You may optionally include a message, explaining the reason for the "
 "invitation."
 msgstr ""
 
-#: src/converse-muc.js:1115
+#: src/converse-muc.js:1249
 msgid "Room name"
 msgstr "Nome da sala"
 
-#: src/converse-muc.js:1116
-msgid "Nickname"
-msgstr "Apelido"
-
-#: src/converse-muc.js:1117
+#: src/converse-muc.js:1251
 msgid "Server"
 msgstr "Server"
 
-#: src/converse-muc.js:1118
+#: src/converse-muc.js:1252
 #, fuzzy
 msgid "Join Room"
 msgstr "Entrar"
 
-#: src/converse-muc.js:1119
+#: src/converse-muc.js:1253
 msgid "Show rooms"
 msgstr "Mostar salas"
 
-#: src/converse-muc.js:1123
+#: src/converse-muc.js:1257
 msgid "Rooms"
 msgstr "Salas"
 
 #. For translators: %1$s is a variable and will be replaced with the XMPP server name
-#: src/converse-muc.js:1143
+#: src/converse-muc.js:1277
 msgid "No rooms on %1$s"
 msgstr "Sem salas em %1$s"
 
 #. For translators: %1$s is a variable and will be
 #. replaced with the XMPP server name
-#: src/converse-muc.js:1157
+#: src/converse-muc.js:1291
 msgid "Rooms on %1$s"
 msgstr "Salas em %1$s"
 
-#: src/converse-muc.js:1166
+#: src/converse-muc.js:1300
 msgid "Click to open this room"
 msgstr "CLique para abrir a sala"
 
-#: src/converse-muc.js:1167
+#: src/converse-muc.js:1301
 msgid "Show more information on this room"
 msgstr "Mostrar mais informações nessa sala"
 
-#: src/converse-muc.js:1239
+#: src/converse-muc.js:1373
 msgid "Description:"
 msgstr "Descrição:"
 
-#: src/converse-muc.js:1240
+#: src/converse-muc.js:1374
 msgid "Occupants:"
 msgstr "Ocupantes:"
 
-#: src/converse-muc.js:1241
+#: src/converse-muc.js:1375
 msgid "Features:"
 msgstr "Recursos:"
 
-#: src/converse-muc.js:1242
+#: src/converse-muc.js:1376
 msgid "Requires authentication"
 msgstr "Requer autenticação"
 
-#: src/converse-muc.js:1243
+#: src/converse-muc.js:1377
 msgid "Hidden"
 msgstr "Escondido"
 
-#: src/converse-muc.js:1244
+#: src/converse-muc.js:1378
 msgid "Requires an invitation"
 msgstr "Requer um convite"
 
-#: src/converse-muc.js:1245
+#: src/converse-muc.js:1379
 msgid "Moderated"
 msgstr "Moderado"
 
-#: src/converse-muc.js:1246
+#: src/converse-muc.js:1380
 msgid "Non-anonymous"
 msgstr "Não anônimo"
 
-#: src/converse-muc.js:1247
+#: src/converse-muc.js:1381
 msgid "Open room"
 msgstr "Sala aberta"
 
-#: src/converse-muc.js:1248
+#: src/converse-muc.js:1382
 msgid "Permanent room"
 msgstr "Sala permanente"
 
-#: src/converse-muc.js:1249
+#: src/converse-muc.js:1383
 msgid "Public"
 msgstr "Público"
 
-#: src/converse-muc.js:1250
+#: src/converse-muc.js:1384
 msgid "Semi-anonymous"
 msgstr "Semi anônimo"
 
-#: src/converse-muc.js:1251
+#: src/converse-muc.js:1385
 msgid "Temporary room"
 msgstr "Sala temporária"
 
-#: src/converse-muc.js:1252
+#: src/converse-muc.js:1386
 msgid "Unmoderated"
 msgstr "Sem moderação"
 
-#: src/converse-muc.js:1329
+#: src/converse-muc.js:1456
 msgid "%1$s has invited you to join a chat room: %2$s"
 msgstr ""
 
-#: src/converse-muc.js:1334
+#: src/converse-muc.js:1461
 msgid ""
 "%1$s has invited you to join a chat room: %2$s, and left the following "
 "reason: \"%3$s\""
@@ -1052,6 +1071,9 @@ msgstr ""
 msgid "Are you sure you want to decline this contact request?"
 msgstr "Clique para remover o contato"
 
+#~ msgid "Your nickname is already taken"
+#~ msgstr "Seu apelido já foi escolhido"
+
 #~ msgid "Disconnected"
 #~ msgstr "Desconectado"
 

locale/ru/LC_MESSAGES/converse.json

@@ -298,6 +298,10 @@
             null,
             "При сохранение формы произошла ошибка."
          ],
+         "Nickname": [
+            null,
+            "Псевдоним"
+         ],
          "This chatroom requires a password": [
             null,
             "Для доступа в чат необходим пароль."
@@ -386,10 +390,6 @@
             null,
             "<strong>%1$s</strong> удалён, потому что не участник"
          ],
-         "Your nickname has been automatically changed to: <strong>%1$s</strong>": [
-            null,
-            "Ваш псевдоним автоматически изменён на: <strong>%1$s</strong>"
-         ],
          "Your nickname has been changed to: <strong>%1$s</strong>": [
             null,
             "Ваш псевдоним изменён на: <strong>%1$s</strong>"
@@ -410,9 +410,9 @@
             null,
             "Псевдоним запрещён правилами чата"
          ],
-         "Your nickname is already taken": [
+         "The nickname you chose is reserved or currently in use, please choose a different one.": [
             null,
-            "Этот псевдоним уже занят другим пользователем"
+            ""
          ],
          "This room does not (yet) exist": [
             null,
@@ -422,18 +422,6 @@
             null,
             "Тема %2$s устатновлена %1$s"
          ],
-         "This user is a moderator": [
-            null,
-            "Модератор"
-         ],
-         "This user can send messages in this room": [
-            null,
-            "Собеседник"
-         ],
-         "This user can NOT send messages in this room": [
-            null,
-            "Пользователь не может посылать сообщения в этот чат"
-         ],
          "Invite": [
             null,
             "Пригласить"
@@ -454,10 +442,6 @@
             null,
             "Имя чата"
          ],
-         "Nickname": [
-            null,
-            "Псевдоним"
-         ],
          "Server": [
             null,
             "Сервер"

locale/ru/LC_MESSAGES/converse.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse.js 0.10\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-26 05:57+0000\n"
+"POT-Creation-Date: 2016-07-28 16:03+0000\n"
 "PO-Revision-Date: 2016-04-07 10:22+0000\n"
 "Last-Translator: Laconic Team <info@laconic.website>\n"
 "Language-Team: Laconic Team <info@laconic.website>\n"
@@ -18,7 +18,7 @@ msgstr ""
 "X-Generator: Poedit 1.8.6\n"
 
 #: src/converse-chatview.js:103 src/converse-headline.js:99
-#: src/converse-muc.js:239
+#: src/converse-muc.js:246
 #, fuzzy
 msgid "You have unread messages"
 msgstr "Удалить сообщения"
@@ -43,12 +43,12 @@ msgstr "набирает текст"
 msgid "has stopped typing"
 msgstr "перестал набирать"
 
-#: src/converse-chatview.js:332 src/converse-chatview.js:588
+#: src/converse-chatview.js:332 src/converse-chatview.js:592
 #: src/converse-notification.js:171
 msgid "has gone away"
 msgstr "отошёл"
 
-#: src/converse-chatview.js:456 src/converse-muc.js:412
+#: src/converse-chatview.js:456 src/converse-muc.js:426
 msgid "Show this menu"
 msgstr "Показать это меню"
 
@@ -56,7 +56,7 @@ msgstr "Показать это меню"
 msgid "Write in the third person"
 msgstr "Вписать третьего человека"
 
-#: src/converse-chatview.js:458 src/converse-muc.js:410
+#: src/converse-chatview.js:458 src/converse-muc.js:424
 msgid "Remove messages"
 msgstr "Удалить сообщения"
 
@@ -64,27 +64,27 @@ msgstr "Удалить сообщения"
 msgid "Are you sure you want to clear the messages from this chat box?"
 msgstr "Вы уверены, что хотите очистить сообщения из окна чата?"
 
-#: src/converse-chatview.js:586 src/converse-notification.js:169
+#: src/converse-chatview.js:590 src/converse-notification.js:169
 msgid "has gone offline"
 msgstr "вышел из сети"
 
-#: src/converse-chatview.js:590 src/converse-notification.js:173
+#: src/converse-chatview.js:594 src/converse-notification.js:173
 msgid "is busy"
 msgstr "занят"
 
-#: src/converse-chatview.js:633
+#: src/converse-chatview.js:637
 msgid "Clear all messages"
 msgstr "Очистить все сообщения"
 
-#: src/converse-chatview.js:634
+#: src/converse-chatview.js:638
 msgid "Hide the list of occupants"
 msgstr "Спрятать список участников"
 
-#: src/converse-chatview.js:635
+#: src/converse-chatview.js:639
 msgid "Insert a smiley"
 msgstr "Вставить смайлик"
 
-#: src/converse-chatview.js:636
+#: src/converse-chatview.js:640
 msgid "Start a call"
 msgstr "Инициировать звонок"
 
@@ -148,7 +148,7 @@ msgstr "Изменить ваш статус"
 msgid "Custom status"
 msgstr "Произвольный статус"
 
-#: src/converse-controlbox.js:490 src/converse-muc.js:580
+#: src/converse-controlbox.js:490 src/converse-muc.js:591
 msgid "Save"
 msgstr "Сохранить"
 
@@ -281,156 +281,170 @@ msgstr "Свёрнуто"
 msgid "Minimize this chat box"
 msgstr "Свернуть окно чата"
 
-#: src/converse-muc.js:241
+#: src/converse-muc.js:248
 msgid "Message"
 msgstr "Сообщение"
 
-#: src/converse-muc.js:302
+#: src/converse-muc.js:316
 msgid "Error: could not execute the command"
 msgstr "Ошибка: невозможно выполнить команду"
 
-#: src/converse-muc.js:358
+#: src/converse-muc.js:372
 msgid "Error: the \""
 msgstr "Ошибка:  \""
 
-#: src/converse-muc.js:368
+#: src/converse-muc.js:382
 msgid "Are you sure you want to clear the messages from this room?"
 msgstr "Вы уверены, что хотите очистить сообщения из этого чата?"
 
-#: src/converse-muc.js:408
+#: src/converse-muc.js:422
 msgid "Change user's affiliation to admin"
 msgstr "Дать права администратора"
 
-#: src/converse-muc.js:409
+#: src/converse-muc.js:423
 msgid "Ban user from room"
 msgstr "Забанить пользователя в этом чате."
 
-#: src/converse-muc.js:411
+#: src/converse-muc.js:425
 msgid "Change user role to occupant"
 msgstr "Изменить роль пользователя на \"участник\""
 
-#: src/converse-muc.js:413
+#: src/converse-muc.js:427
 msgid "Kick user from room"
 msgstr "Удалить пользователя из чата."
 
-#: src/converse-muc.js:414
+#: src/converse-muc.js:428
 #, fuzzy
 msgid "Write in 3rd person"
 msgstr "Вписать третьего"
 
-#: src/converse-muc.js:415
+#: src/converse-muc.js:429
 msgid "Grant membership to a user"
 msgstr "Сделать пользователя участником"
 
-#: src/converse-muc.js:416
+#: src/converse-muc.js:430
 msgid "Remove user's ability to post messages"
 msgstr "Запретить отправку сообщений"
 
-#: src/converse-muc.js:417
+#: src/converse-muc.js:431
 msgid "Change your nickname"
 msgstr "Изменить свой псевдоним"
 
-#: src/converse-muc.js:418
+#: src/converse-muc.js:432
 msgid "Grant moderator role to user"
 msgstr "Предоставить права модератора пользователю"
 
-#: src/converse-muc.js:419
+#: src/converse-muc.js:433
 msgid "Grant ownership of this room"
 msgstr "Предоставить права владельца на этот чат"
 
-#: src/converse-muc.js:420
+#: src/converse-muc.js:434
 msgid "Revoke user's membership"
 msgstr "Отозвать членство пользователя"
 
-#: src/converse-muc.js:421
+#: src/converse-muc.js:435
 #, fuzzy
 msgid "Set room topic"
 msgstr "Установить тему"
 
-#: src/converse-muc.js:422
+#: src/converse-muc.js:436
 msgid "Allow muted user to post messages"
 msgstr "Разрешить заглушенным пользователям отправлять сообщения"
 
-#: src/converse-muc.js:581 src/converse-register.js:216
+#: src/converse-muc.js:592 src/converse-register.js:216
 #: src/converse-register.js:331
 msgid "Cancel"
 msgstr "Отменить"
 
-#: src/converse-muc.js:624
+#: src/converse-muc.js:635
 msgid "An error occurred while trying to save the form."
 msgstr "При сохранение формы произошла ошибка."
 
-#: src/converse-muc.js:666
+#: src/converse-muc.js:725
+#, fuzzy
+msgid "Please choose your nickname"
+msgstr "Изменить свой псевдоним"
+
+#: src/converse-muc.js:726 src/converse-muc.js:1250
+msgid "Nickname"
+msgstr "Псевдоним"
+
+#: src/converse-muc.js:727
+#, fuzzy
+msgid "Enter room"
+msgstr "Открыть чат"
+
+#: src/converse-muc.js:745
 msgid "This chatroom requires a password"
 msgstr "Для доступа в чат необходим пароль."
 
-#: src/converse-muc.js:667
+#: src/converse-muc.js:746
 msgid "Password: "
 msgstr "Пароль: "
 
-#: src/converse-muc.js:668
+#: src/converse-muc.js:747
 msgid "Submit"
 msgstr "Отправить"
 
-#: src/converse-muc.js:703
+#: src/converse-muc.js:782
 msgid "This room is not anonymous"
 msgstr "Этот чат не анонимный"
 
-#: src/converse-muc.js:704
+#: src/converse-muc.js:783
 msgid "This room now shows unavailable members"
 msgstr "Этот чат показывает недоступных собеседников"
 
-#: src/converse-muc.js:705
+#: src/converse-muc.js:784
 msgid "This room does not show unavailable members"
 msgstr "Этот чат не показывает недоступных собеседников"
 
-#: src/converse-muc.js:706
+#: src/converse-muc.js:785
 msgid "Non-privacy-related room configuration has changed"
 msgstr "Изменились настройки чата, не относящиеся к приватности"
 
-#: src/converse-muc.js:707
+#: src/converse-muc.js:786
 msgid "Room logging is now enabled"
 msgstr "Протокол чата включен"
 
-#: src/converse-muc.js:708
+#: src/converse-muc.js:787
 msgid "Room logging is now disabled"
 msgstr "Протокол чата выключен"
 
-#: src/converse-muc.js:709
+#: src/converse-muc.js:788
 msgid "This room is now non-anonymous"
 msgstr "Этот чат больше не анонимный"
 
-#: src/converse-muc.js:710
+#: src/converse-muc.js:789
 msgid "This room is now semi-anonymous"
 msgstr "Этот чат частично анонимный"
 
-#: src/converse-muc.js:711
+#: src/converse-muc.js:790
 msgid "This room is now fully-anonymous"
 msgstr "Этот чат стал полностью анонимный"
 
-#: src/converse-muc.js:712
+#: src/converse-muc.js:791
 msgid "A new room has been created"
 msgstr "Появился новый чат"
 
-#: src/converse-muc.js:716 src/converse-muc.js:816
+#: src/converse-muc.js:795 src/converse-muc.js:895
 msgid "You have been banned from this room"
 msgstr "Вам запрещено подключатся к этому чату"
 
-#: src/converse-muc.js:717
+#: src/converse-muc.js:796
 msgid "You have been kicked from this room"
 msgstr "Вас выкинули из чата"
 
-#: src/converse-muc.js:718
+#: src/converse-muc.js:797
 msgid "You have been removed from this room because of an affiliation change"
 msgstr "Вас удалили из-за изменения прав"
 
-#: src/converse-muc.js:719
+#: src/converse-muc.js:798
 msgid ""
 "You have been removed from this room because the room has changed to members-"
 "only and you're not a member"
 msgstr "Вы отключены от чата, потому что он теперь только для участников"
 
-#: src/converse-muc.js:720
+#: src/converse-muc.js:799
 msgid ""
 "You have been removed from this room because the MUC (Multi-user chat) "
 "service is being shut down."
@@ -446,208 +460,215 @@ msgstr "Вы отключены от этого чата, потому что с
 #. * can then at least tell gettext to scan for it so that these
 #. * strings are picked up by the translation machinery.
 #.
-#: src/converse-muc.js:734
+#: src/converse-muc.js:813
 msgid "<strong>%1$s</strong> has been banned"
 msgstr "<strong>%1$s</strong> забанен"
 
-#: src/converse-muc.js:735
+#: src/converse-muc.js:814
 #, fuzzy
 msgid "<strong>%1$s</strong>'s nickname has changed"
 msgstr "<strong>%1$s</strong> сменил псевдоним"
 
-#: src/converse-muc.js:736
+#: src/converse-muc.js:815
 msgid "<strong>%1$s</strong> has been kicked out"
 msgstr "<strong>%1$s</strong> выкинут"
 
-#: src/converse-muc.js:737
+#: src/converse-muc.js:816
 msgid "<strong>%1$s</strong> has been removed because of an affiliation change"
 msgstr "<strong>%1$s</strong> удалён, потому что изменились права"
 
-#: src/converse-muc.js:738
+#: src/converse-muc.js:817
 msgid "<strong>%1$s</strong> has been removed for not being a member"
 msgstr "<strong>%1$s</strong> удалён, потому что не участник"
 
-#: src/converse-muc.js:742
-msgid "Your nickname has been automatically changed to: <strong>%1$s</strong>"
+#: src/converse-muc.js:821
+#, fuzzy
+msgid "Your nickname has been automatically set to: <strong>%1$s</strong>"
 msgstr "Ваш псевдоним автоматически изменён на: <strong>%1$s</strong>"
 
-#: src/converse-muc.js:743
+#: src/converse-muc.js:822
 msgid "Your nickname has been changed to: <strong>%1$s</strong>"
 msgstr "Ваш псевдоним изменён на: <strong>%1$s</strong>"
 
-#: src/converse-muc.js:790 src/converse-muc.js:799
+#: src/converse-muc.js:869 src/converse-muc.js:878
 #, fuzzy
 msgid "The reason given is: \""
 msgstr "Причина: \""
 
-#: src/converse-muc.js:814
+#: src/converse-muc.js:893
 msgid "You are not on the member list of this room"
 msgstr "Вы не участник этого чата"
 
-#: src/converse-muc.js:820
+#: src/converse-muc.js:899
 msgid "No nickname was specified"
 msgstr "Вы не указали псевдоним"
 
-#: src/converse-muc.js:824
+#: src/converse-muc.js:903
 msgid "You are not allowed to create new rooms"
 msgstr "Вы не имеете права создавать чаты"
 
-#: src/converse-muc.js:826
+#: src/converse-muc.js:905
 msgid "Your nickname doesn't conform to this room's policies"
 msgstr "Псевдоним запрещён правилами чата"
 
-#: src/converse-muc.js:828
-msgid "Your nickname is already taken"
-msgstr "Этот псевдоним уже занят другим пользователем"
+#: src/converse-muc.js:907
+msgid ""
+"The nickname you chose is reserved or currently in use, please choose a "
+"different one."
+msgstr ""
 
-#: src/converse-muc.js:831
+#: src/converse-muc.js:909
 msgid "This room does not (yet) exist"
 msgstr "Этот чат не существует"
 
-#: src/converse-muc.js:833
+#: src/converse-muc.js:911
 #, fuzzy
 msgid "This room has reached its maximum number of occupants"
 msgstr "Чат достиг максимального количества участников"
 
-#: src/converse-muc.js:861
+#: src/converse-muc.js:961
 msgid "Topic set by %1$s to: %2$s"
 msgstr "Тема %2$s устатновлена %1$s"
 
-#: src/converse-muc.js:941
-msgid "This user is a moderator"
+#: src/converse-muc.js:1048
+#, fuzzy
+msgid "Click to mention this user in your message."
+msgstr "Зайти в чат"
+
+#: src/converse-muc.js:1049
+#, fuzzy
+msgid "This user is a moderator."
 msgstr "Модератор"
 
-#: src/converse-muc.js:942
-msgid "This user can send messages in this room"
+#: src/converse-muc.js:1050
+#, fuzzy
+msgid "This user can send messages in this room."
 msgstr "Собеседник"
 
-#: src/converse-muc.js:943
-msgid "This user can NOT send messages in this room"
+#: src/converse-muc.js:1051
+#, fuzzy
+msgid "This user can NOT send messages in this room."
 msgstr "Пользователь не может посылать сообщения в этот чат"
 
-#: src/converse-muc.js:972
+#: src/converse-muc.js:1087
 msgid "Invite"
 msgstr "Пригласить"
 
-#: src/converse-muc.js:973
+#: src/converse-muc.js:1088
 msgid "Occupants"
 msgstr "Участники:"
 
-#: src/converse-muc.js:1072
+#: src/converse-muc.js:1206
 msgid "You are about to invite %1$s to the chat room \"%2$s\". "
 msgstr "Вы собираетесь пригласить %1$s в чат \"%2$s\". "
 
-#: src/converse-muc.js:1073
+#: src/converse-muc.js:1207
 msgid ""
 "You may optionally include a message, explaining the reason for the "
 "invitation."
 msgstr ""
 "Вы можете дополнительно вставить сообщение, объясняющее причину приглашения."
 
-#: src/converse-muc.js:1115
+#: src/converse-muc.js:1249
 msgid "Room name"
 msgstr "Имя чата"
 
-#: src/converse-muc.js:1116
-msgid "Nickname"
-msgstr "Псевдоним"
-
-#: src/converse-muc.js:1117
+#: src/converse-muc.js:1251
 msgid "Server"
 msgstr "Сервер"
 
-#: src/converse-muc.js:1118
+#: src/converse-muc.js:1252
 msgid "Join Room"
 msgstr "Присоединться к чату"
 
-#: src/converse-muc.js:1119
+#: src/converse-muc.js:1253
 msgid "Show rooms"
 msgstr "Показать чаты"
 
-#: src/converse-muc.js:1123
+#: src/converse-muc.js:1257
 msgid "Rooms"
 msgstr "Чаты"
 
 #. For translators: %1$s is a variable and will be replaced with the XMPP server name
-#: src/converse-muc.js:1143
+#: src/converse-muc.js:1277
 msgid "No rooms on %1$s"
 msgstr "Нет чатов %1$s"
 
 #. For translators: %1$s is a variable and will be
 #. replaced with the XMPP server name
-#: src/converse-muc.js:1157
+#: src/converse-muc.js:1291
 msgid "Rooms on %1$s"
 msgstr "Чаты %1$s:"
 
-#: src/converse-muc.js:1166
+#: src/converse-muc.js:1300
 msgid "Click to open this room"
 msgstr "Зайти в чат"
 
-#: src/converse-muc.js:1167
+#: src/converse-muc.js:1301
 msgid "Show more information on this room"
 msgstr "Показать больше информации об этом чате"
 
-#: src/converse-muc.js:1239
+#: src/converse-muc.js:1373
 msgid "Description:"
 msgstr "Описание:"
 
-#: src/converse-muc.js:1240
+#: src/converse-muc.js:1374
 msgid "Occupants:"
 msgstr "Участники:"
 
-#: src/converse-muc.js:1241
+#: src/converse-muc.js:1375
 msgid "Features:"
 msgstr "Свойства:"
 
-#: src/converse-muc.js:1242
+#: src/converse-muc.js:1376
 msgid "Requires authentication"
 msgstr "Требуется авторизация"
 
-#: src/converse-muc.js:1243
+#: src/converse-muc.js:1377
 msgid "Hidden"
 msgstr "Скрыто"
 
-#: src/converse-muc.js:1244
+#: src/converse-muc.js:1378
 msgid "Requires an invitation"
 msgstr "Требуется приглашение"
 
-#: src/converse-muc.js:1245
+#: src/converse-muc.js:1379
 msgid "Moderated"
 msgstr "Модерируемая"
 
-#: src/converse-muc.js:1246
+#: src/converse-muc.js:1380
 msgid "Non-anonymous"
 msgstr "Не анонимная"
 
-#: src/converse-muc.js:1247
+#: src/converse-muc.js:1381
 msgid "Open room"
 msgstr "Открыть чат"
 
-#: src/converse-muc.js:1248
+#: src/converse-muc.js:1382
 msgid "Permanent room"
 msgstr "Постоянный чат"
 
-#: src/converse-muc.js:1249
+#: src/converse-muc.js:1383
 msgid "Public"
 msgstr "Публичный"
 
-#: src/converse-muc.js:1250
+#: src/converse-muc.js:1384
 msgid "Semi-anonymous"
 msgstr "Частично анонимный"
 
-#: src/converse-muc.js:1251
+#: src/converse-muc.js:1385
 msgid "Temporary room"
 msgstr "Временный чат"
 
-#: src/converse-muc.js:1252
+#: src/converse-muc.js:1386
 msgid "Unmoderated"
 msgstr "Немодерируемый"
 
-#: src/converse-muc.js:1329
+#: src/converse-muc.js:1456
 msgid "%1$s has invited you to join a chat room: %2$s"
 msgstr "%1$s пригласил вас в чат: %2$s"
 
-#: src/converse-muc.js:1334
+#: src/converse-muc.js:1461
 msgid ""
 "%1$s has invited you to join a chat room: %2$s, and left the following "
 "reason: \"%3$s\""
@@ -1021,6 +1042,9 @@ msgstr "Возникла ошибка при удалении "
 msgid "Are you sure you want to decline this contact request?"
 msgstr "Вы уверены, что хотите отклонить запрос от этого контакта?"
 
+#~ msgid "Your nickname is already taken"
+#~ msgstr "Этот псевдоним уже занят другим пользователем"
+
 #~ msgid "Disconnected"
 #~ msgstr "Отключено"
 

locale/uk/LC_MESSAGES/converse.json

@@ -295,6 +295,10 @@
             null,
             "Трапилася помилка при спробі зберегти форму."
          ],
+         "Nickname": [
+            null,
+            "Прізвисько"
+         ],
          "This chatroom requires a password": [
             null,
             "Ця кімната вимагає пароль"
@@ -387,10 +391,6 @@
             null,
             "<strong>%1$s</strong> було виделано через відсутність членства"
          ],
-         "Your nickname has been automatically changed to: <strong>%1$s</strong>": [
-            null,
-            "Ваше прізвисько було автоматично змінене на: <strong>%1$s</strong>"
-         ],
          "Your nickname has been changed to: <strong>%1$s</strong>": [
             null,
             "Ваше прізвисько було змінене на: <strong>%1$s</strong>"
@@ -415,9 +415,9 @@
             null,
             "Ваше прізвисько не відповідає політиці кімнати"
          ],
-         "Your nickname is already taken": [
+         "The nickname you chose is reserved or currently in use, please choose a different one.": [
             null,
-            "Таке прізвисько вже зайняте"
+            ""
          ],
          "This room does not (yet) exist": [
             null,
@@ -427,18 +427,6 @@
             null,
             "Тема встановлена %1$s: %2$s"
          ],
-         "This user is a moderator": [
-            null,
-            "Цей користувач є модератором"
-         ],
-         "This user can send messages in this room": [
-            null,
-            "Цей користувач може слати повідомлення в цій кімнаті"
-         ],
-         "This user can NOT send messages in this room": [
-            null,
-            "Цей користувач НЕ МОЖЕ слати повідомлення в цій кімнаті"
-         ],
          "Invite": [
             null,
             "Запросіть"
@@ -459,10 +447,6 @@
             null,
             "Назва кімнати"
          ],
-         "Nickname": [
-            null,
-            "Прізвисько"
-         ],
          "Server": [
             null,
             "Сервер"

locale/uk/LC_MESSAGES/converse.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse.js 0.7.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-26 05:57+0000\n"
+"POT-Creation-Date: 2016-07-28 16:03+0000\n"
 "PO-Revision-Date: 2016-04-07 10:22+0000\n"
 "Last-Translator: Andriy Kopystyansky <anri@polynet.lviv.ua>\n"
 "Language-Team: Ukrainian\n"
@@ -21,7 +21,7 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: src/converse-chatview.js:103 src/converse-headline.js:99
-#: src/converse-muc.js:239
+#: src/converse-muc.js:246
 #, fuzzy
 msgid "You have unread messages"
 msgstr "Видалити повідомлення"
@@ -47,12 +47,12 @@ msgstr "друкує"
 msgid "has stopped typing"
 msgstr "припинив друкувати"
 
-#: src/converse-chatview.js:332 src/converse-chatview.js:588
+#: src/converse-chatview.js:332 src/converse-chatview.js:592
 #: src/converse-notification.js:171
 msgid "has gone away"
 msgstr "пішов геть"
 
-#: src/converse-chatview.js:456 src/converse-muc.js:412
+#: src/converse-chatview.js:456 src/converse-muc.js:426
 msgid "Show this menu"
 msgstr "Показати це меню"
 
@@ -60,7 +60,7 @@ msgstr "Показати це меню"
 msgid "Write in the third person"
 msgstr "Писати від третьої особи"
 
-#: src/converse-chatview.js:458 src/converse-muc.js:410
+#: src/converse-chatview.js:458 src/converse-muc.js:424
 msgid "Remove messages"
 msgstr "Видалити повідомлення"
 
@@ -68,28 +68,28 @@ msgstr "Видалити повідомлення"
 msgid "Are you sure you want to clear the messages from this chat box?"
 msgstr "Ви впевнені, що хочете очистити повідомлення з цього вікна чату?"
 
-#: src/converse-chatview.js:586 src/converse-notification.js:169
+#: src/converse-chatview.js:590 src/converse-notification.js:169
 msgid "has gone offline"
 msgstr "тепер поза мережею"
 
-#: src/converse-chatview.js:590 src/converse-notification.js:173
+#: src/converse-chatview.js:594 src/converse-notification.js:173
 msgid "is busy"
 msgstr "зайнятий"
 
-#: src/converse-chatview.js:633
+#: src/converse-chatview.js:637
 msgid "Clear all messages"
 msgstr "Очистити всі повідомлення"
 
-#: src/converse-chatview.js:634
+#: src/converse-chatview.js:638
 #, fuzzy
 msgid "Hide the list of occupants"
 msgstr "Сховати список учасників"
 
-#: src/converse-chatview.js:635
+#: src/converse-chatview.js:639
 msgid "Insert a smiley"
 msgstr ""
 
-#: src/converse-chatview.js:636
+#: src/converse-chatview.js:640
 msgid "Start a call"
 msgstr "Почати виклик"
 
@@ -155,7 +155,7 @@ msgstr "Клацніть, щоб змінити статус в чаті"
 msgid "Custom status"
 msgstr "Власний статус"
 
-#: src/converse-controlbox.js:490 src/converse-muc.js:580
+#: src/converse-controlbox.js:490 src/converse-muc.js:591
 msgid "Save"
 msgstr "Зберегти"
 
@@ -286,149 +286,163 @@ msgstr "Мінімізовано"
 msgid "Minimize this chat box"
 msgstr ""
 
-#: src/converse-muc.js:241
+#: src/converse-muc.js:248
 msgid "Message"
 msgstr "Повідомлення"
 
-#: src/converse-muc.js:302
+#: src/converse-muc.js:316
 msgid "Error: could not execute the command"
 msgstr "Помилка: Не можу виконати команду"
 
-#: src/converse-muc.js:358
+#: src/converse-muc.js:372
 msgid "Error: the \""
 msgstr ""
 
-#: src/converse-muc.js:368
+#: src/converse-muc.js:382
 msgid "Are you sure you want to clear the messages from this room?"
 msgstr "Ви впевнені, що хочете очистити повідомлення з цієї кімнати?"
 
-#: src/converse-muc.js:408
+#: src/converse-muc.js:422
 msgid "Change user's affiliation to admin"
 msgstr "Призначити користувача адміністратором"
 
-#: src/converse-muc.js:409
+#: src/converse-muc.js:423
 msgid "Ban user from room"
 msgstr "Заблокувати і викинути з кімнати"
 
-#: src/converse-muc.js:411
+#: src/converse-muc.js:425
 #, fuzzy
 msgid "Change user role to occupant"
 msgstr "Зробити користувача учасником"
 
-#: src/converse-muc.js:413
+#: src/converse-muc.js:427
 msgid "Kick user from room"
 msgstr "Викинути з кімнати"
 
-#: src/converse-muc.js:414
+#: src/converse-muc.js:428
 msgid "Write in 3rd person"
 msgstr "Писати в 3-й особі"
 
-#: src/converse-muc.js:415
+#: src/converse-muc.js:429
 msgid "Grant membership to a user"
 msgstr "Надати членство користувачу"
 
-#: src/converse-muc.js:416
+#: src/converse-muc.js:430
 msgid "Remove user's ability to post messages"
 msgstr "Забрати можливість слати повідомлення"
 
-#: src/converse-muc.js:417
+#: src/converse-muc.js:431
 msgid "Change your nickname"
 msgstr "Змінити Ваше прізвисько"
 
-#: src/converse-muc.js:418
+#: src/converse-muc.js:432
 msgid "Grant moderator role to user"
 msgstr "Надати права модератора"
 
-#: src/converse-muc.js:419
+#: src/converse-muc.js:433
 msgid "Grant ownership of this room"
 msgstr "Передати у власність цю кімнату"
 
-#: src/converse-muc.js:420
+#: src/converse-muc.js:434
 msgid "Revoke user's membership"
 msgstr "Забрати членство в користувача"
 
-#: src/converse-muc.js:421
+#: src/converse-muc.js:435
 msgid "Set room topic"
 msgstr "Встановити тему кімнати"
 
-#: src/converse-muc.js:422
+#: src/converse-muc.js:436
 msgid "Allow muted user to post messages"
 msgstr "Дозволити безголосому користувачу слати повідомлення"
 
-#: src/converse-muc.js:581 src/converse-register.js:216
+#: src/converse-muc.js:592 src/converse-register.js:216
 #: src/converse-register.js:331
 msgid "Cancel"
 msgstr "Відміна"
 
-#: src/converse-muc.js:624
+#: src/converse-muc.js:635
 msgid "An error occurred while trying to save the form."
 msgstr "Трапилася помилка при спробі зберегти форму."
 
-#: src/converse-muc.js:666
+#: src/converse-muc.js:725
+#, fuzzy
+msgid "Please choose your nickname"
+msgstr "Змінити Ваше прізвисько"
+
+#: src/converse-muc.js:726 src/converse-muc.js:1250
+msgid "Nickname"
+msgstr "Прізвисько"
+
+#: src/converse-muc.js:727
+#, fuzzy
+msgid "Enter room"
+msgstr "Увійти в кімнату"
+
+#: src/converse-muc.js:745
 msgid "This chatroom requires a password"
 msgstr "Ця кімната вимагає пароль"
 
-#: src/converse-muc.js:667
+#: src/converse-muc.js:746
 msgid "Password: "
 msgstr "Пароль:"
 
-#: src/converse-muc.js:668
+#: src/converse-muc.js:747
 msgid "Submit"
 msgstr "Надіслати"
 
-#: src/converse-muc.js:703
+#: src/converse-muc.js:782
 msgid "This room is not anonymous"
 msgstr "Ця кімната не є анонімною"
 
-#: src/converse-muc.js:704
+#: src/converse-muc.js:783
 msgid "This room now shows unavailable members"
 msgstr "Ця кімната вже показує недоступних учасників"
 
-#: src/converse-muc.js:705
+#: src/converse-muc.js:784
 msgid "This room does not show unavailable members"
 msgstr "Ця кімната не показує недоступних учасників"
 
-#: src/converse-muc.js:706
+#: src/converse-muc.js:785
 msgid "Non-privacy-related room configuration has changed"
 msgstr "Змінено конфігурацію кімнати, не повязану з приватністю"
 
-#: src/converse-muc.js:707
+#: src/converse-muc.js:786
 msgid "Room logging is now enabled"
 msgstr "Журналювання кімнати тепер ввімкнено"
 
-#: src/converse-muc.js:708
+#: src/converse-muc.js:787
 msgid "Room logging is now disabled"
 msgstr "Журналювання кімнати тепер вимкнено"
 
-#: src/converse-muc.js:709
+#: src/converse-muc.js:788
 msgid "This room is now non-anonymous"
 msgstr "Ця кімната тепер не-анонімна"
 
-#: src/converse-muc.js:710
+#: src/converse-muc.js:789
 msgid "This room is now semi-anonymous"
 msgstr "Ця кімната тепер напів-анонімна"
 
-#: src/converse-muc.js:711
+#: src/converse-muc.js:790
 msgid "This room is now fully-anonymous"
 msgstr "Ця кімната тепер повністю анонімна"
 
-#: src/converse-muc.js:712
+#: src/converse-muc.js:791
 msgid "A new room has been created"
 msgstr "Створено нову кімнату"
 
-#: src/converse-muc.js:716 src/converse-muc.js:816
+#: src/converse-muc.js:795 src/converse-muc.js:895
 msgid "You have been banned from this room"
 msgstr "Вам заблокували доступ до цієї кімнати"
 
-#: src/converse-muc.js:717
+#: src/converse-muc.js:796
 msgid "You have been kicked from this room"
 msgstr "Вас викинули з цієї кімнати"
 
-#: src/converse-muc.js:718
+#: src/converse-muc.js:797
 msgid "You have been removed from this room because of an affiliation change"
 msgstr "Вас видалено з кімнати у зв'язку зі змінами власності кімнати"
 
-#: src/converse-muc.js:719
+#: src/converse-muc.js:798
 msgid ""
 "You have been removed from this room because the room has changed to members-"
 "only and you're not a member"
@@ -436,7 +450,7 @@ msgstr ""
 "Вас видалено з цієї кімнати, оскільки вона тепер вимагає членства, а Ви ним "
 "не є її членом"
 
-#: src/converse-muc.js:720
+#: src/converse-muc.js:799
 msgid ""
 "You have been removed from this room because the MUC (Multi-user chat) "
 "service is being shut down."
@@ -452,206 +466,213 @@ msgstr "Вас видалено з цієї кімнати, тому що MUC (
 #. * can then at least tell gettext to scan for it so that these
 #. * strings are picked up by the translation machinery.
 #.
-#: src/converse-muc.js:734
+#: src/converse-muc.js:813
 msgid "<strong>%1$s</strong> has been banned"
 msgstr "<strong>%1$s</strong> заблоковано"
 
-#: src/converse-muc.js:735
+#: src/converse-muc.js:814
 msgid "<strong>%1$s</strong>'s nickname has changed"
 msgstr "Прізвисько <strong>%1$s</strong> змінено"
 
-#: src/converse-muc.js:736
+#: src/converse-muc.js:815
 msgid "<strong>%1$s</strong> has been kicked out"
 msgstr "<strong>%1$s</strong> було викинуто звідси"
 
-#: src/converse-muc.js:737
+#: src/converse-muc.js:816
 msgid "<strong>%1$s</strong> has been removed because of an affiliation change"
 msgstr "<strong>%1$s</strong> було видалено через зміни власності кімнати"
 
-#: src/converse-muc.js:738
+#: src/converse-muc.js:817
 msgid "<strong>%1$s</strong> has been removed for not being a member"
 msgstr "<strong>%1$s</strong> було виделано через відсутність членства"
 
-#: src/converse-muc.js:742
-msgid "Your nickname has been automatically changed to: <strong>%1$s</strong>"
+#: src/converse-muc.js:821
+#, fuzzy
+msgid "Your nickname has been automatically set to: <strong>%1$s</strong>"
 msgstr "Ваше прізвисько було автоматично змінене на: <strong>%1$s</strong>"
 
-#: src/converse-muc.js:743
+#: src/converse-muc.js:822
 msgid "Your nickname has been changed to: <strong>%1$s</strong>"
 msgstr "Ваше прізвисько було змінене на: <strong>%1$s</strong>"
 
-#: src/converse-muc.js:790 src/converse-muc.js:799
+#: src/converse-muc.js:869 src/converse-muc.js:878
 msgid "The reason given is: \""
 msgstr "Причиною вказано: \""
 
-#: src/converse-muc.js:814
+#: src/converse-muc.js:893
 msgid "You are not on the member list of this room"
 msgstr "Ви не є у списку членів цієї кімнати"
 
-#: src/converse-muc.js:820
+#: src/converse-muc.js:899
 msgid "No nickname was specified"
 msgstr "Не вказане прізвисько"
 
-#: src/converse-muc.js:824
+#: src/converse-muc.js:903
 msgid "You are not allowed to create new rooms"
 msgstr "Вам не дозволено створювати нові кімнати"
 
-#: src/converse-muc.js:826
+#: src/converse-muc.js:905
 msgid "Your nickname doesn't conform to this room's policies"
 msgstr "Ваше прізвисько не відповідає політиці кімнати"
 
-#: src/converse-muc.js:828
-msgid "Your nickname is already taken"
-msgstr "Таке прізвисько вже зайняте"
+#: src/converse-muc.js:907
+msgid ""
+"The nickname you chose is reserved or currently in use, please choose a "
+"different one."
+msgstr ""
 
-#: src/converse-muc.js:831
+#: src/converse-muc.js:909
 msgid "This room does not (yet) exist"
 msgstr "Такої кімнати (поки) не існує"
 
-#: src/converse-muc.js:833
+#: src/converse-muc.js:911
 #, fuzzy
 msgid "This room has reached its maximum number of occupants"
 msgstr "Ця кімната досягнула максимуму учасників"
 
-#: src/converse-muc.js:861
+#: src/converse-muc.js:961
 msgid "Topic set by %1$s to: %2$s"
 msgstr "Тема встановлена %1$s: %2$s"
 
-#: src/converse-muc.js:941
-msgid "This user is a moderator"
+#: src/converse-muc.js:1048
+#, fuzzy
+msgid "Click to mention this user in your message."
+msgstr "Клацніть, щоб увійти в цю кімнату"
+
+#: src/converse-muc.js:1049
+#, fuzzy
+msgid "This user is a moderator."
 msgstr "Цей користувач є модератором"
 
-#: src/converse-muc.js:942
-msgid "This user can send messages in this room"
+#: src/converse-muc.js:1050
+#, fuzzy
+msgid "This user can send messages in this room."
 msgstr "Цей користувач може слати повідомлення в цій кімнаті"
 
-#: src/converse-muc.js:943
-msgid "This user can NOT send messages in this room"
+#: src/converse-muc.js:1051
+#, fuzzy
+msgid "This user can NOT send messages in this room."
 msgstr "Цей користувач НЕ МОЖЕ слати повідомлення в цій кімнаті"
 
-#: src/converse-muc.js:972
+#: src/converse-muc.js:1087
 msgid "Invite"
 msgstr "Запросіть"
 
-#: src/converse-muc.js:973
+#: src/converse-muc.js:1088
 msgid "Occupants"
 msgstr "Учасники"
 
-#: src/converse-muc.js:1072
+#: src/converse-muc.js:1206
 msgid "You are about to invite %1$s to the chat room \"%2$s\". "
 msgstr "Ви запрошуєте %1$s до чату \"%2$s\". "
 
-#: src/converse-muc.js:1073
+#: src/converse-muc.js:1207
 msgid ""
 "You may optionally include a message, explaining the reason for the "
 "invitation."
 msgstr ""
 "Ви можете опціонально додати повідомлення, щоб пояснити причину запрошення."
 
-#: src/converse-muc.js:1115
+#: src/converse-muc.js:1249
 msgid "Room name"
 msgstr "Назва кімнати"
 
-#: src/converse-muc.js:1116
-msgid "Nickname"
-msgstr "Прізвисько"
-
-#: src/converse-muc.js:1117
+#: src/converse-muc.js:1251
 msgid "Server"
 msgstr "Сервер"
 
-#: src/converse-muc.js:1118
+#: src/converse-muc.js:1252
 msgid "Join Room"
 msgstr "Приєднатися до кімнати"
 
-#: src/converse-muc.js:1119
+#: src/converse-muc.js:1253
 msgid "Show rooms"
 msgstr "Показати кімнати"
 
-#: src/converse-muc.js:1123
+#: src/converse-muc.js:1257
 msgid "Rooms"
 msgstr "Кімнати"
 
 #. For translators: %1$s is a variable and will be replaced with the XMPP server name
-#: src/converse-muc.js:1143
+#: src/converse-muc.js:1277
 msgid "No rooms on %1$s"
 msgstr "Жодної кімнати на %1$s"
 
 #. For translators: %1$s is a variable and will be
 #. replaced with the XMPP server name
-#: src/converse-muc.js:1157
+#: src/converse-muc.js:1291
 msgid "Rooms on %1$s"
 msgstr "Кімнати на %1$s"
 
-#: src/converse-muc.js:1166
+#: src/converse-muc.js:1300
 msgid "Click to open this room"
 msgstr "Клацніть, щоб увійти в цю кімнату"
 
-#: src/converse-muc.js:1167
+#: src/converse-muc.js:1301
 msgid "Show more information on this room"
 msgstr "Показати більше інформації про цю кімату"
 
-#: src/converse-muc.js:1239
+#: src/converse-muc.js:1373
 msgid "Description:"
 msgstr "Опис:"
 
-#: src/converse-muc.js:1240
+#: src/converse-muc.js:1374
 msgid "Occupants:"
 msgstr "Присутні:"
 
-#: src/converse-muc.js:1241
+#: src/converse-muc.js:1375
 msgid "Features:"
 msgstr "Особливості:"
 
-#: src/converse-muc.js:1242
+#: src/converse-muc.js:1376
 msgid "Requires authentication"
 msgstr "Вимагає автентикації"
 
-#: src/converse-muc.js:1243
+#: src/converse-muc.js:1377
 msgid "Hidden"
 msgstr "Прихована"
 
-#: src/converse-muc.js:1244
+#: src/converse-muc.js:1378
 msgid "Requires an invitation"
 msgstr "Вимагає запрошення"
 
-#: src/converse-muc.js:1245
+#: src/converse-muc.js:1379
 msgid "Moderated"
 msgstr "Модерована"
 
-#: src/converse-muc.js:1246
+#: src/converse-muc.js:1380
 msgid "Non-anonymous"
 msgstr "Не-анонімні"
 
-#: src/converse-muc.js:1247
+#: src/converse-muc.js:1381
 msgid "Open room"
 msgstr "Увійти в кімнату"
 
-#: src/converse-muc.js:1248
+#: src/converse-muc.js:1382
 msgid "Permanent room"
 msgstr "Постійна кімната"
 
-#: src/converse-muc.js:1249
+#: src/converse-muc.js:1383
 msgid "Public"
 msgstr "Публічна"
 
-#: src/converse-muc.js:1250
+#: src/converse-muc.js:1384
 msgid "Semi-anonymous"
 msgstr "Напів-анонімна"
 
-#: src/converse-muc.js:1251
+#: src/converse-muc.js:1385
 msgid "Temporary room"
 msgstr "Тимчасова кімната"
 
-#: src/converse-muc.js:1252
+#: src/converse-muc.js:1386
 msgid "Unmoderated"
 msgstr "Немодерована"
 
-#: src/converse-muc.js:1329
+#: src/converse-muc.js:1456
 msgid "%1$s has invited you to join a chat room: %2$s"
 msgstr "%1$s запрошує вас приєднатись до чату: %2$s"
 
-#: src/converse-muc.js:1334
+#: src/converse-muc.js:1461
 msgid ""
 "%1$s has invited you to join a chat room: %2$s, and left the following "
 "reason: \"%3$s\""
@@ -1022,6 +1043,9 @@ msgstr ""
 msgid "Are you sure you want to decline this contact request?"
 msgstr "Ви впевнені, що хочете відхилити цей запит контакту?"
 
+#~ msgid "Your nickname is already taken"
+#~ msgstr "Таке прізвисько вже зайняте"
+
 #~ msgid "Type to filter"
 #~ msgstr "Друкуйте для фільтру"
 

locale/zh/LC_MESSAGES/converse.json

@@ -246,6 +246,14 @@
             null,
             "保存表单是出错。"
          ],
+         "Please choose your nickname": [
+            null,
+            ""
+         ],
+         "Nickname": [
+            null,
+            "昵称"
+         ],
          "This chatroom requires a password": [
             null,
             "此聊天室需要密码"
@@ -354,9 +362,9 @@
             null,
             "您的昵称不符合此房间标准"
          ],
-         "Your nickname is already taken": [
+         "The nickname you chose is reserved or currently in use, please choose a different one.": [
             null,
-            "您的昵称已被占用"
+            ""
          ],
          "This room does not (yet) exist": [
             null,
@@ -366,18 +374,6 @@
             null,
             "%1$s 设置话题为: %2$s"
          ],
-         "This user is a moderator": [
-            null,
-            "此用户是主持人"
-         ],
-         "This user can send messages in this room": [
-            null,
-            "此用户在这房间里可发消息"
-         ],
-         "This user can NOT send messages in this room": [
-            null,
-            "此用户不可在此房间发消息"
-         ],
          "Invite": [
             null,
             ""
@@ -394,10 +390,6 @@
             null,
             "聊天室名称"
          ],
-         "Nickname": [
-            null,
-            "昵称"
-         ],
          "Server": [
             null,
             "服务器"

locale/zh/LC_MESSAGES/converse.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse.js 0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-26 05:57+0000\n"
+"POT-Creation-Date: 2016-07-28 16:03+0000\n"
 "PO-Revision-Date: 2016-04-07 10:23+0000\n"
 "Last-Translator: Huxisuz Hu <huxisuz@gmail.com>\n"
 "Language-Team: Language zh\n"
@@ -20,7 +20,7 @@ msgstr ""
 "plural_forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/converse-chatview.js:103 src/converse-headline.js:99
-#: src/converse-muc.js:239
+#: src/converse-muc.js:246
 #, fuzzy
 msgid "You have unread messages"
 msgstr "移除消息"
@@ -46,13 +46,13 @@ msgstr ""
 msgid "has stopped typing"
 msgstr ""
 
-#: src/converse-chatview.js:332 src/converse-chatview.js:588
+#: src/converse-chatview.js:332 src/converse-chatview.js:592
 #: src/converse-notification.js:171
 #, fuzzy
 msgid "has gone away"
 msgstr "对方离开"
 
-#: src/converse-chatview.js:456 src/converse-muc.js:412
+#: src/converse-chatview.js:456 src/converse-muc.js:426
 msgid "Show this menu"
 msgstr "显示此项菜单"
 
@@ -60,7 +60,7 @@ msgstr "显示此项菜单"
 msgid "Write in the third person"
 msgstr "以第三者身份写"
 
-#: src/converse-chatview.js:458 src/converse-muc.js:410
+#: src/converse-chatview.js:458 src/converse-muc.js:424
 msgid "Remove messages"
 msgstr "移除消息"
 
@@ -68,30 +68,30 @@ msgstr "移除消息"
 msgid "Are you sure you want to clear the messages from this chat box?"
 msgstr "你确定清除此次的聊天记录吗？"
 
-#: src/converse-chatview.js:586 src/converse-notification.js:169
+#: src/converse-chatview.js:590 src/converse-notification.js:169
 #, fuzzy
 msgid "has gone offline"
 msgstr "对方已下线"
 
-#: src/converse-chatview.js:590 src/converse-notification.js:173
+#: src/converse-chatview.js:594 src/converse-notification.js:173
 #, fuzzy
 msgid "is busy"
 msgstr "忙碌"
 
-#: src/converse-chatview.js:633
+#: src/converse-chatview.js:637
 #, fuzzy
 msgid "Clear all messages"
 msgstr "私信"
 
-#: src/converse-chatview.js:634
+#: src/converse-chatview.js:638
 msgid "Hide the list of occupants"
 msgstr ""
 
-#: src/converse-chatview.js:635
+#: src/converse-chatview.js:639
 msgid "Insert a smiley"
 msgstr ""
 
-#: src/converse-chatview.js:636
+#: src/converse-chatview.js:640
 msgid "Start a call"
 msgstr ""
 
@@ -158,7 +158,7 @@ msgstr "点击这里改变聊天状态"
 msgid "Custom status"
 msgstr "DIY状态"
 
-#: src/converse-controlbox.js:490 src/converse-muc.js:580
+#: src/converse-controlbox.js:490 src/converse-muc.js:591
 msgid "Save"
 msgstr "保存"
 
@@ -292,160 +292,173 @@ msgstr "最小化的"
 msgid "Minimize this chat box"
 msgstr ""
 
-#: src/converse-muc.js:241
+#: src/converse-muc.js:248
 msgid "Message"
 msgstr "信息"
 
-#: src/converse-muc.js:302
+#: src/converse-muc.js:316
 msgid "Error: could not execute the command"
 msgstr ""
 
-#: src/converse-muc.js:358
+#: src/converse-muc.js:372
 msgid "Error: the \""
 msgstr ""
 
-#: src/converse-muc.js:368
+#: src/converse-muc.js:382
 #, fuzzy
 msgid "Are you sure you want to clear the messages from this room?"
 msgstr "您并非此房间成员"
 
-#: src/converse-muc.js:408
+#: src/converse-muc.js:422
 msgid "Change user's affiliation to admin"
 msgstr ""
 
-#: src/converse-muc.js:409
+#: src/converse-muc.js:423
 #, fuzzy
 msgid "Ban user from room"
 msgstr "阻止此用户进入房间"
 
-#: src/converse-muc.js:411
+#: src/converse-muc.js:425
 msgid "Change user role to occupant"
 msgstr ""
 
-#: src/converse-muc.js:413
+#: src/converse-muc.js:427
 #, fuzzy
 msgid "Kick user from room"
 msgstr "把用户踢出房间"
 
-#: src/converse-muc.js:414
+#: src/converse-muc.js:428
 #, fuzzy
 msgid "Write in 3rd person"
 msgstr "以第三者身份写"
 
-#: src/converse-muc.js:415
+#: src/converse-muc.js:429
 msgid "Grant membership to a user"
 msgstr ""
 
-#: src/converse-muc.js:416
+#: src/converse-muc.js:430
 msgid "Remove user's ability to post messages"
 msgstr ""
 
-#: src/converse-muc.js:417
+#: src/converse-muc.js:431
 msgid "Change your nickname"
 msgstr ""
 
-#: src/converse-muc.js:418
+#: src/converse-muc.js:432
 msgid "Grant moderator role to user"
 msgstr ""
 
-#: src/converse-muc.js:419
+#: src/converse-muc.js:433
 #, fuzzy
 msgid "Grant ownership of this room"
 msgstr "您并非此房间成员"
 
-#: src/converse-muc.js:420
+#: src/converse-muc.js:434
 msgid "Revoke user's membership"
 msgstr ""
 
-#: src/converse-muc.js:421
+#: src/converse-muc.js:435
 #, fuzzy
 msgid "Set room topic"
 msgstr "设置房间主题"
 
-#: src/converse-muc.js:422
+#: src/converse-muc.js:436
 msgid "Allow muted user to post messages"
 msgstr ""
 
-#: src/converse-muc.js:581 src/converse-register.js:216
+#: src/converse-muc.js:592 src/converse-register.js:216
 #: src/converse-register.js:331
 msgid "Cancel"
 msgstr "取消"
 
-#: src/converse-muc.js:624
+#: src/converse-muc.js:635
 msgid "An error occurred while trying to save the form."
 msgstr "保存表单是出错。"
 
-#: src/converse-muc.js:666
+#: src/converse-muc.js:725
+msgid "Please choose your nickname"
+msgstr ""
+
+#: src/converse-muc.js:726 src/converse-muc.js:1250
+msgid "Nickname"
+msgstr "昵称"
+
+#: src/converse-muc.js:727
+#, fuzzy
+msgid "Enter room"
+msgstr "打开聊天室"
+
+#: src/converse-muc.js:745
 msgid "This chatroom requires a password"
 msgstr "此聊天室需要密码"
 
-#: src/converse-muc.js:667
+#: src/converse-muc.js:746
 msgid "Password: "
 msgstr "密码:"
 
-#: src/converse-muc.js:668
+#: src/converse-muc.js:747
 msgid "Submit"
 msgstr "发送"
 
-#: src/converse-muc.js:703
+#: src/converse-muc.js:782
 msgid "This room is not anonymous"
 msgstr "此为非匿名聊天室"
 
-#: src/converse-muc.js:704
+#: src/converse-muc.js:783
 msgid "This room now shows unavailable members"
 msgstr "此聊天室显示不可用用户"
 
-#: src/converse-muc.js:705
+#: src/converse-muc.js:784
 msgid "This room does not show unavailable members"
 msgstr "此聊天室不显示不可用用户"
 
-#: src/converse-muc.js:706
+#: src/converse-muc.js:785
 msgid "Non-privacy-related room configuration has changed"
 msgstr "此聊天室设置(非私密性)已改变"
 
-#: src/converse-muc.js:707
+#: src/converse-muc.js:786
 msgid "Room logging is now enabled"
 msgstr "聊天室聊天记录已启用"
 
-#: src/converse-muc.js:708
+#: src/converse-muc.js:787
 msgid "Room logging is now disabled"
 msgstr "聊天室聊天记录已禁用"
 
-#: src/converse-muc.js:709
+#: src/converse-muc.js:788
 msgid "This room is now non-anonymous"
 msgstr "此聊天室非匿名"
 
-#: src/converse-muc.js:710
+#: src/converse-muc.js:789
 msgid "This room is now semi-anonymous"
 msgstr "此聊天室半匿名"
 
-#: src/converse-muc.js:711
+#: src/converse-muc.js:790
 msgid "This room is now fully-anonymous"
 msgstr "此聊天室完全匿名"
 
-#: src/converse-muc.js:712
+#: src/converse-muc.js:791
 msgid "A new room has been created"
 msgstr "新聊天室已创建"
 
-#: src/converse-muc.js:716 src/converse-muc.js:816
+#: src/converse-muc.js:795 src/converse-muc.js:895
 msgid "You have been banned from this room"
 msgstr "您已被此聊天室禁止入内"
 
-#: src/converse-muc.js:717
+#: src/converse-muc.js:796
 msgid "You have been kicked from this room"
 msgstr "您已被踢出次房间"
 
-#: src/converse-muc.js:718
+#: src/converse-muc.js:797
 msgid "You have been removed from this room because of an affiliation change"
 msgstr "由于关系变化，您已被移除此房间"
 
-#: src/converse-muc.js:719
+#: src/converse-muc.js:798
 msgid ""
 "You have been removed from this room because the room has changed to members-"
 "only and you're not a member"
 msgstr "您已被移除此房间因为此房间更改为只允许成员加入，而您非成员"
 
-#: src/converse-muc.js:720
+#: src/converse-muc.js:799
 msgid ""
 "You have been removed from this room because the MUC (Multi-user chat) "
 "service is being shut down."
@@ -461,210 +474,216 @@ msgstr "由于服务不可用，您已被移除此房间。"
 #. * can then at least tell gettext to scan for it so that these
 #. * strings are picked up by the translation machinery.
 #.
-#: src/converse-muc.js:734
+#: src/converse-muc.js:813
 msgid "<strong>%1$s</strong> has been banned"
 msgstr "<strong>%1$s</strong> 已被禁止"
 
-#: src/converse-muc.js:735
+#: src/converse-muc.js:814
 #, fuzzy
 msgid "<strong>%1$s</strong>'s nickname has changed"
 msgstr "<strong>%1$s</strong> 已被禁止"
 
-#: src/converse-muc.js:736
+#: src/converse-muc.js:815
 msgid "<strong>%1$s</strong> has been kicked out"
 msgstr "<strong>%1$s</strong> 已被踢出"
 
-#: src/converse-muc.js:737
+#: src/converse-muc.js:816
 msgid "<strong>%1$s</strong> has been removed because of an affiliation change"
 msgstr "由于关系解除、<strong>%1$s</strong> 已被移除"
 
-#: src/converse-muc.js:738
+#: src/converse-muc.js:817
 msgid "<strong>%1$s</strong> has been removed for not being a member"
 msgstr "由于不是成员、<strong>%1$s</strong> 已被移除"
 
-#: src/converse-muc.js:742
+#: src/converse-muc.js:821
 #, fuzzy
-msgid "Your nickname has been automatically changed to: <strong>%1$s</strong>"
+msgid "Your nickname has been automatically set to: <strong>%1$s</strong>"
 msgstr "您的昵称被更改了"
 
-#: src/converse-muc.js:743
+#: src/converse-muc.js:822
 #, fuzzy
 msgid "Your nickname has been changed to: <strong>%1$s</strong>"
 msgstr "您的昵称被更改了"
 
-#: src/converse-muc.js:790 src/converse-muc.js:799
+#: src/converse-muc.js:869 src/converse-muc.js:878
 msgid "The reason given is: \""
 msgstr ""
 
-#: src/converse-muc.js:814
+#: src/converse-muc.js:893
 msgid "You are not on the member list of this room"
 msgstr "您并非此房间成员"
 
-#: src/converse-muc.js:820
+#: src/converse-muc.js:899
 msgid "No nickname was specified"
 msgstr "未指定昵称"
 
-#: src/converse-muc.js:824
+#: src/converse-muc.js:903
 msgid "You are not allowed to create new rooms"
 msgstr "您可此创建新房间了"
 
-#: src/converse-muc.js:826
+#: src/converse-muc.js:905
 msgid "Your nickname doesn't conform to this room's policies"
 msgstr "您的昵称不符合此房间标准"
 
-#: src/converse-muc.js:828
-msgid "Your nickname is already taken"
-msgstr "您的昵称已被占用"
+#: src/converse-muc.js:907
+msgid ""
+"The nickname you chose is reserved or currently in use, please choose a "
+"different one."
+msgstr ""
 
-#: src/converse-muc.js:831
+#: src/converse-muc.js:909
 msgid "This room does not (yet) exist"
 msgstr "此房间不存在"
 
-#: src/converse-muc.js:833
+#: src/converse-muc.js:911
 #, fuzzy
 msgid "This room has reached its maximum number of occupants"
 msgstr "此房间人数已达上线"
 
-#: src/converse-muc.js:861
+#: src/converse-muc.js:961
 msgid "Topic set by %1$s to: %2$s"
 msgstr "%1$s 设置话题为: %2$s"
 
-#: src/converse-muc.js:941
-msgid "This user is a moderator"
+#: src/converse-muc.js:1048
+#, fuzzy
+msgid "Click to mention this user in your message."
+msgstr "打开聊天室"
+
+#: src/converse-muc.js:1049
+#, fuzzy
+msgid "This user is a moderator."
 msgstr "此用户是主持人"
 
-#: src/converse-muc.js:942
-msgid "This user can send messages in this room"
+#: src/converse-muc.js:1050
+#, fuzzy
+msgid "This user can send messages in this room."
 msgstr "此用户在这房间里可发消息"
 
-#: src/converse-muc.js:943
-msgid "This user can NOT send messages in this room"
+#: src/converse-muc.js:1051
+#, fuzzy
+msgid "This user can NOT send messages in this room."
 msgstr "此用户不可在此房间发消息"
 
-#: src/converse-muc.js:972
+#: src/converse-muc.js:1087
 msgid "Invite"
 msgstr ""
 
-#: src/converse-muc.js:973
+#: src/converse-muc.js:1088
 #, fuzzy
 msgid "Occupants"
 msgstr "成员:"
 
-#: src/converse-muc.js:1072
+#: src/converse-muc.js:1206
 msgid "You are about to invite %1$s to the chat room \"%2$s\". "
 msgstr ""
 
-#: src/converse-muc.js:1073
+#: src/converse-muc.js:1207
 msgid ""
 "You may optionally include a message, explaining the reason for the "
 "invitation."
 msgstr ""
 
-#: src/converse-muc.js:1115
+#: src/converse-muc.js:1249
 msgid "Room name"
 msgstr "聊天室名称"
 
-#: src/converse-muc.js:1116
-msgid "Nickname"
-msgstr "昵称"
-
-#: src/converse-muc.js:1117
+#: src/converse-muc.js:1251
 msgid "Server"
 msgstr "服务器"
 
-#: src/converse-muc.js:1118
+#: src/converse-muc.js:1252
 #, fuzzy
 msgid "Join Room"
 msgstr "加入"
 
-#: src/converse-muc.js:1119
+#: src/converse-muc.js:1253
 msgid "Show rooms"
 msgstr "显示所有聊天室"
 
-#: src/converse-muc.js:1123
+#: src/converse-muc.js:1257
 msgid "Rooms"
 msgstr "聊天室"
 
 #. For translators: %1$s is a variable and will be replaced with the XMPP server name
-#: src/converse-muc.js:1143
+#: src/converse-muc.js:1277
 msgid "No rooms on %1$s"
 msgstr "%1$s 上没有聊天室"
 
 #. For translators: %1$s is a variable and will be
 #. replaced with the XMPP server name
-#: src/converse-muc.js:1157
+#: src/converse-muc.js:1291
 msgid "Rooms on %1$s"
 msgstr "%1$s 上的聊天室"
 
-#: src/converse-muc.js:1166
+#: src/converse-muc.js:1300
 msgid "Click to open this room"
 msgstr "打开聊天室"
 
-#: src/converse-muc.js:1167
+#: src/converse-muc.js:1301
 msgid "Show more information on this room"
 msgstr "显示次聊天室的更多信息"
 
-#: src/converse-muc.js:1239
+#: src/converse-muc.js:1373
 msgid "Description:"
 msgstr "描述: "
 
-#: src/converse-muc.js:1240
+#: src/converse-muc.js:1374
 msgid "Occupants:"
 msgstr "成员:"
 
-#: src/converse-muc.js:1241
+#: src/converse-muc.js:1375
 msgid "Features:"
 msgstr "特性:"
 
-#: src/converse-muc.js:1242
+#: src/converse-muc.js:1376
 msgid "Requires authentication"
 msgstr "需要验证"
 
-#: src/converse-muc.js:1243
+#: src/converse-muc.js:1377
 msgid "Hidden"
 msgstr "隐藏的"
 
-#: src/converse-muc.js:1244
+#: src/converse-muc.js:1378
 msgid "Requires an invitation"
 msgstr "需要被邀请"
 
-#: src/converse-muc.js:1245
+#: src/converse-muc.js:1379
 msgid "Moderated"
 msgstr "发言受限"
 
-#: src/converse-muc.js:1246
+#: src/converse-muc.js:1380
 msgid "Non-anonymous"
 msgstr "非匿名"
 
-#: src/converse-muc.js:1247
+#: src/converse-muc.js:1381
 msgid "Open room"
 msgstr "打开聊天室"
 
-#: src/converse-muc.js:1248
+#: src/converse-muc.js:1382
 msgid "Permanent room"
 msgstr "永久聊天室"
 
-#: src/converse-muc.js:1249
+#: src/converse-muc.js:1383
 msgid "Public"
 msgstr "公开的"
 
-#: src/converse-muc.js:1250
+#: src/converse-muc.js:1384
 msgid "Semi-anonymous"
 msgstr "半匿名"
 
-#: src/converse-muc.js:1251
+#: src/converse-muc.js:1385
 msgid "Temporary room"
 msgstr "临时聊天室"
 
-#: src/converse-muc.js:1252
+#: src/converse-muc.js:1386
 msgid "Unmoderated"
 msgstr "无发言限制"
 
-#: src/converse-muc.js:1329
+#: src/converse-muc.js:1456
 msgid "%1$s has invited you to join a chat room: %2$s"
 msgstr ""
 
-#: src/converse-muc.js:1334
+#: src/converse-muc.js:1461
 msgid ""
 "%1$s has invited you to join a chat room: %2$s, and left the following "
 "reason: \"%3$s\""
@@ -1034,6 +1053,9 @@ msgstr ""
 msgid "Are you sure you want to decline this contact request?"
 msgstr "确定移除联系人吗？"
 
+#~ msgid "Your nickname is already taken"
+#~ msgstr "您的昵称已被占用"
+
 #~ msgid "Disconnected"
 #~ msgstr "连接已断开"
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "converse.js",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "Browser based XMPP instant messaging client",
   "main": "main.js",
   "directories": {