Merge branch 'master' into enter-to-send
This commit is contained in:
commit
56ea66634d
99 changed files with 2358 additions and 599 deletions
|
|
@ -20,7 +20,9 @@
|
|||
<string name="unpin_conversation">Unpin</string>
|
||||
<string name="forward_message">Forward</string>
|
||||
<string name="compress_error">Unable to compress image to selected size</string>
|
||||
<!-- vCard-->
|
||||
<!-- Attachments -->
|
||||
<string name="duplicate_item_warning">Duplicate item was not included</string>
|
||||
<!-- vCard -->
|
||||
<plurals name="and_other_contacts">
|
||||
<item quantity="zero">and %d other</item>
|
||||
<item quantity="one">and %d others</item>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue