From fa53b13f7309749bbf38bfffa5bd284e0a667740 Mon Sep 17 00:00:00 2001
From: Marius Kittler <mkittler@suse.de>
Date: Mon, 23 Jul 2018 14:45:16 +0200
Subject: [PATCH] Fix typo occured -> occurred

---
 misc/dbusnotification.cpp         |  2 +-
 settingsdialog/settingsdialog.cpp |  4 ++--
 translations/qtutilities_de_DE.ts | 30 +++++++++++++++---------------
 translations/qtutilities_en_US.ts | 30 +++++++++++++++---------------
 4 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/misc/dbusnotification.cpp b/misc/dbusnotification.cpp
index 40ecc6e..8e124ec 100644
--- a/misc/dbusnotification.cpp
+++ b/misc/dbusnotification.cpp
@@ -246,7 +246,7 @@ void DBusNotification::setImage(const QImage &image)
 
 /*!
  * \brief Makes the notification object delete itself when the notification has
- * been closed or an error occured.
+ * been closed or an error occurred.
  */
 void DBusNotification::deleteOnCloseOrError()
 {
diff --git a/settingsdialog/settingsdialog.cpp b/settingsdialog/settingsdialog.cpp
index 70df779..ead5f60 100644
--- a/settingsdialog/settingsdialog.cpp
+++ b/settingsdialog/settingsdialog.cpp
@@ -242,7 +242,7 @@ bool SettingsDialog::apply()
 
             // add error message
             if (errorMessage.isEmpty()) {
-                errorMessage = tr("<p><b>Errors occured when applying changes:</b></p><ul>");
+                errorMessage = tr("<p><b>Errors occurred when applying changes:</b></p><ul>");
             }
             QStringList &errors = const_cast<OptionPage *>(page)->errors();
             if (errors.isEmpty()) {
@@ -258,7 +258,7 @@ bool SettingsDialog::apply()
         }
     }
 
