Commit 96df8dea authored by JC Brand's avatar JC Brand

Merge branch 'Placeholder-for-translation' of...

Merge branch 'Placeholder-for-translation' of https://github.com/thierrytiti/converse.js into thierrytiti-Placeholder-for-translation

Conflicts:
	src/templates/toolbar.html
parents cd759a71 7a359562
......@@ -1562,6 +1562,7 @@
allow_otr: converse.allow_otr && !this.is_chatroom,
label_clear: __('Clear all messages'),
label_end_encrypted_conversation: __('End encrypted conversation'),
label_insert_smiley: __('Insert a smiley'),
label_hide_participants: __('Hide the list of participants'),
label_refresh_encrypted_conversation: __('Refresh encrypted conversation'),
label_start_call: __('Start a call'),
......
......@@ -8,6 +8,7 @@ Changelog
* Bugfix. Manual login doesn't work when only websocket_url is set and not bosh_service_url. [jcbrand]
* Bugfix. clearSessions during unload event would throw an error when not logged in. [gbonvehi]
* #389 Allow login panel placeholders and roster item 'Name' translations. [gbonvehi]
* Add placeholder for "Insert a smiley" translation [thierrytiti]
0.9.3 (2015-05-01)
------------------
......
{[ if (show_emoticons) { ]}
<li class="toggle-smiley icon-happy" title="Insert a smiley">
<li class="toggle-smiley icon-happy" title="{{label_insert_smiley}}">
<ul>
<li><a class="icon-smiley" href="#" data-emoticon=":)"></a></li>
<li><a class="icon-wink" href="#" data-emoticon=";)"></a></li>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment