From 5194f86f6b713ce3767ec167178d78fb14fde484 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 9 Jul 2007 09:52:21 +0000
Subject: [PATCH] fixed mixed up category and location

---
 addressbook/inc/class.addressbook_merge.inc.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addressbook/inc/class.addressbook_merge.inc.php b/addressbook/inc/class.addressbook_merge.inc.php
index c13323a849..0fd5ed5db8 100644
--- a/addressbook/inc/class.addressbook_merge.inc.php
+++ b/addressbook/inc/class.addressbook_merge.inc.php
@@ -293,7 +293,7 @@ class addressbook_merge	// extends bo_merge
 			'title' => lang('Title'),
 			'description' => lang('Description'),
 			'participants' => lang('Participants'),
-			'category' => lang('Location'),
+			'location' => lang('Location'),
 			'start'    => lang('Start').': '.lang('Date').'+'.lang('Time'),
 			'startday' => lang('Start').': '.lang('Weekday'),
 			'startdate'=> lang('Start').': '.lang('Date'),
@@ -303,11 +303,12 @@ class addressbook_merge	// extends bo_merge
 			'enddate'  => lang('End').': '.lang('Date'),
 			'endtime'  => lang('End').': '.lang('Time'),
 			'duration' => lang('Duration'),
-			'owner'    => lang('Owner'),
+			'category' => lang('Category'),
 			'priority' => lang('Priority'),
 			'updated'  => lang('Updated'),
 			'recur_type' => lang('Repetition'),
 			'access'   => lang('Access').': '.lang('public').', '.lang('private'),
+			'owner'    => lang('Owner'),
 		) as $name => $label)
 		{
 			if (in_array($name,array('start','end')) && $n&1)		// main values, which should be in the first column