Update desktop files and mimetypes

6 files changed, 308 insertions, 68 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9662740fe9bb..d09e349d312a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = softmaker-office-2018-bin
 	pkgdesc = Softmaker Office 2018, proprietary office suite; word processing, spreadsheets, presentations
 	pkgver = 2018.924
-	pkgrel = 1
+	pkgrel = 2
 	url = http://softmaker.com
 	arch = x86_64
 	arch = i686
@@ -24,21 +24,21 @@ pkgbase = softmaker-office-2018-bin
 	source = textmaker18
 	source = softmaker-office-2018.xml
 	source = license-scope.txt
-	md5sums = 7afe83509fe2e5455fb5c832544a1a5e
-	md5sums = 545bcdff67bf80266df46fd1ff943b5c
-	md5sums = 2bac7ffc31d59c5997f1ba8151b34671
+	md5sums = 61a119bf8807977035f28cda48a3e638
+	md5sums = 81d32048481bab4cf009f86742a8793a
+	md5sums = 0865b2e62d78b655c82c4e07624a06bd
 	md5sums = b18a7751649f423d4e5e21dadcd83d49
 	md5sums = 3c7d81e64333e7ab15676f08886736ee
 	md5sums = 494d6d84e3855303c86a93d57bc95788
-	md5sums = 9e2fe397368fff4297f28338dd09f142
+	md5sums = 91a0c79955c9157a195b68295a4cd904
 	md5sums = 610683571939cde2d2223c2717259b78
-	sha512sums = 267a49d68130d5c5fed4319de91972d7b71510a0c090be3343965997bb6554dcc197405d6272971195d2b5df9ec270c9b620820cb2ea1bff35eeef0d013f1d97
-	sha512sums = 5cc874d89f36a570d8ed93d86034649c63f52ac429dfc69db8e9fe89ade32023ec64ab1e17dfa1b67a60e90ad5c82d1ee7007f09682273de5f8aa7abc0d53e9b
-	sha512sums = 17971aed65cd1432e3ed361c6fb4c150e52bc2a7fa17505ceedbbae190e2dba87d7ab4233edda4e0841b2ab2d1912bfddca70e9bf3b699803e72573d8f5b8f25
+	sha512sums = 21ac47ca4327abc2cb819b8fc343e7abc8f8d95bc3a88b6745277c1a25045a5ccf420308a08964c199ed341ebd48349781ff5606c538d951aab7634ff3e30d5c
+	sha512sums = 6ba3e74e08af16d5d150fecb6c97c986a94f00e1810a719328e8938981a3af1a6632a0957490bd0dfc41fc787322e047b655db6c6e0187cfe9ecdc1dcd90deac
+	sha512sums = 2ce75892fad29d056537c69e4920093ce615178cc35b47e0492dfda8718ebbc97c4ca027624e1e0d90ec368769da0c56ba1e593c49cebde8c82a8275ce7acf47
 	sha512sums = 1dd786250853f8241020655a766b08a371671eba3381c231569ae9a9a3b0ded838a817ebc50a4fc21588abf9e722b83a9eaab2851fc036fa4478f977d826408c
 	sha512sums = ee5021d7625682233ddb4ca21251dda6d01e50354ee0df9fdae93ab09f1a70fdd6f216dd9c0555d8780c628014acbaae6a5f185444e45852bf977c9d73c22f7d
 	sha512sums = c09f7d80c7be33b26c384a18514ddc6f9c9d1b2669037a5921212a1d2b3b316a12524d458872446e1a850f87bec4af4e14d99967713d07d5dd7425b658b900f6
-	sha512sums = 02528e698373bd36f5bfe4671f75fc6a7f995e297f6069a838b8b66b0d9b840724548dfe15549b0216e34ee59e74a869ee6504890347bb035f2a1cd0fc91d9ac
+	sha512sums = 8dcf3caa7273cb3f9f3b8ce08251db420c39b42be2a339d561771e913fae1dda55820403a1f7cd883aa1d361693c1a67fac44f92542872f5f186f66dd1fa45e4
 	sha512sums = 4dc5f414c45b25647a204d93ad8819fa35684e48e53eeeecbb8189d7a89976f8ac303c6b7097af324f93c61ba6d43ec3cb389a47ae9b2e0f45442e8cd79e9ba7
 	source_x86_64 = http://www.softmaker.net/down/softmaker-office-2018-924-amd64.tgz
 	md5sums_x86_64 = 62ea8bb0095575731bd194446e7f8003
diff --git a/PKGBUILD b/PKGBUILD
index eb65931eb5e4..a8fd77d13cee 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=softmaker-office-2018-bin
 pkgver=2018.924
-pkgrel=1
+pkgrel=2
 pkgdesc="Softmaker Office 2018, proprietary office suite; word processing, spreadsheets, presentations"
 url="http://softmaker.com"
 arch=('x86_64' 'i686')
@@ -19,23 +19,23 @@ source=('planmaker-2018.desktop'
         'license-scope.txt')
 source_i686=("http://www.softmaker.net/down/softmaker-office-${pkgver//./-}-i386.tgz")
 source_x86_64=("http://www.softmaker.net/down/softmaker-office-${pkgver//./-}-amd64.tgz")
