X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Fresources%2Fen.lang.php;h=ef89c364b5c8c3a2ef12d12d8ee969aeb65d0f18;hb=a0ff02ec3fa7016404f3992710db57951e74e824;hp=45dbdfeeb5a77a6511b88f6b25862d6d88f7c2ff;hpb=95d4442c1517b0d9e76081fd901a600e45e9fbea;p=timetracker.git

diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 45dbdfee..ef89c364 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,16 @@ $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',
 'menu.charts' => 'Charts',
 'menu.projects' => 'Projects',
 'menu.tasks' => 'Tasks',
@@ -83,22 +85,33 @@ $i18n_key_words = array(
 'error.auth' => 'Incorrect login or password.',
 'error.user_exists' => 'User with this login already exists.',
 'error.object_exists' => 'Object with this name already exists.',
-'error.project_exists' => 'Project with this name already exists.',
-'error.task_exists' => 'Task with this name already exists.',
-'error.client_exists' => 'Client with this name already exists.',
 '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.',
 'error.range_locked' => 'Date range is locked.',
-'error.mail_send' => 'Error sending mail.',
+'error.mail_send' => 'Error sending mail. Use MAIL_SMTP_DEBUG for diagnostics.',
 'error.no_email' => 'No email associated with this login.',
 'error.uncompleted_exists' => 'Uncompleted entry already exists. Close or delete it.',
 'error.goto_uncompleted' => 'Go to uncompleted entry.',
 'error.overlap' => 'Time interval overlaps with existing records.',
 'error.future_date' => 'Date is in future.',
+'error.xml' => 'Error in XML file at line %d: %s.',
+'error.cannot_import' => 'Cannot import: %s.',
+'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?',
+'warn.confirm_save' => 'Date has changed. Confirm saving, not copying this item.',
+
+// Success messages.
+'msg.success' => 'Operation completed successfully.',
 
 // Labels for buttons.
 'button.login' => 'Login',
@@ -118,6 +131,8 @@ $i18n_key_words = array(
 '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',
@@ -139,6 +154,8 @@ $i18n_key_words = array(
 'label.end_date' => 'End date',
 'label.user' => 'User',
 'label.users' => 'Users',
+'label.group' => 'Group',
+'label.subgroups' => 'Subgroups',
 'label.roles' => 'Roles',
 'label.client' => 'Client',
 'label.clients' => 'Clients',
@@ -197,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',
@@ -209,13 +227,34 @@ $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',
+'label.work_units_short' => 'Units',
+'label.totals_only' => 'Totals only',
+'label.quota' => 'Quota',
+'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',
+'title.success' => 'Success',
 'title.login' => 'Login',
 'title.groups' => 'Groups',
-'title.create_group' => 'Creating Group',
+'title.subgroups' => 'Subgroups',
+'title.add_group' => 'Adding Group',
 'title.edit_group' => 'Editing Group',
 'title.delete_group' => 'Deleting Group',
 'title.reset_password' => 'Resetting Password',
@@ -223,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',
@@ -233,10 +273,14 @@ $i18n_key_words = array(
 'title.reports' => 'Reports',
 'title.report' => 'Report',
 'title.send_report' => 'Sending Report',
+'title.timesheets' => 'Timesheets',
+'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',
@@ -264,12 +308,16 @@ $i18n_key_words = array(
 'title.add_notification' => 'Adding Notification',
 'title.edit_notification' => 'Editing Notification',
 'title.delete_notification' => 'Deleting Notification',
+'title.add_timesheet' => 'Adding Timesheet',
+'title.edit_timesheet' => 'Editing Timesheet',
+'title.delete_timesheet' => 'Deleting Timesheet',
 'title.monthly_quotas' => 'Monthly Quotas',
 'title.export' => 'Exporting Group Data',
 'title.import' => 'Importing Group Data',
 'title.options' => 'Options',
+'title.display_options' => 'Display Options',
 'title.profile' => 'Profile',
-'title.group' => 'Group Settings',
+'title.plugins' => 'Plugins',
 'title.cf_custom_fields' => 'Custom Fields',
 'title.cf_add_custom_field' => 'Adding Custom Field',
 'title.cf_edit_custom_field' => 'Editing Custom Field',
@@ -283,6 +331,20 @@ $i18n_key_words = array(
 'title.locking' => 'Locking',
 '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.
@@ -301,18 +363,23 @@ $i18n_key_words = array(
 'dropdown.previous_year' => 'previous year',
 'dropdown.selected_year' => 'year',
 'dropdown.all_time' => 'all time',
+'dropdown.time' => 'time',
 '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.
@@ -336,6 +403,13 @@ $i18n_key_words = array(
 'form.time.uncompleted' => 'Uncompleted',
 'form.time.remaining_quota' => 'Remaining quota',
 'form.time.over_quota' => 'Over quota',
+// Note for translators. "Balance" below means accumulated quota for user since 1st of the month
+// until and including a selected day. If a quota is 8 hours a day, then the balance
+// is 8 hours multiplied by a number of work days. "Remaining balance" and "Over balance" are
+// balance differences with logged hours.
+// The term looks confusing, if you have a better idea how to name these things, let us know.
+'form.time.remaining_balance' => 'Remaining balance',
+'form.time.over_balance' => 'Over balance',
 
 // Editing Time Record form. See example at https://timetracker.anuko.com/time_edit.php (get there by editing an uncompleted time record).
 'form.time_edit.uncompleted' => 'This record was saved with only start time. It is not an error.',
@@ -350,6 +424,9 @@ $i18n_key_words = array(
 'form.reports.include_not_billable' => 'not billable',
 'form.reports.include_invoiced' => 'invoiced',
 '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',
@@ -360,12 +437,20 @@ $i18n_key_words = array(
 'form.reports.group_by_client' => 'client',
 'form.reports.group_by_project' => 'project',
 'form.reports.group_by_task' => 'task',
-'form.reports.totals_only' => 'Totals only',
 
 // Report form. See example at https://timetracker.anuko.com/report.php
 // (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.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).
@@ -390,8 +475,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',
@@ -424,7 +507,7 @@ $i18n_key_words = array(
 'form.export.compression_none' => 'none',
 'form.export.compression_bzip' => 'bzip',
 
-// Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first).
+// Importing Group Data form. See example at https://timetracker.anuko.com/import.php (login as admin first).
 'form.import.hint' => 'Import group data from an xml file.',
 'form.import.file' => 'Select file',
 'form.import.success' => 'Import completed successfully.',
@@ -435,7 +518,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',
@@ -448,8 +532,9 @@ $i18n_key_words = array(
 'form.group_edit.allow_overlap' => 'Allow overlap',
 'form.group_edit.future_entries' => 'Future entries',
 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
+'form.group_edit.confirm_save' => 'Confirm saving',
 'form.group_edit.allow_ip' => 'Allow IP',
-'form.group_edit.plugins' => 'Plugins',
+'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?',
@@ -465,7 +550,6 @@ $i18n_key_words = array(
 // Quotas configuration form. See example at https://timetracker.anuko.com/quotas.php after enabling Monthly quotas plugin.
 'form.quota.year' => 'Year',
 'form.quota.month' => 'Month',
-'form.quota.quota' => 'Quota',
 'form.quota.workday_hours' => 'Hours in work day',
 'form.quota.hint' => 'If values are empty, quotas are calculated automatically based on workday hours and holidays.',
 
@@ -473,13 +557,17 @@ $i18n_key_words = array(
 'form.swap.hint' => 'Demote yourself to a lower role by swapping roles with someone else. This cannot be undone.',
 'form.swap.swap_with' => 'Swap roles with',
 
+// Work Units configuration form. See example at https://timetracker.anuko.com/work_units.php after enabling Work units plugin.
+'form.work_units.minutes_in_unit' => 'Minutes in unit',
+'form.work_units.1st_unit_threshold' => '1st unit threshold',
+
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
 'role.user.label' => 'User',
 'role.user.low_case_label' => 'user',
 '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.',
@@ -494,5 +582,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',
 );