mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-13 18:14:26 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into lib

Browse Source
This commit is contained in:
lonalore
2017-01-26 09:46:00 +01:00
parent 8b7631995e 5c3ce83168
commit 7ef1d13b35
247 changed files with 7633 additions and 2239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107_languages/English/admin/lan_language.php
View File

@@ -61,6 +61,8 @@ define("LANG_LAN_141", "Select Script...");
define("LANG_LAN_142", "Auto-Detect");
define("LANG_LAN_143", "Specific LAN file:");
define("LANG_LAN_144", "Must be re-enabled");
define("LANG_LAN_148", "Normal Mode");
define("LANG_LAN_149", "Value");
define("LANG_LAN_150", "[b]Search ENTIRE core before commenting out ANY LAN from ANY language file.[/b]");
?>

10
e107_languages/English/admin/lan_mailout.php
View File

@@ -280,7 +280,13 @@ define("LAN_HOLD", "Hold");
define("LAN_MAILOUT_260", "User-Type");
define("LAN_MAILOUT_261", "SMTP Port");
define("LAN_MAILOUT_262", "Template Preview");
define("LAN_MAILOUT_263", "Total Recipients");
define("LAN_MAILOUT_264", "Embed Media");
define("LAN_MAILOUT_265", "Pending");
define("LAN_MAILOUT_266", "Max Active");
define("LAN_MAILOUT_267", "Generate Public/Private keys");
define("LAN_MAILOUT_268", "Developer Mode Only");
//define("LAN_SUBMIT", "Do it!"); LAN_RUN
?>
?>

2
e107_languages/English/admin/lan_menus.php
View File

@@ -72,5 +72,5 @@ define("MENLAN_54", "Theme Layout");
define("MENLAN_55", "Menu Layout");
define("MENLAN_56", "Custom Pages");
define("MENLAN_57", "Drag-and-Drop Menus");
define("MENLAN_58", "The Menu-Manager allows you to place and arrange your menus within your theme template. Hover over the sub-areas to modify existing menu items.");
?>

5
e107_languages/English/admin/lan_newspost.php
View File

@@ -232,4 +232,7 @@ define("LAN_NEWS_105", "Email notification triggered!");
define("LAN_NEWS_106", "News item visibility must include 'everyone' for email notifications to work.");
define("LAN_NEWS_107", "Checking for Ping Status");
?>
//v2.1.4
define("LAN_NEWS_108", "The SEF URL is unlike the title of your news item.");
?>

5
e107_languages/English/admin/lan_userclass2.php
View File

@@ -103,10 +103,9 @@ define("UCSLAN_87", "Recently joined users");
define("UCSLAN_88", "Identified search bots");
define("UCSLAN_89", "Checked classes are members of the group");
define("UCSLAN_90", "You can't edit certain system user classes!");
//define("UCSLAN_91", "");//NOT USED
define("UCSLAN_91", "Class Structure");
//define("UCSLAN_UPDATE", "Update");//NOT USED ... LAN_UPDATE
?>
?>

10
e107_languages/English/admin/lan_users_extended.php
View File

@@ -94,7 +94,13 @@ define("EXTLAN_78", "Cannot find file --FILE-- needed to create data table");
define("EXTLAN_79", "Label");
define("EXTLAN_80", "Validation error - aborted.");
define("EXTLAN_81", "Add Custom Field");
define("EXTLAN_82", "Values");
define("EXTLAN_83", "Placeholder");
define("EXTLAN_84", "Help Tip");
define("EXTLAN_86", "User Extended Column deleted from table");
define("EXTLAN_87", "Sort values");
//textbox
define("EXTLAN_HELP_1", "<b><i>Parameters:</i></b><br />size - size of field<br />maxlength - max length of field<br /><br />class - css class of field<br />style - css style string<br /><br />regex - regex validation code<br />regexfail - validation fail text");
@@ -115,4 +121,4 @@ define("EXTLAN_HELP_8", "Allow user to select from installed languages");
// Predefined list
define("EXTLAN_HELP_9", "Specify a predefined list. The value field selects the type of list - at present only 'timezones' is a valid entry");
?>
?>

3
e107_languages/English/lan_form_handler.php
View File

@@ -14,7 +14,7 @@ define("LAN_EFORM_002", "Choose Avatar");
define("LAN_EFORM_003", "OR");
define("LAN_EFORM_004", "Choose this avatar");
define("LAN_EFORM_005", "No Avatars Available");
define("LAN_EFORM_006", "Admin-Only Notice: The folder [x] is empty. Upload some default avatars images to this folder for users to choose avatars from.");
define("LAN_EFORM_006", "Admin-Only Notice:[br]The folder [b][x][/b] is empty.[br]Upload some default avatars images to this folder for users to choose avatars from.");
define("LAN_EFORM_007", "Media Manager");
define("LAN_EFORM_008", "Select columns to display");
define("LAN_EFORM_009", "Display Columns");
@@ -25,3 +25,4 @@ define("LAN_EFORM_013", "go to list");
define("LAN_EFORM_014", "create another");
define("LAN_EFORM_015", "edit current");
define("LAN_EFORM_016", "After submit:");
?>

2
e107_languages/English/lan_signup.php
View File

@@ -159,4 +159,4 @@ define("LAN_SIGNUP_116", "Preview After Form Submit");
define("LAN_SIGNUP_117", "Send a Test Activation");
define("LAN_SIGNUP_118", "To [x]");
define("LAN_SIGNUP_119", "Don't send email");
define("LAN_SIGNUP_120", "OR");

5
e107_languages/English/lan_user_extended.php
View File

@@ -20,6 +20,9 @@ define("UE_LAN_6", "Integer");
define("UE_LAN_8", "Language");
define("UE_LAN_9", "Predefined list");
define("UE_LAN_10", "Checkboxes");
//v2.1.5
define("UE_LAN_13", "Country");
// Leave a gap to allow for more field types
define("UE_LAN_21", "Name");
define("UE_LAN_22", "Type");
@@ -44,7 +47,7 @@ define("UE_LAN_BIRTHDAY_DESC", "Birthday");
define("UE_LAN_LANGUAGE", "Language");
define("UE_LAN_LANGUAGE_DESC", "User Language");
define("UE_LAN_COUNTRY", "Country");
define("UE_LAN_COUNTRY_DESC", "User Country (includes db table)");
define("UE_LAN_COUNTRY_DESC", "User Country");
define("UE_LAN_TIMEZONE", "Timezone");
define("UE_LAN_TIMEZONE_DESC", "User Timezone (from predefined list)");