Index: /trunk/INSTALL/arquivos/expresso.dump
===================================================================
--- /trunk/INSTALL/arquivos/expresso.dump	(revision 6173)
+++ /trunk/INSTALL/arquivos/expresso.dump	(revision 7527)
@@ -11,11 +11,16 @@
 
 --
--- Name: plpgsql; Type: PROCEDURAL LANGUAGE; Schema: -; Owner: postgres
---
-
-CREATE PROCEDURAL LANGUAGE plpgsql;
-
-
-ALTER PROCEDURAL LANGUAGE plpgsql OWNER TO postgres;
+-- Name: plpgsql; Type: EXTENSION; Schema: -; Owner: 
+--
+
+CREATE EXTENSION IF NOT EXISTS plpgsql WITH SCHEMA pg_catalog;
+
+
+--
+-- Name: EXTENSION plpgsql; Type: COMMENT; Schema: -; Owner: 
+--
+
+COMMENT ON EXTENSION plpgsql IS 'PL/pgSQL procedural language';
+
 
 SET search_path = public, pg_catalog;
@@ -50,6 +55,6 @@
     START WITH 1
     INCREMENT BY 1
+    NO MINVALUE
     NO MAXVALUE
-    NO MINVALUE
     CACHE 1;
 
@@ -91,6 +96,6 @@
     START WITH 1
     INCREMENT BY 1
+    NO MINVALUE
     NO MAXVALUE
-    NO MINVALUE
     CACHE 1;
 
@@ -116,5 +121,6 @@
     duration bigint,
     tzid character varying(50),
-    dtstamp bigint DEFAULT (date_part('epoch'::text, ('now'::text)::timestamp(3) with time zone) * (1000)::double precision)
+    dtstamp bigint DEFAULT (date_part('epoch'::text, ('now'::text)::timestamp(3) with time zone) * (1000)::double precision),
+    type smallint DEFAULT 0
 );
 
@@ -129,6 +135,6 @@
     START WITH 1
     INCREMENT BY 1
+    NO MINVALUE
     NO MAXVALUE
-    NO MINVALUE
     CACHE 1;
 
@@ -168,6 +174,6 @@
     START WITH 1
     INCREMENT BY 1
+    NO MINVALUE
     NO MAXVALUE
-    NO MINVALUE
     CACHE 1;
 
@@ -202,6 +208,6 @@
     START WITH 1
     INCREMENT BY 1
+    NO MINVALUE
     NO MAXVALUE
-    NO MINVALUE
     CACHE 1;
 
@@ -235,6 +241,6 @@
     START WITH 1
     INCREMENT BY 1
+    NO MINVALUE
     NO MAXVALUE
-    NO MINVALUE
     CACHE 1;
 
@@ -264,4 +270,44 @@
 
 --
+-- Name: seq_calendar_historic; Type: SEQUENCE; Schema: public; Owner: postgres
+--
+
+CREATE SEQUENCE seq_calendar_historic
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.seq_calendar_historic OWNER TO postgres;
+
+--
+-- Name: seq_calendar_historic; Type: SEQUENCE SET; Schema: public; Owner: postgres
+--
+
+SELECT pg_catalog.setval('seq_calendar_historic', 1, false);
+
+
+SET default_with_oids = true;
+
+--
+-- Name: calendar_historic; Type: TABLE; Schema: public; Owner: postgres; Tablespace: 
+--
+
+CREATE TABLE calendar_historic (
+    id integer DEFAULT nextval('seq_calendar_historic'::regclass) NOT NULL,
+    object_id bigint,
+    user_uidnumber bigint NOT NULL,
+    dtstamp bigint NOT NULL,
+    attribute character varying(50),
+    before_value character varying(255),
+    after_value character varying(255)
+);
+
+
+ALTER TABLE public.calendar_historic OWNER TO postgres;
+
+--
 -- Name: seq_calendar_object; Type: SEQUENCE; Schema: public; Owner: postgres
 --
@@ -270,6 +316,6 @@
     START WITH 1
     INCREMENT BY 1
+    NO MINVALUE
     NO MAXVALUE
-    NO MINVALUE
     CACHE 1;
 
@@ -283,4 +329,6 @@
 SELECT pg_catalog.setval('seq_calendar_object', 1, false);
 
+
+SET default_with_oids = false;
 
 --
@@ -306,5 +354,9 @@
     tzid character varying(50),
     transp smallint DEFAULT 0 NOT NULL,
-    sequence bigint DEFAULT 0 NOT NULL
+    sequence bigint DEFAULT 0 NOT NULL,
+    priority smallint DEFAULT 0,
+    percentage smallint DEFAULT 0,
+    status smallint DEFAULT 0,
+    due bigint DEFAULT 0
 );
 
@@ -319,6 +371,6 @@
     START WITH 1
     INCREMENT BY 1
+    NO MINVALUE
     NO MAXVALUE
-    NO MINVALUE
     CACHE 1;
 
@@ -352,6 +404,6 @@
     START WITH 1
     INCREMENT BY 1
+    NO MINVALUE
     NO MAXVALUE
-    NO MINVALUE
     CACHE 1;
 
@@ -392,6 +444,6 @@
     START WITH 1
     INCREMENT BY 1
+    NO MINVALUE
     NO MAXVALUE
-    NO MINVALUE
     CACHE 1;
 
@@ -425,6 +477,6 @@
     START WITH 1
     INCREMENT BY 1
+    NO MINVALUE
     NO MAXVALUE
-    NO MINVALUE
     CACHE 1;
 
@@ -448,5 +500,6 @@
     object_id bigint NOT NULL,
     object_type bigint NOT NULL,
-    permission character varying(50) NOT NULL
+    permission character varying(50) NOT NULL,
+    owner bigint
 );
 
@@ -461,6 +514,6 @@
     START WITH 1
     INCREMENT BY 1
+    NO MINVALUE
     NO MAXVALUE
-    NO MINVALUE
     CACHE 1;
 
@@ -510,6 +563,6 @@
     START WITH 1
     INCREMENT BY 1
+    NO MINVALUE
     NO MAXVALUE
-    NO MINVALUE
     CACHE 1;
 
@@ -545,6 +598,6 @@
     START WITH 1
     INCREMENT BY 1
+    NO MINVALUE
     NO MAXVALUE
-    NO MINVALUE
     CACHE 1;
 
@@ -580,6 +633,6 @@
     START WITH 1
     INCREMENT BY 1
+    NO MINVALUE
     NO MAXVALUE
-    NO MINVALUE
     CACHE 1;
 
@@ -611,5 +664,6 @@
     font_color character varying(6),
     background_color character varying(6),
-    border_color character varying(6)
+    border_color character varying(6),
+    type smallint DEFAULT 0
 );
 
@@ -624,6 +678,6 @@
     START WITH 1
     INCREMENT BY 1
+    NO MINVALUE
     NO MAXVALUE
-    NO MINVALUE
     CACHE 1;
 
@@ -653,4 +707,48 @@
 ALTER TABLE public.calendar_signature_alarm OWNER TO postgres;
 
+SET default_with_oids = true;
+
+--
+-- Name: calendar_task_to_activity_object; Type: TABLE; Schema: public; Owner: postgres; Tablespace: 
+--
+
+CREATE TABLE calendar_task_to_activity_object (
+    id integer NOT NULL,
+    calendar_object_activity_id integer NOT NULL,
+    calendar_object_task_id integer NOT NULL,
+    owner integer NOT NULL
+);
+
+
+ALTER TABLE public.calendar_task_to_activity_object OWNER TO postgres;
+
+--
+-- Name: calendar_task_to_activity_object_id_seq; Type: SEQUENCE; Schema: public; Owner: postgres
+--
+
+CREATE SEQUENCE calendar_task_to_activity_object_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.calendar_task_to_activity_object_id_seq OWNER TO postgres;
+
+--
+-- Name: calendar_task_to_activity_object_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: postgres
+--
+
+ALTER SEQUENCE calendar_task_to_activity_object_id_seq OWNED BY calendar_task_to_activity_object.id;
+
+
+--
+-- Name: calendar_task_to_activity_object_id_seq; Type: SEQUENCE SET; Schema: public; Owner: postgres
+--
+
+SELECT pg_catalog.setval('calendar_task_to_activity_object_id_seq', 1, false);
+
+
 --
 -- Name: seq_calendar_to_calendar_object; Type: SEQUENCE; Schema: public; Owner: postgres
@@ -660,6 +758,6 @@
     START WITH 1
     INCREMENT BY 1
+    NO MINVALUE
     NO MAXVALUE
-    NO MINVALUE
     CACHE 1;
 
@@ -673,4 +771,6 @@
 SELECT pg_catalog.setval('seq_calendar_to_calendar_object', 1, false);
 
+
+SET default_with_oids = false;
 
 --
@@ -694,6 +794,6 @@
     START WITH 1
     INCREMENT BY 1
+    NO MINVALUE
     NO MAXVALUE
-    NO MINVALUE
     CACHE 1;
 
@@ -779,6 +879,6 @@
     START WITH 1
     INCREMENT BY 1
+    NO MINVALUE
     NO MAXVALUE
-    NO MINVALUE
     CACHE 1;
 
@@ -819,6 +919,6 @@
     START WITH 1
     INCREMENT BY 1
+    NO MINVALUE
     NO MAXVALUE
-    NO MINVALUE
     CACHE 1;
 
@@ -874,6 +974,6 @@
     START WITH 1
     INCREMENT BY 1
+    NO MINVALUE
     NO MAXVALUE
-    NO MINVALUE
     CACHE 1;
 
@@ -944,6 +1044,6 @@
     START WITH 1
     INCREMENT BY 1
+    NO MINVALUE
     NO MAXVALUE
-    NO MINVALUE
     CACHE 1;
 
@@ -1000,6 +1100,6 @@
     START WITH 1
     INCREMENT BY 1
+    NO MINVALUE
     NO MAXVALUE
-    NO MINVALUE
     CACHE 1;
 
@@ -1039,6 +1139,6 @@
     START WITH 1
     INCREMENT BY 1
+    NO MINVALUE
     NO MAXVALUE
-    NO MINVALUE
     CACHE 1;
 
@@ -1110,6 +1210,6 @@
     START WITH 1
     INCREMENT BY 1
+    NO MINVALUE
     NO MAXVALUE
-    NO MINVALUE
     CACHE 1;
 
@@ -1145,6 +1245,6 @@
     START WITH 1
     INCREMENT BY 1
+    NO MINVALUE
     NO MAXVALUE
-    NO MINVALUE
     CACHE 1;
 
@@ -1186,6 +1286,6 @@
     START WITH 1
     INCREMENT BY 1
+    NO MINVALUE
     NO MAXVALUE
-    NO MINVALUE
     CACHE 1;
 
@@ -1227,6 +1327,6 @@
     START WITH 1
     INCREMENT BY 1
+    NO MINVALUE
     NO MAXVALUE
-    NO MINVALUE
     CACHE 1;
 
@@ -1261,6 +1361,6 @@
     START WITH 1
     INCREMENT BY 1
+    NO MINVALUE
     NO MAXVALUE
-    NO MINVALUE
     CACHE 1;
 
@@ -1299,6 +1399,6 @@
     START WITH 1
     INCREMENT BY 1
+    NO MINVALUE
     NO MAXVALUE
-    NO MINVALUE
     CACHE 1;
 
@@ -1339,6 +1439,6 @@
     START WITH 1
     INCREMENT BY 1
+    NO MINVALUE
     NO MAXVALUE
-    NO MINVALUE
     CACHE 1;
 
@@ -2221,6 +2321,6 @@
     START WITH 1
     INCREMENT BY 1
+    NO MINVALUE
     NO MAXVALUE
-    NO MINVALUE
     CACHE 1;
 
@@ -2487,4 +2587,25 @@
 
 --
+-- Name: seq_calendar_task_to_activity_object; Type: SEQUENCE; Schema: public; Owner: postgres
+--
+
+CREATE SEQUENCE seq_calendar_task_to_activity_object
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.seq_calendar_task_to_activity_object OWNER TO postgres;
+
+--
+-- Name: seq_calendar_task_to_activity_object; Type: SEQUENCE SET; Schema: public; Owner: postgres
+--
+
+SELECT pg_catalog.setval('seq_calendar_task_to_activity_object', 1, false);
+
+
+--
 -- Name: seq_phpgw_accounts; Type: SEQUENCE; Schema: public; Owner: postgres
 --
@@ -2493,6 +2614,6 @@
     START WITH 1
     INCREMENT BY 1
+    NO MINVALUE
     NO MAXVALUE
-    NO MINVALUE
     CACHE 1;
 
@@ -2514,6 +2635,6 @@
     START WITH 1
     INCREMENT BY 1
+    NO MINVALUE
     NO MAXVALUE
-    NO MINVALUE
     CACHE 1;
 
@@ -2535,6 +2656,6 @@
     START WITH 1
     INCREMENT BY 1
+    NO MINVALUE
     NO MAXVALUE
-    NO MINVALUE
     CACHE 1;
 
@@ -2556,6 +2677,6 @@
     START WITH 1
     INCREMENT BY 1
+    NO MINVALUE
     NO MAXVALUE
-    NO MINVALUE
     CACHE 1;
 
@@ -2577,6 +2698,6 @@
     START WITH 1
     INCREMENT BY 1
+    NO MINVALUE
     NO MAXVALUE
-    NO MINVALUE
     CACHE 1;
 
@@ -2598,6 +2719,6 @@
     START WITH 1
     INCREMENT BY 1
+    NO MINVALUE
     NO MAXVALUE
-    NO MINVALUE
     CACHE 1;
 
@@ -2619,6 +2740,6 @@
     START WITH 1
     INCREMENT BY 1
+    NO MINVALUE
     NO MAXVALUE
-    NO MINVALUE
     CACHE 1;
 
@@ -2640,6 +2761,6 @@
     START WITH 1
     INCREMENT BY 1
+    NO MINVALUE
     NO MAXVALUE
-    NO MINVALUE
     CACHE 1;
 
@@ -2661,6 +2782,6 @@
     START WITH 93
     INCREMENT BY 1
+    NO MINVALUE
     NO MAXVALUE
-    NO MINVALUE
     CACHE 1;
 
@@ -2682,6 +2803,6 @@
     START WITH 1
     INCREMENT BY 1
+    NO MINVALUE
     NO MAXVALUE
-    NO MINVALUE
     CACHE 1;
 
@@ -2703,6 +2824,6 @@
     START WITH 1
     INCREMENT BY 1
+    NO MINVALUE
     NO MAXVALUE
-    NO MINVALUE
     CACHE 1;
 
@@ -2714,5 +2835,5 @@
 --
 
-SELECT pg_catalog.setval('seq_phpgw_hooks', 775, true);
+SELECT pg_catalog.setval('seq_phpgw_hooks', 904, true);
 
 
@@ -2724,6 +2845,6 @@
     START WITH 1
     INCREMENT BY 1
+    NO MINVALUE
     NO MAXVALUE
-    NO MINVALUE
     CACHE 1;
 
@@ -2745,6 +2866,6 @@
     START WITH 1
     INCREMENT BY 1
+    NO MINVALUE
     NO MAXVALUE
-    NO MINVALUE
     CACHE 1;
 
@@ -2766,6 +2887,6 @@
     START WITH 1
     INCREMENT BY 1
+    NO MINVALUE
     NO MAXVALUE
-    NO MINVALUE
     CACHE 1;
 
@@ -2787,6 +2908,6 @@
     START WITH 1
     INCREMENT BY 1
+    NO MINVALUE
     NO MAXVALUE
-    NO MINVALUE
     CACHE 1;
 
@@ -2799,4 +2920,11 @@
 
 SELECT pg_catalog.setval('seq_phpgw_vfs', 4, true);
+
+
+--
+-- Name: id; Type: DEFAULT; Schema: public; Owner: postgres
+--
+
+ALTER TABLE ONLY calendar_task_to_activity_object ALTER COLUMN id SET DEFAULT nextval('calendar_task_to_activity_object_id_seq'::regclass);
 
 
@@ -2813,7 +2941,7 @@
 --
 
-COPY calendar (id, name, location, description, duration, tzid, dtstamp) FROM stdin;
-1	Calendario	Calendario	Calendario Padrão	\N	America/Sao_Paulo	1332527174000
-2	Calendario	Calendario	Calendario Padrão	\N	America/Sao_Paulo	1332529079000
+COPY calendar (id, name, location, description, duration, tzid, dtstamp, type) FROM stdin;
+1	Calendario	Calendario	Calendario Padrão	\N	America/Sao_Paulo	1332527174000	0
+2	Calendario	Calendario	Calendario Padrão	\N	America/Sao_Paulo	1332529079000	0
 \.
 
@@ -2855,8 +2983,16 @@
 
 --
+-- Data for Name: calendar_historic; Type: TABLE DATA; Schema: public; Owner: postgres
+--
+
+COPY calendar_historic (id, object_id, user_uidnumber, dtstamp, attribute, before_value, after_value) FROM stdin;
+\.
+
+
+--
 -- Data for Name: calendar_object; Type: TABLE DATA; Schema: public; Owner: postgres
 --
 
-COPY calendar_object (id, type_id, cal_uid, dtstamp, dtstart, description, dtend, location, class_id, last_update, range_end, summary, range_start, allday, repeat, tzid, transp, sequence) FROM stdin;
+COPY calendar_object (id, type_id, cal_uid, dtstamp, dtstart, description, dtend, location, class_id, last_update, range_end, summary, range_start, allday, repeat, tzid, transp, sequence, priority, percentage, status, due) FROM stdin;
 \.
 
@@ -2868,4 +3004,5 @@
 COPY calendar_object_type (id, name) FROM stdin;
 1	VEVENT
+2	TODO
 \.
 
@@ -2896,5 +3033,5 @@
 --
 
-COPY calendar_permission (id, uidnumber, object_id, object_type, permission) FROM stdin;
+COPY calendar_permission (id, uidnumber, object_id, object_type, permission, owner) FROM stdin;
 \.
 
@@ -2928,7 +3065,7 @@
 --
 
-COPY calendar_signature (id, user_uidnumber, calendar_id, is_owner, dtstamp, msg_add, msg_cancel, msg_update, msg_reply, msg_alarms, font_color, background_color, border_color) FROM stdin;
-1	1003	1	1	1332527174000	\N	\N	\N	\N	\N	FFFFFF	3366CC	3366CC
-2	1009	2	1	1332529080000	\N	\N	\N	\N	\N	FFFFFF	3366CC	3366CC
+COPY calendar_signature (id, user_uidnumber, calendar_id, is_owner, dtstamp, msg_add, msg_cancel, msg_update, msg_reply, msg_alarms, font_color, background_color, border_color, type) FROM stdin;
+1	1003	1	1	1332527174000	\N	\N	\N	\N	\N	FFFFFF	3366CC	3366CC	0
+2	1009	2	1	1332529080000	\N	\N	\N	\N	\N	FFFFFF	3366CC	3366CC	0
 \.
 
@@ -2939,4 +3076,12 @@
 
 COPY calendar_signature_alarm (id, action_id, unit, "time", calendar_signature_id) FROM stdin;
+\.
+
+
+--
+-- Data for Name: calendar_task_to_activity_object; Type: TABLE DATA; Schema: public; Owner: postgres
+--
+
+COPY calendar_task_to_activity_object (id, calendar_object_activity_id, calendar_object_task_id, owner) FROM stdin;
 \.
 
@@ -3242,21 +3387,21 @@
 
 COPY phpgw_applications (app_id, app_name, app_enabled, app_order, app_tables, app_version) FROM stdin;
-7	expressoAdmin1_2	1	1	phpgw_expressoadmin,phpgw_expressoadmin_apps,phpgw_expressoadmin_passwords,phpgw_expressoadmin_log,phpgw_expressoadmin_samba,phpgw_expressoadmin_configuration,phpgw_expressoadmin_acls	2.4.0
-4	calendar	1	3	phpgw_cal,phpgw_cal_holidays,phpgw_cal_repeats,phpgw_cal_user,phpgw_cal_extra	2.4.0
-1	phpgwapi	3	1	phpgw_config,phpgw_applications,phpgw_acl,phpgw_accounts,phpgw_preferences,phpgw_sessions,phpgw_app_sessions,phpgw_access_log,phpgw_hooks,phpgw_languages,phpgw_lang,phpgw_nextid,phpgw_categories,phpgw_addressbook,phpgw_addressbook_extra,phpgw_log,phpgw_log_msg,phpgw_interserv,phpgw_vfs,phpgw_history_log,phpgw_async	2.4.0
-2	admin	1	1		2.4.0
-3	preferences	2	1		2.4.0
-19	listAdmin	1	10		2.4.0
-5	contactcenter	1	4	phpgw_cc_status,phpgw_cc_prefixes,phpgw_cc_suffixes,phpgw_cc_typeof_ct_rels,phpgw_cc_typeof_ct_addrs,phpgw_cc_typeof_ct_conns,phpgw_cc_typeof_co_rels,phpgw_cc_typeof_co_addrs,phpgw_cc_typeof_co_conns,phpgw_cc_typeof_co_legals,phpgw_cc_state,phpgw_cc_city,phpgw_cc_addresses,phpgw_cc_connections,phpgw_cc_company,phpgw_cc_company_rels,phpgw_cc_company_addrs,phpgw_cc_company_conns,phpgw_cc_company_legals,phpgw_cc_contact,phpgw_cc_contact_rels,phpgw_cc_contact_addrs,phpgw_cc_contact_conns,phpgw_cc_contact_company,phpgw_cc_contact_grps,phpgw_cc_groups	2.4.0
-15	workflow	1	10	egw_wf_activities,egw_wf_activity_roles,egw_wf_instance_activities,egw_wf_instances,egw_wf_processes,egw_wf_roles,egw_wf_transitions,egw_wf_user_roles,egw_wf_workitems,egw_wf_process_config,egw_wf_activity_agents,egw_wf_agent_mail_smtp,egw_wf_interinstance_relations,egw_wf_external_application,egw_wf_admin_access,egw_wf_user_cache,egw_wf_jobs,egw_wf_job_logs	2.4.0
-10	emailadmin	2	10	phpgw_emailadmin	2.4.0
-11	help	2	5		2.4.0
-18	mobile	2	4		2.4.0
-9	news_admin	1	16	phpgw_news,phpgw_news_export	2.4.0
-17	jabberit_messenger	1	9		2.4.0
 21	filemanager	1	6	phpgw_vfs,phpgw_vfs_quota,phpgw_filemanager_notification	2.4.0
 13	expressoMail1_2	1	2	phpgw_expressomail_contacts,phpgw_certificados,expressomail_attachment,expressomail_label,expressomail_message_followupflag,expressomail_followupflag	2.4.6
-20	reports	1	17		2.4.0
-22	expressoCalendar	1	3	calendar_signature_alarm,calendar_signature,calendar_repeat_occurrence,calendar_repeat,calendar_alarm,calendar_participant,calendar_participant_status,calendar_attach,attachment,calendar_to_calendar_object,calendar,calendar_object,calendar_object_type,calendar_class,calendar_ex_participant,calendar_permission,module_preference,calendar_repeat_ranges	1.006
+5	contactcenter	1	4	phpgw_cc_status,phpgw_cc_prefixes,phpgw_cc_suffixes,phpgw_cc_typeof_ct_rels,phpgw_cc_typeof_ct_addrs,phpgw_cc_typeof_ct_conns,phpgw_cc_typeof_co_rels,phpgw_cc_typeof_co_addrs,phpgw_cc_typeof_co_conns,phpgw_cc_typeof_co_legals,phpgw_cc_state,phpgw_cc_city,phpgw_cc_addresses,phpgw_cc_connections,phpgw_cc_company,phpgw_cc_company_rels,phpgw_cc_company_addrs,phpgw_cc_company_conns,phpgw_cc_company_legals,phpgw_cc_contact,phpgw_cc_contact_rels,phpgw_cc_contact_addrs,phpgw_cc_contact_conns,phpgw_cc_contact_company,phpgw_cc_contact_grps,phpgw_cc_groups	2.5.0
+1	phpgwapi	3	1	phpgw_config,phpgw_applications,phpgw_acl,phpgw_accounts,phpgw_preferences,phpgw_sessions,phpgw_app_sessions,phpgw_access_log,phpgw_hooks,phpgw_languages,phpgw_lang,phpgw_nextid,phpgw_categories,phpgw_addressbook,phpgw_addressbook_extra,phpgw_log,phpgw_log_msg,phpgw_interserv,phpgw_vfs,phpgw_history_log,phpgw_async	2.5.0
+2	admin	1	1		2.5.0
+3	preferences	2	1		2.5.0
+22	expressoCalendar	1	10	calendar_signature_alarm,calendar_signature,calendar_repeat_occurrence,calendar_repeat,calendar_alarm,calendar_participant,calendar_participant_status,calendar_attach,attachment,calendar_to_calendar_object,calendar,calendar_object,calendar_object_type,calendar_class,calendar_ex_participant,calendar_permission,module_preference,calendar_repeat_ranges,calendar_task_to_activity_object,calendar_historic	1.009
+19	listAdmin	1	10		2.5.0
+10	emailadmin	2	10	phpgw_emailadmin	2.5.0
+4	calendar	1	3	phpgw_cal,phpgw_cal_holidays,phpgw_cal_repeats,phpgw_cal_user,phpgw_cal_extra	2.5.0
+7	expressoAdmin1_2	1	1	phpgw_expressoadmin,phpgw_expressoadmin_apps,phpgw_expressoadmin_passwords,phpgw_expressoadmin_log,phpgw_expressoadmin_samba,phpgw_expressoadmin_configuration,phpgw_expressoadmin_acls	2.5.0
+11	help	2	5		2.5.0
+17	jabberit_messenger	1	9		2.5.0
+18	mobile	2	4		2.5.0
+9	news_admin	1	16	phpgw_news,phpgw_news_export	2.5.0
+20	reports	1	17		2.5.0
+15	workflow	1	10	egw_wf_activities,egw_wf_activity_roles,egw_wf_instance_activities,egw_wf_instances,egw_wf_processes,egw_wf_roles,egw_wf_transitions,egw_wf_user_roles,egw_wf_workitems,egw_wf_process_config,egw_wf_activity_agents,egw_wf_agent_mail_smtp,egw_wf_interinstance_relations,egw_wf_external_application,egw_wf_admin_access,egw_wf_user_cache,egw_wf_jobs,egw_wf_job_logs	2.5.0
 \.
 
