diff --git a/resources/inc/class.resources_wizard_export_csv.inc.php b/resources/inc/class.resources_wizard_export_csv.inc.php index 33dc0c95f1..6f599e2c37 100644 --- a/resources/inc/class.resources_wizard_export_csv.inc.php +++ b/resources/inc/class.resources_wizard_export_csv.inc.php @@ -17,7 +17,7 @@ class resources_wizard_export_csv extends importexport_wizard_basic_export_csv // Field mapping $this->export_fields = array( - 'res_id' => lang('ID'), + 'res_id' => lang('Resource ID'), 'name' => lang('name'), 'short_description' => lang('short description'), 'cat_id' => lang('Category'), diff --git a/resources/inc/class.resources_wizard_import_csv.inc.php b/resources/inc/class.resources_wizard_import_csv.inc.php index 01a2f3d33a..e5c3cefb36 100644 --- a/resources/inc/class.resources_wizard_import_csv.inc.php +++ b/resources/inc/class.resources_wizard_import_csv.inc.php @@ -27,7 +27,7 @@ class resources_wizard_import_csv extends importexport_wizard_basic_import_csv // Field mapping $export = new resources_wizard_export_csv(); $this->mapping_fields = array( - 'res_id' => lang('ID'), + 'res_id' => lang('Resource ID'), 'name' => lang('name'), 'short_description' => lang('short description'), 'cat_id' => lang('Category'), diff --git a/resources/lang/egw_en.lang b/resources/lang/egw_en.lang index b1e5166230..ab9d906a34 100644 --- a/resources/lang/egw_en.lang +++ b/resources/lang/egw_en.lang @@ -69,6 +69,7 @@ quantity: resources en Quantity: read calendar permissions resources en Read Calendar permissions read permissions resources en Read permissions related links resources en Related links +resource id resources en Resource ID resources common en Resources resources list resources en Resources list responsible: resources en Responsible: diff --git a/resources/setup/importexport_default.xml b/resources/setup/importexport_default.xml index c385f1d6f8..7ed15a81b4 100644 --- a/resources/setup/importexport_default.xml +++ b/resources/setup/importexport_default.xml @@ -16,7 +16,7 @@ - ID + Resource ID Name Short description Category @@ -35,7 +35,7 @@ label 1 - 2011-03-02 10:17:41 + 2011-03-28 10:59:50 import-resources @@ -51,20 +51,19 @@ 1 add - name - short_description - cat_id - quantity - useable - location - bookable - buyable - prize - long_description - inventory_number - no_csv_1 - no_csv_2 - no_csv_3 + Resource ID + Name + Short description + Category + Quantity + useable + Location + Bookable + Buyable + Prize + Long description + Inventory number + Test CF res_id @@ -96,7 +95,7 @@ - 2011-03-02 10:16:33 + 2011-03-28 11:02:19