Description: <short summary of the patch>
 TODO: Put a short summary on the line above and replace this paragraph
 with a longer explanation of this change. Complete the meta-information
 with other relevant fields (see below for details). To make it easier, the
 information below has been extracted from the changelog. Adjust it or drop
 it.
 .
 bambootracker (0.2.0-1) experimental; urgency=medium
 .
   * New upstream version.
Author: Gürkan Myczko <gurkan@phys.ethz.ch>

---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:

Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: https://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: 2019-05-05

--- bambootracker-0.2.0.orig/BambooTracker/gui/q_application_wrapper.cpp
+++ bambootracker-0.2.0/BambooTracker/gui/q_application_wrapper.cpp
@@ -11,7 +11,7 @@ bool QApplicationWrapper::notify(QObject
 	}
 	catch (std::exception& e) {
 		QMessageBox::critical(nullptr, QObject::tr("Error"),
-							  QObject::tr("An unknown error occured.\n%1").arg(e.what()));
+							  QObject::tr("An unknown error occurred.\n%1").arg(e.what()));
 		return false;
 	}
 }
--- bambootracker-0.2.0.orig/BambooTracker/main.cpp
+++ bambootracker-0.2.0/BambooTracker/main.cpp
@@ -31,12 +31,12 @@ int main(int argc, char *argv[])
 		w->show();
 		int ret = a->exec();
 		ConfigurationHandler::saveConfiguration(config);
-		if (ret) QMessageBox::critical(nullptr, QObject::tr("Error"), QObject::tr("An unknown error occured."));
+		if (ret) QMessageBox::critical(nullptr, QObject::tr("Error"), QObject::tr("An unknown error occurred."));
 		return ret;
 	}
 	catch (std::exception& e) {
 		QMessageBox::critical(nullptr, QObject::tr("Error"),
-							  QObject::tr("An unknown error occured.\n%1").arg(e.what()));
+							  QObject::tr("An unknown error occurred.\n%1").arg(e.what()));
 		return 1;
 	}
 }
--- bambootracker-0.2.0.orig/BambooTracker/res/lang/bamboo_tracker_fr.ts
+++ bambootracker-0.2.0/BambooTracker/res/lang/bamboo_tracker_fr.ts
@@ -2364,14 +2364,14 @@
     <message>
         <location filename="../../gui/q_application_wrapper.cpp" line="14"/>
         <location filename="../../main.cpp" line="39"/>
-        <source>An unknown error occured.
+        <source>An unknown error occurred.
 %1</source>
         <translation>Une erreur inconnue s&apos;est produite.
 %1</translation>
     </message>
     <message>
         <location filename="../../main.cpp" line="34"/>
-        <source>An unknown error occured.</source>
+        <source>An unknown error occurred.</source>
         <translation>Une erreur inconnue s&apos;est produite.</translation>
     </message>
 </context>
--- bambootracker-0.2.0.orig/BambooTracker/res/lang/bamboo_tracker_ja.ts
+++ bambootracker-0.2.0/BambooTracker/res/lang/bamboo_tracker_ja.ts
@@ -2342,14 +2342,14 @@
     <message>
         <location filename="../../gui/q_application_wrapper.cpp" line="14"/>
         <location filename="../../main.cpp" line="39"/>
-        <source>An unknown error occured.
+        <source>An unknown error occurred.
 %1</source>
         <translation>不明なエラーが発生しました。
 %1</translation>
     </message>
     <message>
         <location filename="../../main.cpp" line="34"/>
-        <source>An unknown error occured.</source>
+        <source>An unknown error occurred.</source>
         <translation>不明なエラーが発生しました。</translation>
     </message>
 </context>