@@ -4457,4 +4602,5 @@
 11071	2	BR	\N	\N	Boa Nova
 11072	2	BR	\N	\N	Boa União
+11201	2	BR	\N	\N	Crussaí
 11073	2	BR	\N	\N	Boa Vista do Lagamar
 11074	2	BR	\N	\N	Boa Vista do Tupim
@@ -4585,5 +4731,4 @@
 11199	2	BR	\N	\N	Cristópolis
 11200	2	BR	\N	\N	Crisópolis
-11201	2	BR	\N	\N	Crussaí
 11202	2	BR	\N	\N	Cruz das Almas
 11203	2	BR	\N	\N	Cumuruxatiba
@@ -10978,4 +11123,5 @@
 17592	25	BR	\N	\N	São Sebastião do Sacramento
 17593	25	BR	\N	\N	São Sebastião do Soberbo
+17719	26	BR	\N	\N	Alta Floresta
 17594	25	BR	\N	\N	São Sebastião do Óculo
 17595	25	BR	\N	\N	São Sebastião dos Poções
@@ -11103,5 +11249,4 @@
 17717	26	BR	\N	\N	Ainhumas
 17718	26	BR	\N	\N	Alcantilado
-17719	26	BR	\N	\N	Alta Floresta
 17720	26	BR	\N	\N	Alto Araguaia
 17721	26	BR	\N	\N	Alto Boa Vista
@@ -11230,4 +11375,5 @@
 17844	26	BR	\N	\N	Nortelândia
 17845	26	BR	\N	\N	Nossa Senhora da Guia
+17967	26	BR	\N	\N	Vila Progresso
 17846	26	BR	\N	\N	Nossa Senhora do Livramento
 17847	26	BR	\N	\N	Nova Alvorada
@@ -11351,5 +11497,4 @@
 17965	26	BR	\N	\N	Vila Operária
 17966	26	BR	\N	\N	Vila Paulista
-17967	26	BR	\N	\N	Vila Progresso
 17968	26	BR	\N	\N	Vila Rica
 17969	26	BR	\N	\N	Várzea Grande
@@ -13355,9 +13500,9 @@
 phpgwapi	sessions_timeout	14400
 phpgwapi	sessions_app_timeout	86400
-phpgwapi	ldap_root_pw	LDAP_PWD
+phpgwapi	ldap_root_pw	prognus
 contactcenter	cc_global_source0	ldap
 contactcenter	cc_catalog_name	Catálogo Geral
 contactcenter	cc_ldap_host0	127.0.0.1
-contactcenter	cc_ldap_context0	LDAP_DN
+contactcenter	cc_ldap_context0	dc=prognus,dc=org
 phpgwapi	asyncservice	off
 phpgwapi	cal_expressoMail	1.2
@@ -13380,7 +13525,7 @@
 phpgwapi	acl_default	deny
 phpgwapi	ldap_host	127.0.0.1
-phpgwapi	ldap_context	LDAP_DN
-phpgwapi	ldap_group_context	LDAP_DN
-phpgwapi	ldap_root_dn	cn=admin,LDAP_DN
+phpgwapi	ldap_context	dc=prognus,dc=org
+phpgwapi	ldap_group_context	dc=prognus,dc=org
+phpgwapi	ldap_root_dn	cn=admin,dc=prognus,dc=org
 phpgwapi	ldap_encryption_type	md5
 phpgwapi	ldap_version3	True
@@ -13395,7 +13540,7 @@
 phpgwapi	server_webjabber	127.0.0.1
 phpgwapi	server_ldap_jabber	127.0.0.1
-phpgwapi	context_ldap_jabber	LDAP_DN
-phpgwapi	user_ldap_jabber	cn=admin,LDAP_DN
-phpgwapi	password_ldap_jabber	LDAP_PWD
+phpgwapi	context_ldap_jabber	dc=prognus,dc=org
+phpgwapi	user_ldap_jabber	cn=admin,dc=prognus,dc=org
+phpgwapi	password_ldap_jabber	prognus
 workflow	workflow_database_type	pgsql
 workflow	database_type	pgsql
@@ -13410,7 +13555,7 @@
 jabberit_messenger	use_ssl_jabberit	false
 jabberit_messenger	server_ldap_jabberit	localhost
-jabberit_messenger	context_ldap_jabberit	LDAP_DN
-jabberit_messenger	password_ldap_jabberit	LDAP_PWD
-jabberit_messenger	user_ldap_jabberit	uid=expresso-admin,ou=ORG,LDAP_DN
+jabberit_messenger	context_ldap_jabberit	dc=prognus,dc=org
+jabberit_messenger	password_ldap_jabberit	prognus
+jabberit_messenger	user_ldap_jabberit	uid=expresso-admin,ou=ORG,dc=prognus,dc=org
 phpgwapi	name_jabberit	localhost
 phpgwapi	port_jabberit	5222
@@ -13418,7 +13563,7 @@
 phpgwapi	use_ssl_jabberit	false
 phpgwapi	server_ldap_jabberit	localhost
-phpgwapi	context_ldap_jabberit	LDAP_DN
-phpgwapi	user_ldap_jabberit	uid=expresso-admin,ou=ORG,LDAP_DN
-phpgwapi	password_ldap_jabberit	LDAP_PWD
+phpgwapi	context_ldap_jabberit	dc=prognus,dc=org
+phpgwapi	user_ldap_jabberit	uid=expresso-admin,ou=ORG,dc=prognus,dc=org
+phpgwapi	password_ldap_jabberit	prognus
 contactcenter	cc_ldap_query_automatic	true
 workflow	log_type_file	True
@@ -13443,13 +13588,12 @@
 workflow	workflow_database_user	postgres
 workflow	ldap_host	localhost
-workflow	ldap_user_context	LDAP_DN
-workflow	ldap_group_context	LDAP_DN
+workflow	ldap_user_context	dc=prognus,dc=org
+workflow	ldap_group_context	dc=prognus,dc=org
 workflow	ldap_follow_referrals	False
 workflow	mainframe_environment	D
 workflow	cc_allow_details	false
 expressoMail1_2	expressoMail_limit_labels	20
-phpgwapi	lang_ctimes	a:1:{s:5:"pt-br";a:16:{s:5:"admin";i:1337012420;s:8:"calendar";i:1337012420;s:13:"contactcenter";i:1337012420;s:10:"emailadmin";i:1337012420;s:16:"expressoAdmin1_2";i:1337012420;s:15:"expressoMail1_2";i:1337012420;s:11:"filemanager";i:1337012420;s:4:"help";i:1337012420;s:18:"jabberit_messenger";i:1337012420;s:9:"listAdmin";i:1337012420;s:6:"mobile";i:1337012420;s:10:"news_admin";i:1337012420;s:8:"phpgwapi";i:1337012420;s:11:"preferences";i:1337012420;s:7:"reports";i:1337012420;s:8:"workflow";i:1337012420;}}
 phpgwapi	csspacker	False
-phpgwapi	admin_mails	expresso-admin@DOMAIN
+phpgwapi	admin_mails	expresso-admin@prognus.org
 phpgwapi	cc_allow_details	false
 phpgwapi	defaultCalendar	expressoCalendar
@@ -13472,4 +13616,5 @@
 contactcenter	cc_allow_details	true
 contactcenter	cc_ldap_max_results	100
+phpgwapi	lang_ctimes	a:3:{s:5:"pt-br";a:16:{s:5:"admin";i:1353085831;s:8:"calendar";i:1353085831;s:13:"contactcenter";i:1353085831;s:10:"emailadmin";i:1353085831;s:16:"expressoAdmin1_2";i:1353085830;s:15:"expressoMail1_2";i:1353085831;s:11:"filemanager";i:1353085831;s:4:"help";i:1353085831;s:18:"jabberit_messenger";i:1353085831;s:9:"listAdmin";i:1353085831;s:6:"mobile";i:1353085831;s:10:"news_admin";i:1353085830;s:8:"phpgwapi";i:1353085831;s:11:"preferences";i:1353085831;s:7:"reports";i:1353085831;s:8:"workflow";i:1353085831;}s:2:"en";a:12:{s:5:"admin";i:1353085831;s:8:"calendar";i:1353085831;s:13:"contactcenter";i:1353085831;s:10:"emailadmin";i:1353085831;s:15:"expressoMail1_2";i:1353085831;s:11:"filemanager";i:1353085831;s:4:"help";i:1353085831;s:6:"mobile";i:1353085831;s:10:"news_admin";i:1353085830;s:8:"phpgwapi";i:1353085831;s:11:"preferences";i:1353085831;s:8:"workflow";i:1353085831;}s:5:"es-es";a:14:{s:5:"admin";i:1353085831;s:8:"calendar";i:1353085831;s:13:"contactcenter";i:1353085831;s:10:"emailadmin";i:1353085831;s:16:"expressoAdmin1_2";i:1353085830;s:15:"expressoMail1_2";i:1353085831;s:11:"filemanager";i:1353085831;s:4:"help";i:1353085831;s:9:"listAdmin";i:1353085831;s:6:"mobile";i:1353085831;s:10:"news_admin";i:1353085830;s:8:"phpgwapi";i:1353085831;s:11:"preferences";i:1353085831;s:8:"workflow";i:1353085831;}}
 \.
 
@@ -13480,5 +13625,5 @@
 
 COPY phpgw_emailadmin (profileid, smtpserver, smtptype, smtpport, smtpdelimiter, smtpauth, smtpldapserver, smtpldapbasedn, smtpldapadmindn, smtpldapadminpw, smtpldapusedefault, imapserver, imaptype, imapport, imapdelimiter, imaplogintype, imaptlsauthentication, imaptlsencryption, imapenablecyrusadmin, imapadminusername, imapadminpw, imapenablesieve, imapsieveserver, imapsieveport, description, defaultdomain, organisationname, userdefinedaccounts, imapoldcclient, imapdefaulttrashfolder, imapdefaultsentfolder, imapdefaultdraftsfolder, imapdefaultspamfolder, imapcreatespamfolder, imapcyrususerpostspam) FROM stdin;
-1	127.0.0.1	2	25	\N		127.0.0.1	LDAP_DN	cn=admin,LDAP_DN	LDAP_PWD	yes	127.0.0.1	3	143	/	standard			yes	expresso-admin	LDAP_PWD	yes	127.0.0.1	2000	Expresso	LDAP_PWD.DOMAIN	LDAP_PWD			Trash	Sent	Drafts	Spam	\N	\N
+1	127.0.0.1	2	25	\N		127.0.0.1	dc=prognus,dc=org	cn=admin,dc=prognus,dc=org	prognus	yes	127.0.0.1	3	143	/	standard			yes	expresso-admin	prognus	yes	127.0.0.1	2000	Expresso	prognus.prognus.org	prognus			Trash	Sent	Drafts	Spam	\N	\N
 \.
 
@@ -13489,5 +13634,5 @@
 
 COPY phpgw_expressoadmin (manager_lid, context, acl) FROM stdin;
-expresso-admin	LDAP_DN	34335619063
+expresso-admin	dc=prognus,dc=org	34335619063
 \.
 
@@ -13498,53 +13643,53 @@
 
 COPY phpgw_expressoadmin_acls (manager_lid, context, acl_name) FROM stdin;
-expresso-admin	LDAP_DN	acl_add_users
-expresso-admin	LDAP_DN	acl_add_groups
-expresso-admin	LDAP_DN	acl_add_maillists
-expresso-admin	LDAP_DN	acl_create_sectors
-expresso-admin	LDAP_DN	acl_edit_users
-expresso-admin	LDAP_DN	acl_edit_groups
-expresso-admin	LDAP_DN	acl_edit_maillists
-expresso-admin	LDAP_DN	acl_edit_sectors
-expresso-admin	LDAP_DN	acl_delete_users
-expresso-admin	LDAP_DN	acl_delete_groups
-expresso-admin	LDAP_DN	acl_delete_maillists
-expresso-admin	LDAP_DN	acl_delete_sectors
-expresso-admin	LDAP_DN	acl_rename_users
-expresso-admin	LDAP_DN	acl_edit_email_groups
-expresso-admin	LDAP_DN	acl_edit_scl_email_lists
-expresso-admin	LDAP_DN	acl_manipulate_corporative_information
-expresso-admin	LDAP_DN	acl_view_users
-expresso-admin	LDAP_DN	acl_add_shared_accounts
-expresso-admin	LDAP_DN	acl_add_institutional_accounts
-expresso-admin	LDAP_DN	acl_edit_maximum_number_of_recipients_generally
-expresso-admin	LDAP_DN	acl_edit_users_picture
-expresso-admin	LDAP_DN	acl_edit_shared_accounts
-expresso-admin	LDAP_DN	acl_edit_institutional_accounts
-expresso-admin	LDAP_DN	acl_add_maximum_number_of_recipients_by_user
-expresso-admin	LDAP_DN	acl_edit_users_phonenumber
-expresso-admin	LDAP_DN	acl_delete_shared_accounts
-expresso-admin	LDAP_DN	acl_remove_institutional_accounts
-expresso-admin	LDAP_DN	acl_edit_and_remove_maximum_number_of_recipients_by_user
-expresso-admin	LDAP_DN	acl_change_users_password
-expresso-admin	LDAP_DN	acl_edit_shared_accounts_acl
-expresso-admin	LDAP_DN	acl_add_maximum_number_of_recipients_by_group
-expresso-admin	LDAP_DN	acl_change_users_quote
-expresso-admin	LDAP_DN	acl_edit_shared_accounts_quote
-expresso-admin	LDAP_DN	acl_active_blocking_sending_email_to_shared_accounts
-expresso-admin	LDAP_DN	acl_edit_and_remove_maximum_number_of_recipients_by_group
-expresso-admin	LDAP_DN	acl_set_user_default_password
-expresso-admin	LDAP_DN	acl_empty_shared_accounts_inbox
-expresso-admin	LDAP_DN	acl_add_blocking_sending_email_to_shared_accounts_exception
-expresso-admin	LDAP_DN	acl_empty_user_inbox
-expresso-admin	LDAP_DN	acl_edit_sambausers_attributes
-expresso-admin	LDAP_DN	acl_edit_sambadomains
-expresso-admin	LDAP_DN	acl_add_messages_size_rule
-expresso-admin	LDAP_DN	acl_view_global_sessions
-expresso-admin	LDAP_DN	acl_edit_messages_size_rule
-expresso-admin	LDAP_DN	acl_create_computers
-expresso-admin	LDAP_DN	acl_view_logs
-expresso-admin	LDAP_DN	acl_remove_messages_size_rule
-expresso-admin	LDAP_DN	acl_edit_computers
-expresso-admin	LDAP_DN	acl_delete_computers
+expresso-admin	dc=prognus,dc=org	acl_add_users
+expresso-admin	dc=prognus,dc=org	acl_add_groups
+expresso-admin	dc=prognus,dc=org	acl_add_maillists
+expresso-admin	dc=prognus,dc=org	acl_create_sectors
+expresso-admin	dc=prognus,dc=org	acl_edit_users
+expresso-admin	dc=prognus,dc=org	acl_edit_groups
+expresso-admin	dc=prognus,dc=org	acl_edit_maillists
+expresso-admin	dc=prognus,dc=org	acl_edit_sectors
+expresso-admin	dc=prognus,dc=org	acl_delete_users
+expresso-admin	dc=prognus,dc=org	acl_delete_groups
+expresso-admin	dc=prognus,dc=org	acl_delete_maillists
+expresso-admin	dc=prognus,dc=org	acl_delete_sectors
+expresso-admin	dc=prognus,dc=org	acl_rename_users
+expresso-admin	dc=prognus,dc=org	acl_edit_email_groups
+expresso-admin	dc=prognus,dc=org	acl_edit_scl_email_lists
+expresso-admin	dc=prognus,dc=org	acl_manipulate_corporative_information
+expresso-admin	dc=prognus,dc=org	acl_view_users
+expresso-admin	dc=prognus,dc=org	acl_add_shared_accounts
+expresso-admin	dc=prognus,dc=org	acl_add_institutional_accounts
+expresso-admin	dc=prognus,dc=org	acl_edit_maximum_number_of_recipients_generally
+expresso-admin	dc=prognus,dc=org	acl_edit_users_picture
+expresso-admin	dc=prognus,dc=org	acl_edit_shared_accounts
+expresso-admin	dc=prognus,dc=org	acl_edit_institutional_accounts
+expresso-admin	dc=prognus,dc=org	acl_add_maximum_number_of_recipients_by_user
+expresso-admin	dc=prognus,dc=org	acl_edit_users_phonenumber
+expresso-admin	dc=prognus,dc=org	acl_delete_shared_accounts
+expresso-admin	dc=prognus,dc=org	acl_remove_institutional_accounts
+expresso-admin	dc=prognus,dc=org	acl_edit_and_remove_maximum_number_of_recipients_by_user
+expresso-admin	dc=prognus,dc=org	acl_change_users_password
+expresso-admin	dc=prognus,dc=org	acl_edit_shared_accounts_acl
+expresso-admin	dc=prognus,dc=org	acl_add_maximum_number_of_recipients_by_group
+expresso-admin	dc=prognus,dc=org	acl_change_users_quote
+expresso-admin	dc=prognus,dc=org	acl_edit_shared_accounts_quote
+expresso-admin	dc=prognus,dc=org	acl_active_blocking_sending_email_to_shared_accounts
+expresso-admin	dc=prognus,dc=org	acl_edit_and_remove_maximum_number_of_recipients_by_group
+expresso-admin	dc=prognus,dc=org	acl_set_user_default_password
+expresso-admin	dc=prognus,dc=org	acl_empty_shared_accounts_inbox
+expresso-admin	dc=prognus,dc=org	acl_add_blocking_sending_email_to_shared_accounts_exception
+expresso-admin	dc=prognus,dc=org	acl_empty_user_inbox
+expresso-admin	dc=prognus,dc=org	acl_edit_sambausers_attributes
+expresso-admin	dc=prognus,dc=org	acl_edit_sambadomains
+expresso-admin	dc=prognus,dc=org	acl_add_messages_size_rule
+expresso-admin	dc=prognus,dc=org	acl_view_global_sessions
+expresso-admin	dc=prognus,dc=org	acl_edit_messages_size_rule
+expresso-admin	dc=prognus,dc=org	acl_create_computers
+expresso-admin	dc=prognus,dc=org	acl_view_logs
+expresso-admin	dc=prognus,dc=org	acl_remove_messages_size_rule
+expresso-admin	dc=prognus,dc=org	acl_edit_computers
+expresso-admin	dc=prognus,dc=org	acl_delete_computers
 \.
 
@@ -13555,21 +13700,21 @@
 
 COPY phpgw_expressoadmin_apps (manager_lid, context, app) FROM stdin;
-expresso-admin	LDAP_DN	emailadmin
-expresso-admin	LDAP_DN	admin
-expresso-admin	LDAP_DN	calendar
-expresso-admin	LDAP_DN	help
-expresso-admin	LDAP_DN	news_admin
-expresso-admin	LDAP_DN	contactcenter
-expresso-admin	LDAP_DN	mobile
-expresso-admin	LDAP_DN	expressoAdmin1_2
-expresso-admin	LDAP_DN	expressoMail1_2
-expresso-admin	LDAP_DN	jabberit_messenger
-expresso-admin	LDAP_DN	reports
-expresso-admin	LDAP_DN	expressoCalendar
-expresso-admin	LDAP_DN	filemanager
-expresso-admin	LDAP_DN	listAdmin
-expresso-admin	LDAP_DN	phpgwapi
-expresso-admin	LDAP_DN	preferences
-expresso-admin	LDAP_DN	workflow
+expresso-admin	dc=prognus,dc=org	emailadmin
+expresso-admin	dc=prognus,dc=org	admin
+expresso-admin	dc=prognus,dc=org	calendar
+expresso-admin	dc=prognus,dc=org	help
+expresso-admin	dc=prognus,dc=org	news_admin
+expresso-admin	dc=prognus,dc=org	contactcenter
+expresso-admin	dc=prognus,dc=org	mobile
+expresso-admin	dc=prognus,dc=org	expressoAdmin1_2
+expresso-admin	dc=prognus,dc=org	expressoMail1_2
+expresso-admin	dc=prognus,dc=org	jabberit_messenger
+expresso-admin	dc=prognus,dc=org	reports
+expresso-admin	dc=prognus,dc=org	expressoCalendar
+expresso-admin	dc=prognus,dc=org	filemanager
+expresso-admin	dc=prognus,dc=org	listAdmin
+expresso-admin	dc=prognus,dc=org	phpgwapi
+expresso-admin	dc=prognus,dc=org	preferences
+expresso-admin	dc=prognus,dc=org	workflow
 \.
 
@@ -13637,55 +13782,4 @@
 COPY phpgw_hooks (hook_id, hook_appname, hook_location, hook_filename) FROM stdin;
 112	instant_messenger	admin	hook_admin.inc.php
-567	admin	acl_manager	hook_acl_manager.inc.php
-568	admin	add_def_pref	hook_add_def_pref.inc.php
-569	admin	admin	hook_admin.inc.php
-570	admin	after_navbar	hook_after_navbar.inc.php
-571	admin	config	hook_config.inc.php
-572	admin	deleteaccount	hook_deleteaccount.inc.php
-573	admin	view_user	admin.uiaccounts.edit_view_user_hook
-574	admin	edit_user	admin.uiaccounts.edit_view_user_hook
-575	admin	sidebox_menu	hook_sidebox_menu.inc.php
-576	preferences	deleteaccount	hook_deleteaccount.inc.php
-577	preferences	config	hook_config.inc.php
-578	preferences	manual	hook_manual.inc.php
-579	preferences	preferences	hook_preferences.inc.php
-580	preferences	settings	hook_settings.inc.php
-581	listAdmin	admin	hook_admin.inc.php
-593	workflow	about	hook_about.inc.php
-594	workflow	admin	hook_admin.inc.php
-595	workflow	add_def_pref	hook_add_def_pref.inc.php
-596	workflow	config	hook_config.inc.php
-597	workflow	manual	hook_manual.inc.php
-598	workflow	preferences	hook_preferences.inc.php
-599	workflow	settings	hook_settings.inc.php
-600	workflow	sidebox_menu	hook_sidebox_menu.inc.php
-601	workflow	acl_manager	hook_acl_manager.inc.php
-602	workflow	deleteaccount	hook_deleteaccount.inc.php
-603	workflow	home	hook_home.inc.php
-656	calendar	add_def_prefs	hook_add_def_prefs.inc.php
-657	calendar	admin	hook_admin.inc.php
-658	calendar	deleteaccount	hook_deleteaccount.inc.php
-659	calendar	email	hook_email.inc.php
-660	calendar	home	hook_home.inc.php
-661	calendar	home_day	hook_home_day.inc.php
-662	calendar	home_month	hook_home_month.inc.php
-663	calendar	home_week	hook_home_week.inc.php
-664	calendar	home_year	hook_home_year.inc.php
-665	calendar	manual	hook_manual.inc.php
-666	calendar	preferences	hook_preferences.inc.php
-667	calendar	settings	hook_settings.inc.php
-668	calendar	sidebox_menu	hook_sidebox_menu.inc.php
-681	contactcenter	admin	hook_admin.inc.php
-682	contactcenter	preferences	hook_preferences.inc.php
-683	contactcenter	config_validate	hook_config_validate.inc.php
-684	contactcenter	sidebox_menu	hook_sidebox_menu.inc.php
-686	emailadmin	admin	hook_admin.inc.php
-691	expressoAdmin1_2	admin	hook_admin.inc.php
-744	news_admin	admin	hook_admin.inc.php
-745	news_admin	home	hook_home.inc.php
-746	news_admin	sidebox_menu	hook_sidebox_menu.inc.php
-747	news_admin	settings	hook_settings.inc.php
-748	news_admin	preferences	hook_preferences.inc.php
-749	jabberit_messenger	admin	hook_admin.inc.php
 750	filemanager	add_def_pref	hook_add_def_pref.inc.php
 751	filemanager	admin	hook_admin.inc.php
