mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-29 17:19:56 +02:00
Code Issues Releases Wiki Activity

Resolve conflict with merging upstream repository changes into this fork.

Browse Source
This commit is contained in:
Lóna Lore
2016-11-15 20:19:10 +01:00
parent 407b6fe939 d2a0685a67
commit e4aefdb6b1
9 changed files with 67 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
e107_languages/English/admin/lan_admin.php
View File

@@ -5,7 +5,6 @@
* Admin Language File
*
*/
define("ADLAN_0", "News");
define("ADLAN_1", "Manage news items");
define("ADLAN_2", "Create news item");
@@ -401,7 +400,6 @@ define("LAN_FILTER_LABEL_DISPLAYALL", "Display All");
define("LAN_FILTER_LABEL_CLEAR", "Clear Filter");
define("LAN_FILTER_LABEL_TYPED", "(typed)");
//FIXME Remove html
define("LAN_UI_NOPID_ERROR", "There is no [b]Primary ID[/b] set");
define("LAN_UI_BATCHDEL_ERROR", "Batch delete not allowed!");
define("LAN_UI_404_BODY_ERROR", "Requested page was not found!");
@@ -425,6 +423,11 @@ define("LAN_UI_BATCH_CREATELINK", "Create Link");
define("LAN_UI_USING_DATABASE_TABLE", "Using [x] database table");
define("LAN_UI_TOTAL_RECORDS", "Total Records: [x]");
define("LAN_UI_FILTER_PAST_HOUR", "Past Hour");
define("LAN_UI_FILTER_PAST_24_HOURS", "Past 24 hours");
define("LAN_UI_FILTER_PAST_WEEK", "Past Week");
define("LAN_UI_FILTER_PAST_MONTH", "Past Month");
define("LAN_UI_FILTER_PAST_YEAR", "Past Year");
define("LAN_USER_MANAGEALL", "Manage all User, Userclass and Extended User-Field settings");
define("LAN_USER_LIST", "User List");
@@ -456,3 +459,15 @@ define("LAN_SELECT_COLUMNS_TO_DISPLAY", "Select columns to display");
define("LAN_DISPLAY_COLUMNS", "Display Columns");
define("LAN_SETTINGS_NOT_SAVED_NO_CHANGES_MADE", "Settings not saved as no changes were made.");
define("LAN_DASHBOARD_LAYOUT", "Dashboard Layout");
define("LAN_AFTER_SUBMIT", "After submit:");
define("LAN_UNAVAILABLE", "Unavailable");
define("LAN_READY_UP_FOLDER_FIELDS", "Ready to use upload form fields, optional - file list view");
define("LAN_NO_LABEL_PROVIDED", "No Label Provided");
define("LAN_NOT_FOUND", "Not Found!");
define("LAN_QUICK_VIEW", "Quick View");
define("LAN_GO_TO_USER_PROFILE", "Go to user profile");
define("LAN_MULTI_LANGUAGE_FIELD", "Multi-language field");
define("LAN_GO_TO_LIST", "go to list");
define("LAN_CREATE_ANOTHER", "create another");
define("LAN_EDIT_CURRENT", "edit current");
define("LAN_MAINTENANCE", "Maintenance");

8
e107_languages/English/admin/lan_admin_log.php
View File

@@ -85,7 +85,7 @@ define("RL_LAN_084", "Temporary accounts");
define("RL_LAN_085", "[x] record(s) successfully deleted!");
define("RL_LAN_086", "[x] records not found and not deleted!");
define("RL_LAN_087", "Details");
define("RL_LAN_088", "Filter the results below");
// Intentional gap
define("RL_LAN_090", "Download ID");
define("RL_LAN_091", "Detailed timings");
@@ -126,11 +126,7 @@ define("RL_LAN_123", "User audit trail class");
define("RL_LAN_124", "User audit trail actions");
define("RL_LAN_125", "System Logs Maintenance");
define("RL_LAN_126", "Total [x] entries matching search condition");
define("RL_LAN_127", "Past Hour");
define("RL_LAN_128", "Past 24 hours");
define("RL_LAN_129", "Past Week");
define("RL_LAN_130", "Past Month");
define("RL_LAN_131", "Past Year");
define("RL_LAN_132", "Informative");
define("RL_LAN_133", "Notice");
define("RL_LAN_134", "Warning");