Merge branch 'develop' into pr/session-class

This commit is contained in:
Kijin Sung 2017-02-07 22:13:08 +09:00
commit 483ac84796
454 changed files with 10659 additions and 30145 deletions

View file

@ -2,6 +2,7 @@
$lang->admin = 'Admin';
$lang->cmd_configure = 'Configure';
$lang->subtitle_primary = 'General Settings';
$lang->subtitle_notification = 'Notification Settings';
$lang->subtitle_security = 'Security Settings';
$lang->subtitle_advanced = 'Advanced Settings';
$lang->subtitle_debug = 'Debug Settings';
@ -74,11 +75,28 @@ $lang->msg_blacklisted_reason['session_shield'] = 'The functionality that this a
$lang->msg_blacklisted_reason['smartphone'] = 'This module was disabled in XE long before Rhymix even existed.';
$lang->msg_blacklisted_reason['zipperupper'] = 'Similar functionality can be configured in the <a href="./index.php?module=admin&act=dispAdminConfigAdvanced">Advanced Settings</a> page.';
$lang->msg_warning = 'Warning';
$lang->msg_failed_to_save_config = 'Failed to save configuration. Please check permissions on files/config.';
$lang->welcome_to_xe = 'Welcome to the Rhymix admin page.';
$lang->about_lang_env = 'If you want to make the language setting same for first-time visitors, change the language setting to what you want and click [Save] button below.';
$lang->xe_license = 'Rhymix complies with the GPL.';
$lang->yesterday = 'Yesterday';
$lang->today = 'Today';
$lang->cmd_admin_default_from_name = 'Default Sender Name';
$lang->cmd_admin_default_from_email = 'Default Sender E-mail';
$lang->cmd_admin_default_from_phone = 'Default Sender Number';
$lang->cmd_admin_default_reply_to = 'Reply-To';
$lang->cmd_admin_force_default_sender = 'Apply to All';
$lang->cmd_admin_sending_method = 'Sending Method';
$lang->cmd_admin_allow_split_sms = 'Split long SMS';
$lang->cmd_admin_allow_split_lms = 'Split long LMS/MMS';
$lang->cmd_admin_default_from_name_help = 'This name will be used in all outgoing emails, such as welcome e-mails, authentication e-mails, and other e-mail notifications.';
$lang->cmd_admin_default_from_email_help = 'This e-mail address will be used in all outgoing e-mails.<br>If you are using SMTP or an external API, please check &quot;Apply to All&quot; to avoid having your e-mails treated as spam.';
$lang->cmd_admin_default_reply_to_help = 'This e-mail will receive replies. Please leave it empty if it is the same as the address above.<br>Some sending methods may not support a separate Reply-To address.';
$lang->cmd_admin_default_from_phone_help = 'This number will be used in all outgoing SMS notifications.<br>Some SMS gateways may require that you pre-register your phone number. In that case, you should also check &quot;Apply to All&quot;.';
$lang->cmd_admin_sms_dummy_driver_help = 'Select &quot;Dummy&quot; if you are not going to send any SMS.';
$lang->cmd_admin_sms_sender_key_help = 'The sender key is used for Alimtalk. Please leave it empty if you do not use Alimtalk.';
$lang->cmd_admin_allow_split_sms_help = 'Split long texts into multiple SMS in order to prevent clipping.<br>This only applies to gateways that cannot send LMS/MMS. Otherwise, long texts will be automatically converted to LMS/MMS.';
$lang->cmd_admin_allow_split_lms_help = 'Split very long texts into multiple LMS/MMS in order to prevent clipping.<br>This may increase your LMS/MMS cost significantly.';
$lang->default_lang = 'Default Language';
$lang->lang_select = 'Supported Languages';
$lang->auto_select_lang = 'Auto-select Language';
@ -198,8 +216,9 @@ $lang->tablets_as_mobile = 'Treat Tablets as Mobile';
$lang->thumbnail_type = 'Select thumbnail type.';
$lang->input_footer_script = 'Footer script';
$lang->detail_input_footer_script = 'The script is inserted into the bottom of body. It does not work at admin page.';
$lang->corp = 'Crop (Cut)';
$lang->ratio = 'Ratio (Keep Aspect Ratio)';
$lang->thumbnail_crop = 'Crop';
$lang->thumbnail_ratio = 'Keep aspect ratio (may result in spaces)';
$lang->thumbnail_none = 'Do not create thumbnails';
$lang->admin_ip_allow = 'IP addresses allowed to log in as administrator';
$lang->admin_ip_deny = 'IP addresses forbidden to log in as administrator';
$lang->local_ip_address = 'Local IP address';