@@ -13699,5 +13793,58 @@
 772	expressoMail1_2	home	hook_home.inc.php
 773	expressoMail1_2	settings	hook_settings.inc.php
-775	reports	admin	hook_admin.inc.php
+776	admin	acl_manager	hook_acl_manager.inc.php
+777	admin	add_def_pref	hook_add_def_pref.inc.php
+778	admin	admin	hook_admin.inc.php
+779	admin	after_navbar	hook_after_navbar.inc.php
+780	admin	config	hook_config.inc.php
+781	admin	deleteaccount	hook_deleteaccount.inc.php
+782	admin	view_user	admin.uiaccounts.edit_view_user_hook
+783	admin	edit_user	admin.uiaccounts.edit_view_user_hook
+784	admin	sidebox_menu	hook_sidebox_menu.inc.php
+785	preferences	deleteaccount	hook_deleteaccount.inc.php
+786	preferences	config	hook_config.inc.php
+787	preferences	manual	hook_manual.inc.php
+788	preferences	preferences	hook_preferences.inc.php
+789	preferences	settings	hook_settings.inc.php
+793	expressoCalendar	admin	hook_admin.inc.php
+794	listAdmin	admin	hook_admin.inc.php
+821	calendar	add_def_prefs	hook_add_def_prefs.inc.php
+822	calendar	admin	hook_admin.inc.php
+823	calendar	deleteaccount	hook_deleteaccount.inc.php
+824	calendar	email	hook_email.inc.php
+825	calendar	home	hook_home.inc.php
+826	calendar	home_day	hook_home_day.inc.php
+827	calendar	home_month	hook_home_month.inc.php
+828	calendar	home_week	hook_home_week.inc.php
+829	calendar	home_year	hook_home_year.inc.php
+830	calendar	manual	hook_manual.inc.php
+831	calendar	preferences	hook_preferences.inc.php
+832	calendar	settings	hook_settings.inc.php
+833	calendar	sidebox_menu	hook_sidebox_menu.inc.php
+844	contactcenter	admin	hook_admin.inc.php
+845	contactcenter	preferences	hook_preferences.inc.php
+846	contactcenter	config_validate	hook_config_validate.inc.php
+847	contactcenter	sidebox_menu	hook_sidebox_menu.inc.php
+848	contactcenter	settings	hook_settings.inc.php
+851	emailadmin	admin	hook_admin.inc.php
+854	expressoAdmin1_2	admin	hook_admin.inc.php
+855	jabberit_messenger	admin	hook_admin.inc.php
+866	news_admin	admin	hook_admin.inc.php
+867	news_admin	home	hook_home.inc.php
+868	news_admin	sidebox_menu	hook_sidebox_menu.inc.php
+869	news_admin	settings	hook_settings.inc.php
+870	news_admin	preferences	hook_preferences.inc.php
+871	reports	admin	hook_admin.inc.php
+894	workflow	about	hook_about.inc.php
+895	workflow	admin	hook_admin.inc.php
+896	workflow	add_def_pref	hook_add_def_pref.inc.php
+897	workflow	config	hook_config.inc.php
+898	workflow	manual	hook_manual.inc.php
+899	workflow	preferences	hook_preferences.inc.php
+900	workflow	settings	hook_settings.inc.php
+901	workflow	sidebox_menu	hook_sidebox_menu.inc.php
+902	workflow	acl_manager	hook_acl_manager.inc.php
+903	workflow	deleteaccount	hook_deleteaccount.inc.php
+904	workflow	home	hook_home.inc.php
 \.
 
@@ -13717,359 +13864,4 @@
 
 COPY phpgw_lang (lang, app_name, message_id, content) FROM stdin;
-pt-br	common	nepal	NEPAL
-pt-br	common	netherlands antilles	ANTILHAS HOLANDESAS
-pt-br	common	netherlands	HOLANDA
-pt-br	common	never	Nunca
-pt-br	common	new caledonia	NOVA CALEDONIA
-pt-br	common	new entry added sucessfully	Entrada adicionada com sucesso
-pt-br	common	new main category	Nova categoria principal
-pt-br	common	new phrase has been added	se ha agregado la nueva frase
-pt-br	common	new value	Novo Valor
-pt-br	common	new zealand	NOVA ZELÂNDIA
-pt-br	common	next	Próximo
-pt-br	common	next page	Próxima página
-pt-br	common	nicaragua	NICARAGUA
-pt-br	common	niger	NIGER
-pt-br	common	nigeria	NIGERIA
-pt-br	common	niue	NIUE
-pt-br	common	no	Não
-pt-br	common	no entries found, try again ...	Nenhum registro encontrado, tente novamente...
-pt-br	common	no history for this record	Nenhum histórico para este registro
-pt-br	common	none	Nenhum
-pt-br	common	norfolk island	ILHAS NORFOLK
-pt-br	common	normal	Normal
-pt-br	common	northern mariana islands	NORTHERN MARIANA ISLANDS
-pt-br	common	norway	NORUEGA
-pt-br	common	no subject	Sem assunto
-pt-br	common	not assigned	Não atribuído
-pt-br	common	notices	Avisos
-pt-br	common	note	Nota
-pt-br	common	notes	Notas
-pt-br	common	notify window	Janela de notificação
-pt-br	common	november	Novembro
-pt-br	common	october	Outubro
-pt-br	common	ok	OK
-pt-br	common	old value	Valor antigo
-pt-br	common	oman	OMÃ
-pt-br	common	only private	Apenas particular
-pt-br	common	only yours	somente as suas
-pt-br	common	on mouse over	Passar o mouse
-pt-br	common	on *nix systems please type: %1	Sobre sistemas *nix tipo: %1
-pt-br	common	open notify window	Abrir janela de notificação
-pt-br	common	open popup window	Abrir janela
-pt-br	common	organization	Organização
-pt-br	common	original	Original
-pt-br	common	other	Outro
-pt-br	common	overview	Visão geral
-pt-br	common	owner	Dono
-pt-br	common	page	Página
-pt-br	common	page was generated in %1 seconds	Página gerada em %1 segundos
-pt-br	common	pakistan	PAQUISTÃO
-pt-br	common	palau	PALAU
-pt-br	common	palestinian territory, occupied	PALESTINA
-pt-br	common	panama	PANAMÁ
-pt-br	common	papua new guinea	PAPUA NOVA GUINÉ
-pt-br	common	paraguay	PARAGUAI
-pt-br	common	parcel	Parcela
-pt-br	common	parent category	Categoria pai
-pt-br	common	password	Senha
-pt-br	common	password could not be changed	Senha não pode ser alterada
-pt-br	common	password has been updated	Senha foi alterada
-pt-br	common	path to user and group files has to be outside of the webservers document-root!!!	O caminho para usuários e grupos deve ser FORA do servidor da extranet.!!!
-pt-br	common	pattern for search in addressbook	Teste padrão para a Busca no Catálogo de Endereços
-pt-br	common	pattern for search in calendar	Teste padrão para a Busca no Calendário
-pt-br	common	pattern for search in projects	Teste padrão para a Busca nos Projetos
-pt-br	common	pause	Pausar
-pt-br	common	permissions to the files/users directory	Permissões do diretório para os arquivos/usuários
-pt-br	common	personal	Pessoal
-pt-br	common	peru	PERU
-pt-br	common	philippines	FILIPINAS
-pt-br	common	phone number	Número de Telefone
-pt-br	common	phpinfo	PhpInfo
-pt-br	common	phpwebhostin	Gerenciamento avançado de arquivos
-pt-br	common	pitcairn	PITCAIRN
-pt-br	common	please %1 by hand	%1 pela mão
-pt-br	common	please enter a name	Por favor digite um nome !
-pt-br	workflow	created	Criado
-pt-br	common	year	Ano
-pt-br	common	yemen	YEMEN
-pt-br	common	yes	Sim
-pt-br	calendar	rule	Regra
-pt-br	calendar	sa	Sa
-pt-br	calendar	sat	Sab
-pt-br	workflow	date:	data:
-en	common	friday	Friday
-en	common	ftp	FTP
-en	common	fullname	Fullname
-en	common	gabon	GABON
-en	common	gambia	GAMBIA
-en	common	general menu	General Menu
-en	common	georgia	GEORGIA
-en	common	germany	GERMANY
-en	common	ghana	GHANA
-en	common	gibraltar	GIBRALTAR
-en	common	global	Global
-en	common	global public	Global Public
-en	common	grant access	Grant Access
-en	common	greece	GREECE
-en	common	greenland	GREENLAND
-en	common	grenada	GRENADA
-en	common	group	Group
-en	common	group access	Group Access
-en	common	group name	group name
-en	common	group public	Group Public
-en	common	groups	Groups
-en	common	groups with permission for %1	Groups with permission for %1
-en	common	groups without permission for %1	Groups without permission for %1
-en	common	guadeloupe	GUADELOUPE
-en	common	guam	GUAM
-en	common	guatemala	GUATEMALA
-en	common	guinea	GUINEA
-en	common	guinea-bissau	GUINEA-BISSAU
-en	common	guyana	GUYANA
-en	common	haiti	HAITI
-en	common	heard island and mcdonald islands	HEARD ISLAND AND MCDONALD ISLANDS
-en	common	help	Help
-en	common	high	High
-en	common	highest	Highest
-en	common	holy see (vatican city state)	HOLY SEE (VATICAN CITY STATE)
-en	common	home	Home
-en	common	home email	home email
-en	common	honduras	HONDURAS
-en	common	hong kong	HONG KONG
-en	common	how many icons should be shown in the navbar (top of the page). additional icons go into a kind of pulldown menu, callable by the icon on the far right side of the navbar.	How many icons should be shown in the navbar (top of the page). Additional icons go into a kind of pulldown menu, callable by the icon on the far right side of the navbar.
-en	common	hungary	HUNGARY
-en	common	iceland	ICELAND
-en	common	india	INDIA
-en	common	indonesia	INDONESIA
-en	common	insert all %1 addresses of the %2 contacts in %3	Insert all %1 addresses of the %2 contacts in %3
-en	common	international	International
-en	common	invalid code	Invalid code
-en	common	invalid ip address	Invalid IP address
-en	common	invalid password	Invalid password
-en	common	iran, islamic republic of	IRAN, ISLAMIC REPUBLIC OF
-en	common	iraq	IRAQ
-en	common	ireland	IRELAND
-en	common	israel	ISRAEL
-en	common	it has been more then %1 days since you changed your password	It has been more then %1 days since you changed your password
-en	common	it is recommended that you run setup to upgrade your tables to the current version	It is recommended that you run setup to upgrade your tables to the current version.
-en	common	italic	Italic
-en	common	italy	ITALY
-en	common	jamaica	JAMAICA
-en	common	january	January
-en	common	japan	JAPAN
-en	common	jordan	JORDAN
-en	common	july	July
-en	common	jun	Jun
-en	common	june	June
-en	common	justify center	Justify Center
-en	common	justify full	Justify Full
-en	common	justify left	Justify Left
-en	common	justify right	Justify Right
-en	common	kazakstan	KAZAKSTAN
-en	common	kenya	KENYA
-en	common	keywords	Keywords
-en	common	kiribati	KIRIBATI
-en	common	korea, democratic peoples republic of	KOREA, DEMOCRATIC PEOPLES REPUBLIC OF
-en	common	korea, republic of	KOREA, REPUBLIC OF
-en	common	kuwait	KUWAIT
-en	common	kyrgyzstan	KYRGYZSTAN
-en	common	language	Language
-en	common	lao peoples democratic republic	LAO PEOPLES DEMOCRATIC REPUBLIC
-en	common	last name	Last name
-en	common	last name of the user, eg. "%1"	last name of the user, eg. "%1"
-en	common	last page	Last page
-en	common	lastname	Lastname
-en	common	latvia	LATVIA
-en	common	lebanon	LEBANON
-en	common	lesotho	LESOTHO
-en	common	liberia	LIBERIA
-en	common	libyan arab jamahiriya	LIBYAN ARAB JAMAHIRIYA
-en	common	license	License
-en	common	liechtenstein	LIECHTENSTEIN
-en	common	list	List
-en	common	list members	List members
-en	common	lithuania	LITHUANIA
-en	common	local	Local
-en	common	login	Login
-en	common	loginid	LoginID
-en	common	logout	Logout
-en	common	low	Low
-en	common	lowest	Lowest
-en	common	luxembourg	LUXEMBOURG
-en	common	macau	MACAU
-en	common	macedonia, the former yugoslav republic of	MACEDONIA, THE FORMER YUGOSLAV REPUBLIC OF
-en	common	madagascar	MADAGASCAR
-en	common	mail domain, eg. "%1"	mail domain, eg. "%1"
-en	common	main category	Main category
-en	common	main screen	Main screen
-en	common	maintainer	Maintainer
-en	common	malawi	MALAWI
-en	common	malaysia	MALAYSIA
-en	common	maldives	MALDIVES
-en	common	mali	MALI
-en	common	malta	MALTA
-en	common	march	March
-en	common	marshall islands	MARSHALL ISLANDS
-en	common	martinique	MARTINIQUE
-en	common	mauritania	MAURITANIA
-en	common	mauritius	MAURITIUS
-en	common	max number of icons in navbar	Max number of icons in navbar
-en	common	may	May
-en	common	mayotte	MAYOTTE
-en	common	medium	Medium
-en	common	menu	Menu
-en	common	message	Message
-en	common	mexico	MEXICO
-en	common	micronesia, federated states of	MICRONESIA, FEDERATED STATES OF
-en	common	moldova, republic of	MOLDOVA, REPUBLIC OF
-en	common	monaco	MONACO
-en	common	monday	Monday
-en	common	mongolia	MONGOLIA
-en	common	montserrat	MONTSERRAT
-en	common	morocco	MOROCCO
-en	common	mozambique	MOZAMBIQUE
-en	common	myanmar	MYANMAR
-en	common	my preferences	My Preferences
-en	common	name	Name
-en	common	name of the user, eg. "%1"	name of the user, eg. "%1"
-en	common	namibia	NAMIBIA
-en	common	nauru	NAURU
-en	common	nepal	NEPAL
-en	common	netherlands	NETHERLANDS
-en	common	netherlands antilles	NETHERLANDS ANTILLES
-en	common	never	Never
-en	common	new caledonia	NEW CALEDONIA
-en	common	new entry added sucessfully	New entry added sucessfully
-en	common	new main category	New main category
-en	common	new value	New Value
-en	common	new zealand	NEW ZEALAND
-en	common	next	Next
-en	common	next page	Next page
-en	common	nicaragua	NICARAGUA
-en	common	niger	NIGER
-en	common	nigeria	NIGERIA
-en	common	niue	NIUE
-en	common	no	No
-en	common	no entries found, try again ...	no entries found, try again ...
-en	common	no history for this record	No history for this record
-en	common	no subject	No Subject
-en	common	none	None
-en	common	norfolk island	NORFOLK ISLAND
-en	common	normal	Normal
-en	common	northern mariana islands	NORTHERN MARIANA ISLANDS
-en	common	norway	NORWAY
-en	common	not assigned	not assigned
-en	common	note	Note
-en	common	notes	Notes
-en	common	notify window	Notify Window
-en	common	november	November
-en	common	october	October
-en	common	ok	OK
-en	common	old value	Old Value
-en	common	oman	OMAN
-en	common	on *nix systems please type: %1	On *nix systems please type: %1
-en	common	on mouse over	On Mouse Over
-en	common	only private	only private
-en	common	only yours	only yours
-en	common	open notify window	Open notify window
-en	common	open popup window	Open popup window
-en	common	original	Original
-en	common	other	Other
-en	common	overview	Overview
-en	common	owner	Owner
-en	common	page	Page
-en	common	page was generated in %1 seconds	Page was generated in %1 seconds
-en	common	pakistan	PAKISTAN
-en	common	palau	PALAU
-en	common	showing %1 - %2 of %3	showing %1 - %2 of %3
-en	calendar	inform	Inform
-en	calendar	interval	Interval
-en	calendar	intervals in day view	Intervals in day view
-en	calendar	intervals per day in planner view	Intervals per day in planner view
-en	calendar	invalid entry id.	Invalid entry id.
-en	calendar	last	last
-en	calendar	lastname of person to notify	Lastname of person to notify
-en	calendar	length shown<br>(emtpy for full length)	Length shown<br>(emtpy for full length)
-en	calendar	length<br>(<= 255)	Length<br>(<= 255)
-en	calendar	link	Link
-en	calendar	link to view the event	Link to view the event
-en	calendar	list all categories.	List all categories.
-en	calendar	load [iv]cal	Load [iv]Cal
-en	calendar	location	Location
-en	calendar	make freebusy information availible to not loged in persons?	Make freebusy information availible to not loged in persons?
-en	calendar	matrixview	Matrix View
-en	calendar	minutes	minutes
-en	calendar	mo	M
-en	calendar	modified	Modified
-en	calendar	modify list of external participants	Modify List of External Participants
-en	calendar	mon	Mon
-en	calendar	month	Month
-en	calendar	monthly	Monthly
-en	calendar	monthly (by date)	Monthly (by date)
-en	calendar	monthly (by day)	Monthly (by day)
-en	calendar	monthview	Month View
-en	calendar	new entry	New Entry
-en	calendar	new name must not exist and not be empty!!!	New name must not exist and not be empty!!!
-en	calendar	no matches found	No matches found
-en	calendar	no response	No Response
-en	calendar	notification messages for added events	Notification messages for added events
-en	calendar	notification messages for canceled events	Notification messages for canceled events
-en	calendar	notification messages for modified events	Notification messages for modified events
-en	calendar	notification messages for your alarms	Notification messages for your alarms
-en	calendar	notification messages for your responses	Notification messages for your responses
-en	calendar	number of intervals per day in planner view	Number of Intervals per Day in Planner View
-en	calendar	number of months	Number of months
-en	calendar	number of records to read (%1)	Number of records to read (%1)
-en	calendar	observance rule	Observance Rule
-en	calendar	occurence	Occurence
-en	calendar	old startdate	Old Startdate
-en	calendar	olddate	OldDate
-en	calendar	on %1 %2 %3 your meeting request for %4	On %1 %2 %3 your meeting request for %4
-en	calendar	on all changes	on all changes
-en	calendar	on all modification, but responses	on all modification, but responses
-en	calendar	on any time change too	on any time change too
-en	calendar	on invitation / cancelation only	on invitation / cancelation only
-en	calendar	on participant responses too	on participant responses too
-en	calendar	on time change of more than 4 hours too	on time change of more than 4 hours too
-en	calendar	open todo's:	Open To Do Items:
-en	calendar	order	Order
-en	calendar	overlap holiday	overlap holiday
-en	calendar	participant	Participant
-en	calendar	participants	Participants
-en	calendar	participates	Participates
-en	calendar	password for not loged in users to your freebusy information?	Password for not loged in users to your freebusy information?
-en	calendar	people holiday	people holiday
-en	calendar	permission denied	Permission denied
-en	calendar	planner	Planner
-en	calendar	planner by category	Planner by category
-en	calendar	planner by user	Planner by user
-en	calendar	please confirm,accept,reject or examine changes in the corresponding entry in your calendar	Please confirm, accept, reject or examine changes in the corresponding entry in your calendar
-en	calendar	preselected group for entering the planner	Preselected group for entering the planner
-en	calendar	print calendars in black & white	Print calendars in black & white
-en	calendar	print the mini calendars	Print the mini calendars
-en	calendar	printer friendly	Printer Friendly
-en	calendar	privat	Privat
-en	calendar	private and global public	Private and Global Public
-en	calendar	private and group public	Private and Group Public
-en	calendar	private only	Private Only
-en	calendar	re-edit event	Re-Edit Event
-en	calendar	read a list of entries.	Read a list of entries.
-en	calendar	read a single entry by passing the id and fieldlist.	Read a single entry by passing the id and fieldlist.
-en	calendar	read this list of methods.	Read this list of methods.
-en	calendar	receive email updates	Receive email updates
-en	calendar	receive extra information in event mails	Receive extra information in event mails
-en	calendar	receive summary of appointments	Receive summary of appointments
-en	calendar	recurring event	recurring event
-en	calendar	refresh	Refresh
-en	calendar	reinstate	Reinstate
-en	calendar	rejected	Rejected
-en	expressoMail1_2	big	Big
-en	expressoMail1_2	bold	Bold
-en	expressoMail1_2	to:	To: 
-en	expressoMail1_2	to	TO
-en	expressoMail1_2	tools	Tools
-en	expressoMail1_2	trash	Trash
-pt-br	admin	add a new account.	Adicionar uma conta. nova
 pt-br	admin	%1 - %2 of %3 user accounts	%1 - %2 de %3 contas de usuários
 pt-br	admin	%1 - %2 of %3 user groups	%1 - %2 de %3 grupos de usuários
@@ -14089,5 +13881,5 @@
 pt-br	admin	add a group	adicionar um grupo
 pt-br	admin	add multiple categories?	Tem certeza que deseja adicionar múltiplas categorias?
-pt-br	admin	80 (http)	80 (http)
+pt-br	admin	add a new account.	Adicionar uma conta. nova
 pt-br	admin	add application	Adicionar um aplicativo
 pt-br	admin	add a subcategory	adicionar uma subcategoria
@@ -14191,4 +13983,5 @@
 pt-br	admin	default user password	Senha padrão do usuário
 pt-br	admin	default user quota	Cota padrão do usuário
+pt-br	admin	default shared account quota	Cota padrão para contas compartilhadas
 pt-br	admin	deinstall crontab	Desinstalar crontab
 pt-br	admin	delete account	Apagar conta
@@ -14239,5 +14032,4 @@
 pt-br	admin	edit main screen message	Editar mensagem da tela inicial
 pt-br	admin	edit login help message	Editar Ajuda do Login
-en	htmlarea	path	Path
 pt-br	admin	edit peer server	Editar servidor Parceiro
 pt-br	admin	edit table format	Editar formato de tabela
@@ -14304,5 +14096,4 @@
 pt-br	admin	hide php information	Esconder informações de PHP
 pt-br	admin	home directory	Diretório de instalação
-en	workflow	monitors	Monitors
 pt-br	admin	host information	Informações do servidor
 pt-br	admin	hour<br>(0-23)	Hora<br>(0-23)
@@ -14510,5 +14301,5 @@
 pt-br	admin	use organization prefix on account creation	Usar prefixo de organização nas criações de contas
 pt-br	admin	let it blank to generate the logon script with user login	Deixe em branco para gerar o script de logon com o login do usuário
-pt-br	admin	this server uses sending control list by ppolicy	Este servidor utiliza "Sending Control List by Ppolicy"
+pt-br	admin	this server uses sending control list by policy	Este servidor utiliza Sending Control List by Policy
 pt-br	admin	use pure html compliant code (not fully working yet)	Usar código HTML puro (não funciona totalmente ainda)
 pt-br	admin	user accounts	Contas de usuários
@@ -14590,5 +14381,4 @@
 pt-br	admin	certificate added to	Adicionado certificado para
 pt-br	admin	file updated and save	Arquivo atualizado e salvo
-pt-br	common	account has been created	A conta foi criada
 pt-br	admin	failure on save file (cd04). the requested operation is not concluded	Falhou ao salvar arquivo (CD04). Nao foi concluida a operacao solicitada'
 pt-br	admin	failure on save file (cd03). the requested operation is not concluded	Falhou ao salvar arquivo (CD03). Nao foi concluida a operacao solicitada
@@ -14622,4 +14412,7 @@
 pt-br	admin	there are users with an quantity greater than of markers. respect the minimum number indicated.	Existem usuários com uma quantidade superior de marcadores. Respeito o número mínimo indicado.
 pt-br	admin	minimum number of labels allowed	Número mínimo de marcadores permitido
+pt-br	admin	identifier of the recipient of a message	Identificador do destinatário de uma mensagem
+pt-br	admin	ldap attribute used to replacement	Atributo LDAP utilizado para substituição
+pt-br	admin	none	Nenhum
 pt-br	admin	all levels	Todos os níveis
 pt-br	admin	all levels with not recursive search	Todos os níveis, busca no mesmo nível
