Merge branch 'release/debian/0.7.2-1'debian/0.7.2-1

1 files changed, 24 insertions, 18 deletions

diff --git a/src/gui/preferencesWindow.vala b/src/gui/preferencesWindow.vala
index 8c6c66c..259a3a4 100644
--- a/src/gui/preferencesWindow.vala
+++ b/src/gui/preferencesWindow.vala
@@ -1,18 +1,24 @@
 /////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2011-2017 by Simon Schneegans
+// Copyright 2011-2018 Simon Schneegans
 //
-// 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 3 of the License, or (at
-// your option) any later version.
-//
-// 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.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 /////////////////////////////////////////////////////////////////////////
 
 namespace GnomePie {
@@ -398,7 +404,7 @@ public class PreferencesWindow : GLib.Object {
         dialog.filter.add_pattern ("*.tar.gz");
 
         var result = Gtk.MessageType.INFO;
-        var message = _("Sucessfully imported new theme!");
+        var message = _("Successfully imported new theme!");
 
         dialog.response.connect((d, r) => {
             if (r == Gtk.ResponseType.ACCEPT) {
@@ -412,19 +418,19 @@ public class PreferencesWindow : GLib.Object {
                                 Config.global.load_themes(a.theme_name);
                                 this.theme_list.reload();
                             } else {
-                                message = _("An error occured while importing the theme: Failed to extract theme!");
+                                message = _("An error occurred while importing the theme: Failed to extract theme!");
                                 result = Gtk.MessageType.ERROR;
                             }
                         } else {
-                            message = _("An error occured while importing the theme: A theme with this name does already exist!");
+                            message = _("An error occurred while importing the theme: A theme with this name does already exist!");
                             result = Gtk.MessageType.ERROR;
                         }
                     } else {
-                        message = _("An error occured while importing the theme: Theme archive does not contain a valid theme!");
+                        message = _("An error occurred while importing the theme: Theme archive does not contain a valid theme!");
                         result = Gtk.MessageType.ERROR;
                     }
                 } else {
-                    message = _("An error occured while importing the theme: Failed to open theme archive!");
+                    message = _("An error occurred while importing the theme: Failed to open theme archive!");
                     result = Gtk.MessageType.ERROR;
                 }
                 a.close();