More refactoring in translation files.

[timetracker.git] / WEB-INF / resources / en.lang.php

diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 361b9d819b0ccaf0f15d8b3adb768df8e668bbe1..5c91c3ee43713a7fa36cb3e38e80b9f937c34d51 100644 (file)
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -236,6 +236,7 @@ $i18n_key_words = array(
 'label.submitted' => 'Submitted',
 'label.approved' => 'Approved',
 'label.approval' => 'Report approval',
 'label.submitted' => 'Submitted',
 'label.approved' => 'Approved',
 'label.approval' => 'Report approval',

+'label.mark_approved' => 'Mark approved',

 
 // Form titles.
 'title.error' => 'Error',
 
 // Form titles.
 'title.error' => 'Error',


@@ -344,9 +345,12 @@ $i18n_key_words = array(
 'dropdown.status_inactive' => 'inactive',
 'dropdown.delete' => 'delete',
 'dropdown.do_not_delete' => 'do not delete',
 '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',
 
 '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.
 // 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.


@@ -394,8 +398,6 @@ $i18n_key_words = array(
 'form.reports.include_assigned' => 'assigned',
 'form.reports.include_not_assigned' => 'not assigned',
 'form.reports.include_pending' => 'pending',
 'form.reports.include_assigned' => 'assigned',
 'form.reports.include_not_assigned' => 'not assigned',
 'form.reports.include_pending' => 'pending',

-'form.reports.include_approved' => 'approved',
-'form.reports.include_not_approved' => 'not approved',

 'form.reports.select_period' => 'Select time period',
 'form.reports.set_period' => 'or set dates',
 'form.reports.show_fields' => 'Show fields',
 'form.reports.select_period' => 'Select time period',
 'form.reports.set_period' => 'or set dates',
 'form.reports.show_fields' => 'Show fields',