@@ -14660,4 +14453,5 @@
 pt-br	admin	00 (disable)	00 (desabilitado)
 pt-br	admin	13 (ntp)	13 (ntp)
+pt-br	admin	80 (http)	80 (http)
 pt-br	admin	datetime port.<br>if using port 13, please set firewall rules appropriately before submitting this page.<br>(port: 13 / host: 129.6.15.28)	Porta da Data e hora.<br>Quando usar a porta 13, por favor configure os filtros do firewall antes de submeter as alterações.<br>(Porta: 13 / Host: 129.6.15.28)
 pt-br	admin	a please wait message is shown when loading the activity form usefull for long tasks	uma mensagem por favor aguarde será mostrada quando o formulário da atividade for carregado. Útil para tarefas de londa duração
@@ -14709,9 +14503,13 @@
 pt-br	admin	follow referrals	Seguir as referências
 pt-br	admin	the activities will be executed using secure connection	As atividades serão executadas utilizando conexão segura
+en	common	loginid	LoginID
+en	common	logout	Logout
+en	common	low	Low
 pt-br	admin	use secure connection	utilizar conexão segura
-pt-br	common	done	Pronto
+pt-br	common	account has been created	A conta foi criada
 pt-br	common	account has been deleted	A conta foi removida
 pt-br	common	account has been updated	A conta foi atualizada
 pt-br	common	acl rights	Permissões de Acesso
+pt-br	expressoMail1_2	serial number	Numero de serie
 pt-br	common	are you sure you want to delete this category ?	Você tem certeza que deseja apagar esta categoria?
 pt-br	common	block/unblock hosts	Bloq/Desbloquear hosts
@@ -14802,4 +14600,5 @@
 pt-br	common	auditing	Auditoria
 pt-br	common	choice attribute	Escolha o Atributo
+pt-br	expressoMail1_2	the folder was not deleted!	A pasta não foi removida!
 pt-br	common	configuration of authentication attribute by organization (ou)	Configurar o atributo de autenticação por Organização (OU)
 pt-br	common	content	Conteúdo
@@ -14900,4 +14699,5 @@
 pt-br	common	bouvet island	ILHA BOUVET
 pt-br	common	brazil	BRASIL
+en	common	lowest	Lowest
 pt-br	common	british indian ocean territory	TERRITÓRIO INGLÊS INDIANO
 pt-br	common	brunei darussalam	BRUNEI DARUSSALAM
@@ -14977,4 +14777,5 @@
 pt-br	common	dominica	DOMINICA
 pt-br	common	dominican republic	REPÚBLICA DOMINICANA
+pt-br	common	done	Pronto
 pt-br	common	do you also want to delete all subcategories ?	Deseja remover também todas subcategorias ?
 pt-br	common	east timor	TIMOR LESTE
@@ -14996,4 +14797,5 @@
 pt-br	common	end date	Data do término
 pt-br	common	end time	Hora do término
+en	common	luxembourg	LUXEMBOURG
 pt-br	common	entry has been deleted sucessfully	Entrada removida com sucesso
 pt-br	common	entry updated sucessfully	Entrada atualizada com sucesso
@@ -15072,5 +14874,4 @@
 pt-br	common	high	Alto
 pt-br	common	highest	Mais alto
-pt-br	common	nauru	NAURU
 pt-br	common	holy see (vatican city state)	VATICANO
 pt-br	common	home	Página Inicial
@@ -15096,4 +14897,5 @@
 pt-br	common	italy	ITÁLIA
 pt-br	common	it has been more then %1 days since you changed your password	Já passaram mais de %1 dias desde que você mudou sua senha
+en	common	macau	MACAU
 pt-br	common	it is recommended that you run setup to upgrade your tables to the current version	É recomendado que seja executada a Configuração para atualizar as tabelas para a versão atual.
 pt-br	common	jamaica	JAMAICA
@@ -15173,4 +14975,79 @@
 pt-br	common	name of the user, eg. "%1"	Nome do usuário, ex. "%1"
 pt-br	common	namibia	NAMIBIA
+pt-br	common	nauru	NAURU
+pt-br	common	nepal	NEPAL
+pt-br	common	netherlands antilles	ANTILHAS HOLANDESAS
+pt-br	common	netherlands	HOLANDA
+pt-br	common	never	Nunca
+pt-br	common	new caledonia	NOVA CALEDONIA
+pt-br	common	new entry added sucessfully	Entrada adicionada com sucesso
+pt-br	common	new main category	Nova categoria principal
+pt-br	common	new phrase has been added	se ha agregado la nueva frase
+pt-br	common	new value	Novo Valor
+pt-br	common	new zealand	NOVA ZELÂNDIA
+pt-br	common	next	Próximo
+pt-br	common	next page	Próxima página
+pt-br	common	nicaragua	NICARAGUA
+pt-br	common	niger	NIGER
+pt-br	common	nigeria	NIGERIA
+pt-br	common	niue	NIUE
+pt-br	common	no	Não
+pt-br	common	no entries found, try again ...	Nenhum registro encontrado, tente novamente...
+pt-br	common	no history for this record	Nenhum histórico para este registro
+pt-br	common	none	Nenhum
+pt-br	common	norfolk island	ILHAS NORFOLK
+pt-br	common	normal	Normal
+pt-br	common	northern mariana islands	NORTHERN MARIANA ISLANDS
+pt-br	common	norway	NORUEGA
+pt-br	common	no subject	Sem assunto
+pt-br	common	not assigned	Não atribuído
+pt-br	common	notices	Avisos
+pt-br	common	note	Nota
+pt-br	common	notes	Notas
+pt-br	common	notify window	Janela de notificação
+pt-br	common	november	Novembro
+pt-br	common	october	Outubro
+pt-br	common	ok	OK
+pt-br	common	old value	Valor antigo
+pt-br	common	oman	OMÃ
+pt-br	common	only private	Apenas particular
+pt-br	common	only yours	somente as suas
+pt-br	common	on mouse over	Passar o mouse
+pt-br	common	on *nix systems please type: %1	Sobre sistemas *nix tipo: %1
+pt-br	common	open notify window	Abrir janela de notificação
+pt-br	common	open popup window	Abrir janela
+pt-br	common	organization	Organização
+pt-br	common	original	Original
+pt-br	common	other	Outro
+pt-br	common	overview	Visão geral
+pt-br	common	owner	Dono
+pt-br	common	page	Página
+pt-br	common	page was generated in %1 seconds	Página gerada em %1 segundos
+pt-br	common	pakistan	PAQUISTÃO
+pt-br	common	palau	PALAU
+pt-br	common	palestinian territory, occupied	PALESTINA
+pt-br	common	panama	PANAMÁ
+pt-br	common	papua new guinea	PAPUA NOVA GUINÉ
+pt-br	common	paraguay	PARAGUAI
+pt-br	common	parcel	Parcela
+pt-br	common	parent category	Categoria pai
+pt-br	common	password	Senha
+pt-br	common	password could not be changed	Senha não pode ser alterada
+pt-br	common	password has been updated	Senha foi alterada
+pt-br	common	path to user and group files has to be outside of the webservers document-root!!!	O caminho para usuários e grupos deve ser FORA do servidor da extranet.!!!
+pt-br	common	pattern for search in addressbook	Teste padrão para a Busca no Catálogo de Endereços
+pt-br	common	pattern for search in calendar	Teste padrão para a Busca no Calendário
+pt-br	common	pattern for search in projects	Teste padrão para a Busca nos Projetos
+pt-br	common	pause	Pausar
+pt-br	common	permissions to the files/users directory	Permissões do diretório para os arquivos/usuários
+pt-br	common	personal	Pessoal
+pt-br	common	peru	PERU
+pt-br	common	philippines	FILIPINAS
+pt-br	common	phone number	Número de Telefone
+pt-br	common	phpinfo	PhpInfo
+pt-br	common	phpwebhostin	Gerenciamento avançado de arquivos
+pt-br	common	pitcairn	PITCAIRN
+pt-br	common	please %1 by hand	%1 pela mão
+pt-br	common	please enter a name	Por favor digite um nome !
 pt-br	common	please run setup to become current	Por favor execute a configuração para atualizar o sistema
 pt-br	common	please select	Por favor selecione
@@ -15261,5 +15138,4 @@
 pt-br	common	somalia	SOMALIA
 pt-br	common	sorry, there was a problem proccesing your request.	Desculpe, Houve um problema ao processar seu pedido.
-es-es	common	charset	iso-8859-1
 pt-br	common	south africa	ÁFRICA DO SUL
 pt-br	common	south georgia and the south sandwich islands	SOUTH GEORGIA AND THE SOUTH SANDWICH ISLANDS
@@ -15355,4 +15231,7 @@
 pt-br	common	work email	Endereço de e-mail comercial
 pt-br	common	written by:	Escrito por:
+pt-br	common	year	Ano
+pt-br	common	yemen	YEMEN
+pt-br	common	yes	Sim
 pt-br	common	you are required to change your password during your first login	Você foi solicitado a alterar a sua senha na primeira sessão.
 pt-br	common	you are running a newer version of phpgroupware than your database is setup for	A sua base de dados está configurada para uma versão mais antiga do aplicativo.
@@ -15401,4 +15280,5 @@
 pt-br	common	/workflow directory does not exist and could not be created, please ask adminstrator to check the global configuration	O diretório /workflow não existe e não pode ser criado, por favor solicite ao administrador para verificar a configuração global
 pt-br	common	actions right options	Opções de Direitos para Ações
+en	common	time zone	Timezone
 pt-br	common	auto-release on leaving activity	Liberação automática ao sair da atividade
 pt-br	common	base directory does not exist, please ask adminstrator to check the global configuration	Diretório base não existe, por favor solicite ao administrador para verificar a configuração global
@@ -15421,5 +15301,4 @@
 pt-br	common	running activities options	Opções para atividades em execução
 pt-br	common	show activity info zone	mostrar zona de informações das atividades
-es-es	common	june	Junio
 pt-br	common	show activity title	mostrar título das atividades
 pt-br	common	show instance name	Mostrar nome da instância
@@ -15486,4 +15365,5 @@
 pt-br	calendar	add or update a single entry by passing the fields.	Adicione ou atualize um evento único preenchendo os campos.
 pt-br	calendar	add participants	Adicionar Participantes
+en	calendar	planner	Planner
 pt-br	calendar	address book	Catálogo de endereços
 pt-br	calendar	add to my expresso	Adicionar ao meu Expresso
@@ -15553,5 +15433,16 @@
 pt-br	calendar	displays your default calendar view on the startpage (page you get when you enter egroupware or click on the homepage icon)?	Indica a visão do calendário na sua página inicial. (será exibida quando você clicar sobre o ícone de Página Inicial)
 pt-br	calendar	download	Baixar
+pt-br	expressoMail1_2	the import was executed successfully.	A importação foi executada com sucesso.
+pt-br	expressoMail1_2	contains the phrase	contém a frase
+pt-br	expressoMail1_2	the list has no participant.	Essa lista não possui nenhum participante.
+en	expressoMail1_2	message	message
+pt-br	expressoMail1_2	the message has attachment	A mensagem contém anexos
+pt-br	expressoMail1_2	the messages were deleted.	Mensagens removidas.
+pt-br	expressoMail1_2	the messages were moved to folder	Mensagens movidas para pasta 
 pt-br	calendar	do you want to be notified about new or changed appointments? you be notified about changes you make yourself.<br>you can limit the notifications to certain changes only. each item includes all the notification listed above it. al	Deseja ser notificado sobre compromissos novos ou modificados? Você será notificado sobre as mudanças efetuadas por você mesmo.<br> Você pode limitar essa notificções a certas mudanças apenas. Cada item inclui as notificações listadas sobre o mesmo. Todas as modificções incluem mudança de título, descrição, participantes (menos suas respostas). Se o dono de um evento requisitar qualquer notificação, sempre receberá as respostas dos participantes como aceite ou cancelamentos.
+pt-br	expressoMail1_2	the message was deleted.	Mensagem removida.
+pt-br	expressoMail1_2	the message was moved to %1 folder.	Mensagem movida para pasta %1.
+pt-br	expressoMail1_2	the message was moved to folder	Mensagem movida para a pasta 
+pt-br	expressoMail1_2	the origin folder and the destination folder are the same.	A pasta de origem e de destino são as mesmas.
 pt-br	calendar	do you want to receive a regulary summary of your appointsments via email?<br>the summary is sent to your standard email-address on the morning of that day or on monday for weekly summarys.<br>it is only sent when you have any app	Deseja receber regularmente um resumo de seus compromissos via correio eletrônico?<br>O sumário será enviado para seu endereço eletrônico padrão na manhã de cada dia ou na Segunda-feira para resumos semanais (somente se houverem eventos na semana).<br>
 pt-br	calendar	duration	Duração
@@ -15707,4 +15598,5 @@
 pt-br	calendar	recurring event	evento recorrente
 pt-br	calendar	recurrent appointments must have a final date	Agendamentos recorrentes precisam de data final da repeticao
+pt-br	expressoMail1_2	the preference "%1" isn't enabled.	A preferência "%1" não foi habilitada.
 pt-br	calendar	recurrent appointments with alarms must have a final date	Agendamentos recorrentes com alarme definido precisam de data final da repeticao
 pt-br	calendar	re-edit event	Re-Editar evento
@@ -15722,4 +15614,7 @@
 pt-br	calendar	reset	Limpar
 pt-br	calendar	restrict	Restrito
+pt-br	calendar	rule	Regra
+pt-br	calendar	sa	Sa
+pt-br	calendar	sat	Sab
 pt-br	calendar	scheduling conflict	Conflito de agendamento
 pt-br	calendar	search for	Buscar por
@@ -15775,5 +15670,4 @@
 pt-br	calendar	this defines the start of your dayview. events before this time, are shown above the dayview.<br>this time is also used as a default starttime for new events.	Isso define o primeiro horário da visão diária. Eventos antes desse horário são mostrados acima do dia.<br>Esse horário também será o horário inicial para novos eventos.
 pt-br	calendar	this group that is preselected when you enter the planner. you can change it in the planner anytime you want.	Esse grupo é pré-selecionado ao entrar no organizador. Você poderá modificá-lo a qualquer tempo.
-pt-br	calendar	you have not entered a title	Você não colocou o título
 pt-br	calendar	this is an external event. even if it added to your expresso its can be changed any time at all	Este é um evento externo. Mesmo que adicionado ao seu Expresso corre o risco de mudança a qualquer momento.
 pt-br	calendar	this is mostly caused by a not or wrongly configured smtp server. notify your administrator.	Esse erro é comumente causado por um servidor SMTP mal configurado. Notifique seu administrador.
@@ -15831,4 +15725,5 @@
 pt-br	calendar	you can either set a year or a occurence, not both !!!	Você pode especificar uma ocorrência única no ano ou recorrente, não ambos !!!
 pt-br	calendar	you can only set a year or a occurence !!!	Você pode selecionar ocorrência única ou recorrente !!!
+en	expressoMail1_2	seen	Seen
 pt-br	calendar	you do not have permission to add alarms to this event !!!	Você não possue permissão para adicionar alarmes a esse evento !!!
 pt-br	calendar	you do not have permission to delete this alarm !!!	Você não tem permissão para apagar esse alarme !!!
@@ -15838,4 +15733,5 @@
 pt-br	calendar	you have not entered a\\nbrief description	você não colocou uma descrição
 pt-br	calendar	you have not entered a\\nvalid time of day.	você não colocou um horário válido do dia
+pt-br	calendar	you have not entered a title	Você não colocou o título
 pt-br	calendar	you have not entered a valid date	Você informou  uma data inválida
 pt-br	calendar	you have not entered a valid time of day	você informou uma hora do dia inválida
@@ -15913,5 +15809,4 @@
 pt-br	contactcenter	contact [full]	Contato [Completo]
 pt-br	contactcenter	contact [shared]	Contato [Compartilhado]
-pt-br	contactcenter	call extension	Efetuar chamada
 pt-br	contactcenter	contacting server...	Contactando Servidor...
 pt-br	contactcenter	contact [quick add]	Contato [Adição Rápida]
@@ -15994,4 +15889,5 @@
 pt-br	contactcenter	personal data	Dados Pessoais
 pt-br	contactcenter	phone	Telefone
+pt-br	contactcenter	call extension	Efetuar chamada
 pt-br	contactcenter	po box	Caixa Postal
 pt-br	contactcenter	postal code	CEP
@@ -16011,4 +15907,8 @@
 pt-br	contactcenter	select the file that contains the contacts to be imported:	Selecione o arquivo que contém os contatos para serem importados
 pt-br	contactcenter	select the file type	Selecione o tipo de arquivo
+pt-br	expressoMail1_2	doesn't contain the phrase	não contém a frase
+en	expressoMail1_2	l_seen	Seen
+es-es	common	rename	Renombrar
+pt-br	expressoMail1_2	starting with	começa com
 pt-br	contactcenter	select the format type that you want to export your contacts	Selecione o tipo de formatação que você gostaria de usar para exportar os seus contatos
 pt-br	contactcenter	select the telephone	Selecione o Telefone
@@ -16048,4 +15948,5 @@
 pt-br	contactcenter	no	Não
 pt-br	contactcenter	multivalued	Multivalorado
+pt-br	expressoMail1_2	ends with	termina com
 pt-br	contactcenter	lang_ldap_max_results	Configurar a quantidade máxima de resultados em uma pesquisa no Catálogo Global
 pt-br	contactcenter	work_main	Principal trabalho
@@ -16113,4 +16014,5 @@
 pt-br	emailadmin	select type of smtp server	Selecione o tipo de servidor SMTP
 pt-br	emailadmin	sent folder	Pasta das enviadas
+pt-br	expressoMail1_2	receiver	Destinatário
 pt-br	emailadmin	sieve server hostname or ip address	Nome ou endereço IP do servidor Sieve
 pt-br	emailadmin	sieve server port	Porta do Servidor Sieve
@@ -16148,5 +16050,4 @@
 pt-br	expressoAdmin1_2	add institutional accounts	Criar contas institucionais
 pt-br	expressoAdmin1_2	add manager	Adicionar Gerente
-es-es	common	tuvalu	TUVALU
 pt-br	expressoAdmin1_2	add managers	Adicionar Gerentes
 pt-br	expressoAdmin1_2	add owner	Adicionar dono
@@ -16156,5 +16057,5 @@
 pt-br	expressoAdmin1_2	add sectors	Criar Setor
 pt-br	expressoAdmin1_2	add shared accounts	Adicionar contas compartilhadas
-pt-br	expressoAdmin1_2	add sub sectors	Criar Sub-Setore
+pt-br	expressoAdmin1_2	add sub sectors	Criar Sub-Setores
 pt-br	expressoAdmin1_2	add user	Adicionar Usuário
 pt-br	expressoAdmin1_2	add users	Adicionar usuários
@@ -16201,4 +16102,5 @@
 pt-br	expressoAdmin1_2	context field is empty	Campo contexto está vazio
 pt-br	expressoAdmin1_2	contexts	Contextos
+pt-br	expressoAdmin1_2	cotas control disabled	Controle de cotas desabilitado
 pt-br	expressoAdmin1_2	corporative information	Informações Corporativas
 pt-br	expressoAdmin1_2	cpf	CPF
@@ -16212,4 +16114,5 @@
 pt-br	expressoAdmin1_2	create institutional account	Criar conta institucional
 pt-br	expressoAdmin1_2	create organizations	Criar organizações
+es-es	calendar	link	Enlace
 pt-br	expressoAdmin1_2	create sector	Criar Setor
 pt-br	expressoAdmin1_2	create sectors	Criar setores
@@ -16217,4 +16120,5 @@
 pt-br	expressoAdmin1_2	creation of shared accounts	Criação de contas compartilhadas
 pt-br	expressoAdmin1_2	create user	Criar Usuário
+pt-br	expressoMail1_2	is over than	é maior que
 pt-br	expressoAdmin1_2	criation of institutional accounts	Criação de contas institucionais
 pt-br	expressoAdmin1_2	default password already registered	Senha padrão já registrada
@@ -16298,4 +16202,5 @@
 pt-br	expressoAdmin1_2	enable blocking sending email to shared accounts (departments)	Ativar bloqueio de envio de e-mails para Contas Compartilhadas (departamentos)
 pt-br	expressoAdmin1_2	error adding application to new manager	Erro adicionando aplicação ao novo gerente
+pt-br	expressoAdmin1_2	email address is not valid	Endereço de e-mail não válido
 pt-br	expressoAdmin1_2	error on function	Erro na função
 pt-br	expressoAdmin1_2	error on insert	Erro na inserção
@@ -16303,4 +16208,7 @@
 pt-br	expressoAdmin1_2	error on updating	Erro na atualização
 pt-br	expressoAdmin1_2	error in openldap.	Erro no OpenLDAP.
+pt-br	expressoAdmin1_2	user already belongs to the list	Usuário já pertence a lista 
+pt-br	expressoAdmin1_2	external user	Usuário externo 
+pt-br	expressoAdmin1_2	external users	Usuários externos 
 pt-br	expressoAdmin1_2	expire	Expira
 pt-br	expressoAdmin1_2	field cpf is invalid	Campo CPF é inválido
@@ -16571,8 +16479,8 @@
 pt-br	expressoAdmin1_2	you do not have right to list institutional accounts	Você não tem acesso para listar contas institucionais
 pt-br	expressoAdmin1_2	you do not have right to list shared accounts	Você não tem acesso para listar contas compartilhadas
-pt-br	expressoMail1_2	list catalog	Listar Catálogo
 pt-br	expressoAdmin1_2	you must type the first and the second name before generate the login	Você deve preencher corretamente o primeiro e o ultimo nome antes de gerar o login
 pt-br	expressoAdmin1_2	your user was add/updated in the shared account	O seu usuário foi adicionado/alterado na Conta Compartilhada
 pt-br	expressoAdmin1_2	your user has the following acl	Seu usuario atualmente tem as seguintes permissoes de acesso
+es-es	calendar	modified	Modificado
 pt-br	expressoAdmin1_2	use login generator	Usar gerador de login
 pt-br	expressoAdmin1_2	login generator disabled	Gerador de logins desabilitado
@@ -16584,4 +16492,11 @@
 pt-br	expressoAdmin1_2	user login	Login do usuário
 pt-br	expressoAdmin1_2	last login	Último acesso
+pt-br	expressoAdmin1_2	user number cota	Cota de usuários
+pt-br	expressoAdmin1_2	disk usage cota	Cota de disco
+pt-br	expressoAdmin1_2	user number	Nº de usuários
+pt-br	expressoAdmin1_2	disk usage	Espaço utilizado
+pt-br	expressoAdmin1_2	view cota	Cotas
+pt-br	expressoAdmin1_2	users quota	Cota de Usuários
+pt-br	expressoAdmin1_2	disk quota	Cota em Disco
 pt-br	expressoAdmin1_2	exclusion	Exclusão
 pt-br	expressoAdmin1_2	creation	Criação
@@ -16641,10 +16556,11 @@
 pt-br	expressoMail1_2	add user into my im	Adicionar no meu IM
 pt-br	expressoMail1_2	after store email in your local computer delete it from server	Depois de guardar e-mail no seu computador local, excluí-lo do servidor
+pt-br	expressoMail1_2	alert message filter by sender	Alertar ao receber mensagens filtradas por remetente
 pt-br	expressoMail1_2	all	Todas
 pt-br	expressoMail1_2	all messages are successfully unarchived	Mensagens desarquivadas com sucesso
 pt-br	expressoMail1_2	also check message against next rule	Checar mensagem contra próxima regra também
 pt-br	expressoMail1_2	always cipher message digitally?	Sempre cifrar digitalmente a mensagem?
-es-es	common	uganda	UGANDA
 pt-br	expressoMail1_2	always sign message digitally?	Sempre assinar digitalmente a mensagem?
+pt-br	expressoMail1_2	when user send an email with image in body message, it changes the size	Quando o usuário envia um e-mail com a imagem no corpo da mensagem ela muda o tamanho
 pt-br	expressoMail1_2	an archiving is in process, but dont worry, expresso will process this messages after the actual archiving	Uma rotina de arquivamento já está sendo executada. Porém, não se preocupe. O expresso tentará arquivar essas mensagens logo em seguida.
 pt-br	expressoMail1_2	and	e
@@ -16657,4 +16573,5 @@
 pt-br	expressoMail1_2	are you sure to delete the filters?	Tem certeza que deseja deletar os filtros?
 pt-br	expressoMail1_2	a read confirmation was sent.	Uma confirmação de leitura foi enviada.
+pt-br	expressoMail1_2	read receipt	Confirmação de leitura
 pt-br	expressoMail1_2	read receipt: %1	Confirmação de leitura: %1
 pt-br	expressoMail1_2	your message: %1	Sua mensagem: %1