-md5sums=('7afe83509fe2e5455fb5c832544a1a5e'
-         '545bcdff67bf80266df46fd1ff943b5c'
-         '2bac7ffc31d59c5997f1ba8151b34671'
+md5sums=('61a119bf8807977035f28cda48a3e638'
+         '81d32048481bab4cf009f86742a8793a'
+         '0865b2e62d78b655c82c4e07624a06bd'
          'b18a7751649f423d4e5e21dadcd83d49'
          '3c7d81e64333e7ab15676f08886736ee'
          '494d6d84e3855303c86a93d57bc95788'
-         '9e2fe397368fff4297f28338dd09f142'
+         '91a0c79955c9157a195b68295a4cd904'
          '610683571939cde2d2223c2717259b78')
 md5sums_x86_64=('62ea8bb0095575731bd194446e7f8003')
 md5sums_i686=('3fff2d25c35e11b944fc2c945c79bc66')
-sha512sums=('267a49d68130d5c5fed4319de91972d7b71510a0c090be3343965997bb6554dcc197405d6272971195d2b5df9ec270c9b620820cb2ea1bff35eeef0d013f1d97'
-            '5cc874d89f36a570d8ed93d86034649c63f52ac429dfc69db8e9fe89ade32023ec64ab1e17dfa1b67a60e90ad5c82d1ee7007f09682273de5f8aa7abc0d53e9b'
-            '17971aed65cd1432e3ed361c6fb4c150e52bc2a7fa17505ceedbbae190e2dba87d7ab4233edda4e0841b2ab2d1912bfddca70e9bf3b699803e72573d8f5b8f25'
+sha512sums=('21ac47ca4327abc2cb819b8fc343e7abc8f8d95bc3a88b6745277c1a25045a5ccf420308a08964c199ed341ebd48349781ff5606c538d951aab7634ff3e30d5c'
+            '6ba3e74e08af16d5d150fecb6c97c986a94f00e1810a719328e8938981a3af1a6632a0957490bd0dfc41fc787322e047b655db6c6e0187cfe9ecdc1dcd90deac'
+            '2ce75892fad29d056537c69e4920093ce615178cc35b47e0492dfda8718ebbc97c4ca027624e1e0d90ec368769da0c56ba1e593c49cebde8c82a8275ce7acf47'
             '1dd786250853f8241020655a766b08a371671eba3381c231569ae9a9a3b0ded838a817ebc50a4fc21588abf9e722b83a9eaab2851fc036fa4478f977d826408c'
             'ee5021d7625682233ddb4ca21251dda6d01e50354ee0df9fdae93ab09f1a70fdd6f216dd9c0555d8780c628014acbaae6a5f185444e45852bf977c9d73c22f7d'
             'c09f7d80c7be33b26c384a18514ddc6f9c9d1b2669037a5921212a1d2b3b316a12524d458872446e1a850f87bec4af4e14d99967713d07d5dd7425b658b900f6'
-            '02528e698373bd36f5bfe4671f75fc6a7f995e297f6069a838b8b66b0d9b840724548dfe15549b0216e34ee59e74a869ee6504890347bb035f2a1cd0fc91d9ac'
+            '8dcf3caa7273cb3f9f3b8ce08251db420c39b42be2a339d561771e913fae1dda55820403a1f7cd883aa1d361693c1a67fac44f92542872f5f186f66dd1fa45e4'
             '4dc5f414c45b25647a204d93ad8819fa35684e48e53eeeecbb8189d7a89976f8ac303c6b7097af324f93c61ba6d43ec3cb389a47ae9b2e0f45442e8cd79e9ba7')
 sha512sums_x86_64=('91b6bbfa0b60648296203c30a4dce8897acb351244368c923dfce19f23e2c0525f70ff95f0c247ac942e427cb28cf31ea5e34e7385263e9b5baafa7d6d435672')
 sha512sums_i686=('5b0bae97170a9318f0e34852a26023f46d7caa1060322cfbb3e718db7014d6d2845ffe978185d364b07d456267a801c66ce660072e74b5dce0fdf966f580385c')
@@ -57,6 +57,9 @@ package() {
     ln -s "/usr/share/smoffice2018/icons/tmd_${size}.png" "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/mimetypes/application-x-tmd18.png"
     ln -s "/usr/share/smoffice2018/icons/pmd_oth_${size}.png" "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/mimetypes/application-x-pmd18-oth.png"
     ln -s "/usr/share/smoffice2018/icons/tmd_oth_${size}.png" "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/mimetypes/application-x-tmd18-oth.png"
+    ln -s "/usr/share/smoffice2018/icons/pmd_mso_${size}.png" "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/mimetypes/application-x-pmd18-mso.png"
+    ln -s "/usr/share/smoffice2018/icons/prd_mso_${size}.png" "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/mimetypes/application-x-prd18-mso.png"
+    ln -s "/usr/share/smoffice2018/icons/tmd_mso_${size}.png" "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/mimetypes/application-x-tmd18-mso.png"
   done
 
   install -Dm644 "${srcdir}/softmaker-office-2018.xml" "${pkgdir}/usr/share/mime/packages/softmaker-office-2018.xml"
diff --git a/planmaker-2018.desktop b/planmaker-2018.desktop
index 8594496cb134..1d5720df54ba 100755
--- a/planmaker-2018.desktop
+++ b/planmaker-2018.desktop
@@ -72,7 +72,9 @@ Comment[de]=Mit PlanMaker können Sie alle Arten von Arbeitsblättern erstellen
 Comment[ru]=PlanMaker позволяет создавать все виды электронных таблиц, от простых до сложных. Включает в себя мощный модуль для составления диаграмм.
 Terminal=false
 Categories=Application;Office;Spreadsheet;
-MimeType=application/x-pmd;application/x-pmdx;application/x-pmv;application/excel;application/x-excel;application/x-ms-excel;application/x-msexcel;application/x-sylk;application/x-xls;application/xls;application/vnd.ms-excel;application/vnd.stardivision.calc;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.sheet.macroenabled.12;application/vnd.ms-excel.sheet.macroEnabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.template.macroenabled.12;application/vnd.ms-excel.template.macroEnabled.12;application/x-dif;text/spreadsheet;text/csv;application/x-prn;Version=1.0
+MimeType=application/x-pmd;application/x-pmdx;application/x-pmv;application/excel;application/x-excel;application/x-ms-excel;application/x-msexcel;application/x-sylk;application/x-xls;application/xls;application/vnd.ms-excel;application/vnd.stardivision.calc;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.sheet.macroenabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.template.macroEnabled.12;application/x-dif;text/spreadsheet;text/csv;application/x-prn;application/vnd.ms-excel.sheet.binary.macroenabled.12;
+
+Version=1.0
 Name=PlanMaker 2018
 Icon=smoffice2018-planmaker
 TryExec=/usr/bin/planmaker18
diff --git a/presentations-2018.desktop b/presentations-2018.desktop
index 0db624fb7a6f..7b185fa99468 100755
--- a/presentations-2018.desktop
+++ b/presentations-2018.desktop
@@ -71,7 +71,7 @@ Comment[de]=Presentations lässt Sie beliebige Präsentationen gestalten - mit E
 Comment[ru]=Presentations позволяет создавать все виды презентаций и добавлять в них специальные эффекты, анимацию и переходы.
 Terminal=false
 Categories=Application;Office;Presentation;
-MimeType=application/x-prdx;application/x-prvx;application/x-prsx;application/x-prd;application/x-prv;application/x-prs;application/ppt;application/mspowerpoint;application/vnd.ms-powerpoint;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.ms-powerpoint.presentation.macroenabled.12;application/vnd.ms-powerpoint.presentation.macroEnabled.12;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.ms-powerpoint.template.macroenabled.12;application/vnd.ms-powerpoint.template.macroEnabled.12;application/vnd.ms-powerpoint.slideshow.macroenabled.12;application/vnd.ms-powerpoint.slideshow.macroEnabled.12;application/vnd.openxmlformats-officedocument.presentationml.slideshow;
+MimeType=application/x-prdx;application/x-prvx;application/x-prsx;application/x-prd;application/x-prv;application/x-prs;application/ppt;application/mspowerpoint;application/vnd.ms-powerpoint;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.ms-powerpoint.presentation.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.ms-powerpoint.template.macroEnabled.12;application/vnd.ms-powerpoint.slideshow.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.slideshow;
 Version=1.0
 Name=Presentations 2018
 Icon=smoffice2018-presentations
diff --git a/softmaker-office-2018.xml b/softmaker-office-2018.xml
index 0e7ef9450c83..48179415b0d0 100644
--- a/softmaker-office-2018.xml
+++ b/softmaker-office-2018.xml
@@ -407,7 +407,7 @@
   </mime-type>
   <mime-type type="application/vnd.ms-excel">
     <icon name="application-vnd.ms-excel" />
-    <generic-icon name="application-x-pmd-mso" />
+    <generic-icon name="application-x-pmd18-mso" />
     <comment>Microsoft Excel Worksheet</comment>
     <comment xml:lang="bg">Microsoft Excel - лист</comment>
     <comment xml:lang="cs">Pracovní sešit Microsoft Excel</comment>
@@ -433,7 +433,7 @@
   </mime-type>
   <mime-type type="application/vnd.ms-excel.sheet.macroenabled.12">
     <icon name="application-vnd.ms-excel.sheet.macroenabled.12" />
-    <generic-icon name="application-x-pmd-mso" />
+    <generic-icon name="application-x-pmd18-mso" />
     <comment>Microsoft Excel Worksheet</comment>
     <comment xml:lang="af">Microsoft Excel-werkvel</comment>
     <comment xml:lang="ar">ورقة عمل Microsoft Excel</comment>
@@ -487,7 +487,7 @@
   </mime-type>
   <mime-type type="application/vnd.ms-excel.sheet.binary.macroenabled.12">
     <icon name="application-vnd.ms-excel.sheet.binary.macroenabled.12" />
-    <generic-icon name="application-x-pmd-mso" />
+    <generic-icon name="application-x-pmd18-mso" />
     <comment>Microsoft Excel Worksheet</comment>
     <comment xml:lang="af">Microsoft Excel-werkvel</comment>
     <comment xml:lang="ar">ورقة عمل Microsoft Excel</comment>
@@ -540,7 +540,7 @@
   </mime-type>
   <mime-type type="application/vnd.ms-excel.template.macroenabled.12">
     <icon name="application/vnd.ms-excel.template.macroenabled.12" />
-    <generic-icon name="application-x-pmd-mso" />
+    <generic-icon name="application-x-pmd18-mso" />
     <comment>Microsoft Excel Worksheet Template</comment>
     <comment xml:lang="af">Microsoft Excel-werkvelsjabloon</comment>
     <comment xml:lang="ar">قالب ورقة عمل Microsoft Excel</comment>
@@ -594,7 +594,7 @@
   </mime-type>
   <mime-type type="application/vnd.ms-powerpoint">
     <icon name="application-vnd.ms-powerpoint" />
-    <generic-icon name="application-x-prd-mso" />
+    <generic-icon name="application-x-prd18-mso" />
     <comment>Microsoft PowerPoint Presentation</comment>
     <comment xml:lang="bg">Microsoft PowerPoint - презентация</comment>
     <comment xml:lang="cs">Prezentace Microsoft PowerPoint</comment>
@@ -617,10 +617,12 @@
     <comment xml:lang="vi">Trình chiếu MS PowerPoint</comment>
     <comment xml:lang="zh-TW">Microsoft PowerPoint 簡報</comment>
     <glob pattern="*.ppt" />
+    <glob pattern="*.pps" />
+    <glob pattern="*.pot" />
   </mime-type>
   <mime-type type="application/vnd.ms-powerpoint.presentation.macroenabled.12">
     <icon name="application/vnd.ms-powerpoint.presentation.macroenabled.12" />
-    <generic-icon name="application-x-prd-mso" />
+    <generic-icon name="application-x-prd18-mso" />
     <comment>Microsoft PowerPoint Presentation</comment>
     <comment xml:lang="af">Microsoft PowerPoint-voorlegging</comment>
     <comment xml:lang="ar">عرض تقديمي لـ Microsoft PowerPoint</comment>
@@ -674,7 +676,7 @@
   </mime-type>
   <mime-type type="application/vnd.ms-powerpoint.template.macroenabled.12">
     <icon name="application-vnd.ms-powerpoint.template.macroenabled.12" />
-    <generic-icon name="application-x-prd-mso" />
+    <generic-icon name="application-x-prd18-mso" />
     <comment>Microsoft PowerPoint Presentation Template</comment>
     <comment xml:lang="af">Microsoft PowerPoint-voorleggingsjabloon</comment>
     <comment xml:lang="ar">قالب عرض تقديمي Microsoft PowerPoint</comment>
@@ -724,12 +726,11 @@
     <comment xml:lang="zh-CN">Microsoft PowerPoint 演示文稿模板</comment>
     <comment xml:lang="zh-TW">Microsoft PowerPoint 簡報範本</comment>
     <glob pattern="*.potm" />
-    <glob pattern="*.pot" />
     <sub-class-of type="application/zip"/>
   </mime-type>
   <mime-type type="application/msword">
     <icon name="application-msword" />
-    <generic-icon name="application-x-tmd-mso" />
+    <generic-icon name="application-x-tmd18-mso" />
     <comment>Microsoft Word Document</comment>
     <comment xml:lang="bg">Microsoft Word - документ</comment>
     <comment xml:lang="cs">Dokument Microsoft Word</comment>
@@ -755,7 +756,7 @@
   </mime-type>
   <mime-type type="application/vnd.ms-word.document.macroenabled.12">
     <icon name="application-vnd.ms-word.document.macroenabled.12" />
-    <generic-icon name="application-x-tmd-mso" />
+    <generic-icon name="application-x-tmd18-mso" />
     <comment>Microsoft Word Document</comment>
     <comment xml:lang="af">Microsoft Word-dokument</comment>
     <comment xml:lang="ar">مستند Microsoft Word</comment>
@@ -809,7 +810,7 @@
   </mime-type>
   <mime-type type="application/vnd.ms-word">
     <icon name="application-vnd.ms-word" />
-    <generic-icon name="application-x-tmd-mso" />
+    <generic-icon name="application-x-tmd18-mso" />
     <comment>Microsoft Word Document</comment>
     <comment xml:lang="bg">Microsoft Word - документ</comment>
     <comment xml:lang="cs">Dokument Microsoft Word</comment>
@@ -835,7 +836,7 @@
   </mime-type>
   <mime-type type="application/vnd.ms-word.template.macroenabled.12">
     <icon name="application/vnd.ms-word.template.macroenabled.12" />
-    <generic-icon name="application-x-tmd-mso" />
+    <generic-icon name="application-x-tmd18-mso" />
     <comment>Microsoft Word Document Template</comment>
     <comment xml:lang="af">Microsoft Word-dokumentsjabloon</comment>
     <comment xml:lang="ar">قالب مستند Microsoft Word</comment>
@@ -889,7 +890,7 @@
   </mime-type>
   <mime-type type="application/msword-template">
     <icon name="application-msword-template" />
-    <generic-icon name="application-x-tmd-mso" />
+    <generic-icon name="application-x-tmd18-mso" />
     <comment>Microsoft Word Document Template</comment>
     <comment xml:lang="af">Microsoft Word-dokumentsjabloon</comment>
     <comment xml:lang="ar">قالب مستند Microsoft Word</comment>
@@ -942,7 +943,7 @@
   </mime-type>
   <mime-type type="application/vnd.openxmlformats-officedocument.presentationml.slideshow">
     <icon name="application-vnd.openxmlformats-officedocument.presentationml.slideshow" />
-    <generic-icon name="application-x-prd-mso" />
+    <generic-icon name="application-x-prd18-mso" />
     <comment>Microsoft PowerPoint Presentation</comment>
     <comment xml:lang="af">Microsoft PowerPoint-voorlegging</comment>
     <comment xml:lang="ar">عرض تقديمي لـ Microsoft PowerPoint</comment>
@@ -995,7 +996,7 @@
   </mime-type>
   <mime-type type="application/vnd.ms-powerpoint.slideshow.macroenabled.12">
     <icon name="application-vnd.ms-powerpoint.slideshow.macroenabled.12" />
-    <generic-icon name="application-x-prd-mso" />
+    <generic-icon name="application-x-prd18-mso" />
     <comment>Microsoft PowerPoint Presentation</comment>
     <comment xml:lang="af">Microsoft PowerPoint-voorlegging</comment>
     <comment xml:lang="ar">عرض تقديمي لـ Microsoft PowerPoint</comment>
@@ -1049,7 +1050,7 @@
   </mime-type>
   <mime-type type="application/vnd.openxmlformats-officedocument.presentationml.presentation">
     <icon name="application-vnd.openxmlformats-officedocument.presentationml.presentation" />
-    <generic-icon name="application-x-prd-mso" />
+    <generic-icon name="application-x-prd18-mso" />
     <comment>Microsoft PowerPoint Presentation</comment>
     <comment xml:lang="af">Microsoft PowerPoint-voorlegging</comment>
     <comment xml:lang="ar">عرض تقديمي لـ Microsoft PowerPoint</comment>
@@ -1102,7 +1103,7 @@
   </mime-type>
   <mime-type type="application/vnd.openxmlformats-officedocument.presentationml.template">
     <icon name="application-vnd.openxmlformats-officedocument.presentationml.template" />
-    <generic-icon name="application-x-prd-mso" />
+    <generic-icon name="application-x-prd18-mso" />
     <comment>Microsoft PowerPoint Presentation Template</comment>
     <comment xml:lang="af">Microsoft PowerPoint-voorleggingsjabloon</comment>
     <comment xml:lang="ar">قالب عرض تقديمي Microsoft PowerPoint</comment>
@@ -1178,37 +1179,12 @@
     <comment xml:lang="vi">Tài liệu MS Pocket Word</comment>
     <comment xml:lang="zh-TW">Microsoft Pocket Word 文件</comment>
     <glob pattern="*.pwd" />
-  </mime-type>
-  <mime-type type="application/x-pocket-word">
-    <icon name="application-x-pocket-word" />
-    <generic-icon name="application-x-tmd18-oth" />
-    <comment>Microsoft Pocket Word Document</comment>
-    <comment xml:lang="bg">Microsoft Pocket Word - документ</comment>
-    <comment xml:lang="cs">Dokument Microsoft Pocket Word</comment>
-    <comment xml:lang="da">Microsoft Pocket Word-dokument</comment>
-    <comment xml:lang="de">Microsoft Pocket Word Dokument</comment>
-    <comment xml:lang="et">Microsoft Pocket Wordi dokument</comment>
-    <comment xml:lang="fi">Microsoft Pocket Word -tekstiasiakirja</comment>
-    <comment xml:lang="fr">Document Microsoft Pocket Word</comment>
-    <comment xml:lang="he">מסמך וורד</comment>
-    <comment xml:lang="it">Documento Microsoft Pocket Word</comment>
-    <comment xml:lang="ja">Microsoft Pocket Word ドキュメント</comment>
-    <comment xml:lang="nb">Microsoft Pocket Word-dokument</comment>
-    <comment xml:lang="pt">Documento do Microsoft Pocket Word</comment>
-    <comment xml:lang="ru">Документ Microsoft Pocket Word</comment>
-    <comment xml:lang="sh">Microsoft Pocket Word dokument</comment>
-    <comment xml:lang="sk">Dokument Microsoft Pocket Word</comment>
-    <comment xml:lang="sl">Dokument programa Microsoft Pocket Word</comment>
-    <comment xml:lang="sr">Microsoft Pocket Word документ</comment>
-    <comment xml:lang="tr">Microsoft Pocket Word Belgesi</comment>
-    <comment xml:lang="vi">Tài liệu MS Pocket Word</comment>
-    <comment xml:lang="zh-TW">Microsoft Pocket Word 文件</comment>
     <glob pattern="*.psw" />
     <glob pattern="*.pwt" />
   </mime-type>
   <mime-type type="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet">
     <icon name="application-vnd.openxmlformats-officedocument.spreadsheetml.sheet" />
-    <generic-icon name="application-x-pmd-mso" />
+    <generic-icon name="application-x-pmd18-mso" />
     <comment>Microsoft Excel Worksheet</comment>
     <comment xml:lang="af">Microsoft Excel-werkvel</comment>
     <comment xml:lang="ar">ورقة عمل Microsoft Excel</comment>
@@ -1261,7 +1237,7 @@
   </mime-type>
   <mime-type type="application/vnd.openxmlformats-officedocument.spreadsheetml.template">
     <icon name="application-vnd.openxmlformats-officedocument.spreadsheetml.template" />
-    <generic-icon name="application-x-pmd-mso" />
+    <generic-icon name="application-x-pmd18-mso" />
     <comment>Microsoft Excel Worksheet Template</comment>
     <comment xml:lang="af">Microsoft Excel-werkvelsjabloon</comment>
     <comment xml:lang="ar">قالب ورقة عمل Microsoft Excel</comment>
@@ -1314,7 +1290,7 @@
   </mime-type>
   <mime-type type="application/vnd.openxmlformats-officedocument.wordprocessingml.document">
     <icon name="application-vnd.openxmlformats-officedocument.wordprocessingml.document" />
-    <generic-icon name="application-x-tmd-mso" />
+    <generic-icon name="application-x-tmd18-mso" />
     <comment>Microsoft Word Document</comment>
     <comment xml:lang="af">Microsoft Word-dokument</comment>
     <comment xml:lang="ar">مستند Microsoft Word</comment>
@@ -1367,7 +1343,7 @@
   </mime-type>
   <mime-type type="application/vnd.openxmlformats-officedocument.wordprocessingml.template">
     <icon name="application-vnd.openxmlformats-officedocument.wordprocessingml.template" />
-    <generic-icon name="application-x-tmd-mso" />
+    <generic-icon name="application-x-tmd18-mso" />
     <comment>Microsoft Word Document Template</comment>
     <comment xml:lang="af">Microsoft Word-dokumentsjabloon</comment>
     <comment xml:lang="ar">قالب مستند Microsoft Word</comment>
@@ -1475,6 +1451,12 @@
     <comment>Rich Text Format File</comment>
     <glob pattern="*.rtf" />
   </mime-type>
+  <mime-type type="application/rtf">
+    <icon name="text-rtf" />
+    <generic-icon name="application-x-tmd18-oth" />
+    <comment>Rich Text Format File</comment>
+    <glob pattern="*.rtf" />
+  </mime-type>
   <mime-type type="application/vnd.sun.xml.writer">
     <icon name="application-vnd.sun.xml.writer" />
     <generic-icon name="application-x-tmd18-oth" />
@@ -1524,9 +1506,22 @@
     <comment>StarCalc Document</comment>
     <glob pattern="*.sdc" />
   </mime-type>
+  <mime-type type="application/vnd.stardivision.writer">
+    <icon name="application-vnd.stardivision.writer" />
+    <generic-icon name="application-x-tmd18-oth" />
+    <comment>StarWriter Document</comment>
+    <glob pattern="*.sdw" />
+  </mime-type>
   <mime-type type="text/spreadsheet">
     <icon name="text-spreadsheet" />
-    <generic-icon name="application-x-pmd-mso" />
+    <generic-icon name="application-x-pmd18-mso" />
+    <comment>Spreadsheet Interchange Document</comment>
+    <glob pattern="*.slk" />
+    <glob pattern="*.sylk" />
+  </mime-type>
+  <mime-type type="application/x-sylk">
+    <icon name="text-spreadsheet" />
+    <generic-icon name="application-x-pmd18-mso" />
     <comment>Spreadsheet Interchange Document</comment>
     <glob pattern="*.slk" />
     <glob pattern="*.sylk" />
@@ -1572,4 +1567,242 @@
     <glob pattern="*.pmd" />
     <sub-class-of type="application/x-ole-storage"/>
   </mime-type>
+  <mime-type type="application/x-doc">
+    <icon name="application-msword" />
+    <generic-icon name="application-x-tmd18-mso" />
+    <comment>Microsoft Word Document</comment>
+    <comment xml:lang="bg">Microsoft Word - документ</comment>
+    <comment xml:lang="cs">Dokument Microsoft Word</comment>
+    <comment xml:lang="da">Microsoft Word-dokument</comment>
+    <comment xml:lang="de">Microsoft Word Dokument</comment>
+    <comment xml:lang="et">Microsoft Wordi dokument</comment>
+    <comment xml:lang="fi">Microsoft Word -tekstiasiakirja</comment>
+    <comment xml:lang="fr">Document Microsoft Word</comment>
+    <comment xml:lang="he">מסמך וורד</comment>
+    <comment xml:lang="it">Documento Microsoft Word</comment>
+    <comment xml:lang="ja">Microsoft Word ドキュメント</comment>
+    <comment xml:lang="nb">Microsoft Word-dokument</comment>
+    <comment xml:lang="pt">Documento do Microsoft Word</comment>
+    <comment xml:lang="ru">Документ Microsoft Word</comment>
+    <comment xml:lang="sh">Microsoft Word dokument</comment>
+    <comment xml:lang="sk">Dokument Microsoft Word</comment>
+    <comment xml:lang="sl">Dokument programa Microsoft Word</comment>
+    <comment xml:lang="sr">Microsoft Word документ</comment>
+    <comment xml:lang="tr">Microsoft Word Belgesi</comment>
+    <comment xml:lang="vi">Tài liệu MS Word</comment>
+    <comment xml:lang="zh-TW">Microsoft Word 文件</comment>
+    <glob pattern="*.doc" />
+  </mime-type>
+  <mime-type type="application/excel">
+    <icon name="application-excel" />
+    <generic-icon name="application-x-pmd18-mso" />
+    <comment>Microsoft Excel Worksheet</comment>
+    <comment xml:lang="bg">Microsoft Excel - лист</comment>
+    <comment xml:lang="cs">Pracovní sešit Microsoft Excel</comment>
+    <comment xml:lang="da">Microsoft Excel-regneark</comment>
+    <comment xml:lang="de">Microsoft Excel Arbeitsblatt</comment>
+    <comment xml:lang="et">Microsoft Exceli töövihik</comment>
+    <comment xml:lang="fi">Microsoft Excel -laskentataulukko</comment>
+    <comment xml:lang="fr">Feuille de calcul Microsoft Excel</comment>
+    <comment xml:lang="he">גיליון עבודה מיקרוסופט אקסל</comment>
+    <comment xml:lang="it">Foglio di lavoro Microsoft Excel</comment>
+    <comment xml:lang="ja">Microsoft Excel ワークシート</comment>
+    <comment xml:lang="nb">Microsoft Excel-ark</comment>
+    <comment xml:lang="pt">Folha de cálculo do Microsoft Excel</comment>
+    <comment xml:lang="ru">Электронная таблица Microsoft Excel</comment>
+    <comment xml:lang="sh">Microsoft Excel radni list</comment>
+    <comment xml:lang="sk">Pracovný zošit Microsoft Excel</comment>
+    <comment xml:lang="sl">Delovni list programa Microsoft Excel</comment>
+    <comment xml:lang="sr">Microsoft Excel радни лист</comment>
+    <comment xml:lang="tr">Microsoft Excel Çalışma Sayfası</comment>
+    <comment xml:lang="vi">Bảng công tác MS Excel</comment>
+    <comment xml:lang="zh-TW">Microsoft Excel 工作表</comment>
+    <glob pattern="*.xls" />
+  </mime-type>
+  <mime-type type="application/x-excel">
+    <icon name="application-vnd.ms-excel" />
+    <generic-icon name="application-x-pmd18-mso" />
+    <comment>Microsoft Excel Worksheet</comment>
+    <comment xml:lang="bg">Microsoft Excel - лист</comment>
+    <comment xml:lang="cs">Pracovní sešit Microsoft Excel</comment>
+    <comment xml:lang="da">Microsoft Excel-regneark</comment>
+    <comment xml:lang="de">Microsoft Excel Arbeitsblatt</comment>
+    <comment xml:lang="et">Microsoft Exceli töövihik</comment>
+    <comment xml:lang="fi">Microsoft Excel -laskentataulukko</comment>
+    <comment xml:lang="fr">Feuille de calcul Microsoft Excel</comment>
+    <comment xml:lang="he">גיליון עבודה מיקרוסופט אקסל</comment>
+    <comment xml:lang="it">Foglio di lavoro Microsoft Excel</comment>
+    <comment xml:lang="ja">Microsoft Excel ワークシート</comment>
+    <comment xml:lang="nb">Microsoft Excel-ark</comment>
+    <comment xml:lang="pt">Folha de cálculo do Microsoft Excel</comment>
+    <comment xml:lang="ru">Электронная таблица Microsoft Excel</comment>
+    <comment xml:lang="sh">Microsoft Excel radni list</comment>
+    <comment xml:lang="sk">Pracovný zošit Microsoft Excel</comment>
+    <comment xml:lang="sl">Delovni list programa Microsoft Excel</comment>
+    <comment xml:lang="sr">Microsoft Excel радни лист</comment>
+    <comment xml:lang="tr">Microsoft Excel Çalışma Sayfası</comment>
+    <comment xml:lang="vi">Bảng công tác MS Excel</comment>
+    <comment xml:lang="zh-TW">Microsoft Excel 工作表</comment>
+    <glob pattern="*.xls" />
+  </mime-type>
+  <mime-type type="application/x-ms-excel">
+    <icon name="application-vnd.ms-excel" />
+    <generic-icon name="application-x-pmd18-mso" />
+    <comment>Microsoft Excel Worksheet</comment>
+    <comment xml:lang="bg">Microsoft Excel - лист</comment>
+    <comment xml:lang="cs">Pracovní sešit Microsoft Excel</comment>
+    <comment xml:lang="da">Microsoft Excel-regneark</comment>
+    <comment xml:lang="de">Microsoft Excel Arbeitsblatt</comment>
+    <comment xml:lang="et">Microsoft Exceli töövihik</comment>
+    <comment xml:lang="fi">Microsoft Excel -laskentataulukko</comment>
+    <comment xml:lang="fr">Feuille de calcul Microsoft Excel</comment>
+    <comment xml:lang="he">גיליון עבודה מיקרוסופט אקסל</comment>
+    <comment xml:lang="it">Foglio di lavoro Microsoft Excel</comment>
+    <comment xml:lang="ja">Microsoft Excel ワークシート</comment>
+    <comment xml:lang="nb">Microsoft Excel-ark</comment>
+    <comment xml:lang="pt">Folha de cálculo do Microsoft Excel</comment>
+    <comment xml:lang="ru">Электронная таблица Microsoft Excel</comment>
+    <comment xml:lang="sh">Microsoft Excel radni list</comment>
+    <comment xml:lang="sk">Pracovný zošit Microsoft Excel</comment>
+    <comment xml:lang="sl">Delovni list programa Microsoft Excel</comment>
+    <comment xml:lang="sr">Microsoft Excel радни лист</comment>
+    <comment xml:lang="tr">Microsoft Excel Çalışma Sayfası</comment>
+    <comment xml:lang="vi">Bảng công tác MS Excel</comment>
+    <comment xml:lang="zh-TW">Microsoft Excel 工作表</comment>
+    <glob pattern="*.xls" />
+  </mime-type>
+  <mime-type type="application/x-msexcel">
+    <icon name="application-vnd.ms-excel" />
+    <generic-icon name="application-x-pmd18-mso" />
+    <comment>Microsoft Excel Worksheet</comment>
+    <comment xml:lang="bg">Microsoft Excel - лист</comment>
+    <comment xml:lang="cs">Pracovní sešit Microsoft Excel</comment>
+    <comment xml:lang="da">Microsoft Excel-regneark</comment>
+    <comment xml:lang="de">Microsoft Excel Arbeitsblatt</comment>
+    <comment xml:lang="et">Microsoft Exceli töövihik</comment>
+    <comment xml:lang="fi">Microsoft Excel -laskentataulukko</comment>
+    <comment xml:lang="fr">Feuille de calcul Microsoft Excel</comment>
+    <comment xml:lang="he">גיליון עבודה מיקרוסופט אקסל</comment>
+    <comment xml:lang="it">Foglio di lavoro Microsoft Excel</comment>
+    <comment xml:lang="ja">Microsoft Excel ワークシート</comment>
+    <comment xml:lang="nb">Microsoft Excel-ark</comment>
+    <comment xml:lang="pt">Folha de cálculo do Microsoft Excel</comment>
+    <comment xml:lang="ru">Электронная таблица Microsoft Excel</comment>
+    <comment xml:lang="sh">Microsoft Excel radni list</comment>
+    <comment xml:lang="sk">Pracovný zošit Microsoft Excel</comment>
+    <comment xml:lang="sl">Delovni list programa Microsoft Excel</comment>
+    <comment xml:lang="sr">Microsoft Excel радни лист</comment>
+    <comment xml:lang="tr">Microsoft Excel Çalışma Sayfası</comment>
+    <comment xml:lang="vi">Bảng công tác MS Excel</comment>
+    <comment xml:lang="zh-TW">Microsoft Excel 工作表</comment>
+    <glob pattern="*.xls" />
+  </mime-type>
+  <mime-type type="application/x-xls">
+    <icon name="application-vnd.ms-excel" />
+    <generic-icon name="application-x-pmd18-mso" />
+    <comment>Microsoft Excel Worksheet</comment>
+    <comment xml:lang="bg">Microsoft Excel - лист</comment>
+    <comment xml:lang="cs">Pracovní sešit Microsoft Excel</comment>
+    <comment xml:lang="da">Microsoft Excel-regneark</comment>
+    <comment xml:lang="de">Microsoft Excel Arbeitsblatt</comment>
+    <comment xml:lang="et">Microsoft Exceli töövihik</comment>
+    <comment xml:lang="fi">Microsoft Excel -laskentataulukko</comment>
+    <comment xml:lang="fr">Feuille de calcul Microsoft Excel</comment>
+    <comment xml:lang="he">גיליון עבודה מיקרוסופט אקסל</comment>
+    <comment xml:lang="it">Foglio di lavoro Microsoft Excel</comment>
+    <comment xml:lang="ja">Microsoft Excel ワークシート</comment>
+    <comment xml:lang="nb">Microsoft Excel-ark</comment>
+    <comment xml:lang="pt">Folha de cálculo do Microsoft Excel</comment>
+    <comment xml:lang="ru">Электронная таблица Microsoft Excel</comment>
+    <comment xml:lang="sh">Microsoft Excel radni list</comment>
+    <comment xml:lang="sk">Pracovný zošit Microsoft Excel</comment>
+    <comment xml:lang="sl">Delovni list programa Microsoft Excel</comment>
+    <comment xml:lang="sr">Microsoft Excel радни лист</comment>
+    <comment xml:lang="tr">Microsoft Excel Çalışma Sayfası</comment>
+    <comment xml:lang="vi">Bảng công tác MS Excel</comment>
+    <comment xml:lang="zh-TW">Microsoft Excel 工作表</comment>
+    <glob pattern="*.xls" />
+  </mime-type>
+  <mime-type type="application/xls">
+    <icon name="application-vnd.ms-excel" />
+    <generic-icon name="application-x-pmd18-mso" />
+    <comment>Microsoft Excel Worksheet</comment>
+    <comment xml:lang="bg">Microsoft Excel - лист</comment>
+    <comment xml:lang="cs">Pracovní sešit Microsoft Excel</comment>
+    <comment xml:lang="da">Microsoft Excel-regneark</comment>
+    <comment xml:lang="de">Microsoft Excel Arbeitsblatt</comment>
+    <comment xml:lang="et">Microsoft Exceli töövihik</comment>
+    <comment xml:lang="fi">Microsoft Excel -laskentataulukko</comment>
+    <comment xml:lang="fr">Feuille de calcul Microsoft Excel</comment>
+    <comment xml:lang="he">גיליון עבודה מיקרוסופט אקסל</comment>
+    <comment xml:lang="it">Foglio di lavoro Microsoft Excel</comment>
+    <comment xml:lang="ja">Microsoft Excel ワークシート</comment>
+    <comment xml:lang="nb">Microsoft Excel-ark</comment>
+    <comment xml:lang="pt">Folha de cálculo do Microsoft Excel</comment>
+    <comment xml:lang="ru">Электронная таблица Microsoft Excel</comment>
+    <comment xml:lang="sh">Microsoft Excel radni list</comment>
+    <comment xml:lang="sk">Pracovný zošit Microsoft Excel</comment>
+    <comment xml:lang="sl">Delovni list programa Microsoft Excel</comment>
+    <comment xml:lang="sr">Microsoft Excel радни лист</comment>
+    <comment xml:lang="tr">Microsoft Excel Çalışma Sayfası</comment>
+    <comment xml:lang="vi">Bảng công tác MS Excel</comment>
+    <comment xml:lang="zh-TW">Microsoft Excel 工作表</comment>
+    <glob pattern="*.xls" />
+  </mime-type>
+  <mime-type type="application/ppt">
+    <icon name="application-vnd.ms-powerpoint" />
+    <generic-icon name="application-x-prd18-mso" />
+    <comment>Microsoft PowerPoint Presentation</comment>
+    <comment xml:lang="bg">Microsoft PowerPoint - презентация</comment>
+    <comment xml:lang="cs">Prezentace Microsoft PowerPoint</comment>
+    <comment xml:lang="da">Microsoft PowerPoint-præsentation</comment>
+    <comment xml:lang="de">Microsoft PowerPoint Präsentation</comment>
+    <comment xml:lang="et">Microsoft PowerPointi esitlus</comment>
+    <comment xml:lang="fi">Microsoft PowerPoint -esitys</comment>
+    <comment xml:lang="fr">Présentation Microsoft PowerPoint</comment>
+    <comment xml:lang="he">מצגת פוורפוינט</comment>
+    <comment xml:lang="it">Presentazione Microsoft PowerPoint</comment>
+    <comment xml:lang="ja">Microsoft PowerPoint プレゼンテーション</comment>
+    <comment xml:lang="nb">Microsoft PowerPoint-presentasjon</comment>
+    <comment xml:lang="pt">Apresentação do Microsoft PowerPoint</comment>
+    <comment xml:lang="ru">Презентация Microsoft PowerPoint</comment>
+    <comment xml:lang="sh">Microsoft PowerPoint prezentacija</comment>
+    <comment xml:lang="sk">Prezentácia Microsoft PowerPoint</comment>
+    <comment xml:lang="sl">Predstavitev programa Microsoft PowerPoint</comment>
+    <comment xml:lang="sr">Microsoft PowerPoint презентација</comment>
+    <comment xml:lang="tr">Microsoft PowerPoint Sunumu</comment>
+    <comment xml:lang="vi">Trình chiếu MS PowerPoint</comment>
+    <comment xml:lang="zh-TW">Microsoft PowerPoint 簡報</comment>
+    <glob pattern="*.ppt" />
+    <glob pattern="*.pps" />
+    <glob pattern="*.pot" />
+  </mime-type>
+  <mime-type type="application/mspowerpoint">
+    <icon name="application-vnd.ms-powerpoint" />
+    <generic-icon name="application-x-prd18-mso" />
+    <comment>Microsoft PowerPoint Presentation</comment>
+    <comment xml:lang="bg">Microsoft PowerPoint - презентация</comment>
+    <comment xml:lang="cs">Prezentace Microsoft PowerPoint</comment>
+    <comment xml:lang="da">Microsoft PowerPoint-præsentation</comment>
+    <comment xml:lang="de">Microsoft PowerPoint Präsentation</comment>
+    <comment xml:lang="et">Microsoft PowerPointi esitlus</comment>
+    <comment xml:lang="fi">Microsoft PowerPoint -esitys</comment>
+    <comment xml:lang="fr">Présentation Microsoft PowerPoint</comment>
+    <comment xml:lang="he">מצגת פוורפוינט</comment>
+    <comment xml:lang="it">Presentazione Microsoft PowerPoint</comment>
+    <comment xml:lang="ja">Microsoft PowerPoint プレゼンテーション</comment>
+    <comment xml:lang="nb">Microsoft PowerPoint-presentasjon</comment>
+    <comment xml:lang="pt">Apresentação do Microsoft PowerPoint</comment>
+    <comment xml:lang="ru">Презентация Microsoft PowerPoint</comment>
+    <comment xml:lang="sh">Microsoft PowerPoint prezentacija</comment>
+    <comment xml:lang="sk">Prezentácia Microsoft PowerPoint</comment>
+    <comment xml:lang="sl">Predstavitev programa Microsoft PowerPoint</comment>
+    <comment xml:lang="sr">Microsoft PowerPoint презентација</comment>
+    <comment xml:lang="tr">Microsoft PowerPoint Sunumu</comment>
+    <comment xml:lang="vi">Trình chiếu MS PowerPoint</comment>
+    <comment xml:lang="zh-TW">Microsoft PowerPoint 簡報</comment>
+    <glob pattern="*.ppt" />
+    <glob pattern="*.pps" />
+    <glob pattern="*.pot" />
+  </mime-type>
 </mime-info>
diff --git a/textmaker-2018.desktop b/textmaker-2018.desktop
index cbd23b89417b..e787b26f39bd 100755
--- a/textmaker-2018.desktop
+++ b/textmaker-2018.desktop
@@ -71,7 +71,9 @@ Comment[de]=Die Textverarbeitung TextMaker ermöglicht es Ihnen, beliebige Arten
 Comment[ru]=TextMaker позволяет работать со всеми видами текстовых документов.
 Terminal=false
 Categories=Application;Office;WordProcessor;
-MimeType=application/x-tmdx;application/x-tmvx;application/x-tmd;application/x-tmv;application/msword;application/vnd.ms-word;application/x-doc;text/rtf;application/rtf;application/rtf;application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.stardivision.writer;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-word.document.macroenabled.12;application/vnd.ms-word.document.macroEnabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.template.macroenabled.12;application/vnd.ms-word.template.macroEnabled.12;application/x-pocket-word;application/x-dbf;Version=1.0
+MimeType=application/x-tmdx;application/x-tmvx;application/x-tmd;application/x-tmv;application/msword;application/vnd.ms-word;application/x-doc;text/rtf;application/rtf;application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.stardivision.writer;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-word.document.macroenabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.template.macroenabled.12;application/x-pocket-word;application/x-dbf;application/msword-template;
+
+Version=1.0
 Name=TextMaker 2018
 Icon=smoffice2018-textmaker
 TryExec=/usr/bin/textmaker18