X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Fresources%2Fen.lang.php;h=7d25fd6907433e01d78ebadbe184203d71fd662a;hb=e85347d56f89d7fcc5e68763038551687f291b5c;hp=f65f9323886a5bb006394caf10bfe2f89b18db23;hpb=b33cf8ebaf54882a2238b660ba07936301077695;p=timetracker.git

diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index f65f9323..7d25fd69 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -33,8 +33,6 @@ $i18n_language = 'English';
 $i18n_months = array('January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December');
 $i18n_weekdays = array('Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday');
 $i18n_weekdays_short = array('Su', 'Mo', 'Tu', 'We', 'Th', 'Fr', 'Sa');
-// format mm/dd
-$i18n_holidays = array('01/01', '01/16', '02/20', '05/28', '07/04', '09/03', '10/10', '11/11', '11/24', '12/25');
 
 $i18n_key_words = array(
 
@@ -44,12 +42,13 @@ $i18n_key_words = array(
 'menu.logout' => 'Logout',
 'menu.forum' => 'Forum',
 'menu.help' => 'Help',
-'menu.create_group' => 'Create Group',
+'menu.register' => 'Register',
 'menu.profile' => 'Profile',
 'menu.group' => 'Group',
 'menu.subgroups' => 'Subgroups',
 'menu.plugins' => 'Plugins',
 'menu.time' => 'Time',
+'menu.week' => 'Week',
 'menu.expenses' => 'Expenses',
 'menu.reports' => 'Reports',
 'menu.timesheets' => 'Timesheets',
@@ -89,6 +88,7 @@ $i18n_key_words = array(
 'error.invoice_exists' => 'Invoice with this number already exists.',
 'error.role_exists' => 'Role with this rank already exists.',
 'error.no_invoiceable_items' => 'There are no invoiceable items.',
+'error.no_records' => 'There are no records.',
 'error.no_login' => 'No user with this login.',
 'error.no_groups' => 'Your database is empty. Login as admin and create a new group.',
 'error.upload' => 'File upload error.',
@@ -104,6 +104,7 @@ $i18n_key_words = array(
 'error.format' => 'Invalid file format.',
 'error.user_count' => 'Limit on user count.',
 'error.expired' => 'Expiration date reached.',
+'error.file_storage' => 'File storage error.',
 
 // Warning messages.
 'warn.sure' => 'Are you sure?',
@@ -126,11 +127,12 @@ $i18n_key_words = array(
 'button.send' => 'Send',
 'button.send_by_email' => 'Send by e-mail',
 'button.create_group' => 'Create group',
-'button.create_timesheet' => 'Create timesheet',
 'button.export' => 'Export group',
 'button.import' => 'Import group',
 'button.close' => 'Close',
 'button.stop' => 'Stop',
+'button.approve' => 'Approve',
+'button.disapprove' => 'Disapprove',
 
 // Labels for controls on forms. Labels in this section are used on multiple forms.
 'label.group_name' => 'Group name',
@@ -212,6 +214,7 @@ $i18n_key_words = array(
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 'label.custom_fields' => 'Custom fields',
 'label.monthly_quotas' => 'Monthly quotas',
+'label.entity' => 'Entity',
 'label.type' => 'Type',
 'label.type_dropdown' => 'dropdown',
 'label.type_text' => 'text',
@@ -224,6 +227,7 @@ $i18n_key_words = array(
 'label.paid_status' => 'Paid status',
 'label.paid' => 'Paid',
 'label.mark_paid' => 'Mark paid',
+'label.week_menu' => 'Week menu',
 'label.week_note' => 'Week note',
 'label.week_list' => 'Week list',
 'label.work_units' => 'Work units',
@@ -233,6 +237,16 @@ $i18n_key_words = array(
 'label.timesheet' => 'Timesheet',
 'label.submitted' => 'Submitted',
 'label.approved' => 'Approved',
+'label.approval' => 'Report approval',
+'label.mark_approved' => 'Mark approved',
+'label.template' => 'Template',
+'label.attachments' => 'Attachments',
+'label.files' => 'Files',
+'label.file' => 'File',
+'label.image' => 'Image',
+'label.download' => 'Download',
+'label.active_users' => 'Active Users',
+'label.inactive_users' => 'Inactive Users',
 
 // Form titles.
 'title.error' => 'Error',
@@ -248,6 +262,7 @@ $i18n_key_words = array(
 'title.time' => 'Time',
 'title.edit_time_record' => 'Editing Time Record',
 'title.delete_time_record' => 'Deleting Time Record',
+'title.time_files' => 'Time Record Files',
 'title.expenses' => 'Expenses',
 'title.edit_expense' => 'Editing Expense Item',
 'title.delete_expense' => 'Deleting Expense Item',
@@ -259,11 +274,13 @@ $i18n_key_words = array(
 'title.report' => 'Report',
 'title.send_report' => 'Sending Report',
 'title.timesheets' => 'Timesheets',
-'title.timesheet' => 'Timesheet',  
+'title.timesheet' => 'Timesheet',
+'title.timesheet_files' => 'Timesheet Files',
 'title.invoice' => 'Invoice',
 'title.send_invoice' => 'Sending Invoice',
 'title.charts' => 'Charts',
 'title.projects' => 'Projects',
+'title.project_files' => 'Project Files',
 'title.add_project' => 'Adding Project',
 'title.edit_project' => 'Editing Project',
 'title.delete_project' => 'Deleting Project',
@@ -298,6 +315,7 @@ $i18n_key_words = array(
 'title.export' => 'Exporting Group Data',
 'title.import' => 'Importing Group Data',
 'title.options' => 'Options',
+'title.display_options' => 'Display Options',
 'title.profile' => 'Profile',
 'title.plugins' => 'Plugins',
 'title.cf_custom_fields' => 'Custom Fields',
@@ -314,6 +332,19 @@ $i18n_key_words = array(
 'title.week_view' => 'Week View',
 'title.swap_roles' => 'Swapping Roles',
 'title.work_units' => 'Work Units',
+'title.templates' => 'Templates',
+'title.add_template' => 'Adding Template',
+'title.edit_template' => 'Editing Template',
+'title.delete_template' => 'Deleting Template',
+'title.edit_file' => 'Editing File',
+'title.delete_file' => 'Deleting File',
+'title.download_file' => 'Downloading File',
+'title.work' => 'Work',
+'title.add_work' => 'Adding Work',
+'title.edit_work' => 'Editing Work',
+'title.delete_work' => 'Deleting Work',
+'title.active_work' => 'Active Work', // Active work items this group outsources to other groups.
+'title.inactive_work' => 'Inactive Work', // Inactive work items this group was outsourcing to other groups.
 
 // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
 // Strings that are used in a single form must go to the specific form section.
@@ -332,18 +363,24 @@ $i18n_key_words = array(
 'dropdown.previous_year' => 'previous year',
 'dropdown.selected_year' => 'year',
 'dropdown.all_time' => 'all time',
+'dropdown.time' => 'time',
+'dropdown.user' => 'user',
 'dropdown.projects' => 'projects',
 'dropdown.tasks' => 'tasks',
 'dropdown.clients' => 'clients',
 'dropdown.select' => '--- select ---',
 'dropdown.select_invoice' => '--- select invoice ---',
+'dropdown.select_timesheet' => '--- select timesheet ---',
 'dropdown.status_active' => 'active',
 'dropdown.status_inactive' => 'inactive',
 'dropdown.delete' => 'delete',
 'dropdown.do_not_delete' => 'do not delete',
+'dropdown.approved' => 'approved',
+'dropdown.not_approved' => 'not approved',
 'dropdown.paid' => 'paid',
 'dropdown.not_paid' => 'not paid',
 
+
 // Below is a section for strings that are used on individual forms. When a string is used only on one form it should be placed here.
 // One exception is for closely related forms such as "Time" and "Editing Time Record" with similar controls. In such cases
 // a string can be defined on the main form and used on related forms. The reasoning for this is to make translation effort easier.
@@ -390,6 +427,7 @@ $i18n_key_words = array(
 'form.reports.include_not_invoiced' => 'not invoiced',
 'form.reports.include_assigned' => 'assigned',
 'form.reports.include_not_assigned' => 'not assigned',
+'form.reports.include_pending' => 'pending',
 'form.reports.select_period' => 'Select time period',
 'form.reports.set_period' => 'or set dates',
 'form.reports.show_fields' => 'Show fields',
@@ -405,12 +443,16 @@ $i18n_key_words = array(
 // (after generating a report at https://timetracker.anuko.com/reports.php).
 'form.report.export' => 'Export',
 'form.report.assign_to_invoice' => 'Assign to invoice',
+'form.report.assign_to_timesheet' => 'Assign to timesheet',
 
  // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
-'form.timesheets.hint' => 'Use reports to add new timesheets.',
 'form.timesheets.active_timesheets' => 'Active Timesheets',
 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
+ // Templates form. See example at https://timetracker.anuko.com/templates.php
+'form.templates.active_templates' => 'Active Templates',
+'form.templates.inactive_templates' => 'Inactive Templates',
+
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 'form.invoice.number' => 'Invoice number',
@@ -434,8 +476,6 @@ $i18n_key_words = array(
 'form.tasks.inactive_tasks' => 'Inactive Tasks',
 
 // Users form. See example at https://timetracker.anuko.com/users.php
-'form.users.active_users' => 'Active Users',
-'form.users.inactive_users' => 'Inactive Users',
 'form.users.uncompleted_entry' => 'User has an uncompleted time entry',
 'form.users.role' => 'Role',
 'form.users.manager' => 'Manager',
@@ -479,7 +519,8 @@ $i18n_key_words = array(
 // Group Settings form. See example at https://timetracker.anuko.com/group_edit.php.
 'form.group_edit.12_hours' => '12 hours',
 'form.group_edit.24_hours' => '24 hours',
-'form.group_edit.show_holidays' => 'Show holidays',
+'form.group_edit.display_options' => 'Display options',
+'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'Tracking mode',
 'form.group_edit.mode_time' => 'time',
 'form.group_edit.mode_projects' => 'projects',
@@ -494,6 +535,7 @@ $i18n_key_words = array(
 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 'form.group_edit.confirm_save' => 'Confirm saving',
 'form.group_edit.allow_ip' => 'Allow IP',
+'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
@@ -526,7 +568,7 @@ $i18n_key_words = array(
 'role.user.description' => 'A regular member without management rights.',
 'role.client.label' => 'Client',
 'role.client.low_case_label' => 'client',
-'role.client.description' => 'A client can view its own reports, charts, and invoices.',
+'role.client.description' => 'A client can view its own data.',
 'role.supervisor.label' => 'Supervisor',
 'role.supervisor.low_case_label' => 'supervisor',
 'role.supervisor.description' => 'A person with a small set of management rights.',
@@ -541,5 +583,17 @@ $i18n_key_words = array(
 'role.top_manager.description' => 'Top group manager. Can do everything in a tree of groups.',
 'role.admin.label' => 'Administrator',
 'role.admin.low_case_label' => 'administrator',
-'role.admin.description' => 'Site adminsitrator.',
+'role.admin.description' => 'Site administrator.',
+
+// Timesheet View form. See example at https://timetracker.anuko.com/timesheet_view.php.
+'form.timesheet_view.submit_subject' => 'Timesheet approval request',
+'form.timesheet_view.submit_body' => "A new timesheet requires approval.<p>User: %s.",
+'form.timesheet_view.approve_subject' => 'Timesheet approved',
+'form.timesheet_view.approve_body' => "Your timesheet %s was approved.<p>%s",
+'form.timesheet_view.disapprove_subject' => 'Timesheet not approved',
+'form.timesheet_view.disapprove_body' => "Your timesheet %s was not approved.<p>%s",
+
+// Display Options form. See example at https://timetracker.anuko.com/display_options.php.
+'form.display_options.menu' => 'Menu',
+'form.display_options.note_on_separate_row' => 'Note on separate row',
 );