@@ -16712,9 +16629,13 @@
 pt-br	expressoMail1_2	coincident	Coincidente
 pt-br	expressoMail1_2	cols	Colunas
+pt-br	expressoMail1_2	confirmation message is not sent	Confirmação de mensagem não enviada
 pt-br	expressoMail1_2	config for expressomail1_2	Configurações do expressoMail1_2
 pt-br	expressoMail1_2	config for expressomail	Configurações para o ExpressoMail
-pt-br	expressoMail1_2	list	Listagem
 pt-br	expressoMail1_2	contact added successfully.	Contato adicionado com sucesso.
+pt-br	expressoMail1_2	continue checking other rules if the criteria is met.	Continuar verificando outras regras caso o critério seja encontrado.
+pt-br	expressoMail1_2	validity	Validade
+pt-br	expressoMail1_2	valid from	Expedido em
 pt-br	expressoMail1_2	connection failed with %1 server. try later.	Ocorreu uma falha de comunicação com o servidor de %1. Tente mais tarde.
+pt-br	expressoMail1_2	convert this message into plain text can make parts of it are removed. continue?	Converter esta mensagem para texto sem formatação pode fazer com que partes dela sejam removidas. Deseja continuar?
 pt-br	expressoMail1_2	couldn't verify if certificate was revoked.(cd-01)	A lista de certificados revogados não foi encontrada.(CD-01)
 pt-br	expressoMail1_2	couldn't verify if certificate was revoked.(cd-02)	Não foi possível verificar se o certificado está revogado.(CD-02)
@@ -16753,5 +16674,7 @@
 pt-br	expressoMail1_2	do you really want to empty your trash folder?	Você tem certeza que deseja limpar sua lixeira?
 pt-br	expressoMail1_2	do you wanna receive an alert for new messages?	Você quer receber um alerta para mensagens novas?
+pt-br	expressoMail1_2	wish you receive notifications for: "new messages", "filter criteria", "event alerts"?	Exibir notificações de: "Nova mensagem", "Criterio atendido", "Alerta de evento"?
 pt-br	expressoMail1_2	do you want to automatically display the message header?	Você deseja exibir automaticamente o cabecalho da mensagem?
+es-es	workflow	update	actualizar
 pt-br	expressoMail1_2	do you want to block this e-mail?	Você gostaria de bloquear este e-mail?
 pt-br	expressoMail1_2	do you want to show common name instead of uid?	Utilizar nome (CN) ao invés de login (uid) em pastas compartilhadas?
@@ -16765,4 +16688,5 @@
 pt-br	expressoMail1_2	edit filters	Editar Filtros
 pt-br	expressoMail1_2	edit folders	Editar Pastas
+pt-br	expressoMail1_2	edit folder	Editar Pasta
 pt-br	expressoMail1_2	labels	Marcadores
 pt-br	expressoMail1_2	follow up	Acompanhar
@@ -16770,4 +16694,5 @@
 pt-br	expressoMail1_2	emails of the account	Emails da conta
 pt-br	expressoMail1_2	empty spam folder	Limpar pasta spam
+pt-br	expressoMail1_2	empty spam	Limpar Spam
 pt-br	expressoMail1_2	empty trash	Limpar Lixeira
 pt-br	expressoMail1_2	enabled	Habilitada
@@ -16776,5 +16701,4 @@
 pt-br	expressoMail1_2	enable quick reply	Responder rápido (com histórico e ao remetente)
 pt-br	expressoMail1_2	enable this option if you want to read the next message everytime you delete a message	Habilite esta opção se você quiser ler a mensagem seguinte sempre que você apagar uma mensagem
-pt-br	expressoMail1_2	hlp_msg_sendlike_acl	Outros usuários poderão ENVIAR mensagens como sendo você
 pt-br	expressoMail1_2	enabling this options you will be able to store messages in your local computer	Ao ativar esta opção você será capaz de armazenar mensagens no seu computador local
 pt-br	expressoMail1_2	end of archive messages	Fim do arquivamento de mensagens
@@ -16801,4 +16725,5 @@
 pt-br	expressoMail1_2	export	Exportar
 pt-br	expressoMail1_2	export messages	Exportar mensagens
+pt-br	expressoMail1_2	export folder messages	Exportar mensagens da pasta
 pt-br	expressoMail1_2	expressomail configuration	Configurações do expressoMail
 pt-br	expressoMail1_2	expresso offline	ExpressoMail Offline
@@ -16812,4 +16737,5 @@
 pt-br	expressoMail1_2	first	Primeira
 pt-br	expressoMail1_2	first name	Primeiro Nome
+pt-br	expressoMail1_2	first page	Primeira página
 pt-br	expressoMail1_2	flag as important	Marcar como Importante
 pt-br	expressoMail1_2	flagged	Importante
@@ -16853,4 +16779,5 @@
 pt-br	expressoMail1_2	hlp_msg_delmov_acl	Outros usuários poderão APAGAR/MOVER suas mensagens
 pt-br	expressoMail1_2	hlp_msg_read_acl	Outros usuários poderão LER suas mensagens
+pt-br	expressoMail1_2	hlp_msg_sendlike_acl	Outros usuários poderão ENVIAR mensagens como sendo você
 pt-br	expressoMail1_2	hlp_msg_savelike_acl	Outros usuários irão SALVAR as mensagens enviadas como sendo você nesta caixa 
 pt-br	expressoMail1_2	hours ago	horas atrás
@@ -16863,4 +16790,5 @@
 pt-br	expressoMail1_2	in all the folders	Em todas as pastas
 pt-br	expressoMail1_2	inbox	Caixa de Entrada
+pt-br	expressoMail1_2	outbox	Caixa de Saída
 pt-br	expressoMail1_2	include	Incluir
 pt-br	expressoMail1_2	indent	Tabulação a esquerda
@@ -16911,4 +16839,5 @@
 pt-br	expressoMail1_2	last	Última
 pt-br	expressoMail1_2	last name	Último Nome
+pt-br	expressoMail1_2	last page	Última página
 pt-br	expressoMail1_2	less	Menos
 pt-br	expressoMail1_2	less than	Menor que
@@ -16917,5 +16846,6 @@
 pt-br	expressoMail1_2	link	Link
 pt-br	expressoMail1_2	list all	Listar Tudo
-es-es	common	ukraine	UKRAINE
+pt-br	expressoMail1_2	list catalog	Listar Catálogo
+pt-br	expressoMail1_2	list	Listagem
 pt-br	expressoMail1_2	list of the filters	Lista de filtros
 pt-br	expressoMail1_2	loading	Carregando
@@ -16947,4 +16877,5 @@
 pt-br	expressoMail1_2	messages	mensagens
 pt-br	expressoMail1_2	messages found in folder:	mensagens encontradas na pasta:
+pt-br	expressoMail1_2	message has attachment	Mensagem tem anexo
 pt-br	expressoMail1_2	message signed by:	Mensagem assinada por:
 pt-br	expressoMail1_2	messages saved in %1 folder.	Mensagens salvas na pasta %1.
@@ -16975,7 +16906,9 @@
 pt-br	expressoMail1_2	new rule	Nova Regra
 pt-br	expressoMail1_2	next	Próximo
+pt-br	expressoMail1_2	next page	Próxima página
 pt-br	expressoMail1_2	next shortcut:control + down	Próximo (Atalho: Ctrl + Para baixo)
 pt-br	expressoMail1_2	snickname	Apelido
 pt-br	expressoMail1_2	nickname	Apelido
+pt-br	expressoMail1_2	valid until	Valido ate
 pt-br	expressoMail1_2	n key (open new message)<br>esc key (close tab)<br>i key (print)<br>e key (forward)<br>r key (reply)<br>delete key (delete the current message)<br>ctrl + up (go to previous message)<br>ctrl + down (go to next message)<br>shift + u	tecla n (Abre nova mensagem)<br>tecla ESC (Fecha aba)<br>tecla i (imprime)<br>tecla e (encaminha)<br>tecla r (responde)<br>tecla DELETE (apaga mensagem atual)<br>Ctrl + pra cima (vai pra mensagem anterior)<br>Ctrl + pra baixo (vai para próxima mensagem)<br>Shift + pra cima ou pra baixo (seleciona várias mensagens)<br>Tecla F9 (procura no catálogo)<br>
 pt-br	expressoMail1_2	no data to search	Nenhum dado digitado para pesquisar.
@@ -16993,4 +16926,6 @@
 pt-br	expressoMail1_2	now	agora
 pt-br	expressoMail1_2	number of messages to send:	Número de mensagens à enviar:
+pt-br	expressoMail1_2	notification	Notificação
+pt-br	expressoMail1_2	filter criteria	Critério de filtro
 pt-br	expressoMail1_2	offline pass	Senha do Offline
 pt-br	expressoMail1_2	offline success installed	Offline instalado com sucesso
@@ -17017,4 +16952,5 @@
 pt-br	expressoMail1_2	portuguese	Português
 pt-br	expressoMail1_2	preferences	Preferências
+pt-br	expressoMail1_2	prev page	Página anterior
 pt-br	expressoMail1_2	preview message text within a tool-tip box	Pré-visualizar a mensagem em uma caixa tool-tip?
 pt-br	expressoMail1_2	preview message text within subject column?	Pré-visualizar a mensagem na coluna Assunto?
@@ -17148,17 +17084,8 @@
 pt-br	expressoMail1_2	the field \\"%1\\" of the message it contains	O campo \\"%1\\" da mensagem contém
 pt-br	expressoMail1_2	the folder %1 was successfully removed	A pasta %1 foi removida com sucesso!
-pt-br	expressoMail1_2	the folder was not deleted!	A pasta não foi removida!
-pt-br	expressoMail1_2	the import was executed successfully.	A importação foi executada com sucesso.
-pt-br	expressoMail1_2	the list has no participant.	Essa lista não possui nenhum participante.
-pt-br	expressoMail1_2	the message has attachment	A mensagem contém anexos
-pt-br	expressoMail1_2	the messages were deleted.	Mensagens removidas.
-pt-br	expressoMail1_2	the messages were moved to folder	Mensagens movidas para pasta 
-pt-br	expressoMail1_2	the message was deleted.	Mensagem removida.
-pt-br	expressoMail1_2	the message was moved to %1 folder.	Mensagem movida para pasta %1.
-pt-br	expressoMail1_2	the message was moved to folder	Mensagem movida para a pasta 
-pt-br	expressoMail1_2	the origin folder and the destination folder are the same.	A pasta de origem e de destino são as mesmas.
-pt-br	expressoMail1_2	the preference "%1" isn't enabled.	A preferência "%1" não foi habilitada.
+pt-br	expressoMail1_2	the local folder %1 was successfully removed	A pasta local %1 foi removida com sucesso!
 pt-br	expressoMail1_2	there is not %1 folder, expresso is creating it for you... please, repeat your request later.	Pasta %1 inexistente, Expresso criará para você. Contudo por favor repita a operação em seguida.
 pt-br	expressoMail1_2	there's an action processing. do you want abort it?	Existe uma ação que ainda está sendo processada. Suspender ação?
+pt-br	expressoMail1_2	the filter is active for alerts	O filtro está ativo para alertas
 pt-br	expressoMail1_2	the results were found in the global catalog	Ocorrências encontradas no Catálogo Geral
 pt-br	expressoMail1_2	the selected folder is empty.	A pasta selecionada está vazia.
@@ -17209,4 +17136,6 @@
 pt-br	expressoMail1_2	view tips	Ver dicas
 pt-br	expressoMail1_2	voided message	Mensagem violada
+pt-br	expressoMail1_2	would you like to send the read receipt?	Deseja enviar a mensagem de confirmação de leitura?
+pt-br	expressoMail1_2	would you like to activate the alert for message attachment?	Exibir confirmação de envio de mensagem quando houver a palavra 'anexo' no corpo do email e não houver anexos?
 pt-br	expressoMail1_2	warning: your mailbox is almost full!	Aviso: Sua caixa postal está quase cheia!
 pt-br	expressoMail1_2	was succefully removed	 foi removida com sucesso
@@ -17219,5 +17148,4 @@
 pt-br	expressoMail1_2	what is your timezone?	Qual o seu fuso-horário?
 pt-br	expressoMail1_2	when delete message, send it automatically to trash folder	Ao excluir um mensagem, mover automaticamente esta mensagem para a pasta lixeira
-pt-br	expressoMail1_2	when user send an email with image in body message, it changes the size	Quando o usuário envia um e-mail com a imagem no corpo da mensagem ela muda o tamanho
 pt-br	expressoMail1_2	when you are away from computer it saves automatically the message you are writing	Quando você estiver longe do computador. Isto salva automaticamente a mensagem que está a escrever
 pt-br	expressoMail1_2	where should the quick search be performed by default?	Onde a pesquisa rápida deve atuar por padrão?
@@ -17231,4 +17159,5 @@
 pt-br	expressoMail1_2	with some	com algumas
 pt-br	expressoMail1_2	with the following message	Com a seguinte mensagem
+pt-br	expressoMail1_2	would you like to have a read receipt option to read messages?	Deseja apresentar opção de confirmação de leitura ao ler mensagem?
 pt-br	expressoMail1_2	would you like to keep archived messages?	Você gostaria de manter as mensagens arquivadas?
 pt-br	expressoMail1_2	would you like to use local messages?	Você gostaria de usar mensagens locais?
@@ -17236,4 +17165,5 @@
 pt-br	expressoMail1_2	write message	Compôr uma mensagem
 pt-br	expressoMail1_2	wrote	escreveu
+pt-br	expressoMail1_2	write a message	Digite alguma mensagem.
 pt-br	expressoMail1_2	yes	Sim
 pt-br	expressoMail1_2	yesterday	Ontem
@@ -17253,4 +17183,5 @@
 pt-br	expressoMail1_2	you must wait while the messages will be exported...	Aguarde enquanto as mensagens serão exportadas...
 pt-br	expressoMail1_2	you must wait while the messages will be imported...	Aguarde enquanto as mensagens serão importadas...
+pt-br	expressoMail1_2	you wrote "%1" in your message, but there are no files attached. send it anyway?	Você escreveu "%1" na sua mensagem, mas não há arquivos anexados. Enviar assim mesmo?
 pt-br	expressoMail1_2	your mailbox is 100% full! you must free more space or will not receive messages.	Sua caixa postal está 100% cheia! Libere espaço ou não irá receber mensagens.
 pt-br	expressoMail1_2	your mailbox is shared with	Sua caixa postal está compartilhada com
@@ -17279,8 +17210,4 @@
 pt-br	expressoMail1_2	identification	Documento identidade
 pt-br	expressoMail1_2	certificate issuer	Expedido por
-pt-br	expressoMail1_2	validity	Validade
-pt-br	expressoMail1_2	valid from	Expedido em
-pt-br	expressoMail1_2	valid until	Valido ate
-pt-br	expressoMail1_2	serial number	Numero de serie
 pt-br	expressoMail1_2	automaticaly create default local folders?	Criar automáticamente pastas locais padrão?
 pt-br	expressoMail1_2	enable this option if you want to automaticaly create the inbox, draft, trash and sent folders	Ative essa opção para que as pastas Caixa de entrada, Lixeira, Enviada e Rascunhos sejam criadas automáticamente no arquivamento local.
@@ -17294,4 +17221,12 @@
 pt-br	expressoMail1_2	send this mail as text plain	Enviar este e-mail como texto simples
 pt-br	expressoMail1_2	the text format will be lost	A formatação do texto será perdida
+pt-br	expressoMail1_2	the format of telephone number is invalid	O formato do número de telefone é inválido
+pt-br	expressoMail1_2	telephone number updated with success.	Telefone atualizado com sucesso.
+pt-br	expressoMail1_2	click here to update your telephone	Clique aqui para atualizar seu telefone
+pt-br	expressoMail1_2	update my telephone	Atualizar meu telefone
+pt-br	expressoMail1_2	you can't modify your commercial telephone.	Você não tem permissão para modificar seu Telefone Comercial.
+pt-br	expressoMail1_2	warning for users	Aviso importante aos usuários
+pt-br	expressoMail1_2	text_warning	Caro usuário, <br>Mantenha seu Telefone Comercial sempre atualizado no Expresso. Muitas pessoas consultam o Catálogo do Expresso como se fosse uma lista telefônica.
+pt-br	expressoMail1_2	close this warning	Fechar este aviso
 pt-br	expressoMail1_2	warning	Atenção
 pt-br	expressoMail1_2	send messages with return recipient option by default	Sempre enviar mensagens com solicitação de confirmação de leitura?
@@ -17330,4 +17265,5 @@
 pt-br	expressoMail1_2	wait a moment, your image is uploading ...	Espere um momento, sua imagem está sendo carregada ... 
 pt-br	expressoMail1_2	reached maximum tab limit. want to close this tab	Limite máximo de abas foi atingido. Deseja fechar esta aba?
+pt-br	expressoMail1_2	is under than	é menor que
 pt-br	expressoMail1_2	it's not possible rename this folder. try other folder name	Erro ao renomear a pasta. Certifique-se de que não tentou renomea-la com um nome que contém a palavra \\"local_\\" ou que possui algum caractere especial.
 pt-br	expressoMail1_2	smtp error: the following recipient addresses failed: %1	Erro de SMTP: Os endereços de destinatário a seguir falharam: %1
@@ -17340,4 +17276,5 @@
 pt-br	expressoMail1_2	simple text mode	Modo texto simples
 pt-br	expressoMail1_2	please enter a parameter to search	Por favor, insira um parâmetro para a busca
+pt-br	expressoMail1_2	parameter must be at least	O parâmetro de busca deve ter ao menos
 pt-br	expressoMail1_2	error saving your message over quota.	Mensagem não salva pois excede a quota.
 pt-br	expressoMail1_2	no mail	Sem e-mail
@@ -17387,5 +17324,5 @@
 pt-br	expressoMail1_2	color	Cor
 pt-br	expressoMail1_2	apply	Aplicar
-pt-br	expressoMail1_2	done	Concluído
+pt-br	expressoMail1_2	done	Concluídas 
 pt-br	expressoMail1_2	this event does not exist on its agenda	Este evento não existe em sua agenda.
 pt-br	expressoMail1_2	answer	Responder
@@ -17407,11 +17344,4 @@
 pt-br	expressoMail1_2	sender	Remetente
 pt-br	expressoMail1_2	is equal to	é igual à
-pt-br	expressoMail1_2	contains the phrase	contém a frase
-pt-br	expressoMail1_2	doesn't contain the phrase	não contém a frase
-pt-br	expressoMail1_2	starting with	começa com
-pt-br	expressoMail1_2	ends with	termina com
-pt-br	expressoMail1_2	receiver	Destinatário
-pt-br	expressoMail1_2	is over than	é maior que
-pt-br	expressoMail1_2	is under than	é menor que
 pt-br	expressoMail1_2	attend all the criteria	Atender a todos os critérios
 pt-br	expressoMail1_2	attend any of the criteria	Atender a qualquer um dos critérios
@@ -17451,4 +17381,52 @@
 pt-br	expressoMail1_2	 will be removed. this action cannot be undone. want to continue?	 serão removidas. Essa ação não poderá ser desfeita. Deseja continuar?
 pt-br	expressoMail1_2	message size greateruler than allowed (default rule)	 Tamanho da mensagem excede o limite de tamanho configurado pelo administrador
+pt-br	expressoMail1_2	you have an archived message:	Você tem uma mensagem arquivada:
+pt-br	expressoMail1_2	you have %1 messages archived:	Você tem %1 mensagens arquivadas:
+pt-br	expressoMail1_2	filter by sender	Filtro por Remetente
+pt-br	expressoMail1_2	follow ups	Sinalizadas
+pt-br	expressoMail1_2	if more than one criterion for the filter, the "meeting all the criteria" must be selected	Se houver mais que um critério para o filtro, a opção "Atender a todos os critérios" deve estar selecionada
+pt-br	expressoMail1_2	the filter should be set as a criteria "sender" and action "archive folder"	O filtro deve ter como critério definido "Remetente" e ação "Arquivar na pasta"
+pt-br	expressoMail1_2	filter with alert	Filtro com alerta
+pt-br	expressoMail1_2	group contacts	Contatos do grupo
+pt-br	expressoMail1_2	remove recipient	Remover destinatário
+pt-br	expressoMail1_2	quick search of messages	Busca rápida de mensagens
+pt-br	expressoMail1_2	search messages of ...	Busca mensagens de ...
+pt-br	expressoMail1_2	telephone	Telefone
+pt-br	expressoMail1_2	and more %1 contact	E mais %1 contato
+pt-br	expressoMail1_2	impossible editing this contact, but it's possible to remove it	Impossível editar este contato, mas é possível removê-lo
+pt-br	expressoMail1_2	the contact was moved from recent contacts to personal contacts successful.	O Contato foi movido dos contatos recentes para os contatos pessoais com sucesso.
+pt-br	expressoMail1_2	permission denied	Permissão negada
+pt-br	expressoMail1_2	permission denied to folder "%1".	Permissão negada para pasta "%1".
+pt-br	expressoMail1_2	success	Concluído
+pt-br	expressoMail1_2	you can not remove the message with the preference 'send to trash' enabled. there is no permission to move messages to the trash folder.	Não é possível remover a mensagem com a preferencia 'Enviar para lixeira' ativada. Não existe permissão para mover mensagens para a pasta lixeira.
+pt-br	expressoMail1_2	one of his messages can not be marked as read, because it contains a read confirmation.	Uma de suas mensagens não pode ser marcada como lida, pois contém uma confirmação de leitura.
+pt-br	expressoMail1_2	 of its messages could not be marked as read, because it contains a read confirmation.	 de suas mensagens não puderam ser marcadas como lida, pois contém uma confirmação de leitura.
+pt-br	expressoMail1_2	cant share with yourself.	Não é possível compartilhar com você mesmo.
+pt-br	expressoMail1_2	moving message %1 of %2	Movendo mensagem %1 de %2
+pt-br	expressoMail1_2	all done. message(s) moved successfully	Concluído. Mensagem(ns) movida(s) com sucesso.
+pt-br	expressoMail1_2	starting to move messages	Iniciando a movimentação de mensagens
+pt-br	expressoMail1_2	mailarchiver does not seems to be running or installed at this workstation, local messages are disabled. check it out!	O MailArchiver não parece estar rodando ou instalado nesta estação de trabalho, as mensagens locais estão desativadas. Verifique!
+pt-br	expressoMail1_2	starting to unarchive messages	Iniciando o desarquivamento de mensagens
+pt-br	expressoMail1_2	messages successfully unarchived	Mensagens desarquivadas com sucesso
+pt-br	expressoMail1_2	all done. end of archive messages operation	Concluído. Operação de arquivamento encerrada
+pt-br	expressoMail1_2	no messages were unarchived	Nenhuma mensagem foi desarquivada
+pt-br	expressoMail1_2	some messages weren't successfully unarchived	Algumas mensagens não puderam ser desarquivadas
+pt-br	expressoMail1_2	coudn't unarchive message	Não foi possível desarquivar mensagem
+pt-br	expressoMail1_2	message successfully unarchived	Mensagem desarquivada com sucesso
+pt-br	expressoMail1_2	unarchiving message %1 of %2	Desarquivando mensagem %1 de %2
+pt-br	expressoMail1_2	message %1 of %2 successfully archived	Mensagem %1 de %2 arquivada com sucesso
+pt-br	expressoMail1_2	sorry, but mail archiver does not seems to be running or installed at this workstation. by now, we are turning off local messages!	Desculpe, mas o Mail Archiver não parece estar rodando ou instalado nesta estação de trabalho. De momento, estamos desativando as mensagens locais!
+pt-br	expressoMail1_2	sorry, but mail archiver still seems to be sleeping. check out your system services!	Desculpe, mas o Mail Archiver parece continuar offline. Verifique os serviços do seu sistema!
+pt-br	expressoMail1_2	trying to communicate with mail archiver...	Tentando comunicação com o Mail Archiver...
+pt-br	expressoMail1_2	wait: attempt %1 from %2...	Aguarde: tentativa %1 de %2...
+pt-br	expressoMail1_2	sorry, but you need to reload this web page. click at reload page at web browsing top navigation	Desculpe, mas você precisa recarregar esta página. Clique em recarregar na janela do seu navegador.
+pt-br	expressoMail1_2	there is something wrong with mailarchiver environment. contact you support	Há algum problema com o ambiente do MailArchiver. Contate seu suporte
+pt-br	expressoMail1_2	mail archiver is not responding. there is some communicating issue hang it up. some services may not work properly. check it out!	O Mail Archiver não está respondendo. Há algum problema de comunicação. Alguns serviços podem não funcionar corretamente. Verifique!
+pt-br	expressoMail1_2	archive operation error: getting online message flags fails. achievement will not be done	O arquivamento falhou: não foi possível obter os marcadores da mensagem. O arquivamento não será realizado
+pt-br	expressoMail1_2	unarchive error	Erro ao desarquivar
+pt-br	expressoMail1_2	messages marked as \\"%1\\"	Mensagens marcadas como \\"%1\\"
+pt-br	expressoMail1_2	mailarchiver search operation fails	A operação de pesquisa do MailArchiver falhou
+pt-br	expressoMail1_2	mailarchiver user login fail	Login do MailArchiver falhou
+pt-br	expressoMail1_2	mailarchiver user logged out	Usuário desconectado do MailArchiver
 pt-br	expressoMail1_1	it's not possible remove this folder, because it is being used in the moment!	Não é possível remover esta pasta, pois estão em uso no momento!
 pt-br	instant_messenger	user connected	Está on-line
