Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Rename 'huddle'->'Private message' in user-facing strings. 

(imported from commit d3bdccc37a4fb7b373c6c1c69091353f39fecafd)
This commit is contained in:
Waseem Daher 2012-11-06 11:59:15 -05:00
parent e9c81a4a8b
commit 6b149af91d
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
templates/zephyr/home.html
View File

@ -112,7 +112,7 @@
</a>
</li>
<li>
<a href="#personal-message" data-toggle="pill" title="Huddle" tabindex="110">
<a href="#personal-message" data-toggle="pill" title="Private message" tabindex="110">
<i class="icon-user"></i>
</a>
</li>

6
templates/zephyr/keyboard_shortcuts.html
View File

@ -21,7 +21,7 @@
</tr>
<tr>
<td class="hotkey">C</td>
<td class="definition">Compose new huddle message</td>
<td class="definition">Compose new private message</td>
</tr>
<tr>
<td class="hotkey">r</td>
@ -33,7 +33,7 @@
</tr>
<tr>
<td class="hotkey">&lt;Tab&gt;</td>
<td class="definition">Switch between composing stream and huddle</td>
<td class="definition">Switch between composing stream and private message</td>
</tr>
<tr>
<td class="hotkey">&lt;Tab&gt; and Enter</td>
@ -67,7 +67,7 @@
</tr>
<tr>
<td class="hotkey">h</td>
<td class="definition">Narrow to all huddles</td>
<td class="definition">Narrow to all private messages</td>
</tr>
<tr>
<td class="hotkey">Esc</td>

2
zephyr/jstemplates/message.html
View File

@ -41,7 +41,7 @@
</td>
<td class="message_label_clickable message_header message_header_huddle right_part"
onclick="narrow.target({{id}}); narrow.by_recipient();"
title="Narrow to your huddles with {{display_reply_to}}">You and {{display_reply_to}}</td>
title="Narrow to your private messages with {{display_reply_to}}">You and {{display_reply_to}}</td>
</tr>
{{/if}}
{{/include_recipient}}

2
zephyr/jstemplates/userinfo_popover_content.html
View File

@ -2,7 +2,7 @@
<ul class="nav nav-list userinfo_popover">
<li>
<a onclick="respond_to_message();">
<i class="icon-share-alt"></i> Reply to this {{#if is_stream}}stream{{else}}huddle{{/if}}
<i class="icon-share-alt"></i> Reply to this {{#if is_stream}}stream{{else}}private message{{/if}}
</a>
</li>
{{#unless is_personal}}