From c0a255eb90769638d57ae4122932f75c46e4e531 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 11 Sep 2008 15:34:29 +0000 Subject: Merge revisions 36016:36303 from trunk. svn path=/branches/kill-bonobo/; revision=36307 --- a11y/addressbook/ea-addressbook-view.c | 4 ++-- a11y/addressbook/ea-addressbook-view.h | 27 ++++++++++++++------------- a11y/addressbook/ea-addressbook.c | 27 ++++++++++++--------------- a11y/addressbook/ea-addressbook.h | 27 ++++++++++++--------------- a11y/addressbook/ea-minicard-view.c | 2 +- a11y/addressbook/ea-minicard-view.h | 28 +++++++++++++++------------- a11y/addressbook/ea-minicard.c | 26 +++++++++++++------------- a11y/addressbook/ea-minicard.h | 27 ++++++++++++++------------- 8 files changed, 83 insertions(+), 85 deletions(-) (limited to 'a11y/addressbook') diff --git a/a11y/addressbook/ea-addressbook-view.c b/a11y/addressbook/ea-addressbook-view.c index be6a1e6212..174fff71f7 100644 --- a/a11y/addressbook/ea-addressbook-view.c +++ b/a11y/addressbook/ea-addressbook-view.c @@ -91,7 +91,7 @@ ea_ab_view_get_name (AtkObject *accessible) if (accessible->name) return accessible->name; - return _("evolution addressbook"); + return _("evolution address book"); } static G_CONST_RETURN gchar* @@ -100,7 +100,7 @@ ea_ab_view_get_description (AtkObject *accessible) if (accessible->description) return accessible->description; - return _("evolution addressbook"); + return _("evolution address book"); } AtkObject* diff --git a/a11y/addressbook/ea-addressbook-view.h b/a11y/addressbook/ea-addressbook-view.h index 90a868e0aa..86782ad737 100644 --- a/a11y/addressbook/ea-addressbook-view.h +++ b/a11y/addressbook/ea-addressbook-view.h @@ -1,24 +1,25 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * ea-addressbook_view.h - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see + * * - * You should have received a copy of the GNU General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * Authors: + * Leon Zhang + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * - * Author: Leon Zhang Sun Microsystem Inc., 2003 */ + #ifndef __EA_ADDRESSBOOK_VIEW_H__ #define __EA_ADDRESSBOOK_VIEW_H__ diff --git a/a11y/addressbook/ea-addressbook.c b/a11y/addressbook/ea-addressbook.c index 96c66c9087..b41a98434e 100644 --- a/a11y/addressbook/ea-addressbook.c +++ b/a11y/addressbook/ea-addressbook.c @@ -1,25 +1,22 @@ -/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* vim:expandtab:shiftwidth=8:tabstop=8: - */ -/* Evolution Accessibility: ea-addressbook.c - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * +/* * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see * - * Author: Leon Zhang Sun Microsystem Inc., 2003 + * + * Authors: + * Leon Zhang + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ diff --git a/a11y/addressbook/ea-addressbook.h b/a11y/addressbook/ea-addressbook.h index 5619a78aaf..337f467760 100644 --- a/a11y/addressbook/ea-addressbook.h +++ b/a11y/addressbook/ea-addressbook.h @@ -1,25 +1,22 @@ -/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* vim:expandtab:shiftwidth=8:tabstop=8: - */ -/* Evolution Accessibility: ea-addressbook.h - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * +/* * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see * - * Author: Leon Zhang Sun Microsystem Inc., 2003 + * + * Authors: + * Leon Zhang + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ diff --git a/a11y/addressbook/ea-minicard-view.c b/a11y/addressbook/ea-minicard-view.c index b617bef24b..fc5638d51d 100644 --- a/a11y/addressbook/ea-minicard-view.c +++ b/a11y/addressbook/ea-minicard-view.c @@ -175,7 +175,7 @@ ea_minicard_view_get_description (AtkObject *accessible) if (accessible->description) return accessible->description; - return _("evolution addressbook"); + return _("evolution address book"); } AtkObject* diff --git a/a11y/addressbook/ea-minicard-view.h b/a11y/addressbook/ea-minicard-view.h index 58126713e7..922941cb7b 100644 --- a/a11y/addressbook/ea-minicard-view.h +++ b/a11y/addressbook/ea-minicard-view.h @@ -1,23 +1,25 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * ea-minicard-view.h - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * Author: Leon Zhang Sun Microsystem Inc., 2003 - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see + * + * + * Authors: + * Leon Zhang + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * - * You should have received a copy of the GNU General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. */ + #ifndef __EA_MINICARD_VIEW_H__ #define __EA_MINICARD_VIEW_H__ diff --git a/a11y/addressbook/ea-minicard.c b/a11y/addressbook/ea-minicard.c index 8f619f0152..d0219e03b5 100644 --- a/a11y/addressbook/ea-minicard.c +++ b/a11y/addressbook/ea-minicard.c @@ -1,23 +1,23 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * ea-minicard.c - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see * - * You should have received a copy of the GNU General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. * - * Author: Leon Zhang Sun Microsystem Inc., 2003 + * Authors: + * Leon Zhang + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * */ #include diff --git a/a11y/addressbook/ea-minicard.h b/a11y/addressbook/ea-minicard.h index a7a1924ddc..9c0c8a2b56 100644 --- a/a11y/addressbook/ea-minicard.h +++ b/a11y/addressbook/ea-minicard.h @@ -1,24 +1,25 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * ea-minicard.h - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see + * * - * You should have received a copy of the GNU General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * Authors: + * Leon Zhang + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * - * Author: Leon Zhang Sun Microsystem Inc., 2003 */ + #ifndef __EA_MINICARD_H__ #define __EA_MINICARD_H__ -- cgit v1.2.3