@@ -17537,4 +17515,6 @@
 pt-br	preferences	the default application will be started when you enter phpgroupware or click on the homepage icon.<br>you can also have more than one application showing up on the homepage, if you don't choose a specific application here (has to 	A aplicação predeterminada se mostrará ao iniciar a sesão no eGroupWare ou clicar no icone da página de inicio.<br> Também pode ter mais de uma aplicação na página inicial, se não escolher uma aplicação específica aquí, configurándo-a nas suas preferencias de cada aplicação. 
 pt-br	preferences	theme (colors/fonts) selection	Seleção de tema (cores/fontes)
+pt-br	filemanager	select a folder	Selecione uma pasta
+pt-br	filemanager	no file(s) to send	Sem arquivo(s) para enviar
 pt-br	preferences	the selectbox shows all available users (can be very slow on big installs with many users). the popup can search users by name or group.	A caixa de seleção mostra todos os usuários disponíveis (poderá causar lentidão em instalações com muitos usuários). Pela janela instantânea, é possível pesquisar usuários por nome ou grupo.
 pt-br	preferences	the two passwords are not the same	As duas senhas não são iguais
@@ -17600,5 +17580,4 @@
 pt-br	filemanager	could not delete %1	Não foi possível remover %1
 pt-br	filemanager	could not move %1 file(s)	Não foi possível mover %1 arquivo(s)
-pt-br	filemanager	select a folder	Selecione uma pasta
 pt-br	filemanager	could not move file because no destination directory is given	Não foi possível mover o arquivo porque não se definiu um diretório de destino
 pt-br	filemanager	could not rename %1 to %2	Não foi possível renomear %1 para %2
@@ -17642,5 +17621,4 @@
 pt-br	filemanager	disposition of pdf output	Disposição do texto no pdf
 pt-br	filemanager	type of pdf paper	Tipo de papel ao exportar
-pt-br	filemanager	search users	Pesquisar Usuários
 pt-br	filemanager	default number of upload fields to show	Padrão para o número de campos de envio de arquivos a exibir
 pt-br	filemanager	deleted %1	Removido %1
@@ -17688,5 +17666,4 @@
 pt-br	filemanager	move to:	Mover para:
 pt-br	filemanager	more files	Mais arquivos
-pt-br	filemanager	no file(s) to send	Sem arquivo(s) para enviar
 pt-br	filemanager	no permission to delete the folder %1	Sem permissão para excluir a pasta %1
 pt-br	filemanager	notify email	Notificar os e-mails
@@ -17727,4 +17704,5 @@
 pt-br	filemanager	send email	Enviar email
 pt-br	filemanager	search folders	Pesquisar Pastas
+pt-br	filemanager	search users	Pesquisar Usuários
 pt-br	filemanager	show	Exibir
 pt-br	filemanager	show ..	Exibir ..
@@ -17774,4 +17752,7 @@
 pt-br	filemanager	it is necessary to inform the user that will receive email notification	É necessário informar o email do usuário que receberá a notificação
 pt-br	filemanager	it is necessary to inform the user that sends mail file	É necessário informar o email do usuário que envia o arquivo
+pt-br	jabberit_messenger	normal	Normal
+pt-br	jabberit_messenger	none result was found.	Nenhum resultado foi encontrado.
+pt-br	jabberit_messenger	others expressos	Outros Expressos
 pt-br	filemanager	please, type a strong password (suggestion: at least 8 characters, letters and numbers) or leave it empty to archive only	Por favor, digite uma senha segura (sugestão: pelo menos 8 caracteres com letras e números) ou deixe o campo vazio para somente arquivar
 pt-br	filemanager	please, retype your password	Por favor, redigite sua senha
@@ -17847,7 +17828,5 @@
 pt-br	jabberit_messenger	no	Não
 pt-br	jabberit_messenger	not auth	Não Autorizado
-pt-br	jabberit_messenger	normal	Normal
-pt-br	jabberit_messenger	none result was found.	Nenhum resultado foi encontrado.
-pt-br	jabberit_messenger	others expressos	Outros Expressos
+pt-br	mobile	schedule	Agendar
 pt-br	jabberit_messenger	organization unit	Selecione uma Organização
 pt-br	jabberit_messenger	organization	Organização
@@ -17877,5 +17856,4 @@
 pt-br	jabberit_messenger	status	Status
 pt-br	jabberit_messenger	status of the transference	Status da Transferência
-pt-br	listAdmin	hour	Hora
 pt-br	jabberit_messenger	the module is not loaded	O módulo não está carregado
 pt-br	jabberit_messenger	this user is part of a small group!	Este usuário faz parte de um grupo restrito!
@@ -17965,4 +17943,5 @@
 pt-br	listAdmin	do you realy want delete this email list?	Você realmente quer DELETAR esta Lista de E-mail?
 pt-br	listAdmin	manager login	Login do Gerente
+pt-br	listAdmin	hour	Hora
 pt-br	listAdmin	contexto	Contexto
 pt-br	listAdmin	manager lid	Login do Gerente
@@ -18134,5 +18113,4 @@
 pt-br	mobile	start date/time	Data/Hora Início
 pt-br	mobile	end date/time	Data/Hora Término
-pt-br	mobile	schedule	Agendar
 pt-br	mobile	continue scheduling	Continuar o agendamento
 pt-br	mobile	already_addeds:	Já adicionados:
@@ -18334,4 +18312,13 @@
 pt-br	login	you have been successfully logged out	Você foi desconectado com sucesso
 pt-br	login	your session could not be verified.	Sua sessão expirou
+pt-br	reports	activated	Ativado
+pt-br	reports	date	Data
+pt-br	reports	without e-mail	Sem E-mail
+pt-br	reports	report of shared accounts of the organization	Relatório das contas compartilhadas da Organização
+pt-br	reports	report shared accounts by organization	Relatório de contas compartilhadas por Organização
+pt-br	reports	report generated by expresso reports	Relatório gerado pelo Expresso Reports
+pt-br	reports	report institutional account organization	Relatório de contas institucionais por Organização
+pt-br	reports	report of institutional accounts of the organization	Relatório de contas institucionais da Organização
+pt-br	reports	report institutional accounts by organization	Relatório de contas institucionais por Organização
 pt-br	reports	uidnumber	UID
 pt-br	reports	user login	Login do usuário
@@ -18361,4 +18348,5 @@
 pt-br	reports	reports	Relatórios
 pt-br	reports	report organization	Relatório de usuários por Organização
+pt-br	reports	report share account organization	Relatório de contas compartilhadas por Organização
 pt-br	reports	report cota organization	Relatório de cotas por Organização
 pt-br	reports	report maillists organization	Relatório de lista de emails por Organização
@@ -18531,4 +18519,6 @@
 pt-br	workflow	couldn't add transition	Impossível adicionar transição
 pt-br	workflow	create	criar
+pt-br	workflow	created	Criado
+pt-br	workflow	date:	data:
 pt-br	workflow	default next user	Próximo usuário padrão
 pt-br	workflow	default owner	Proprietário padrão
@@ -18580,5 +18570,5 @@
 pt-br	workflow	failure	falha
 pt-br	workflow	fatal error: nextactivity does not match any candidate in autorouting switch activity	Erro fatal: nextActivity não confere com qualquer candidato na atividade switch de autoroteamento
-pt-br	workflow	pre-agent %1 code is not avaible	código do pré-agente %1 não está disponível
+pt-br	workflow	list of processes	Lista de processos
 pt-br	workflow	fatal error: non-deterministic decision for autorouting activity	Erro fatal: decisão indeterminada para atividade de autoroteamento
 pt-br	workflow	fatal error: setting next activity to an unexisting activity	Erro fatal: próxima atividade definida para uma atividade que não existe
@@ -18644,10 +18634,8 @@
 pt-br	workflow	list of all activities with, for each,  counters of instances by status	lista de todas as atividade, com contadores de instâncias, por estado, para cada uma
 pt-br	workflow	list of all history items made by instances while they travel in the workflow with information about duration and date	lista de todos os ítens históricos gerados pelas instâncias, com informação sobre duração e data, enquanto trafegaram pelo workflow
-pt-br	workflow	pre-shared code is not avaible	código pré-compartilhado não está disponível
 pt-br	workflow	list of all instances with info about current status and activities and link to administration of theses instances	lista de todas as instâncias, com informação sobre o estado corrente e atividades, e um link para administrar estas instâncias
 pt-br	workflow	list of instances	Lista de instâncias
 pt-br	workflow	list of mappings	Lista de mapeamentos
 pt-br	workflow	list of monitors	Lista de monitores
-pt-br	workflow	list of processes	Lista de processos
 pt-br	workflow	list of processes (%1)	Lista de processos (%1)
 pt-br	workflow	list of processes with status and validity and, for each, counters of instances by status	lista de processos com estado e validade e, para cada um deles, contadores de instâncias por estado
@@ -18717,4 +18705,6 @@
 pt-br	workflow	pr.	Pr.
 pt-br	workflow	pre-activity %1 code is not avaible	código da pré-atividade %1 não está disponível
+pt-br	workflow	pre-agent %1 code is not avaible	código do pré-agente %1 não está disponível
+pt-br	workflow	pre-shared code is not avaible	código pré-compartilhado não está disponível
 pt-br	workflow	printer friendly	Versão para impressão
 pt-br	workflow	priority level:	Nível de prioridade:
@@ -18725,4 +18715,5 @@
 pt-br	workflow	process %d has been activated	Processo %d foi ativado
 pt-br	workflow	process %d has been deactivated	Processo %d foi desativado
+pt-br	workflow	send an email	Enviar um email
 pt-br	workflow	process %s %s already exists, the import process was aborted	Processo %s %s já existe, o processo de importação foi abortado
 pt-br	workflow	process %s %s imported	Processo %s %s importado
@@ -18800,5 +18791,4 @@
 pt-br	workflow	send after interactive activity is completed	envio ao final da atividade interativa foi completado
 pt-br	workflow	send all to	Enviar tudo para
-pt-br	workflow	send an email	Enviar um email
 pt-br	workflow	send instance	enviar instância
 pt-br	workflow	send this instance to the next activity	Enviar esta instância para a próxima atividade
@@ -18854,5 +18844,4 @@
 pt-br	workflow	there are no config value defined	Não existe valor de configuração definido
 pt-br	workflow	there are no instances available	Não existem instâncias disponíveis
-en	admin	crontab only (recomended)	crontab only (recomended)
 pt-br	workflow	there are no mappings defined for this process	Não existem mapeamentos definidos para este processo
 pt-br	workflow	there are no process available	Não existe processo disponível
@@ -18920,5 +18909,4 @@
 pt-br	workflow	view workitem	Visualizar Workitem
 pt-br	workflow	view options	Opções de Visualização
-en	admin	data	Data
 pt-br	workflow	warning this filter override all others filters	aviso: este filtro sobrescreve todos os outros filtros
 pt-br	workflow	warning: by using this button you will definitively remove all aborted instances and their history (workitems) for the selected process.	aviso: usando este botão, você irá remover definitivamente todas as instâncias abortadas E seus históricos (workitems), para os processos selecionados.
@@ -18980,7 +18968,4 @@
 en	admin	(default no, leave it off if you dont use it)	(default No, leave it off if you dont use it)
 en	admin	(stored password will not be shown here)	(Stored password will not be shown here)
-en	admin	day	Day
-en	admin	day of week<br>(0-6, 0=sun)	Day of week<br>(0-6, 0=Sun)
-en	admin	default	Default
 en	admin	(to install new applications use<br><a href="setup/" target="setup">setup</a> [manage applications] !!!)	(To install new applications use<br><a href="setup/" target="setup">Setup</a> [Manage Applications] !!!)
 en	admin	accesslog and bruteforce defense	AccessLog and BruteForce defense
@@ -19012,4 +18997,5 @@
 en	admin	administration	Administration
 en	admin	admins	Admins
+en	admin	select group managers	Select Group Managers
 en	admin	how many days the password should be kept(empty to disable this) ?	How many days the password should be kept(empty to disable this) ?
 en	admin	after how many unsuccessful attempts to login, an account should be blocked (default 3) ?	After how many unsuccessful attempts to login, an account should be blocked (default 3) ?
@@ -19059,5 +19045,9 @@
 en	admin	country selection	Country Selection
 en	admin	create group	Create Group
-en	common	contacts	Contacts
+en	admin	crontab only (recomended)	crontab only (recomended)
+en	admin	data	Data
+en	admin	day	Day
+en	admin	day of week<br>(0-6, 0=sun)	Day of week<br>(0-6, 0=Sun)
+en	admin	default	Default
 en	admin	default file system space per user	Default file system space per user
 en	admin	default file system space per user/group ?	Default file system space per user/group ?
@@ -19088,4 +19078,5 @@
 en	admin	deny access to user accounts	Deny access to user accounts
 en	admin	deny all users access to grant other users access to their entries ?	Deny all users access to grant other users access to their entries ?
+en	admin	command for unmark spam	Command for unmark spam
 en	admin	description can not exceed 255 characters in length !	Description can not exceed 255 characters in length !
 en	admin	disable "auto completion" of the login form	Disable "auto completion" of the login form
@@ -19130,5 +19121,4 @@
 en	admin	enter the title for your site	Enter the title for your site
 en	admin	enter the title of your logo	Enter the title of your logo
-es-es	contactcenter	empty	Vacío
 en	admin	enter the url or filename (in phpgwapi/templates/default/images) of your logo	Enter the URL or filename (in phpgwapi/templates/default/images) of your logo
 en	admin	enter the url where your logo should link to	Enter the url where your logo should link to
@@ -19159,4 +19149,5 @@
 en	admin	hour<br>(0-23)	Hour<br>(0-23)
 en	admin	how many days should entries stay in the access log, before they get deleted (default 90) ?	How many days should entries stay in the access log, before they get deleted (default 90) ?
+en	admin	select permissions this group will have	Select permissions this group will have
 en	admin	how many minutes should an account or ip be blocked (default 30) ?	How many minutes should an account or IP be blocked (default 30) ?
 en	admin	icon	Icon
@@ -19211,5 +19202,4 @@
 en	admin	next run	Next run
 en	admin	no algorithms available	no algorithms available
-es-es	contactcenter	sex	Sexo
 en	admin	no jobs in the database !!!	No jobs in the database !!!
 en	admin	no login history exists for this user	No login history exists for this user
@@ -19252,6 +19242,4 @@
 en	admin	search peer servers	Search peer servers
 en	admin	security	Security
-en	admin	select group managers	Select Group Managers
-en	admin	select permissions this group will have	Select permissions this group will have
 en	admin	select the parent category. if this is a main category select no category	Select the parent category. If this is a main category select NO CATEGORY
 en	admin	select users for inclusion	Select users for inclusion
@@ -19291,5 +19279,4 @@
 en	admin	that loginid has already been taken	That loginid has already been taken
 en	admin	that name has been used already	That name has been used already
-en	common	found %1 entries	Found %1 Entrie(s)
 en	admin	that server name has been used already !	That server name has been used already !
 en	admin	the api is current	The API is current
@@ -19358,5 +19345,4 @@
 en	admin	file to execution log of get crls	File to execution log of get CRLs revogados
 en	admin	back	Back
-en	common	go	Go
 en	admin	administration data of ca\\'s and crl\\'s not found	Administration data of CA\\'s and CRL\\'s not found
 en	admin	crls use is disable	CRLs use is disable
@@ -19411,5 +19397,4 @@
 en	admin	comma separated	Comma separated
 en	admin	command for spam	Command for spam
-en	admin	command for unmark spam	Command for unmark spam
 en	admin	do you want to log the sent messages?	Do you want to log the sent messages?
 en	admin	do you want to use the spam filter?	Do you want to use the spam filter?
@@ -19472,4 +19457,5 @@
 en	admin	group context of the ldap	Group context of the LDAP
 en	admin	ldap group context	LDAP group context
+en	common	brazil	BRAZIL
 en	admin	follow ldap referrals	Follow LDAP referrals
 en	admin	follow referrals	Follow referrals
@@ -19498,4 +19484,7 @@
 en	common	contact center	Contact Center
 en	common	contactcenter	Contact Center
+en	common	contacts	Contacts
+en	common	found %1 entries	Found %1 Entrie(s)
+en	common	go	Go
 en	common	search for...	Search for ...
 en	common	send mail	Send Mail
@@ -19574,5 +19563,4 @@
 en	common	botswana	BOTSWANA
 en	common	bouvet island	BOUVET ISLAND
-en	common	brazil	BRAZIL
 en	common	british indian ocean territory	BRITISH INDIAN OCEAN TERRITORY
 en	common	brunei darussalam	BRUNEI DARUSSALAM
@@ -19700,4 +19688,182 @@
 en	common	french polynesia	FRENCH POLYNESIA
 en	common	french southern territories	FRENCH SOUTHERN TERRITORIES
+en	common	friday	Friday
+en	common	ftp	FTP
+en	common	fullname	Fullname
+en	common	gabon	GABON
+en	common	gambia	GAMBIA
+en	common	general menu	General Menu
+en	common	georgia	GEORGIA
+en	common	germany	GERMANY
+en	common	ghana	GHANA
+en	common	gibraltar	GIBRALTAR
+en	common	global	Global
+en	common	global public	Global Public
+en	common	grant access	Grant Access
+en	common	greece	GREECE
+en	common	greenland	GREENLAND
+en	common	grenada	GRENADA
+en	common	group	Group
+en	common	group access	Group Access
+en	common	group name	group name
+en	common	group public	Group Public
+en	common	groups	Groups
+en	common	groups with permission for %1	Groups with permission for %1
+en	common	groups without permission for %1	Groups without permission for %1
+en	common	guadeloupe	GUADELOUPE
+en	common	guam	GUAM
+en	common	guatemala	GUATEMALA
+en	common	guinea	GUINEA
+en	common	guinea-bissau	GUINEA-BISSAU
+en	common	guyana	GUYANA
+en	common	haiti	HAITI
+en	common	heard island and mcdonald islands	HEARD ISLAND AND MCDONALD ISLANDS
+en	common	help	Help
+en	common	high	High
+en	common	highest	Highest
+en	common	holy see (vatican city state)	HOLY SEE (VATICAN CITY STATE)
+en	common	home	Home
+en	common	home email	home email
+en	common	honduras	HONDURAS
+en	common	hong kong	HONG KONG
+en	common	how many icons should be shown in the navbar (top of the page). additional icons go into a kind of pulldown menu, callable by the icon on the far right side of the navbar.	How many icons should be shown in the navbar (top of the page). Additional icons go into a kind of pulldown menu, callable by the icon on the far right side of the navbar.
+en	common	hungary	HUNGARY
+en	common	iceland	ICELAND
+en	common	india	INDIA
+en	common	indonesia	INDONESIA
+en	common	insert all %1 addresses of the %2 contacts in %3	Insert all %1 addresses of the %2 contacts in %3
+en	common	international	International
+en	common	invalid code	Invalid code
+en	common	invalid ip address	Invalid IP address
+en	common	invalid password	Invalid password
+en	common	iran, islamic republic of	IRAN, ISLAMIC REPUBLIC OF
+en	common	iraq	IRAQ
+en	common	ireland	IRELAND
+en	common	israel	ISRAEL
+en	common	it has been more then %1 days since you changed your password	It has been more then %1 days since you changed your password
+en	common	it is recommended that you run setup to upgrade your tables to the current version	It is recommended that you run setup to upgrade your tables to the current version.
+en	common	italic	Italic
+en	common	italy	ITALY
+en	common	jamaica	JAMAICA
+en	common	january	January
+en	common	japan	JAPAN
+en	common	jordan	JORDAN
+en	common	july	July
+en	common	jun	Jun
+en	common	june	June
+en	common	justify center	Justify Center
+en	common	justify full	Justify Full
+en	common	justify left	Justify Left
+en	common	justify right	Justify Right
+en	common	kazakstan	KAZAKSTAN
+en	common	kenya	KENYA
+en	common	keywords	Keywords
+en	common	kiribati	KIRIBATI
+en	common	korea, democratic peoples republic of	KOREA, DEMOCRATIC PEOPLES REPUBLIC OF
+en	common	korea, republic of	KOREA, REPUBLIC OF
+en	common	kuwait	KUWAIT
+en	common	kyrgyzstan	KYRGYZSTAN
+en	common	language	Language
+en	common	lao peoples democratic republic	LAO PEOPLES DEMOCRATIC REPUBLIC
+en	common	last name	Last name
+en	common	last name of the user, eg. "%1"	last name of the user, eg. "%1"
+en	common	last page	Last page
+en	common	lastname	Lastname
+en	common	latvia	LATVIA
+en	common	lebanon	LEBANON
+en	common	lesotho	LESOTHO
+en	common	liberia	LIBERIA
+en	common	libyan arab jamahiriya	LIBYAN ARAB JAMAHIRIYA
+en	common	license	License
+en	common	liechtenstein	LIECHTENSTEIN
+en	common	list	List
+en	common	list members	List members
+en	common	lithuania	LITHUANIA
+en	common	local	Local
+en	common	login	Login
+en	common	macedonia, the former yugoslav republic of	MACEDONIA, THE FORMER YUGOSLAV REPUBLIC OF
+en	common	madagascar	MADAGASCAR
+en	common	mail domain, eg. "%1"	mail domain, eg. "%1"
+en	common	main category	Main category
+en	common	main screen	Main screen
+en	common	maintainer	Maintainer
+en	common	malawi	MALAWI
+en	common	malaysia	MALAYSIA
+en	common	maldives	MALDIVES
+en	common	mali	MALI
+en	common	malta	MALTA
+en	common	march	March
+en	common	marshall islands	MARSHALL ISLANDS
+en	common	martinique	MARTINIQUE
+en	common	mauritania	MAURITANIA
+en	common	mauritius	MAURITIUS
+en	common	max number of icons in navbar	Max number of icons in navbar
+en	common	may	May
+en	common	mayotte	MAYOTTE
+en	common	medium	Medium
+en	common	menu	Menu
+en	common	message	Message
+en	common	mexico	MEXICO
+en	common	micronesia, federated states of	MICRONESIA, FEDERATED STATES OF
+en	common	moldova, republic of	MOLDOVA, REPUBLIC OF
+en	common	monaco	MONACO
+en	common	monday	Monday
+en	common	mongolia	MONGOLIA
+en	common	montserrat	MONTSERRAT
+en	common	morocco	MOROCCO
+en	common	mozambique	MOZAMBIQUE
+en	common	myanmar	MYANMAR
+en	common	my preferences	My Preferences
+en	common	name	Name
+en	common	name of the user, eg. "%1"	name of the user, eg. "%1"
+en	common	namibia	NAMIBIA
+en	common	nauru	NAURU
+en	common	nepal	NEPAL
+en	common	netherlands	NETHERLANDS
+en	common	netherlands antilles	NETHERLANDS ANTILLES
+en	common	never	Never
+en	common	new caledonia	NEW CALEDONIA
+en	common	new entry added sucessfully	New entry added sucessfully
+en	common	new main category	New main category
+en	common	new value	New Value
+en	common	new zealand	NEW ZEALAND
+en	common	next	Next
+en	common	next page	Next page
+en	common	nicaragua	NICARAGUA
+en	common	niger	NIGER
+en	common	nigeria	NIGERIA
+en	common	niue	NIUE
+en	common	no	No
+en	common	no entries found, try again ...	no entries found, try again ...
+en	common	no history for this record	No history for this record
+en	common	no subject	No Subject
+en	common	none	None
+en	common	norfolk island	NORFOLK ISLAND
+en	common	normal	Normal
+en	common	northern mariana islands	NORTHERN MARIANA ISLANDS
+en	common	norway	NORWAY
+en	common	not assigned	not assigned
+en	common	note	Note
+en	common	notes	Notes
+en	common	notify window	Notify Window
+en	common	november	November
+en	common	october	October
+en	common	ok	OK
+en	common	old value	Old Value
+en	common	oman	OMAN
+en	common	on *nix systems please type: %1	On *nix systems please type: %1
+en	common	on mouse over	On Mouse Over
+en	common	only private	only private
+en	common	only yours	only yours
+en	common	open notify window	Open notify window
+en	common	open popup window	Open popup window
+en	common	original	Original
+en	common	other	Other
+en	common	overview	Overview
+en	common	owner	Owner
+en	common	page	Page
+en	common	page was generated in %1 seconds	Page was generated in %1 seconds
+en	common	pakistan	PAKISTAN
+en	common	palau	PALAU
 en	common	palestinian territory, occupied	PALESTINIAN TERRITORY, OCCUPIED
 en	common	panama	PANAMA
