aboutsummaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@src.gnome.org>2008-10-02 04:56:04 +0800
committerMatthew Barnes <mbarnes@src.gnome.org>2008-10-02 04:56:04 +0800
commitb2cda1d0c6d44f53f71bad9e256f41188677dfba (patch)
tree65bd7560e802baf1740482ae48b952dc5c5957fc /shell
parente52986f4225cbe8496043da74ca250521d244705 (diff)
downloadgsoc2013-evolution-b2cda1d0c6d44f53f71bad9e256f41188677dfba.tar.gz
gsoc2013-evolution-b2cda1d0c6d44f53f71bad9e256f41188677dfba.tar.zst
gsoc2013-evolution-b2cda1d0c6d44f53f71bad9e256f41188677dfba.zip
Merge revisions 36016:36533 from trunk.
svn path=/branches/kill-bonobo/; revision=36534
Diffstat (limited to 'shell')
-rw-r--r--shell/ChangeLog61
-rw-r--r--shell/e-config-upgrade.c29
-rw-r--r--shell/e-shell-importer.c26
-rw-r--r--shell/e-shell-nm.c27
-rw-r--r--shell/e-shell-view.c4
-rw-r--r--shell/e-shell-view.h14
-rw-r--r--shell/e-shell.c19
-rw-r--r--shell/main.c26
-rw-r--r--shell/shell.error.xml6
9 files changed, 135 insertions, 77 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 599e2f32ec..ad724371c3 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,64 @@
+2008-09-30 Sankar P <psankar@novell.com>
+
+License Changes
+
+ * e-shell.c:
+ * main.c:
+
+2008-09-29 Gabor Kelemen <kelemeng@gnome.hu>
+
+ * shell.error.xml: Unbreak build, sorry for the inconvenience.
+
+2008-09-29 Gabor Kelemen <kelemeng@gnome.hu>
+
+ * shell.error.xml: Mark some forgotten strings for translation. Fixes bug #553106
+
+2008-09-24 Sankar P <psankar@novell.com>
+
+License Changes
+
+ * e-shell-window-commands.c:
+ * e-user-creatable-items-handler.c:
+
+2008-09-24 Sankar P <psankar@novell.com>
+
+License Changes
+
+ * e-shell-view.c:
+
+2008-09-24 Philip Withnall <philip@tecnocode.co.uk>
+
+ ** Fixes bug #553479
+
+ * shell.error.xml: String capitalisation improvements.
+
+2008-09-19 Sankar P <psankar@novell.com>
+
+License Changes
+
+ * e-sidebar.c:
+
+2008-09-16 Sankar P <psankar@novell.com>
+
+License Changes
+
+ * test/evolution-test-component.c:
+
+2008-09-15 Bharath Acharya <abharath@novell.com>
+
+ Updated the list of Contributors.
+
+ * e-shell-window-commands.c:
+
+2008-09-12 Sankar P <psankar@novell.com>
+
+License Changes
+
+ * e-config-upgrade.c:
+ * e-shell-importer.c:
+ * e-shell-nm-glib.c:
+ * e-shell-nm.c:
+
2008-09-04 Sankar P <psankar@novell.com>
License Changes
diff --git a/shell/e-config-upgrade.c b/shell/e-config-upgrade.c
index 4868d99bf7..09c9281ab7 100644
--- a/shell/e-config-upgrade.c
+++ b/shell/e-config-upgrade.c
@@ -1,24 +1,25 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-upgrade.c - upgrade previous config versions
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Michael Zucchi <notzed@ximian.com>
- * Jeffery Stedfast <fejj@ximian.com>
+/*
+ * e-upgrade.c - upgrade previous config versions
*
* 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 Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
- * 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.
+ *
+ * Authors:
+ * Michael Zucchi <notzed@ximian.com>
+ * Jeffery Stedfast <fejj@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
*/
diff --git a/shell/e-shell-importer.c b/shell/e-shell-importer.c
index bea25420fb..6ce54e8292 100644
--- a/shell/e-shell-importer.c
+++ b/shell/e-shell-importer.c
@@ -1,23 +1,23 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* importer.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 Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
- * 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.
*
- * Author: Iain Holmes <iain@ximian.com>
+ * Authors:
+ * Iain Holmes <iain@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
*/
#include <config.h>
diff --git a/shell/e-shell-nm.c b/shell/e-shell-nm.c
index 8809f32a9f..163be242c6 100644
--- a/shell/e-shell-nm.c
+++ b/shell/e-shell-nm.c
@@ -1,22 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * Shreyas Srinivasan <sshreyas@novell.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * 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 <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ * Shreyas Srinivasan <sshreyas@novell.com>
*
- * 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.
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
- * (C) Copyright 2005 Novell, Inc.
*/
#define DBUS_API_SUBJECT_TO_CHANGE 1
diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c
index a10fb635cb..46c789efbe 100644
--- a/shell/e-shell-view.c
+++ b/shell/e-shell-view.c
@@ -1,5 +1,5 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
- * e-shell-view.c
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+/* e-shell-view.c
*
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
diff --git a/shell/e-shell-view.h b/shell/e-shell-view.h
index 34d001d0d4..6f5b6f6cc4 100644
--- a/shell/e-shell-view.h
+++ b/shell/e-shell-view.h
@@ -1,8 +1,6 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
* e-shell-view.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 the GNU Lesser General Public
* License as published by the Free Software Foundation; either
@@ -11,12 +9,14 @@
* 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 <http://www.gnu.org/licenses/>
+ *
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
- * 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.
*/
/**
diff --git a/shell/e-shell.c b/shell/e-shell.c
index 73ff91dd15..87380ee574 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -1,21 +1,16 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-shell.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 <http://www.gnu.org/licenses/>
*/
#include "e-shell.h"
diff --git a/shell/main.c b/shell/main.c
index 4d28eb7549..5d9405fcfe 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -1,23 +1,23 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* main.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 Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
- * 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.
*
- * Author: Ettore Perazzoli
+ * Authors:
+ * Ettore Perazzoli <ettore@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
*/
#include <config.h>
diff --git a/shell/shell.error.xml b/shell/shell.error.xml
index 75a6247eb6..a69adec801 100644
--- a/shell/shell.error.xml
+++ b/shell/shell.error.xml
@@ -27,9 +27,9 @@ If you choose to continue, you may not have access to some of your old data.
</error>
<error id="upgrade-remove-1-4" type="question" default="GTK_RESPONSE_CANCEL">
- <title>Delete old data from version {0}?</title>
+ <_title>Delete old data from version {0}?</_title>
<_primary>Delete old data from version {0}?</_primary>
- <_secondary xml:space="preserve">The previous version of evolution stored its data in a different location.
+ <_secondary xml:space="preserve">The previous version of Evolution stored its data in a different location.
If you choose to remove this data, the entire contents of the &quot;evolution&quot; directory will be removed permanently. If you choose to keep this data, then you may manually remove the contents of &quot;evolution&quot; at your convenience.
</_secondary>
@@ -39,7 +39,7 @@ If you choose to remove this data, the entire contents of the &quot;evolution&qu
</error>
<error id="upgrade-remove-1-4-confirm" type="warning" default="GTK_RESPONSE_CANCEL">
- <title>Really delete old data?</title>
+ <_title>Really delete old data?</_title>
<_primary>Really delete old data?</_primary>
<_secondary xml:space="preserve">The entire contents of the &quot;evolution&quot; directory are about to be permanently removed.