diff options
author | Aleksander Machniak <alec@alec.pl> | 2014-05-28 15:52:30 +0200 |
---|---|---|
committer | Aleksander Machniak <alec@alec.pl> | 2014-05-28 15:52:30 +0200 |
commit | 731d190fecb1976d845f6bd18768ee528b007232 (patch) | |
tree | 323c63555256ad7e5faa6a9d3c10f957295d0ce1 /program/localization/en_US | |
parent | 586ed69aa8f9df34076f4e3bb5e1ecf0cfc6581a (diff) | |
parent | 8763170d224408bb01998d0a3393d2eacfc781ad (diff) |
Merge branch 'tinymce4'
Conflicts:
program/js/app.js
program/js/editor.js
program/js/tiny_mce/tiny_mce.js
program/steps/utils/spell_html.inc
Diffstat (limited to 'program/localization/en_US')
-rw-r--r-- | program/localization/en_US/labels.inc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc index 5bb645d29..20992e50e 100644 --- a/program/localization/en_US/labels.inc +++ b/program/localization/en_US/labels.inc @@ -230,6 +230,8 @@ $labels['returnreceipt'] = 'Return receipt'; $labels['dsn'] = 'Delivery status notification'; $labels['mailreplyintro'] = 'On $date, $sender wrote:'; $labels['originalmessage'] = 'Original Message'; +$labels['selectimage'] = 'Select image'; +$labels['addimage'] = 'Add image'; $labels['editidents'] = 'Edit identities'; $labels['spellcheck'] = 'Spell'; |