@@ -19794,5 +19960,5 @@
 en	common	show_more_apps	Show More Applications
 en	common	showing %1	showing %1
-es-es	emailadmin	remove	borrar
+en	common	showing %1 - %2 of %3	showing %1 - %2 of %3
 en	common	sierra leone	SIERRA LEONE
 en	common	singapore	SINGAPORE
@@ -19835,5 +20001,4 @@
 en	common	thursday	Thursday
 en	common	time	Time
-en	common	time zone	Timezone
 en	common	time zone offset	Time zone offset
 en	common	title	Title
@@ -19894,5 +20059,4 @@
 en	common	yemen	YEMEN
 en	common	yes	Yes
-en	calendar	repeat day	Repeat day
 en	common	you are required to change your password during your first login	You are required to change your password during your first login
 en	common	you are running a newer version of phpgroupware than your database is setup for	You are running a newer version of phpGroupWare than your database is setup for.
@@ -20055,5 +20219,4 @@
 en	calendar	default calendar filter	Default calendar filter
 en	calendar	default calendar view	Default calendar view
-en	calendar	repeat end date	Repeat End date
 en	calendar	default length of newly created events. the length is in minutes, eg. 60 for 1 hour.	Default length of newly created events. The length is in minutes, eg. 60 for 1 hour.
 en	calendar	defines the size in minutes of the lines in the day view.	Defines the size in minutes of the lines in the day view.
@@ -20125,4 +20288,86 @@
 en	calendar	ignore conflict	Ignore Conflict
 en	calendar	import	Import
+en	calendar	inform	Inform
+en	calendar	interval	Interval
+en	calendar	intervals in day view	Intervals in day view
+en	calendar	intervals per day in planner view	Intervals per day in planner view
+en	calendar	invalid entry id.	Invalid entry id.
+en	calendar	last	last
+en	calendar	lastname of person to notify	Lastname of person to notify
+en	calendar	length shown<br>(emtpy for full length)	Length shown<br>(emtpy for full length)
+en	calendar	length<br>(<= 255)	Length<br>(<= 255)
+en	calendar	link	Link
+en	calendar	link to view the event	Link to view the event
+en	calendar	list all categories.	List all categories.
+en	calendar	load [iv]cal	Load [iv]Cal
+en	calendar	location	Location
+en	calendar	make freebusy information availible to not loged in persons?	Make freebusy information availible to not loged in persons?
+en	calendar	matrixview	Matrix View
+en	calendar	minutes	minutes
+en	calendar	mo	M
+en	calendar	modified	Modified
+en	calendar	modify list of external participants	Modify List of External Participants
+en	calendar	mon	Mon
+en	calendar	month	Month
+en	calendar	monthly	Monthly
+en	calendar	monthly (by date)	Monthly (by date)
+en	calendar	monthly (by day)	Monthly (by day)
+en	calendar	monthview	Month View
+en	calendar	new entry	New Entry
+en	calendar	new name must not exist and not be empty!!!	New name must not exist and not be empty!!!
+en	calendar	no matches found	No matches found
+en	calendar	no response	No Response
+en	calendar	notification messages for added events	Notification messages for added events
+en	calendar	notification messages for canceled events	Notification messages for canceled events
+en	calendar	notification messages for modified events	Notification messages for modified events
+en	calendar	notification messages for your alarms	Notification messages for your alarms
+en	calendar	notification messages for your responses	Notification messages for your responses
+en	calendar	number of intervals per day in planner view	Number of Intervals per Day in Planner View
+en	calendar	number of months	Number of months
+en	calendar	number of records to read (%1)	Number of records to read (%1)
+en	calendar	observance rule	Observance Rule
+en	calendar	occurence	Occurence
+en	calendar	old startdate	Old Startdate
+en	calendar	olddate	OldDate
+en	calendar	on %1 %2 %3 your meeting request for %4	On %1 %2 %3 your meeting request for %4
+en	calendar	on all changes	on all changes
+en	calendar	on all modification, but responses	on all modification, but responses
+en	calendar	on any time change too	on any time change too
+en	calendar	on invitation / cancelation only	on invitation / cancelation only
+en	calendar	on participant responses too	on participant responses too
+en	calendar	on time change of more than 4 hours too	on time change of more than 4 hours too
+en	calendar	open todo's:	Open To Do Items:
+en	calendar	order	Order
+en	calendar	overlap holiday	overlap holiday
+en	calendar	participant	Participant
+en	calendar	participants	Participants
+en	calendar	participates	Participates
+en	calendar	password for not loged in users to your freebusy information?	Password for not loged in users to your freebusy information?
+en	calendar	people holiday	people holiday
+en	calendar	permission denied	Permission denied
+en	calendar	planner by category	Planner by category
+en	calendar	planner by user	Planner by user
+en	calendar	please confirm,accept,reject or examine changes in the corresponding entry in your calendar	Please confirm, accept, reject or examine changes in the corresponding entry in your calendar
+en	calendar	preselected group for entering the planner	Preselected group for entering the planner
+en	calendar	print calendars in black & white	Print calendars in black & white
+en	calendar	print the mini calendars	Print the mini calendars
+en	calendar	printer friendly	Printer Friendly
+en	calendar	privat	Privat
+en	calendar	private and global public	Private and Global Public
+en	calendar	private and group public	Private and Group Public
+en	calendar	private only	Private Only
+en	calendar	re-edit event	Re-Edit Event
+en	calendar	read a list of entries.	Read a list of entries.
+en	calendar	read a single entry by passing the id and fieldlist.	Read a single entry by passing the id and fieldlist.
+en	calendar	read this list of methods.	Read this list of methods.
+en	calendar	receive email updates	Receive email updates
+en	calendar	receive extra information in event mails	Receive extra information in event mails
+en	calendar	receive summary of appointments	Receive summary of appointments
+en	calendar	recurring event	recurring event
+en	calendar	refresh	Refresh
+en	calendar	reinstate	Reinstate
+en	calendar	rejected	Rejected
+en	calendar	repeat day	Repeat day
+en	calendar	repeat end date	Repeat End date
 en	calendar	repeat type	Repeat type
 en	calendar	repeating event information	Repeating Event Information
@@ -20178,9 +20423,4 @@
 en	calendar	this message is sent for canceled or deleted events.	This message is sent for canceled or deleted events.
 en	calendar	this message is sent for modified or moved events.	This message is sent for modified or moved events.
-en	contactcenter	connection value	Connection Value
-en	contactcenter	connections	Connetions
-en	contactcenter	contact [full]	Contact [Full]
-en	contactcenter	contact [quick add]	Contact [Quick Add]
-es-es	expressoMail1_2	new	Nuevo
 en	calendar	this message is sent to every participant of events you own, who has requested notifcations about new events.<br>you can use certain variables which get substituted with the data of the event. the first line is the subject of the 	This message is sent to every participant of events you own, who has requested notifcations about new events.<br>You can use certain variables which get substituted with the data of the event. The first line is the subject of the email.
 en	calendar	this message is sent when you accept, tentative accept or reject an event.	This message is sent when you accept, tentatively accept, or reject an event.
@@ -20256,4 +20496,8 @@
 en	contactcenter	confirm removal of this contact?	Confirm Removal of this Contact?
 en	contactcenter	connection name	Connection Name
+en	contactcenter	connection value	Connection Value
+en	contactcenter	connections	Connetions
+en	contactcenter	contact [full]	Contact [Full]
+en	contactcenter	contact [quick add]	Contact [Quick Add]
 en	contactcenter	contacting server...	Contacting Server...
 en	contactcenter	country	Country
@@ -20343,5 +20587,4 @@
 en	emailadmin	default	default
 en	emailadmin	deliver extern	deliver extern
-en	expressoMail1_2	before date	Before Date
 en	emailadmin	do you really want to delete this profile	Do you really want to delete this Profile
 en	emailadmin	domainname	domainname
@@ -20429,4 +20672,7 @@
 en	expressoMail1_2	back	Back
 en	expressoMail1_2	bcc	BCC
+en	expressoMail1_2	before date	Before Date
+en	expressoMail1_2	big	Big
+en	expressoMail1_2	bold	Bold
 en	expressoMail1_2	border	Border
 en	expressoMail1_2	block sender	Block Sender
@@ -20594,5 +20840,4 @@
 en	expressoMail1_2	message body	Message body
 en	expressoMail1_2	message date:	Message date:
-en	expressoMail1_2	message	message
 en	expressoMail1_2	minute ago	minute ago
 en	expressoMail1_2	minutes ago	minutes ago
@@ -20689,6 +20934,4 @@
 en	expressoMail1_2	search user	Search user
 en	expressoMail1_2	sector	Sector
-en	expressoMail1_2	seen	Seen
-en	expressoMail1_2	l_seen	Seen
 en	expressoMail1_2	select a folder:	Select a folder:
 en	expressoMail1_2	select a folder!	Select a folder!
@@ -20754,4 +20997,8 @@
 en	expressoMail1_2	this message is signed, and you can trust.	This message is signed, and you can trust.
 en	expressoMail1_2	this message is signed, but it is invalid. you should not trust on it.	This message is signed, but it is invalid. You should not trust on it.
+en	expressoMail1_2	to:	To: 
+en	expressoMail1_2	to	TO
+en	expressoMail1_2	tools	Tools
+en	expressoMail1_2	trash	Trash
 en	expressoMail1_2	type without spaces, dots or special characters!	Type without spaces, dots or special characters!
 en	expressoMail1_2	unanswered/unforwarded	Unanswered/Unforwarded
@@ -20940,4 +21187,5 @@
 en	filemanager	who	Who
 en	filemanager	you do not have access to %1	You do not have access to %1
+en	htmlarea-ContextMenu	_modify link...	_Modify Link...
 en	filemanager	your home dir did not exist, egroupware created a new one.	Your Home Dir did not exist, eGroupWare created a new one.
 en	manual	%1 manual page(s) added or updated	%1 manual page(s) added or updated
@@ -21005,5 +21253,4 @@
 en	news_admin	write permissions	Write permissions
 en	news_admin	read news	Read news
-en	htmlarea	paste from clipboard	Paste from clipboard
 en	jscalendar	(shift-)click or drag to change value	(Shift-)Click or drag to change value
 en	jscalendar	- click on any of the time parts to increase it	- Click on any of the time parts to increase it
@@ -21031,5 +21278,4 @@
 en	htmlarea-ContextMenu	_delete row	_Delete Row
 en	htmlarea-ContextMenu	_image properties...	_Image Properties...
-en	htmlarea-ContextMenu	_modify link...	_Modify Link...
 en	htmlarea-ContextMenu	_remove link...	_Remove Link...
 en	htmlarea-ContextMenu	_table properties...	_Table Properties...
@@ -21084,4 +21330,6 @@
 en	htmlarea	insert web link	Insert Web Link
 en	htmlarea	ordered list	Ordered List
+en	htmlarea	paste from clipboard	Paste from clipboard
+en	htmlarea	path	Path
 en	htmlarea	redoes your last action	Redoes your last action
 en	htmlarea	strikethrough	Strikethrough
@@ -21197,4 +21445,5 @@
 en	preferences	24 hour	24 hour
 en	preferences	a template defines the layout of phpgroupware and it contains icons for each application.	A template defines the layout of eGroupWare and it contains icons for each application.
+en	workflow	process %s has been updated	Process %s has been updated
 en	preferences	a theme defines the colors and fonts used by the template.	A theme defines the colors and fonts used by the template.
 en	preferences	acl grants have been updated	ACL grants have been updated
@@ -21252,4 +21501,6 @@
 en	preferences	the two passwords are not the same	The two passwords are not the same
 en	preferences	theme (colors/fonts) selection	Theme (colors/fonts) Selection
+en	workflow	activity %1 is standalone or view but has transitions	Activity %1 is standalone or view but has transitions
+en	workflow	situation	Situation
 en	preferences	this telephone number will apear in searches for your name, and it will be visible for all expressolivre users	This telephone number will appear in searches for your name, and it will be visible for all ExpressoLivre Users
 en	preferences	this server is located in the %1 timezone	This server is located in the %1 timezone
@@ -21286,6 +21537,4 @@
 en	workflow	<strong>%role_xx%</strong> are all the emails of all users mapped to the role xx	<strong>%role_XX%</strong> are all the emails of all users mapped to the role XX
 en	workflow	<strong>%roles%</strong> are the emails of all users mapped to any role on this activity	<strong>%roles%</strong> are the emails of all users mapped to any role on this activity
-en	workflow	admin processes sources	Admin Processes Sources
-en	workflow	more options?	more options?
 en	workflow	<strong>%signature%</strong> is the agent signature defined in the process configuration	<strong>%signature%</strong> is the agent signature defined in the process configuration
 en	workflow	<strong>%user%</strong> is the instance user email	<strong>%user%</strong> is the instance user email
@@ -21321,5 +21570,4 @@
 en	workflow	activity %1 is standalone and is using the $instance object	Activity %1 is standalone and is using the $instance object
 en	workflow	activity %1 is standalone but has transitions	Activity %1 is standalone but has transitions
-en	workflow	activity %1 is standalone or view but has transitions	Activity %1 is standalone or view but has transitions
 en	workflow	activity %1 is switch so it must use $instance->setnextactivity($actname) method	Activity %1 is switch so it must use $instance->setNextActivity($actname) method
 en	workflow	activity %1 is view and is using the $instance object in write mode	Activity %1 is view and is using the $instance object in write mode
@@ -21358,4 +21606,5 @@
 en	workflow	admin process activities	Admin Process Activities
 en	workflow	admin process roles	Admin Process Roles
+en	workflow	admin processes sources	Admin Processes Sources
 en	workflow	agent #%1 of type %2 is associated to an inexistent activity #%3	Agent #%1 of type %2 is associated to an inexistent activity #%3
 en	workflow	agent #%1 of type %2 is not linked with an activity	Agent #%1 of type %2 is not linked with an activity
@@ -21424,5 +21673,4 @@
 en	workflow	do you want the activity status on instances lists. most of the time it is "running" but if you use non-autorouted transitions you will have some completed activities.	Do you want the activity status on instances lists. Most of the time it is "running" but if you use non-autorouted transitions you will have some completed activities.
 en	workflow	do you want the category column on instances lists, if yout instances use categories you should use it	Do you want the category column on instances lists, if yout instances use categories you should use it
-en	workflow	go to same process activities	go to same process activities
 en	workflow	do you want the category name column on instances lists, if your instances use categories you should use it	Do you want the category name column on instances lists, if your instances use categories you should use it
 en	workflow	do you want the category name column on instances lists. if your instances use categories you should use this	Do you want the category name column on instances lists. If your instances use categories you should use this
@@ -21481,4 +21729,5 @@
 en	workflow	go	go
 en	workflow	go to same activities for other instances of this process	go to same activities for other instances of this process
+en	workflow	go to same process activities	go to same process activities
 en	workflow	go to the actual state of this instance	go to the actual state of this instance
 en	workflow	grab instance	grab instance
@@ -21526,4 +21775,7 @@
 en	workflow	list of all activities with, for each,  counters of instances by status	list of all activities with, for each,  counters of instances by status
 en	workflow	list of all history items made by instances while they travel in the workflow with information about duration and date	list of all history items made by instances while they travel in the workflow with information about duration and date
+en	workflow	process %s %s imported	Process %s %s imported
+en	workflow	process %s has been created	Process %s has been created
+en	workflow	assigned to	Assigned to
 en	workflow	list of all instances with info about current status and activities and link to administration of theses instances	list of all instances with info about current status and activities and link to administration of theses instances
 en	workflow	list of instances	List of instances
@@ -21551,4 +21803,6 @@
 en	workflow	monitor work items	Monitor Work Items
 en	workflow	monitor workitems	Monitor workitems
+en	workflow	monitors	Monitors
+en	workflow	more options?	more options?
 en	workflow	my activities	My Activities
 en	workflow	my instances	My Instances
@@ -21607,7 +21861,4 @@
 en	workflow	process %d has been deactivated	Process %d has been deactivated
 en	workflow	process %s %s already exists, the import process was aborted	Process %s %s already exists, the import process was aborted
-en	workflow	process %s %s imported	Process %s %s imported
-en	workflow	process %s has been created	Process %s has been created
-en	workflow	process %s has been updated	Process %s has been updated
 en	workflow	process %s removed	Process %s removed
 en	workflow	process activities	Process activities
@@ -21829,6 +22080,4 @@
 en	workflow	add participants	Add participants
 en	workflow	loading	Loading workflow
-en	workflow	situation	Situation
-en	workflow	assigned to	Assigned to
 en	workflow	user interface	User interface
 en	workflow	organization chart	Organization chart
@@ -21838,5 +22087,4 @@
 en	workflow	there are no external applications	There are no external applications
 en	workflow	warnings in this process	Warnings in this process
-es-es	admin	deny access to groups	Denegar acceso a grupos
 en	workflow	this instance doesn't exist in this activity. probably, this instance has already been executed	This instance doesn't exist in this activity. Probably, this instance has already been executed
 en	workflow	external applications	External Applications
@@ -21989,4 +22237,5 @@
 es-es	admin	deny access to error log	Denegar acceso al registro de errores
 es-es	admin	deny access to global categories	Denegar acceso a las categorías globales
+es-es	admin	deny access to groups	Denegar acceso a grupos
 es-es	admin	deny access to mainscreen message	Denegar acceso al mensaje de la pantalla principal
 es-es	admin	deny access to peer servers	Denegar acceso a servidores 'peer'
@@ -22133,4 +22382,5 @@
 es-es	admin	max attachment size	Tamaño máximo de anexos
 es-es	admin	maximum account id (e.g. 65535 or 1000000)	Máximo id de cuenta (ej. 65535 o 1000000)
+es-es	admin	server url	URL del servidor
 es-es	admin	maximum entries in click path history	Número máximo de entradas en la ruta del historial de pulsar con el ratón
 es-es	admin	maximum length of photo archive  (default 10240 = 10 kb)	Tamaño máximo del archivo de foto  (predeterminado 10240 = 10 kb)
@@ -22200,6 +22450,4 @@
 es-es	admin	select organization	Selecione la Organización
 es-es	admin	select permissions this group will have	Selecciones los permisos que tendrá este grupo
-es-es	admin	timetrack	Seguimiento del Tiempo
-es-es	admin	title	Titulo
 es-es	admin	select the parent category. if this is a main category select no category	Seleccione la categoría superior. Si ésta es una categoría principal seleccione SIN CATEGORIA
 es-es	admin	select users for inclusion	Seleccionar usuarios para inclusión
@@ -22214,5 +22462,4 @@
 es-es	admin	server password	Contraseña del servidor
 es-es	admin	server type(mode)	Tipo (modo) del servidor
-es-es	admin	server url	URL del servidor
 es-es	admin	server username	Usuario del servidor
 es-es	admin	servidor ldap	Servidor LDAP
@@ -22268,4 +22515,6 @@
 es-es	admin	timeout for sessions in seconds (default 14400 = 4 hours)	Tiempo límite para las sesiones en segundos (por defecto 14400 = 4 horas)
 es-es	admin	times	Horas
+es-es	admin	timetrack	Seguimiento del Tiempo
+es-es	admin	title	Titulo
 es-es	admin	(to install new applications use<br><a href="setup/" target="setup">setup</a> [manage applications] !!!)	(Para instalar nuevas aplicaciones, utilice <br><a href="setup/" target="setup">Instalación</a> [Administrar Aplicaciones])
 es-es	admin	top	Superior
@@ -22282,4 +22531,5 @@
 es-es	admin	use restrictions in the creation of emaillists	Utilizar las restricciones en la creación de listas de e-mail
 es-es	admin	use restrictions in the creation of groups	Utilizar las restricciones en la creación de grupos
+es-es	common	antarctica	ANTARCTICA
 es-es	admin	user for smtp-authentication (leave it empty if no auth required)	Usuario para identificación SMTP (dejar en blanco si no se usa)
 es-es	admin	user groups	Grupos de usuarios
@@ -22502,5 +22752,4 @@
 es-es	common	angola	ANGOLA
 es-es	common	anguilla	ANGUILLA
-es-es	common	antarctica	ANTARCTICA
 es-es	common	antigua and barbuda	ANTIGUA AND BARBUDA
 es-es	common	apply	Aplicar
@@ -22561,4 +22810,5 @@
 es-es	common	chad	CHAD
 es-es	common	change	Cambiar
+es-es	common	charset	iso-8859-1
 es-es	common	check installation	Comprobar instalación
 es-es	common	chile	CHILE
@@ -22605,4 +22855,7 @@
 es-es	common	detail	Detalle
 es-es	common	details	Detalles
+es-es	common	guinea	GUINEA
+es-es	common	guyana	GUYANA
+es-es	common	haiti	HAITI
 es-es	common	diable the execution a bugfixscript for internet explorer 5.5 and higher to show transparency in png-images?	¿Desactivar la ejecución del script que arregla el bug de IE 5.5 y superiores para mostrar transparencias en imágenes PNG?
 es-es	common	disabled	Deshabilitado
@@ -22700,7 +22953,4 @@
 es-es	common	guatemala	GUATEMALA
 es-es	common	guinea-bissau	GUINEA-BISSAU
-es-es	common	guinea	GUINEA
-es-es	common	guyana	GUYANA
-es-es	common	haiti	HAITI
 es-es	common	header admin login	Usuario administrador del encabezado
 es-es	common	header password	Contraseña del encabezado
@@ -22740,4 +22990,5 @@
 es-es	common	july	Julio
 es-es	common	jun	Jun
+es-es	common	june	Junio
 es-es	common	kazakstan	KAZAKSTAN
 es-es	common	kenya	KENYA
@@ -22906,5 +23157,4 @@
 es-es	common	reject	Rechazar
 es-es	common	remove selected accounts	quite las cuentas seleccionadas
-es-es	common	rename	Renombrar
 es-es	common	returns a full list of accounts on the system.  warning: this is return can be quite large	Devuelve una lista completa de las cuentas del sistema. Aviso: puede ser bastante largo
 es-es	common	returns an array of todo items	Devuelve un array de elementos pendientes
@@ -23020,4 +23270,7 @@
 es-es	common	turkmenistan	TURKMENISTAN
 es-es	common	turks and caicos islands	TURKS AND CAICOS ISLANDS
+es-es	common	tuvalu	TUVALU
+es-es	common	uganda	UGANDA
+es-es	common	ukraine	UKRAINE
 es-es	common	united arab emirates	UNITED ARAB EMIRATES
 es-es	common	united kingdom	UNITED KINGDOM
@@ -23096,5 +23349,4 @@
 es-es	common	admin processes	Administrar procesos
 es-es	common	auto-release on leaving activity	Liberar automáticamente al abandonar la actividad
-es-es	calendar	adding event	Agregando evento
 es-es	common	base directory does not exist, please ask adminstrator to check the global configuration	El directorio base no existe. Por favor, pida al administrador que compruebe la configuración global
 es-es	common	config values	Valores de configuración
@@ -23166,4 +23418,5 @@
 es-es	calendar	1 match found	1 coincidencia encontrada
 es-es	calendar	%1 records imported	%1 registros importados
+es-es	calendar	link to view the event	Enlace para ver el evento
 es-es	calendar	%1 records read (not yet imported, you may go back and uncheck test import)	%1 registros leídos (todavía sin importar, puede volver atrás desmarcar Probar Importar)
 es-es	calendar	a	un
@@ -23175,4 +23428,5 @@
 es-es	calendar	add contact	Añadir contacto
 es-es	calendar	added	Añadido
+es-es	calendar	adding event	Agregando evento
 es-es	calendar	add or update a single entry by passing the fields.	Añadir o actualizar una simple entrada pasando los campos.
 es-es	calendar	add participants	Añadir Participantes
@@ -23238,4 +23492,12 @@
 es-es	calendar	displays your default calendar view on the startpage (page you get when you enter egroupware or click on the homepage icon)?	Muestra la vista predeterminada del calendario en la página de inicio de eGroupWare
 es-es	calendar	download	Descargar
