From 2d675e5d58328be07898b18a24409ca066a2331f Mon Sep 17 00:00:00 2001
From: Michail Vourlakos <mvourlakos@gmail.com>
Date: Thu, 3 Aug 2017 10:42:13 +0300
Subject: [PATCH] fix #592,add a crash checker to autostart Latte

---
 app/CMakeLists.txt                                       | 2 ++
 app/latte-dock.sh                                        | 6 ++++++
 app/lattedock.notifyrc                                   | 1 +
 app/org.kde.latte-dock.desktop.cmake                     | 2 +-
 applets/separator/metadata.desktop.cmake                 | 2 ++
 applets/separator/package/metadata.desktop               | 2 ++
 applets/spacer/metadata.desktop.cmake                    | 2 ++
 applets/spacer/package/metadata.desktop                  | 2 ++
 po/desktop-templates/org.kde.latte-dock.desktop.template | 2 +-
 po/metainfo/org.kde.latte-dock.appdata.pot               | 2 +-
 10 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 app/latte-dock.sh

diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index 709463e9c..5cb97305a 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -68,6 +68,8 @@ configure_file(org.kde.latte-dock.desktop.cmake org.kde.latte-dock.desktop)
 configure_file(org.kde.latte-dock.appdata.xml.cmake org.kde.latte-dock.appdata.xml)
 
 install(TARGETS latte-dock ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
+install(FILES latte-dock.sh PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+                            DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.latte-dock.desktop DESTINATION ${KDE_INSTALL_APPDIR})
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.latte-dock.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR})
 install(FILES dbus/org.kde.LatteDock.xml DESTINATION ${KDE_INSTALL_DBUSINTERFACEDIR})
diff --git a/app/latte-dock.sh b/app/latte-dock.sh
new file mode 100644
index 000000000..6a1d9723f
--- /dev/null
+++ b/app/latte-dock.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+until latte-dock; do
+echo "'latte-dock' crashed with exit code $?. Respawning.." >&2
+sleep 2
+done
diff --git a/app/lattedock.notifyrc b/app/lattedock.notifyrc
index 430de2dc2..cf2118a7c 100644
--- a/app/lattedock.notifyrc
+++ b/app/lattedock.notifyrc
@@ -68,5 +68,6 @@ Action=Popup
 [Event/switch-layout]
 Name[de]=Wechsel zu Profil
 Name[el]=Εναλλαγή στο προφίλ
+Name[zh_TW]=切換到佈局
 Name=Switch to layout
 Action=Popup
diff --git a/app/org.kde.latte-dock.desktop.cmake b/app/org.kde.latte-dock.desktop.cmake
index c92b9c690..cb5b39fd3 100644
--- a/app/org.kde.latte-dock.desktop.cmake
+++ b/app/org.kde.latte-dock.desktop.cmake
@@ -28,7 +28,7 @@ GenericName[zh_TW]=Dock
 GenericName=Dock
 Icon=latte-dock
 Categories=Utility;X-SuSE-DesktopUtility;
-Exec=latte-dock %u
+Exec=latte-dock.sh %u
 InitialPreference=1
 StartupNotify=false
 Terminal=false
diff --git a/applets/separator/metadata.desktop.cmake b/applets/separator/metadata.desktop.cmake
index 90c884814..fa423ccb4 100644
--- a/applets/separator/metadata.desktop.cmake
+++ b/applets/separator/metadata.desktop.cmake
@@ -1,7 +1,9 @@
 [Desktop Entry]
 Name[el]=Διαχωριστικό
+Name[zh_TW]=分隔符號
 Name=Separator
 Comment[el]=Για όλες τις εργασίες διαχωρισμού σας
+Comment[zh_TW]=為您所有分開的工作
 Comment=For all your separation tasks
 
 Encoding=UTF-8
diff --git a/applets/separator/package/metadata.desktop b/applets/separator/package/metadata.desktop
index 90c884814..fa423ccb4 100644
--- a/applets/separator/package/metadata.desktop
+++ b/applets/separator/package/metadata.desktop
@@ -1,7 +1,9 @@
 [Desktop Entry]
 Name[el]=Διαχωριστικό
+Name[zh_TW]=分隔符號
 Name=Separator
 Comment[el]=Για όλες τις εργασίες διαχωρισμού σας
+Comment[zh_TW]=為您所有分開的工作
 Comment=For all your separation tasks
 
 Encoding=UTF-8
diff --git a/applets/spacer/metadata.desktop.cmake b/applets/spacer/metadata.desktop.cmake
index c6498a5a8..66501fe33 100644
--- a/applets/spacer/metadata.desktop.cmake
+++ b/applets/spacer/metadata.desktop.cmake
@@ -1,7 +1,9 @@
 [Desktop Entry]
 Name[el]=Latte Κενό
+Name[zh_TW]=Latte Dock 間隔器
 Name=Latte Dock Spacer
 Comment[el]=Διατηρεί κενούς χώρους μέσα στον πίνακα.
+Comment[zh_TW]=在 dock 內保留空間。
 Comment=Reserve empty spaces within the dock.
 
 Encoding=UTF-8
diff --git a/applets/spacer/package/metadata.desktop b/applets/spacer/package/metadata.desktop
index c6498a5a8..66501fe33 100644
--- a/applets/spacer/package/metadata.desktop
+++ b/applets/spacer/package/metadata.desktop
@@ -1,7 +1,9 @@
 [Desktop Entry]
 Name[el]=Latte Κενό
+Name[zh_TW]=Latte Dock 間隔器
 Name=Latte Dock Spacer
 Comment[el]=Διατηρεί κενούς χώρους μέσα στον πίνακα.
+Comment[zh_TW]=在 dock 內保留空間。
 Comment=Reserve empty spaces within the dock.
 
 Encoding=UTF-8
diff --git a/po/desktop-templates/org.kde.latte-dock.desktop.template b/po/desktop-templates/org.kde.latte-dock.desktop.template
index d75348940..6e2cc9a6a 100644
--- a/po/desktop-templates/org.kde.latte-dock.desktop.template
+++ b/po/desktop-templates/org.kde.latte-dock.desktop.template
@@ -4,7 +4,7 @@ Comment=Dock for the masses
 GenericName=Dock
 Icon=latte-dock
 Categories=Utility;X-SuSE-DesktopUtility;
-Exec=latte-dock %u
+Exec=latte-dock.sh %u
 InitialPreference=1
 StartupNotify=false
 Terminal=false
diff --git a/po/metainfo/org.kde.latte-dock.appdata.pot b/po/metainfo/org.kde.latte-dock.appdata.pot
index 4ece278aa..92cbb8ee2 100644
--- a/po/metainfo/org.kde.latte-dock.appdata.pot
+++ b/po/metainfo/org.kde.latte-dock.appdata.pot
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-07-29 10:36+0300\n"
+"POT-Creation-Date: 2017-08-03 10:39+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"