-    // show error messages (if errors occured)
+    // show error messages (if errors occurred)
     if (!errorMessage.isEmpty()) {
         errorMessage.append(QStringLiteral("</ul>"));
         QMessageBox::warning(this, windowTitle(), errorMessage);
diff --git a/translations/qtutilities_de_DE.ts b/translations/qtutilities_de_DE.ts
index 13a3f71..c0f1494 100644
--- a/translations/qtutilities_de_DE.ts
+++ b/translations/qtutilities_de_DE.ts
@@ -44,12 +44,12 @@
         <translation>entwickelt von %1</translation>
     </message>
     <message>
-        <location filename="../aboutdialog/aboutdialog.cpp" line="71"/>
+        <location filename="../aboutdialog/aboutdialog.cpp" line="69"/>
         <source>Linked against:</source>
         <translation>Gegen folgende Bibliotheken gelinkt:</translation>
     </message>
     <message>
-        <location filename="../aboutdialog/aboutdialog.cpp" line="74"/>
+        <location filename="../aboutdialog/aboutdialog.cpp" line="72"/>
         <source>For updates and bug reports visit the &lt;a href=&quot;%1&quot; style=&quot;text-decoration: underline; color: palette(link);&quot;&gt;project website&lt;/a&gt;.</source>
         <translation>Für Aktualisierung und Melden von Fehlern besuche die &lt;a href=&quot;%1&quot; style=&quot;text-decoration: underline; color: palette(link);&quot;&gt;Webseite des Projekts&lt;/a&gt;.</translation>
     </message>
@@ -59,8 +59,8 @@
     <message>
         <location filename="../enterpassworddialog/enterpassworddialog.ui" line="12"/>
         <location filename="../enterpassworddialog/enterpassworddialog.ui" line="51"/>
-        <location filename="../enterpassworddialog/enterpassworddialog.cpp" line="187"/>
-        <location filename="../enterpassworddialog/enterpassworddialog.cpp" line="202"/>
+        <location filename="../enterpassworddialog/enterpassworddialog.cpp" line="190"/>
+        <location filename="../enterpassworddialog/enterpassworddialog.cpp" line="205"/>
         <source>Enter the password</source>
         <translation>Passwort eingeben</translation>
     </message>
@@ -105,28 +105,28 @@
         <translation>Bestätigen</translation>
     </message>
     <message>
-        <location filename="../enterpassworddialog/enterpassworddialog.cpp" line="187"/>
-        <location filename="../enterpassworddialog/enterpassworddialog.cpp" line="202"/>
+        <location filename="../enterpassworddialog/enterpassworddialog.cpp" line="190"/>
+        <location filename="../enterpassworddialog/enterpassworddialog.cpp" line="205"/>
         <source>Enter the new password</source>
         <translation>Neues Passwort festlegen</translation>
     </message>
     <message>
-        <location filename="../enterpassworddialog/enterpassworddialog.cpp" line="287"/>
+        <location filename="../enterpassworddialog/enterpassworddialog.cpp" line="290"/>
         <source>You didn&apos;t enter a user name.</source>
         <translation>Es wurde kein Benutzername eingegeben.</translation>
     </message>
     <message>
-        <location filename="../enterpassworddialog/enterpassworddialog.cpp" line="289"/>
+        <location filename="../enterpassworddialog/enterpassworddialog.cpp" line="292"/>
         <source>You didn&apos;t enter a password.</source>
         <translation>Es wurde kein Passwort eingegeben.</translation>
     </message>
     <message>
-        <location filename="../enterpassworddialog/enterpassworddialog.cpp" line="294"/>
+        <location filename="../enterpassworddialog/enterpassworddialog.cpp" line="297"/>
         <source>You have to enter the new password twice to ensure you enterd it correct.</source>
         <translation>Um sicher zu stellen, dass das neue Passwort richtig eingegeben wurde, muss es zweimal eingegeben werden.</translation>
     </message>
     <message>
-        <location filename="../enterpassworddialog/enterpassworddialog.cpp" line="297"/>
+        <location filename="../enterpassworddialog/enterpassworddialog.cpp" line="300"/>
         <source>You mistyped the password.</source>
         <translation>Erstes und zweites Passwort stimmen nicht überein.</translation>
     </message>
@@ -162,22 +162,22 @@
 <context>
     <name>Dialogs::PaletteModel</name>
     <message>
-        <location filename="../paletteeditor/paletteeditor.cpp" line="323"/>
+        <location filename="../paletteeditor/paletteeditor.cpp" line="324"/>
         <source>Color Role</source>
         <translation>Farbrolle</translation>
     </message>
     <message>
-        <location filename="../paletteeditor/paletteeditor.cpp" line="325"/>
+        <location filename="../paletteeditor/paletteeditor.cpp" line="326"/>
         <source>Active</source>
         <translation>Aktiv</translation>
     </message>
     <message>
-        <location filename="../paletteeditor/paletteeditor.cpp" line="327"/>
+        <location filename="../paletteeditor/paletteeditor.cpp" line="328"/>
         <source>Inactive</source>
         <translation>Inaktiv</translation>
     </message>
     <message>
-        <location filename="../paletteeditor/paletteeditor.cpp" line="329"/>
+        <location filename="../paletteeditor/paletteeditor.cpp" line="330"/>
         <source>Disabled</source>
         <translation>Deaktiviert</translation>
     </message>
@@ -323,7 +323,7 @@ Außerdem werden sie vielleicht vom QPA plugin überschrieben und funktionieren
     </message>
     <message>
         <location filename="../settingsdialog/settingsdialog.cpp" line="245"/>
-        <source>&lt;p&gt;&lt;b&gt;Errors occured when applying changes:&lt;/b&gt;&lt;/p&gt;&lt;ul&gt;</source>
+        <source>&lt;p&gt;&lt;b&gt;Errors occurred when applying changes:&lt;/b&gt;&lt;/p&gt;&lt;ul&gt;</source>
         <translation>&lt;p&gt;&lt;b&gt;Beim Anwenden der Einstellungen sind Fehler aufgetreten:&lt;/b&gt;&lt;/p&gt;&lt;ul&gt;</translation>
     </message>
     <message>
diff --git a/translations/qtutilities_en_US.ts b/translations/qtutilities_en_US.ts
index 82ea116..d4ac292 100644
--- a/translations/qtutilities_en_US.ts
+++ b/translations/qtutilities_en_US.ts
@@ -39,12 +39,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../aboutdialog/aboutdialog.cpp" line="71"/>
+        <location filename="../aboutdialog/aboutdialog.cpp" line="69"/>
         <source>Linked against:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../aboutdialog/aboutdialog.cpp" line="74"/>
+        <location filename="../aboutdialog/aboutdialog.cpp" line="72"/>
         <source>For updates and bug reports visit the &lt;a href=&quot;%1&quot; style=&quot;text-decoration: underline; color: palette(link);&quot;&gt;project website&lt;/a&gt;.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -54,8 +54,8 @@
     <message>
         <location filename="../enterpassworddialog/enterpassworddialog.ui" line="12"/>
         <location filename="../enterpassworddialog/enterpassworddialog.ui" line="51"/>
-        <location filename="../enterpassworddialog/enterpassworddialog.cpp" line="187"/>
-        <location filename="../enterpassworddialog/enterpassworddialog.cpp" line="202"/>
+        <location filename="../enterpassworddialog/enterpassworddialog.cpp" line="190"/>
+        <location filename="../enterpassworddialog/enterpassworddialog.cpp" line="205"/>
         <source>Enter the password</source>
         <translation type="unfinished"></translation>
     </message>
@@ -100,28 +100,28 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../enterpassworddialog/enterpassworddialog.cpp" line="187"/>
-        <location filename="../enterpassworddialog/enterpassworddialog.cpp" line="202"/>
+        <location filename="../enterpassworddialog/enterpassworddialog.cpp" line="190"/>
+        <location filename="../enterpassworddialog/enterpassworddialog.cpp" line="205"/>
         <source>Enter the new password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../enterpassworddialog/enterpassworddialog.cpp" line="287"/>
+        <location filename="../enterpassworddialog/enterpassworddialog.cpp" line="290"/>
         <source>You didn&apos;t enter a user name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../enterpassworddialog/enterpassworddialog.cpp" line="289"/>
+        <location filename="../enterpassworddialog/enterpassworddialog.cpp" line="292"/>
         <source>You didn&apos;t enter a password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../enterpassworddialog/enterpassworddialog.cpp" line="294"/>
+        <location filename="../enterpassworddialog/enterpassworddialog.cpp" line="297"/>
         <source>You have to enter the new password twice to ensure you enterd it correct.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../enterpassworddialog/enterpassworddialog.cpp" line="297"/>
+        <location filename="../enterpassworddialog/enterpassworddialog.cpp" line="300"/>
         <source>You mistyped the password.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -157,22 +157,22 @@
 <context>
     <name>Dialogs::PaletteModel</name>
     <message>
-        <location filename="../paletteeditor/paletteeditor.cpp" line="323"/>
+        <location filename="../paletteeditor/paletteeditor.cpp" line="324"/>
         <source>Color Role</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../paletteeditor/paletteeditor.cpp" line="325"/>
+        <location filename="../paletteeditor/paletteeditor.cpp" line="326"/>
         <source>Active</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../paletteeditor/paletteeditor.cpp" line="327"/>
+        <location filename="../paletteeditor/paletteeditor.cpp" line="328"/>
         <source>Inactive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../paletteeditor/paletteeditor.cpp" line="329"/>
+        <location filename="../paletteeditor/paletteeditor.cpp" line="330"/>
         <source>Disabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -317,7 +317,7 @@ These settings might be overwritten by your Qt 5 platfrom integration plugin and
     </message>
     <message>
         <location filename="../settingsdialog/settingsdialog.cpp" line="245"/>
-        <source>&lt;p&gt;&lt;b&gt;Errors occured when applying changes:&lt;/b&gt;&lt;/p&gt;&lt;ul&gt;</source>
+        <source>&lt;p&gt;&lt;b&gt;Errors occurred when applying changes:&lt;/b&gt;&lt;/p&gt;&lt;ul&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>