+es-es	calendar	list all categories.	Listar todas las categorías.
+es-es	calendar	loading	Cargando
+es-es	calendar	load [iv]cal	Cargar [iv]Cal
+es-es	calendar	location	Lugar
+es-es	calendar	make freebusy information availible to not loged in persons?	¿Hacer la información libre-ocupado disponible para personas que no inicien sesión?
+es-es	calendar	matrixview	Vista matricial
+es-es	calendar	minutes	minutos
+es-es	calendar	mo	L
 es-es	calendar	do you want to be notified about new or changed appointments? you be notified about changes you make yourself.<br>you can limit the notifications to certain changes only. each item includes all the notification listed above it. al	¿Desea que se le notifiquen citas nuevas o modificadas? Se le notificará de los cambios que haga usted mismo.<br>Puede limitar las notificaciones para sólo ciertos cambios. Cada elemento incluye toda la notificación listada encima. Todas las modificaciones incluyen cambios de título, participantes, pero no las respuestas de los participantes. Si el dueño de un evento solicitó alguna notificación, siempre obtendrá las respuestas de aceptación o rechazo del participante.
 es-es	calendar	do you want to receive a regulary summary of your appointsments via email?<br>the summary is sent to your standard email-address on the morning of that day or on monday for weekly summarys.<br>it is only sent when you have any app	¿Desea recibir regularmente por correo un resumen de sus citas?<br>El resumen se le enviará a su correo electrónico habitual el mismo día por la mañana o el lunes para resúmenes semanales.<br>Sólo se envía si hay citas en ese día o esa semana.
@@ -23307,15 +23569,4 @@
 es-es	calendar	length<br>(<= 255)	Longitud<br>(<=255)
 es-es	calendar	length shown<br>(emtpy for full length)	Longitud mostrada<br>(vació para dia completo)
-es-es	calendar	link	Enlace
-es-es	calendar	link to view the event	Enlace para ver el evento
-es-es	calendar	list all categories.	Listar todas las categorías.
-es-es	calendar	loading	Cargando
-es-es	calendar	load [iv]cal	Cargar [iv]Cal
-es-es	calendar	location	Lugar
-es-es	calendar	make freebusy information availible to not loged in persons?	¿Hacer la información libre-ocupado disponible para personas que no inicien sesión?
-es-es	calendar	matrixview	Vista matricial
-es-es	calendar	minutes	minutos
-es-es	calendar	mo	L
-es-es	calendar	modified	Modificado
 es-es	calendar	modify list of external participants	Modificar lista de participantes externos
 es-es	calendar	mon	Lun
@@ -23444,9 +23695,9 @@
 es-es	calendar	this defines the start of your dayview. events before this time, are shown above the dayview.<br>this time is also used as a default starttime for new events.	Esto define el inicio de la vista del día. Los eventos anteriores a esta hora se muestran encima de la vista del día.<br>Esta hora se usa también como hora predeterminada para nuevos eventos.
 es-es	calendar	this group that is preselected when you enter the planner. you can change it in the planner anytime you want.	Este grupo es el predeterminado al entrar en el organizador. Puede cambiarlo en el organizador cuando quiera.
-es-es	calendar	you have not entered participants	No ha introducido participantes
 es-es	calendar	this is an external event. even if it added to your expresso its can be changed any time at all	Este es un evento externo. Aunque sea agregado a su Expresso corre el riesgo de mudar a cualquier momento
 es-es	calendar	this is mostly caused by a not or wrongly configured smtp server. notify your administrator.	Esto se debe mayormente a una configuración errónea del servidor SMTP. Notifíquelo a su administrador.
 es-es	calendar	this message is sent for canceled or deleted events.	Este mensaje se envía cuando un evento se borra o se cancela.
 es-es	calendar	this message is sent for modified or moved events.	Este mensaje se envía al modificar o mover eventos.
+es-es	contactcenter	add relation	Agregue la Relación
 es-es	calendar	this message is sent to every participant of events you own, who has requested notifcations about new events.<br>you can use certain variables which get substituted with the data of the event. the first line is the subject of the 	Este mensaje se envía a cada participante de los eventos de los que usted es el dueño, quien ha solicitado notificaciones sobre nuevos eventos.<br>Puede usar ciertas variables a las que sustituyen los datos del evento. La primera línea es el asunto del correo electrónico.
 es-es	calendar	this message is sent when you accept, tentative accept or reject an event.	Este mensaje se envía cuando acepta, acepta la tentativa o rechaza un evento.
@@ -23509,4 +23760,5 @@
 es-es	calendar	you have not entered a valid date	Ha introducido una fecha incorrecta
 es-es	calendar	you have not entered a valid time of day	Ha introducido una hora incorrecta
+es-es	calendar	you have not entered participants	No ha introducido participantes
 es-es	calendar	you must enter one or more search keywords	Ud. debe entrar una o mas claves de busqueda
 es-es	calendar	you must select a [iv]cal. (*.[iv]cs)	Debe seleccionar un [iv]Val. (*.[iv]cs)
@@ -23516,5 +23768,4 @@
 es-es	calendar	your suggested time of <b> %1 - %2 </b> conflicts with the following existing calendar entries:	Sus horas sugeridas de <B> %1 - %2 </B> están en conflicto con las siguientes entradas es el calendario:
 es-es	contactcenter	add participants	Agregar Participantes
-es-es	contactcenter	add relation	Agregue la Relación
 es-es	contactcenter	add to catalog	Agregar al catálogo
 es-es	contactcenter	address 1	Dirección 1
@@ -23585,4 +23836,5 @@
 es-es	contactcenter	edit group	Editar Grupo
 es-es	contactcenter	e-mails and telephones	E-mails y Teléfonos
+es-es	contactcenter	empty	Vacío
 es-es	contactcenter	entry added with success!	¡Contacto añadido con suceso!
 es-es	contactcenter	entry added with success. but some contacts will not receive or send messages.	Entrada añadido con éxito. Pero algunos contactos no recibir ni enviar mensajes.
@@ -23663,4 +23915,5 @@
 es-es	contactcenter	select the telephone	Seleccione el teléfono
 es-es	contactcenter	server contacted. waiting for response...	Servidor contactado. Esperando respuesta...
+es-es	contactcenter	sex	Sexo
 es-es	contactcenter	state	Estado
 es-es	contactcenter	suffix	Característica
@@ -23742,4 +23995,5 @@
 es-es	emailadmin	qouta size in mbyte	Tamaño de la cuota en MBytes
 es-es	emailadmin	quota settings	Configuración de las cuotas
+es-es	emailadmin	remove	borrar
 es-es	emailadmin	spam settings	Configuraciones de Spam
 es-es	emailadmin	select type of imap/pop3 server	Seleccione el tipo de servidor IMAP/POP3
@@ -24044,5 +24298,4 @@
 es-es	expressoMail1_2	day(s)	Día(s)
 es-es	expressoMail1_2	dear user,\\nthis is your first time in the expressomail, your preferences must be saved.\\nplease, choose your preferences and click on the button save.	Estimado usuario, \\ncomo esta es la primera vez que usted esta entraando a ExpressoMail, sus preferencias deben ser guardadas.\\n Favor seleccionar sus preferencias y darle al boton Guardar.
-es-es	expressoMail1_2	error saving your message.	Ocurrió un ERROR al guardar su mensaje.
 es-es	expressoMail1_2	define some criterion to the fields from, to and subject with more than 3 characters!	Defina algún critério para los campos De, Para, Asunto con  más de 3 caracteres!
 es-es	expressoMail1_2	define some search parameters!	Defina algunos parámetros para la busqueda!
@@ -24105,5 +24358,5 @@
 es-es	expressoMail1_2	error moving message.	Error al mover el mensaje
 es-es	expressoMail1_2	error moving or delete message: message too large. select one message by one.	Error al mover o borrar mensaje: Mensaje muy grande. Seleccione uno a la vez.
-es-es	expressoMail1_2	italic	Cursiva
+es-es	expressoMail1_2	error saving your message.	Ocurrió un ERROR al guardar su mensaje.
 es-es	expressoMail1_2	error emptying your spam folder.	Ocurrió un ERROR al vaciar su carpeta Spam.
 es-es	expressoMail1_2	everytime you receive new messages you will be informed	Cada vez que reciba nuevos mensajes será informado
@@ -24160,4 +24413,5 @@
 es-es	expressoMail1_2	hlp_msg_delmov_acl	Otros usuarios podrán ELIMINAR/MOVER sus mensajes
 es-es	expressoMail1_2	hlp_msg_read_acl	Otros usuarios podrán LEER sus mensajes
+es-es	expressoMail1_2	spam	Spam
 es-es	expressoMail1_2	hlp_msg_sendlike_acl	Otros usuarios podrán ENVIAR mensajes como siendo usted
 es-es	expressoMail1_2	hlp_msg_savelike_acl	Otros usuarios podrán GUARDAR los mensajes enviados como siendo usted en esta bandeja 
@@ -24189,4 +24443,5 @@
 es-es	expressoMail1_2	in this message	En el mensaje
 es-es	expressoMail1_2	invalid signature	Error indeterminado: No fue posible validar la firma digital del mensaje.
+es-es	expressoMail1_2	italic	Cursiva
 es-es	expressoMail1_2	it allow you to remove attachments from messages	Permite que usted borre anexos de los mensajes
 es-es	expressoMail1_2	it allow you to send emails with important flag, but you can receive unwanted messages with important flag	Permite que ústed envie e-mails con marca de importante, pero usted puede reciber mensajes indeseados marcados como de importante
@@ -24238,4 +24493,5 @@
 es-es	expressoMail1_2	message marked as	Mensaje marcado como 
 es-es	expressoMail1_2	message(s) deleted from your trash folder.	Mensaje(s) eliminado(s) de su papelera
+es-es	filemanager	delete	Borrar
 es-es	expressoMail1_2	messages	mensajes
 es-es	expressoMail1_2	messages found in folder:	mensajes encontrados en la carpeta
@@ -24261,4 +24517,5 @@
 es-es	expressoMail1_2	nao foi possivel verificar se o certificado esta revogado.(cd-02)	No fue posibl verificar si el certificado está revocado.(CD-02)
 es-es	expressoMail1_2	nao foi possivel verificar se o certificado esta revogado.(cd-03)	No fue posible verificar si el certificado está revocado.(CD-03)
+es-es	expressoMail1_2	new	Nuevo
 es-es	expressoMail1_2	new folder	Nueva carpeta
 es-es	expressoMail1_2	new message	Nuevo Mensaje
@@ -24396,5 +24653,4 @@
 es-es	expressoMail1_2	size	Tamaño
 es-es	expressoMail1_2	small	pequeña
-es-es	expressoMail1_2	spam	Spam
 es-es	expressoMail1_2	standard imap server	Servidor standar de IMAP
 es-es	expressoMail1_2	standard pop3 server	Servidor standar de POP3
@@ -24412,5 +24668,4 @@
 es-es	expressoMail1_2	test word: hello %1 %2 %3 %4, bye!	Prueba de palabra:  %1 %2 %3 %4, Hello!
 es-es	expressoMail1_2	the %1 folder is not created. it is necessary to finish your request.	Su carpeta \\"%1\\" no está creada. Es necesario crearla para que funcione correctamente.
-es-es	expressoMail1_2	warning: your mailbox is almost full!	Aviso: ¡Su Buzón de Correo está casi lleno!
 es-es	expressoMail1_2	the anti pop-up is enabled. allow this site (%1) for print.	El anti Pop-Up está habilitado. Desactivelo para este sitio (%1) para permitir la impresión.
 es-es	expressoMail1_2	the event was imported successfully.	El evento fue importado con éxito.
@@ -24475,4 +24730,5 @@
 es-es	expressoMail1_2	view tips	Ver tips
 es-es	expressoMail1_2	voided message	Mensaje anulado
+es-es	expressoMail1_2	warning: your mailbox is almost full!	Aviso: ¡Su Buzón de Correo está casi lleno!
 es-es	expressoMail1_2	 was succefully removed	fue eliminado con éxito
 es-es	expressoMail1_2	wednesday	Miércoles
@@ -24596,5 +24852,4 @@
 es-es	filemanager	type of pdf paper	Tipo de papel para exportar
 es-es	filemanager	default number of upload fields to show	Número predeterminado de campos a mostrar
-es-es	filemanager	delete	Borrar
 es-es	filemanager	deleted %1	%1 ha sido borrado
 es-es	filemanager	directory	Directorio
@@ -24801,5 +25056,4 @@
 es-es	preferences	use default	Usar predeterminado
 es-es	preferences	users choice	Elegido por el usuario
-es-es	mobile	already_addeds:	ya agregados:
 es-es	preferences	when you say yes the home and logout buttons are presented as applications in the main top applcation bar	Cuando usted selecciona Sí, los botones serán colocados en la barra de herramientas en la parte superior del aplicativo.
 es-es	preferences	which currency symbol or name should be used in phpgroupware.	Símbolo de moneda o nombre que debe usar eGroupWare
@@ -24875,4 +25129,5 @@
 es-es	mobile	schedule	Agendar
 es-es	mobile	continue scheduling	Continuar agendando
+es-es	mobile	already_addeds:	ya agregados:
 es-es	mobile	start date	Fecha(Inicio)
 es-es	mobile	end date	Fecha(Fin)
@@ -24887,4 +25142,5 @@
 es-es	mobile	username_mobile	Usuario
 es-es	mobile	password_mobile	Contraseña
+es-es	workflow	inst. status	Estado de la instancia
 es-es	mobile	the search argument must have at least 4 digits	El argumento de búsqueda debe poseer por lo menos 4 dígitos
 es-es	mobile	choose the participants	Seleccione los participantes
@@ -24959,5 +25215,4 @@
 es-es	news_admin	write permissions	Escribir permisos
 es-es	jscalendar	3 number of chars for day-shortcut	3 números para el di'a-atajo
-es-es	workflow	aborted	abortada
 es-es	jscalendar	3 number of chars for month-shortcut	3 números para el mes-atajo
 es-es	jscalendar	about the calendar	Acerca del calendario
@@ -25034,4 +25289,5 @@
 es-es	workflow	abort instance	abortar instancia
 es-es	workflow	abort this instance	Abortar esta instancia
+es-es	workflow	aborted	abortada
 es-es	workflow	access denied for user %1 on activity %2, no role	Acceso denegado para el usuario %1 en la actividad %2, sin rol
 es-es	workflow	act	actividad
@@ -25098,5 +25354,4 @@
 es-es	workflow	admin process roles	Administrar roles del proceso
 es-es	workflow	admin processes	Administrar Procesos
-es-es	workflow	delition successful	Borrado correcto
 es-es	workflow	admin processes sources	Administrar código fuente de los procesos
 es-es	workflow	agent #%1 of type %2 is associated to an inexistent activity #%3	El agente nº%1 del tipo %2 está asociado a una actividad inexistente nº%3
@@ -25119,4 +25374,5 @@
 es-es	workflow	be carefull with interactive activity, end and start of theses activities are multiple.	Tenga cuidado con la actividad interactiva, porque el fin y el inicio de estas actividades son múltiples.
 es-es	workflow	being run	siendo ejecutado
+es-es	workflow	instance	Instancia
 es-es	workflow	by running theses links you will create new instances of the related process.	Al ejecutar estos enlaces, creará nuevas instancias del proceso relacionado.
 es-es	workflow	cannot add transition only split or switch activities can have more than one outbound transition	No se puede añadir la transición. Sólo las actividades divididas o de cambio pueden tener más de una transición saliente
@@ -25162,4 +25418,5 @@
 es-es	workflow	delete transition	Borrar transición
 es-es	workflow	deletion successful	Borrado correcto
+es-es	workflow	delition successful	Borrado correcto
 es-es	workflow	description	Descripción
 es-es	workflow	do you want the activity status on instances lists. most of the time it is "running" but if you use non-autorouted transitions you will have some completed activities.	¿Desea el estado de la actividad en las listas de instancias? La mayoría del tiempo está "en ejecución", pero si usa transiciones no autoenrutadas tendrá algunas actividades completadas.
@@ -25171,4 +25428,6 @@
 es-es	workflow	do you want the instance status on instances lists. the instance status is usefull to disting beteween aborted, completed, exception or active instances	¿Desea el estado de la instancia en las listas de instancia? El estado de la instancia es útil para distinguir entre instancias abortadas, completadas, excepción o activa.
 es-es	workflow	do you want the owner column on instances lists. this will show you the actual owner, especially usefull if ownership is defined with special rights	¿Desea la columna propietario en las listas de instancias? Esto mostrará el propietario actual, especialmente útil si el propietario está definido con derechos especiales.
+es-es	workflow	instance %1	Instancia %1
+es-es	workflow	instance %1 is in %2 state, action %3 is impossible.	La instancia %1 está en estado %2, la acción %3 es imposible.
 es-es	workflow	do you want the priority column on instances lists. priority can be set with activities forms	¿Desea la columna prioridad en las listas de instancias? La prioridad puede establecerse con formularios de actividades.
 es-es	workflow	do you want the process column on instances lists. usefull if you have different processes and/or versions of theses processes	¿Desea la columna proceso en las listas de instancias? Es útil si se tienen distintos procesos y/o versiones de estos procesos
@@ -25236,8 +25495,4 @@
 es-es	workflow	inactive	Inactivo
 es-es	workflow	inst.	Inst.
-es-es	workflow	inst. status	Estado de la instancia
-es-es	workflow	instance	Instancia
-es-es	workflow	instance %1	Instancia %1
-es-es	workflow	instance %1 is in %2 state, action %3 is impossible.	La instancia %1 está en estado %2, la acción %3 es imposible.
 es-es	workflow	instance %1 is in exception, action %2 is not possible.	La instancia %1 está en excepción, la acción %2 no es posible.
 es-es	workflow	instance %1 is not associated with activity %2, action %3 is impossible.	La instancia %1 no está asociada con la actividad %2, la acción %3 es imposible.
@@ -25383,4 +25638,5 @@
 es-es	workflow	removing instances and workitems for aborted instances on all processes	eliminando instancias y elementos de trabajo para las instancias abortadas en todos los procesos
 es-es	workflow	removing instances and workitems for aborted instances on process #%1	eliminando instancias y elementos de trabajo paras las instancias abortadas en el proceso nº%1
+es-es	workflow	unknown status	estado desconocido
 es-es	workflow	removing instances and workitems for all instances on process #%1	eliminando instancias y elementos de trabajo paras las instancias en el proceso nº%1
 es-es	workflow	replyto:	Responder a:
@@ -25515,6 +25771,4 @@
 es-es	workflow	unknow fix instruction :%1	instrucción de corrección desconocida: %1
 es-es	workflow	unknown instruction from the workflow engine: %1	instrucción desconocida para el motor de flujo del trabajo: %1
-es-es	workflow	unknown status	estado desconocido
-es-es	workflow	update	actualizar
 es-es	workflow	upload file	Subir fichero
 es-es	workflow	use <a href="%1">emailadmin</a> to create mail profiles	Usar <a href="%1">EmailAdmin</a> para crear perfiles de correo
@@ -25799,5 +26053,5 @@
 1003	expressoMail	a:1:{s:13:"use_signature";s:1:"1";}
 -2	calendar	a:24:{s:15:"defaultcalendar";s:4:"week";s:21:"mainscreen_showevents";s:1:"0";s:7:"summary";s:2:"no";s:15:"receive_updates";s:2:"no";s:13:"update_format";s:8:"extended";s:11:"notifyAdded";s:113:"Evento do calendário - $$action$$: $$startdate$$ $$title$$\nVocê possui um compromisso agendado para $$startdate$$";s:14:"notifyCanceled";s:116:"Evento do calendário - $$action$$: $$startdate$$ $$title$$\nSeu compromisso agendado para $$startdate$$ foi cancelado";s:14:"notifyModified";s:133:"Evento do calendário - $$action$$: $$startdate$$ $$title$$\nSeu compromisso agendado para $$olddate$$ foi remarcado para $$startdate$$";s:14:"notifyResponse";s:140:"Evento do calendário - $$action$$: $$startdate$$ $$title$$\nEm $$date$$ $$fullname$$ $$action$$ sua requisição de encontro para $$startdate$$";s:11:"notifyAlarm";s:85:"Alarme para $$title$$ em $$startdate$$ na $$location$$\nAqui está o alarme solicitado.";s:13:"show_rejected";s:1:"0";s:14:"display_status";s:1:"1";s:13:"weekdaystarts";s:6:"Monday";s:13:"workdaystarts";s:1:"9";s:11:"workdayends";s:2:"17";s:8:"interval";s:2:"30";s:13:"defaultlength";s:2:"60";s:24:"planner_start_with_group";s:4:"1001";s:25:"planner_intervals_per_day";s:1:"4";s:13:"defaultfilter";s:3:"all";s:15:"default_private";s:1:"0";s:16:"display_minicals";s:1:"1";s:17:"print_black_white";s:1:"0";s:19:"hide_event_conflict";s:1:"0";}
--2	expressoMail	a:19:{s:18:"max_email_per_page";s:2:"50";s:16:"save_deleted_msg";s:1:"1";s:18:"use_local_messages";s:1:"0";s:22:"keep_archived_messages";s:1:"0";s:32:"delete_and_show_previous_message";s:1:"1";s:13:"alert_new_msg";s:1:"1";s:19:"mainscreen_showmail";s:1:"1";s:27:"remove_attachments_function";s:1:"0";s:21:"enable_important_flag";s:1:"0";s:14:"save_in_folder";s:10:"INBOX/Sent";s:12:"hide_folders";s:1:"0";s:11:"line_height";s:2:"20";s:9:"font_size";s:2:"11";s:20:"use_dynamic_contacts";s:1:"0";s:13:"use_shortcuts";s:1:"0";s:15:"auto_save_draft";s:1:"0";s:10:"image_size";s:5:"65536";s:28:"use_signature_digital_cripto";s:1:"0";s:14:"type_signature";s:4:"text";}
+-2	expressoMail	a:21:{s:18:"max_email_per_page";s:2:"50";s:16:"save_deleted_msg";s:1:"1";s:18:"use_local_messages";s:1:"0";s:22:"keep_archived_messages";s:1:"0";s:32:"delete_and_show_previous_message";s:1:"1";s:13:"alert_new_msg";s:1:"1";s:19:"mainscreen_showmail";s:1:"1";s:27:"remove_attachments_function";s:1:"0";s:21:"enable_important_flag";s:1:"0";s:14:"save_in_folder";s:10:"INBOX/Sent";s:12:"hide_folders";s:1:"0";s:11:"line_height";s:2:"20";s:9:"font_size";s:2:"11";s:20:"use_dynamic_contacts";s:1:"1";s:13:"use_shortcuts";s:1:"0";s:15:"auto_save_draft";s:1:"0";s:10:"image_size";s:5:"65536";s:28:"use_signature_digital_cripto";s:1:"0";s:14:"type_signature";s:4:"text";s:24:"show_name_print_messages";s:1:"0";s:8:"timezone";s:17:"America/Sao_Paulo";}
 -2	filemanager	a:19:{s:4:"name";s:1:"1";s:9:"mime_type";s:1:"1";s:4:"size";s:1:"1";s:7:"created";s:1:"1";s:8:"modified";s:1:"1";s:5:"owner";s:1:"1";s:12:"createdby_id";s:1:"1";s:13:"modifiedby_id";s:1:"1";s:3:"app";s:1:"0";s:7:"comment";s:1:"1";s:7:"version";s:1:"1";s:12:"viewinnewwin";s:1:"1";s:12:"viewonserver";s:1:"1";s:13:"viewtextplain";s:1:"1";s:6:"dotdot";s:1:"1";s:8:"dotfiles";s:1:"1";s:8:"pdf_type";s:8:"portrait";s:14:"pdf_paper_type";s:2:"a4";s:14:"files_per_page";s:3:"200";}
 \.
@@ -25873,4 +26127,12 @@
 
 --
+-- Name: calendar_historic_pkey; Type: CONSTRAINT; Schema: public; Owner: postgres; Tablespace: 
+--
+
+ALTER TABLE ONLY calendar_historic
+    ADD CONSTRAINT calendar_historic_pkey PRIMARY KEY (id);
+
+
+--
 -- Name: calendar_object_cal_uid_key; Type: CONSTRAINT; Schema: public; Owner: postgres; Tablespace: 
 --
@@ -26844,8 +27106,5 @@
 --
 
-CREATE TRIGGER trig_share_catalog_delete
-    AFTER DELETE ON phpgw_acl
-    FOR EACH ROW
-    EXECUTE PROCEDURE share_catalog_delete();
+CREATE TRIGGER trig_share_catalog_delete AFTER DELETE ON phpgw_acl FOR EACH ROW EXECUTE PROCEDURE share_catalog_delete();
 
 
@@ -26854,8 +27113,5 @@
 --
 
-CREATE TRIGGER trig_share_catalog_insert
-    AFTER INSERT ON phpgw_acl
-    FOR EACH ROW
-    EXECUTE PROCEDURE share_catalog_insert();
+CREATE TRIGGER trig_share_catalog_insert AFTER INSERT ON phpgw_acl FOR EACH ROW EXECUTE PROCEDURE share_catalog_insert();
 
 
