Hello community,

here is the log from the commit of package solid for openSUSE:Factory checked 
in at 2017-10-27 13:59:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/solid (Old)
 and      /work/SRC/openSUSE:Factory/.solid.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "solid"

Fri Oct 27 13:59:33 2017 rev:48 rq:536365 version:5.39.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/solid/solid.changes      2017-09-19 
16:28:20.573257569 +0200
+++ /work/SRC/openSUSE:Factory/.solid.new/solid.changes 2017-10-27 
13:59:38.996985726 +0200
@@ -1,0 +2,11 @@
+Mon Oct 23 06:41:47 CEST 2017 - lbeltr...@kde.org
+
+- Update to 5.39.0
+  * New feature release
+  * For more details please see:
+  * https://www.kde.org/announcements/kde-frameworks-5.39.0.php
+- Changes since 5.38.0:
+  * [solid/fstab] Add support for x-gvfs style options in fstab
+  * [solid/fstab] Swap vendor and product properties, allow i18n of description
+
+-------------------------------------------------------------------

Old:
----
  solid-5.38.0.tar.xz

New:
----
  solid-5.39.0.tar.xz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ solid.spec ++++++
--- /var/tmp/diff_new_pack.CMXpzN/_old  2017-10-27 13:59:39.852945714 +0200
+++ /var/tmp/diff_new_pack.CMXpzN/_new  2017-10-27 13:59:39.852945714 +0200
@@ -18,9 +18,9 @@
 
 %bcond_without lang
 %define lname   libKF5Solid5
-%define _tar_path 5.38
+%define _tar_path 5.39
 Name:           solid
-Version:        5.38.0
+Version:        5.39.0
 Release:        0
 BuildRequires:  bison
 BuildRequires:  cmake >= 3.0

++++++ solid-5.38.0.tar.xz -> solid-5.39.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/solid-5.38.0/CMakeLists.txt 
new/solid-5.39.0/CMakeLists.txt
--- old/solid-5.38.0/CMakeLists.txt     2017-09-03 10:18:35.000000000 +0200
+++ new/solid-5.39.0/CMakeLists.txt     2017-10-07 21:28:57.000000000 +0200
@@ -1,11 +1,11 @@
 
 cmake_minimum_required(VERSION 3.0)
 
-set(KF5_VERSION "5.38.0") # handled by release scripts
+set(KF5_VERSION "5.39.0") # handled by release scripts
 project(Solid VERSION ${KF5_VERSION})
 
 include(FeatureSummary)
-find_package(ECM 5.38.0  NO_MODULE)
+find_package(ECM 5.39.0  NO_MODULE)
 set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake 
Modules." URL 
"https://projects.kde.org/projects/kdesupport/extra-cmake-modules";)
 feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND 
FATAL_ON_MISSING_REQUIRED_PACKAGES)
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/solid-5.38.0/po/ar/solid5_qt.po 
new/solid-5.39.0/po/ar/solid5_qt.po
--- old/solid-5.38.0/po/ar/solid5_qt.po 2017-09-03 10:18:35.000000000 +0200
+++ new/solid-5.39.0/po/ar/solid5_qt.po 2017-10-07 21:28:57.000000000 +0200
@@ -16,6 +16,12 @@
 "X-Generator: Virtaal 0.7.1\n"
 "X-Qt-Contexts: true\n"
 
+#: solid/devices/backends/fstab/fstabdevice.cpp:60
+#, qt-format
+msgctxt "%1 is sharename, %2 is servername"
+msgid "%1 on %2"
+msgstr ""
+
 #: solid/devices/backends/fstab/fstabmanager.cpp:88
 msgctxt "Solid::Backends::Fstab::FstabManager|"
 msgid "Network Shares"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/solid-5.38.0/po/ast/solid5_qt.po 
new/solid-5.39.0/po/ast/solid5_qt.po
--- old/solid-5.38.0/po/ast/solid5_qt.po        2017-09-03 10:18:35.000000000 
+0200
+++ new/solid-5.39.0/po/ast/solid5_qt.po        2017-10-07 21:28:57.000000000 
+0200
@@ -13,6 +13,12 @@
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Lokalize 2.0\n"
 
+#: solid/devices/backends/fstab/fstabdevice.cpp:60
+#, qt-format
+msgctxt "%1 is sharename, %2 is servername"
+msgid "%1 on %2"
+msgstr ""
+
 #: solid/devices/backends/fstab/fstabmanager.cpp:88
 msgctxt "Solid::Backends::Fstab::FstabManager|"
 msgid "Network Shares"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/solid-5.38.0/po/bg/solid5_qt.po 
new/solid-5.39.0/po/bg/solid5_qt.po
--- old/solid-5.38.0/po/bg/solid5_qt.po 2017-09-03 10:18:35.000000000 +0200
+++ new/solid-5.39.0/po/bg/solid5_qt.po 2017-10-07 21:28:57.000000000 +0200
@@ -18,6 +18,12 @@
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Qt-Contexts: true\n"
 
+#: solid/devices/backends/fstab/fstabdevice.cpp:60
+#, qt-format
+msgctxt "%1 is sharename, %2 is servername"
+msgid "%1 on %2"
+msgstr ""
+
 #: solid/devices/backends/fstab/fstabmanager.cpp:88
 #, fuzzy
 #| msgctxt "Network Interface device type"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/solid-5.38.0/po/bs/solid5_qt.po 
new/solid-5.39.0/po/bs/solid5_qt.po
--- old/solid-5.38.0/po/bs/solid5_qt.po 2017-09-03 10:18:35.000000000 +0200
+++ new/solid-5.39.0/po/bs/solid5_qt.po 2017-10-07 21:28:57.000000000 +0200
@@ -13,6 +13,12 @@
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
+#: solid/devices/backends/fstab/fstabdevice.cpp:60
+#, qt-format
+msgctxt "%1 is sharename, %2 is servername"
+msgid "%1 on %2"
+msgstr ""
+
 #: solid/devices/backends/fstab/fstabmanager.cpp:88
 msgctxt "Solid::Backends::Fstab::FstabManager|"
 msgid "Network Shares"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/solid-5.38.0/po/ca/solid5_qt.po 
new/solid-5.39.0/po/ca/solid5_qt.po
--- old/solid-5.38.0/po/ca/solid5_qt.po 2017-09-03 10:18:35.000000000 +0200
+++ new/solid-5.39.0/po/ca/solid5_qt.po 2017-10-07 21:28:57.000000000 +0200
@@ -10,7 +10,7 @@
 "Project-Id-Version: solid5_qt\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-01-24 18:50+0000\n"
-"PO-Revision-Date: 2017-02-12 11:56+0100\n"
+"PO-Revision-Date: 2017-09-27 22:25+0100\n"
 "Last-Translator: Josep Ma. Ferrer <txe...@gmail.com>\n"
 "Language-Team: Catalan <kde-i18n...@kde.org>\n"
 "Language: ca\n"
@@ -22,6 +22,12 @@
 "X-Accelerator-Marker: &\n"
 "X-Qt-Contexts: true\n"
 
+#: solid/devices/backends/fstab/fstabdevice.cpp:60
+#, qt-format
+msgctxt "%1 is sharename, %2 is servername"
+msgid "%1 on %2"
+msgstr "%1 a %2"
+
 #: solid/devices/backends/fstab/fstabmanager.cpp:88
 msgctxt "Solid::Backends::Fstab::FstabManager|"
 msgid "Network Shares"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/solid-5.38.0/po/ca@valencia/solid5_qt.po 
new/solid-5.39.0/po/ca@valencia/solid5_qt.po
--- old/solid-5.38.0/po/ca@valencia/solid5_qt.po        2017-09-03 
10:18:35.000000000 +0200
+++ new/solid-5.39.0/po/ca@valencia/solid5_qt.po        2017-10-07 
21:28:57.000000000 +0200
@@ -10,7 +10,7 @@
 "Project-Id-Version: solid5_qt\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-01-24 18:50+0000\n"
-"PO-Revision-Date: 2017-02-12 11:56+0100\n"
+"PO-Revision-Date: 2017-09-27 22:25+0100\n"
 "Last-Translator: Josep Ma. Ferrer <txe...@gmail.com>\n"
 "Language-Team: Catalan <kde-i18n...@kde.org>\n"
 "Language: ca@valencia\n"
@@ -22,6 +22,12 @@
 "X-Accelerator-Marker: &\n"
 "X-Qt-Contexts: true\n"
 
+#: solid/devices/backends/fstab/fstabdevice.cpp:60
+#, qt-format
+msgctxt "%1 is sharename, %2 is servername"
+msgid "%1 on %2"
+msgstr "%1 a %2"
+
 #: solid/devices/backends/fstab/fstabmanager.cpp:88
 msgctxt "Solid::Backends::Fstab::FstabManager|"
 msgid "Network Shares"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/solid-5.38.0/po/cs/solid5_qt.po 
new/solid-5.39.0/po/cs/solid5_qt.po
--- old/solid-5.38.0/po/cs/solid5_qt.po 2017-09-03 10:18:35.000000000 +0200
+++ new/solid-5.39.0/po/cs/solid5_qt.po 2017-10-07 21:28:57.000000000 +0200
@@ -22,6 +22,12 @@
 "X-Source-Language: en_US\n"
 "X-Qt-Contexts: true\n"
 
+#: solid/devices/backends/fstab/fstabdevice.cpp:60
+#, qt-format
+msgctxt "%1 is sharename, %2 is servername"
+msgid "%1 on %2"
+msgstr ""
+
 #: solid/devices/backends/fstab/fstabmanager.cpp:88
 msgctxt "Solid::Backends::Fstab::FstabManager|"
 msgid "Network Shares"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/solid-5.38.0/po/da/solid5_qt.po 
new/solid-5.39.0/po/da/solid5_qt.po
--- old/solid-5.38.0/po/da/solid5_qt.po 2017-09-03 10:18:35.000000000 +0200
+++ new/solid-5.39.0/po/da/solid5_qt.po 2017-10-07 21:28:57.000000000 +0200
@@ -18,6 +18,12 @@
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Qt-Contexts: true\n"
 
+#: solid/devices/backends/fstab/fstabdevice.cpp:60
+#, qt-format
+msgctxt "%1 is sharename, %2 is servername"
+msgid "%1 on %2"
+msgstr ""
+
 #: solid/devices/backends/fstab/fstabmanager.cpp:88
 msgctxt "Solid::Backends::Fstab::FstabManager|"
 msgid "Network Shares"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/solid-5.38.0/po/de/solid5_qt.po 
new/solid-5.39.0/po/de/solid5_qt.po
--- old/solid-5.38.0/po/de/solid5_qt.po 2017-09-03 10:18:35.000000000 +0200
+++ new/solid-5.39.0/po/de/solid5_qt.po 2017-10-07 21:28:57.000000000 +0200
@@ -20,6 +20,12 @@
 "X-Qt-Contexts: true\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
+#: solid/devices/backends/fstab/fstabdevice.cpp:60
+#, qt-format
+msgctxt "%1 is sharename, %2 is servername"
+msgid "%1 on %2"
+msgstr ""
+
 #: solid/devices/backends/fstab/fstabmanager.cpp:88
 msgctxt "Solid::Backends::Fstab::FstabManager|"
 msgid "Network Shares"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/solid-5.38.0/po/el/solid5_qt.po 
new/solid-5.39.0/po/el/solid5_qt.po
--- old/solid-5.38.0/po/el/solid5_qt.po 2017-09-03 10:18:35.000000000 +0200
+++ new/solid-5.39.0/po/el/solid5_qt.po 2017-10-07 21:28:57.000000000 +0200
@@ -23,6 +23,12 @@
 "X-Generator: Lokalize 1.5\n"
 "X-Qt-Contexts: true\n"
 
+#: solid/devices/backends/fstab/fstabdevice.cpp:60
+#, qt-format
+msgctxt "%1 is sharename, %2 is servername"
+msgid "%1 on %2"
+msgstr ""
+
 #: solid/devices/backends/fstab/fstabmanager.cpp:88
 msgctxt "Solid::Backends::Fstab::FstabManager|"
 msgid "Network Shares"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/solid-5.38.0/po/en_GB/solid5_qt.po 
new/solid-5.39.0/po/en_GB/solid5_qt.po
--- old/solid-5.38.0/po/en_GB/solid5_qt.po      2017-09-03 10:18:35.000000000 
+0200
+++ new/solid-5.39.0/po/en_GB/solid5_qt.po      2017-10-07 21:28:57.000000000 
+0200
@@ -19,6 +19,12 @@
 "X-Generator: Lokalize 2.0\n"
 "X-Qt-Contexts: true\n"
 
+#: solid/devices/backends/fstab/fstabdevice.cpp:60
+#, qt-format
+msgctxt "%1 is sharename, %2 is servername"
+msgid "%1 on %2"
+msgstr ""
+
 #: solid/devices/backends/fstab/fstabmanager.cpp:88
 msgctxt "Solid::Backends::Fstab::FstabManager|"
 msgid "Network Shares"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/solid-5.38.0/po/eo/solid5_qt.po 
new/solid-5.39.0/po/eo/solid5_qt.po
--- old/solid-5.38.0/po/eo/solid5_qt.po 2017-09-03 10:18:35.000000000 +0200
+++ new/solid-5.39.0/po/eo/solid5_qt.po 2017-10-07 21:28:57.000000000 +0200
@@ -17,6 +17,12 @@
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Qt-Contexts: true\n"
 
+#: solid/devices/backends/fstab/fstabdevice.cpp:60
+#, qt-format
+msgctxt "%1 is sharename, %2 is servername"
+msgid "%1 on %2"
+msgstr ""
+
 #: solid/devices/backends/fstab/fstabmanager.cpp:88
 msgctxt "Solid::Backends::Fstab::FstabManager|"
 msgid "Network Shares"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/solid-5.38.0/po/es/solid5_qt.po 
new/solid-5.39.0/po/es/solid5_qt.po
--- old/solid-5.38.0/po/es/solid5_qt.po 2017-09-03 10:18:35.000000000 +0200
+++ new/solid-5.39.0/po/es/solid5_qt.po 2017-10-07 21:28:57.000000000 +0200
@@ -9,7 +9,7 @@
 "Project-Id-Version: solid_qt\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-04-01 01:49+0000\n"
-"PO-Revision-Date: 2017-02-12 22:21+0100\n"
+"PO-Revision-Date: 2017-09-30 22:17+0100\n"
 "Last-Translator: Eloy Cuadra <ecua...@eloihr.net>\n"
 "Language-Team: Spanish <kde-l10n...@kde.org>\n"
 "Language: es\n"
@@ -20,6 +20,12 @@
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Qt-Contexts: true\n"
 
+#: solid/devices/backends/fstab/fstabdevice.cpp:60
+#, qt-format
+msgctxt "%1 is sharename, %2 is servername"
+msgid "%1 on %2"
+msgstr "%1 en %2"
+
 #: solid/devices/backends/fstab/fstabmanager.cpp:88
 msgctxt "Solid::Backends::Fstab::FstabManager|"
 msgid "Network Shares"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/solid-5.38.0/po/et/solid5_qt.po 
new/solid-5.39.0/po/et/solid5_qt.po
--- old/solid-5.38.0/po/et/solid5_qt.po 2017-09-03 10:18:35.000000000 +0200
+++ new/solid-5.39.0/po/et/solid5_qt.po 2017-10-07 21:28:57.000000000 +0200
@@ -19,6 +19,12 @@
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Qt-Contexts: true\n"
 
+#: solid/devices/backends/fstab/fstabdevice.cpp:60
+#, qt-format
+msgctxt "%1 is sharename, %2 is servername"
+msgid "%1 on %2"
+msgstr ""
+
 #: solid/devices/backends/fstab/fstabmanager.cpp:88
 msgctxt "Solid::Backends::Fstab::FstabManager|"
 msgid "Network Shares"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/solid-5.38.0/po/eu/solid5_qt.po 
new/solid-5.39.0/po/eu/solid5_qt.po
--- old/solid-5.38.0/po/eu/solid5_qt.po 2017-09-03 10:18:35.000000000 +0200
+++ new/solid-5.39.0/po/eu/solid5_qt.po 2017-10-07 21:28:57.000000000 +0200
@@ -20,6 +20,12 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Qt-Contexts: true\n"
 
+#: solid/devices/backends/fstab/fstabdevice.cpp:60
+#, qt-format
+msgctxt "%1 is sharename, %2 is servername"
+msgid "%1 on %2"
+msgstr ""
+
 #: solid/devices/backends/fstab/fstabmanager.cpp:88
 msgctxt "Solid::Backends::Fstab::FstabManager|"
 msgid "Network Shares"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/solid-5.38.0/po/fi/solid5_qt.po 
new/solid-5.39.0/po/fi/solid5_qt.po
--- old/solid-5.38.0/po/fi/solid5_qt.po 2017-09-03 10:18:35.000000000 +0200
+++ new/solid-5.39.0/po/fi/solid5_qt.po 2017-10-07 21:28:57.000000000 +0200
@@ -26,6 +26,12 @@
 "X-Generator: Lokalize 2.0\n"
 "X-Qt-Contexts: true\n"
 
+#: solid/devices/backends/fstab/fstabdevice.cpp:60
+#, qt-format
+msgctxt "%1 is sharename, %2 is servername"
+msgid "%1 on %2"
+msgstr ""
+
 #: solid/devices/backends/fstab/fstabmanager.cpp:88
 msgctxt "Solid::Backends::Fstab::FstabManager|"
 msgid "Network Shares"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/solid-5.38.0/po/fr/solid5_qt.po 
new/solid-5.39.0/po/fr/solid5_qt.po
--- old/solid-5.38.0/po/fr/solid5_qt.po 2017-09-03 10:18:35.000000000 +0200
+++ new/solid-5.39.0/po/fr/solid5_qt.po 2017-10-07 21:28:57.000000000 +0200
@@ -26,6 +26,12 @@
 "X-Text-Markup: qtrich\n"
 "X-Qt-Contexts: true\n"
 
+#: solid/devices/backends/fstab/fstabdevice.cpp:60
+#, qt-format
+msgctxt "%1 is sharename, %2 is servername"
+msgid "%1 on %2"
+msgstr ""
+
 #: solid/devices/backends/fstab/fstabmanager.cpp:88
 msgctxt "Solid::Backends::Fstab::FstabManager|"
 msgid "Network Shares"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/solid-5.38.0/po/ga/solid5_qt.po 
new/solid-5.39.0/po/ga/solid5_qt.po
--- old/solid-5.38.0/po/ga/solid5_qt.po 2017-09-03 10:18:35.000000000 +0200
+++ new/solid-5.39.0/po/ga/solid5_qt.po 2017-10-07 21:28:57.000000000 +0200
@@ -18,6 +18,12 @@
 "3 : 4\n"
 "X-Qt-Contexts: true\n"
 
+#: solid/devices/backends/fstab/fstabdevice.cpp:60
+#, qt-format
+msgctxt "%1 is sharename, %2 is servername"
+msgid "%1 on %2"
+msgstr ""
+
 #: solid/devices/backends/fstab/fstabmanager.cpp:88
 #, fuzzy
 #| msgid "Network Shares"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/solid-5.38.0/po/gd/solid5_qt.po 
new/solid-5.39.0/po/gd/solid5_qt.po
--- old/solid-5.38.0/po/gd/solid5_qt.po 2017-09-03 10:18:35.000000000 +0200
+++ new/solid-5.39.0/po/gd/solid5_qt.po 2017-10-07 21:28:57.000000000 +0200
@@ -15,6 +15,12 @@
 "X-Generator: Virtaal 0.7.1\n"
 "X-Qt-Contexts: true\n"
 
+#: solid/devices/backends/fstab/fstabdevice.cpp:60
+#, qt-format
+msgctxt "%1 is sharename, %2 is servername"
+msgid "%1 on %2"
+msgstr ""
+
 #: solid/devices/backends/fstab/fstabmanager.cpp:88
 msgctxt "Solid::Backends::Fstab::FstabManager|"
 msgid "Network Shares"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/solid-5.38.0/po/gl/solid5_qt.po 
new/solid-5.39.0/po/gl/solid5_qt.po
--- old/solid-5.38.0/po/gl/solid5_qt.po 2017-09-03 10:18:35.000000000 +0200
+++ new/solid-5.39.0/po/gl/solid5_qt.po 2017-10-07 21:28:57.000000000 +0200
@@ -24,6 +24,12 @@
 "X-Text-Markup: qtrich\n"
 "X-Qt-Contexts: true\n"
 
+#: solid/devices/backends/fstab/fstabdevice.cpp:60
+#, qt-format
+msgctxt "%1 is sharename, %2 is servername"
+msgid "%1 on %2"
+msgstr ""
+
 #: solid/devices/backends/fstab/fstabmanager.cpp:88
 msgctxt "Solid::Backends::Fstab::FstabManager|"
 msgid "Network Shares"
@@ -1173,7 +1179,7 @@
 msgctxt "solid-hardware|"
 msgid "             # Listen to all add/remove events on supported hardware."
 msgstr ""
-"             # Escoita todos os acontecementos de engadir/eliminar no "
+"             # Escoita todos os acontecementos de engadir/retirar no "
 "hardware admitido."
 
 #: tools/solid-hardware/solid-hardware.cpp:259
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/solid-5.38.0/po/he/solid5_qt.po 
new/solid-5.39.0/po/he/solid5_qt.po
--- old/solid-5.38.0/po/he/solid5_qt.po 2017-09-03 10:18:35.000000000 +0200
+++ new/solid-5.39.0/po/he/solid5_qt.po 2017-10-07 21:28:57.000000000 +0200
@@ -17,6 +17,12 @@
 "X-Generator: Zanata 3.9.6\n"
 "X-Qt-Contexts: true\n"
 
+#: solid/devices/backends/fstab/fstabdevice.cpp:60
+#, qt-format
+msgctxt "%1 is sharename, %2 is servername"
+msgid "%1 on %2"
+msgstr ""
+
 #: solid/devices/backends/fstab/fstabmanager.cpp:88
 msgctxt "Solid::Backends::Fstab::FstabManager|"
 msgid "Network Shares"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/solid-5.38.0/po/hr/solid5_qt.po 
new/solid-5.39.0/po/hr/solid5_qt.po
--- old/solid-5.38.0/po/hr/solid5_qt.po 2017-09-03 10:18:35.000000000 +0200
+++ new/solid-5.39.0/po/hr/solid5_qt.po 2017-10-07 21:28:57.000000000 +0200
@@ -25,6 +25,12 @@
 "X-Text-Markup: qtrich\n"
 "X-Qt-Contexts: true\n"
 
+#: solid/devices/backends/fstab/fstabdevice.cpp:60
+#, qt-format
+msgctxt "%1 is sharename, %2 is servername"
+msgid "%1 on %2"
+msgstr ""
+
 #: solid/devices/backends/fstab/fstabmanager.cpp:88
 #, fuzzy
 #| msgid "Network Shares"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/solid-5.38.0/po/hu/solid5_qt.po 
new/solid-5.39.0/po/hu/solid5_qt.po
--- old/solid-5.38.0/po/hu/solid5_qt.po 2017-09-03 10:18:35.000000000 +0200
+++ new/solid-5.39.0/po/hu/solid5_qt.po 2017-10-07 21:28:57.000000000 +0200
@@ -21,6 +21,12 @@
 "X-Generator: Lokalize 2.0\n"
 "X-Qt-Contexts: true\n"
 
+#: solid/devices/backends/fstab/fstabdevice.cpp:60
+#, qt-format
+msgctxt "%1 is sharename, %2 is servername"
+msgid "%1 on %2"
+msgstr ""
+
 #: solid/devices/backends/fstab/fstabmanager.cpp:88
 msgctxt "Solid::Backends::Fstab::FstabManager|"
 msgid "Network Shares"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/solid-5.38.0/po/ia/solid5_qt.po 
new/solid-5.39.0/po/ia/solid5_qt.po
--- old/solid-5.38.0/po/ia/solid5_qt.po 2017-09-03 10:18:35.000000000 +0200
+++ new/solid-5.39.0/po/ia/solid5_qt.po 2017-10-07 21:28:57.000000000 +0200
@@ -18,6 +18,12 @@
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Qt-Contexts: true\n"
 
+#: solid/devices/backends/fstab/fstabdevice.cpp:60
+#, qt-format
+msgctxt "%1 is sharename, %2 is servername"
+msgid "%1 on %2"
+msgstr ""
+
 #: solid/devices/backends/fstab/fstabmanager.cpp:88
 msgctxt "Solid::Backends::Fstab::FstabManager|"
 msgid "Network Shares"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/solid-5.38.0/po/is/solid5_qt.po 
new/solid-5.39.0/po/is/solid5_qt.po
--- old/solid-5.38.0/po/is/solid5_qt.po 2017-09-03 10:18:35.000000000 +0200
+++ new/solid-5.39.0/po/is/solid5_qt.po 2017-10-07 21:28:57.000000000 +0200
@@ -20,6 +20,12 @@
 "Plural-Forms: Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Qt-Contexts: true\n"
 
+#: solid/devices/backends/fstab/fstabdevice.cpp:60
+#, qt-format
+msgctxt "%1 is sharename, %2 is servername"
+msgid "%1 on %2"
+msgstr ""
+
 #: solid/devices/backends/fstab/fstabmanager.cpp:88
 msgctxt "Solid::Backends::Fstab::FstabManager|"
 msgid "Network Shares"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/solid-5.38.0/po/it/solid5_qt.po 
new/solid-5.39.0/po/it/solid5_qt.po
--- old/solid-5.38.0/po/it/solid5_qt.po 2017-09-03 10:18:35.000000000 +0200
+++ new/solid-5.39.0/po/it/solid5_qt.po 2017-10-07 21:28:57.000000000 +0200
@@ -1,15 +1,15 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
 # Federico Zenith <federico.zen...@member.fsf.org>, 2009, 2010, 2011, 2012, 
2014.
-# Vincenzo Reale <smart2...@baslug.org>, 2014.
+# Vincenzo Reale <smart2...@baslug.org>, 2014, 2017.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: solid_qt\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-04-01 01:49+0000\n"
-"PO-Revision-Date: 2017-02-18 08:39+0100\n"
-"Last-Translator: Federico Zenith <zenith.feder...@gmail.com>\n"
+"PO-Revision-Date: 2017-09-27 23:29+0100\n"
+"Last-Translator: Vincenzo Reale <smart2...@baslug.org>\n"
 "Language-Team: Italian <kde-i18n...@kde.org>\n"
 "Language: it\n"
 "MIME-Version: 1.0\n"
@@ -19,6 +19,12 @@
 "X-Qt-Contexts: true\n"
 "X-Generator: Lokalize 2.0\n"
 
+#: solid/devices/backends/fstab/fstabdevice.cpp:60
+#, qt-format
+msgctxt "%1 is sharename, %2 is servername"
+msgid "%1 on %2"
+msgstr "%1 su %2"
+
 #: solid/devices/backends/fstab/fstabmanager.cpp:88
 msgctxt "Solid::Backends::Fstab::FstabManager|"
 msgid "Network Shares"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/solid-5.38.0/po/ja/solid5_qt.po 
new/solid-5.39.0/po/ja/solid5_qt.po
--- old/solid-5.38.0/po/ja/solid5_qt.po 2017-09-03 10:18:35.000000000 +0200
+++ new/solid-5.39.0/po/ja/solid5_qt.po 2017-10-07 21:28:57.000000000 +0200
@@ -18,6 +18,12 @@
 "X-Text-Markup: qtrich\n"
 "X-Qt-Contexts: true\n"
 
+#: solid/devices/backends/fstab/fstabdevice.cpp:60
+#, qt-format
+msgctxt "%1 is sharename, %2 is servername"
+msgid "%1 on %2"
+msgstr ""
+
 #: solid/devices/backends/fstab/fstabmanager.cpp:88
 #, fuzzy
 #| msgid "Network Shares"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/solid-5.38.0/po/kk/solid5_qt.po 
new/solid-5.39.0/po/kk/solid5_qt.po
--- old/solid-5.38.0/po/kk/solid5_qt.po 2017-09-03 10:18:35.000000000 +0200
+++ new/solid-5.39.0/po/kk/solid5_qt.po 2017-10-07 21:28:57.000000000 +0200
@@ -19,6 +19,12 @@
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Qt-Contexts: true\n"
 
+#: solid/devices/backends/fstab/fstabdevice.cpp:60
+#, qt-format
+msgctxt "%1 is sharename, %2 is servername"
+msgid "%1 on %2"
+msgstr ""
+
 #: solid/devices/backends/fstab/fstabmanager.cpp:88
 #, fuzzy
 #| msgid "Network Shares"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/solid-5.38.0/po/km/solid5_qt.po 
new/solid-5.39.0/po/km/solid5_qt.po
--- old/solid-5.38.0/po/km/solid5_qt.po 2017-09-03 10:18:35.000000000 +0200
+++ new/solid-5.39.0/po/km/solid5_qt.po 2017-10-07 21:28:57.000000000 +0200
@@ -17,6 +17,12 @@
 "X-Language: km-CM\n"
 "X-Qt-Contexts: true\n"
 
+#: solid/devices/backends/fstab/fstabdevice.cpp:60
+#, qt-format
+msgctxt "%1 is sharename, %2 is servername"
+msgid "%1 on %2"
+msgstr ""
+
 #: solid/devices/backends/fstab/fstabmanager.cpp:88
 #, fuzzy
 #| msgid "Network Shares"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/solid-5.38.0/po/ko/solid5_qt.po 
new/solid-5.39.0/po/ko/solid5_qt.po
--- old/solid-5.38.0/po/ko/solid5_qt.po 2017-09-03 10:18:35.000000000 +0200
+++ new/solid-5.39.0/po/ko/solid5_qt.po 2017-10-07 21:28:57.000000000 +0200
@@ -19,6 +19,12 @@
 "X-Qt-Contexts: true\n"
 "X-Generator: Lokalize 1.5\n"
 
+#: solid/devices/backends/fstab/fstabdevice.cpp:60
+#, qt-format
+msgctxt "%1 is sharename, %2 is servername"
+msgid "%1 on %2"
+msgstr ""
+
 #: solid/devices/backends/fstab/fstabmanager.cpp:88
 msgctxt "Solid::Backends::Fstab::FstabManager|"
 msgid "Network Shares"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/solid-5.38.0/po/lt/solid5_qt.po 
new/solid-5.39.0/po/lt/solid5_qt.po
--- old/solid-5.38.0/po/lt/solid5_qt.po 2017-09-03 10:18:35.000000000 +0200
+++ new/solid-5.39.0/po/lt/solid5_qt.po 2017-10-07 21:28:57.000000000 +0200
@@ -22,6 +22,12 @@
 "%100>=20) ? 1 : n%10==0 || (n%100>10 && n%100<20) ? 2 : 3);\n"
 "X-Qt-Contexts: true\n"
 
+#: solid/devices/backends/fstab/fstabdevice.cpp:60
+#, qt-format
+msgctxt "%1 is sharename, %2 is servername"
+msgid "%1 on %2"
+msgstr ""
+
 #: solid/devices/backends/fstab/fstabmanager.cpp:88
 msgctxt "Solid::Backends::Fstab::FstabManager|"
 msgid "Network Shares"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/solid-5.38.0/po/lv/solid5_qt.po 
new/solid-5.39.0/po/lv/solid5_qt.po
--- old/solid-5.38.0/po/lv/solid5_qt.po 2017-09-03 10:18:35.000000000 +0200
+++ new/solid-5.39.0/po/lv/solid5_qt.po 2017-10-07 21:28:57.000000000 +0200
@@ -22,6 +22,12 @@
 "2);\n"
 "X-Qt-Contexts: true\n"
 
+#: solid/devices/backends/fstab/fstabdevice.cpp:60
+#, qt-format
+msgctxt "%1 is sharename, %2 is servername"
+msgid "%1 on %2"
+msgstr ""
+
 #: solid/devices/backends/fstab/fstabmanager.cpp:88
 #, fuzzy
 #| msgid "Network Shares"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/solid-5.38.0/po/ml/solid5_qt.po 
new/solid-5.39.0/po/ml/solid5_qt.po
--- old/solid-5.38.0/po/ml/solid5_qt.po 2017-09-03 10:18:35.000000000 +0200
+++ new/solid-5.39.0/po/ml/solid5_qt.po 2017-10-07 21:28:57.000000000 +0200
@@ -19,6 +19,12 @@
 "X-Generator: KBabel 1.11.4\n"
 "X-Qt-Contexts: true\n"
 
+#: solid/devices/backends/fstab/fstabdevice.cpp:60
+#, qt-format
+msgctxt "%1 is sharename, %2 is servername"
+msgid "%1 on %2"
+msgstr ""
+
 #: solid/devices/backends/fstab/fstabmanager.cpp:88
 #, fuzzy
 #| msgid "Network Shares"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/solid-5.38.0/po/mr/solid5_qt.po 
new/solid-5.39.0/po/mr/solid5_qt.po
--- old/solid-5.38.0/po/mr/solid5_qt.po 2017-09-03 10:18:35.000000000 +0200
+++ new/solid-5.39.0/po/mr/solid5_qt.po 2017-10-07 21:28:57.000000000 +0200
@@ -18,6 +18,12 @@
 "X-Generator: Lokalize 1.5\n"
 "X-Qt-Contexts: true\n"
 
+#: solid/devices/backends/fstab/fstabdevice.cpp:60
+#, qt-format
+msgctxt "%1 is sharename, %2 is servername"
+msgid "%1 on %2"
+msgstr ""
+
 #: solid/devices/backends/fstab/fstabmanager.cpp:88
 msgctxt "Solid::Backends::Fstab::FstabManager|"
 msgid "Network Shares"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/solid-5.38.0/po/ms/solid5_qt.po 
new/solid-5.39.0/po/ms/solid5_qt.po
--- old/solid-5.38.0/po/ms/solid5_qt.po 2017-09-03 10:18:35.000000000 +0200
+++ new/solid-5.39.0/po/ms/solid5_qt.po 2017-10-07 21:28:57.000000000 +0200
@@ -19,6 +19,12 @@
 "Plural-Forms: nplurals=2; plural=1;\n"
 "X-Qt-Contexts: true\n"
 
+#: solid/devices/backends/fstab/fstabdevice.cpp:60
+#, qt-format
+msgctxt "%1 is sharename, %2 is servername"
+msgid "%1 on %2"
+msgstr ""
+
 #: solid/devices/backends/fstab/fstabmanager.cpp:88
 #, fuzzy
 #| msgctxt "Network Interface device type"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/solid-5.38.0/po/nds/solid5_qt.po 
new/solid-5.39.0/po/nds/solid5_qt.po
--- old/solid-5.38.0/po/nds/solid5_qt.po        2017-09-03 10:18:35.000000000 
+0200
+++ new/solid-5.39.0/po/nds/solid5_qt.po        2017-10-07 21:28:57.000000000 
+0200
@@ -19,6 +19,12 @@
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Qt-Contexts: true\n"
 
+#: solid/devices/backends/fstab/fstabdevice.cpp:60
+#, qt-format
+msgctxt "%1 is sharename, %2 is servername"
+msgid "%1 on %2"
+msgstr ""
+
 #: solid/devices/backends/fstab/fstabmanager.cpp:88
 msgctxt "Solid::Backends::Fstab::FstabManager|"
 msgid "Network Shares"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/solid-5.38.0/po/nl/solid5_qt.po 
new/solid-5.39.0/po/nl/solid5_qt.po
--- old/solid-5.38.0/po/nl/solid5_qt.po 2017-09-03 10:18:35.000000000 +0200
+++ new/solid-5.39.0/po/nl/solid5_qt.po 2017-10-07 21:28:57.000000000 +0200
@@ -7,7 +7,7 @@
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-01-24 18:50+0000\n"
-"PO-Revision-Date: 2017-02-12 12:22+0100\n"
+"PO-Revision-Date: 2017-09-27 22:41+0100\n"
 "Last-Translator: Freek de Kruijf <freekdekru...@kde.nl>\n"
 "Language-Team: Dutch <kde-i18n...@kde.org>\n"
 "Language: nl\n"
@@ -18,6 +18,12 @@
 "X-Generator: Lokalize 2.0\n"
 "X-Qt-Contexts: true\n"
 
+#: solid/devices/backends/fstab/fstabdevice.cpp:60
+#, qt-format
+msgctxt "%1 is sharename, %2 is servername"
+msgid "%1 on %2"
+msgstr "%1 op %2"
+
 #: solid/devices/backends/fstab/fstabmanager.cpp:88
 msgctxt "Solid::Backends::Fstab::FstabManager|"
 msgid "Network Shares"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/solid-5.38.0/po/pa/solid5_qt.po 
new/solid-5.39.0/po/pa/solid5_qt.po
--- old/solid-5.38.0/po/pa/solid5_qt.po 2017-09-03 10:18:35.000000000 +0200
+++ new/solid-5.39.0/po/pa/solid5_qt.po 2017-10-07 21:28:57.000000000 +0200
@@ -18,6 +18,12 @@
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Qt-Contexts: true\n"
 
+#: solid/devices/backends/fstab/fstabdevice.cpp:60
+#, qt-format
+msgctxt "%1 is sharename, %2 is servername"
+msgid "%1 on %2"
+msgstr ""
+
 #: solid/devices/backends/fstab/fstabmanager.cpp:88
 msgctxt "Solid::Backends::Fstab::FstabManager|"
 msgid "Network Shares"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/solid-5.38.0/po/pl/solid5_qt.po 
new/solid-5.39.0/po/pl/solid5_qt.po
--- old/solid-5.38.0/po/pl/solid5_qt.po 2017-09-03 10:18:35.000000000 +0200
+++ new/solid-5.39.0/po/pl/solid5_qt.po 2017-10-07 21:28:57.000000000 +0200
@@ -9,7 +9,7 @@
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-04-01 01:49+0000\n"
-"PO-Revision-Date: 2017-02-18 07:19+0100\n"
+"PO-Revision-Date: 2017-10-01 11:03+0100\n"
 "Last-Translator: Łukasz Wojniłowicz <lukasz.wojnilow...@gmail.com>\n"
 "Language-Team: Polish <kde-i18n-...@kde.org>\n"
 "Language: pl\n"
@@ -21,6 +21,12 @@
 "|| n%100>=20) ? 1 : 2);\n"
 "X-Qt-Contexts: true\n"
 
+#: solid/devices/backends/fstab/fstabdevice.cpp:60
+#, qt-format
+msgctxt "%1 is sharename, %2 is servername"
+msgid "%1 on %2"
+msgstr "%1 na %2"
+
 #: solid/devices/backends/fstab/fstabmanager.cpp:88
 msgctxt "Solid::Backends::Fstab::FstabManager|"
 msgid "Network Shares"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/solid-5.38.0/po/pt/solid5_qt.po 
new/solid-5.39.0/po/pt/solid5_qt.po
--- old/solid-5.38.0/po/pt/solid5_qt.po 2017-09-03 10:18:35.000000000 +0200
+++ new/solid-5.39.0/po/pt/solid5_qt.po 2017-10-07 21:28:57.000000000 +0200
@@ -3,7 +3,7 @@
 "Project-Id-Version: solid-hardware\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-04-01 01:49+0000\n"
-"PO-Revision-Date: 2017-02-12 15:46+0000\n"
+"PO-Revision-Date: 2017-09-27 10:20+0100\n"
 "Last-Translator: José Nuno Coelho Pires <zepi...@gmail.com>\n"
 "Language-Team: Portuguese <kde-i18n...@kde.org>\n"
 "Language: pt\n"
@@ -17,6 +17,12 @@
 "X-POFile-SpellExtra: acPlugged\n"
 "X-Qt-Contexts: true\n"
 
+#: solid/devices/backends/fstab/fstabdevice.cpp:60
+#, qt-format
+msgctxt "%1 is sharename, %2 is servername"
+msgid "%1 on %2"
+msgstr "%1 em %2"
+
 #: solid/devices/backends/fstab/fstabmanager.cpp:88
 msgctxt "Solid::Backends::Fstab::FstabManager|"
 msgid "Network Shares"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/solid-5.38.0/po/pt_BR/solid5_qt.po 
new/solid-5.39.0/po/pt_BR/solid5_qt.po
--- old/solid-5.38.0/po/pt_BR/solid5_qt.po      2017-09-03 10:18:35.000000000 
+0200
+++ new/solid-5.39.0/po/pt_BR/solid5_qt.po      2017-10-07 21:28:57.000000000 
+0200
@@ -19,6 +19,12 @@
 "X-Generator: Lokalize 1.5\n"
 "X-Qt-Contexts: true\n"
 
+#: solid/devices/backends/fstab/fstabdevice.cpp:60
+#, qt-format
+msgctxt "%1 is sharename, %2 is servername"
+msgid "%1 on %2"
+msgstr ""
+
 #: solid/devices/backends/fstab/fstabmanager.cpp:88
 msgctxt "Solid::Backends::Fstab::FstabManager|"
 msgid "Network Shares"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/solid-5.38.0/po/ro/solid5_qt.po 
new/solid-5.39.0/po/ro/solid5_qt.po
--- old/solid-5.38.0/po/ro/solid5_qt.po 2017-09-03 10:18:35.000000000 +0200
+++ new/solid-5.39.0/po/ro/solid5_qt.po 2017-10-07 21:28:57.000000000 +0200
@@ -21,6 +21,12 @@
 "20)) ? 1 : 2;\n"
 "X-Qt-Contexts: true\n"
 
+#: solid/devices/backends/fstab/fstabdevice.cpp:60
+#, qt-format
+msgctxt "%1 is sharename, %2 is servername"
+msgid "%1 on %2"
+msgstr ""
+
 #: solid/devices/backends/fstab/fstabmanager.cpp:88
 #, fuzzy
 #| msgid "Network Shares"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/solid-5.38.0/po/ru/solid5_qt.po 
new/solid-5.39.0/po/ru/solid5_qt.po
--- old/solid-5.38.0/po/ru/solid5_qt.po 2017-09-03 10:18:35.000000000 +0200
+++ new/solid-5.39.0/po/ru/solid5_qt.po 2017-10-07 21:28:57.000000000 +0200
@@ -24,6 +24,12 @@
 "X-Text-Markup: qtrich\n"
 "X-Qt-Contexts: true\n"
 
+#: solid/devices/backends/fstab/fstabdevice.cpp:60
+#, qt-format
+msgctxt "%1 is sharename, %2 is servername"
+msgid "%1 on %2"
+msgstr ""
+
 #: solid/devices/backends/fstab/fstabmanager.cpp:88
 msgctxt "Solid::Backends::Fstab::FstabManager|"
 msgid "Network Shares"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/solid-5.38.0/po/sk/solid5_qt.po 
new/solid-5.39.0/po/sk/solid5_qt.po
--- old/solid-5.38.0/po/sk/solid5_qt.po 2017-09-03 10:18:35.000000000 +0200
+++ new/solid-5.39.0/po/sk/solid5_qt.po 2017-10-07 21:28:57.000000000 +0200
@@ -16,6 +16,12 @@
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 "X-Qt-Contexts: true\n"
 
+#: solid/devices/backends/fstab/fstabdevice.cpp:60
+#, qt-format
+msgctxt "%1 is sharename, %2 is servername"
+msgid "%1 on %2"
+msgstr ""
+
 #: solid/devices/backends/fstab/fstabmanager.cpp:88
 msgctxt "Solid::Backends::Fstab::FstabManager|"
 msgid "Network Shares"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/solid-5.38.0/po/sl/solid5_qt.po 
new/solid-5.39.0/po/sl/solid5_qt.po
--- old/solid-5.38.0/po/sl/solid5_qt.po 2017-09-03 10:18:35.000000000 +0200
+++ new/solid-5.39.0/po/sl/solid5_qt.po 2017-10-07 21:28:57.000000000 +0200
@@ -21,6 +21,12 @@
 "%100==4 ? 3 : 0);\n"
 "X-Qt-Contexts: true\n"
 
+#: solid/devices/backends/fstab/fstabdevice.cpp:60
+#, qt-format
+msgctxt "%1 is sharename, %2 is servername"
+msgid "%1 on %2"
+msgstr ""
+
 #: solid/devices/backends/fstab/fstabmanager.cpp:88
 msgctxt "Solid::Backends::Fstab::FstabManager|"
 msgid "Network Shares"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/solid-5.38.0/po/sr/solid5_qt.po 
new/solid-5.39.0/po/sr/solid5_qt.po
--- old/solid-5.38.0/po/sr/solid5_qt.po 2017-09-03 10:18:35.000000000 +0200
+++ new/solid-5.39.0/po/sr/solid5_qt.po 2017-10-07 21:28:57.000000000 +0200
@@ -6,7 +6,7 @@
 "Project-Id-Version: solid5_qt\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-01-24 18:50+0000\n"
-"PO-Revision-Date: 2017-02-19 13:25+0100\n"
+"PO-Revision-Date: 2017-09-29 18:09+0200\n"
 "Last-Translator: Chusslove Illich <caslav.i...@gmx.net>\n"
 "Language-Team: Serbian <kde-i18n...@kde.org>\n"
 "Language: sr\n"
@@ -20,6 +20,12 @@
 "X-Environment: kde\n"
 "X-Qt-Contexts: true\n"
 
+#: solid/devices/backends/fstab/fstabdevice.cpp:60
+#, qt-format
+msgctxt "%1 is sharename, %2 is servername"
+msgid "%1 on %2"
+msgstr "%1 на %2"
+
 #: solid/devices/backends/fstab/fstabmanager.cpp:88
 msgctxt "Solid::Backends::Fstab::FstabManager|"
 msgid "Network Shares"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/solid-5.38.0/po/sr@ijekavian/solid5_qt.po 
new/solid-5.39.0/po/sr@ijekavian/solid5_qt.po
--- old/solid-5.38.0/po/sr@ijekavian/solid5_qt.po       2017-09-03 
10:18:35.000000000 +0200
+++ new/solid-5.39.0/po/sr@ijekavian/solid5_qt.po       2017-10-07 
21:28:57.000000000 +0200
@@ -6,7 +6,7 @@
 "Project-Id-Version: solid5_qt\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-01-24 18:50+0000\n"
-"PO-Revision-Date: 2017-02-19 13:25+0100\n"
+"PO-Revision-Date: 2017-09-29 18:09+0200\n"
 "Last-Translator: Chusslove Illich <caslav.i...@gmx.net>\n"
 "Language-Team: Serbian <kde-i18n...@kde.org>\n"
 "Language: sr@ijekavian\n"
@@ -20,6 +20,12 @@
 "X-Environment: kde\n"
 "X-Qt-Contexts: true\n"
 
+#: solid/devices/backends/fstab/fstabdevice.cpp:60
+#, qt-format
+msgctxt "%1 is sharename, %2 is servername"
+msgid "%1 on %2"
+msgstr "%1 на %2"
+
 #: solid/devices/backends/fstab/fstabmanager.cpp:88
 msgctxt "Solid::Backends::Fstab::FstabManager|"
 msgid "Network Shares"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/solid-5.38.0/po/sr@ijekavianlatin/solid5_qt.po 
new/solid-5.39.0/po/sr@ijekavianlatin/solid5_qt.po
--- old/solid-5.38.0/po/sr@ijekavianlatin/solid5_qt.po  2017-09-03 
10:18:35.000000000 +0200
+++ new/solid-5.39.0/po/sr@ijekavianlatin/solid5_qt.po  2017-10-07 
21:28:57.000000000 +0200
@@ -6,7 +6,7 @@
 "Project-Id-Version: solid5_qt\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-01-24 18:50+0000\n"
-"PO-Revision-Date: 2017-02-19 13:25+0100\n"
+"PO-Revision-Date: 2017-09-29 18:09+0200\n"
 "Last-Translator: Chusslove Illich <caslav.i...@gmx.net>\n"
 "Language-Team: Serbian <kde-i18n...@kde.org>\n"
 "Language: sr@ijekavianlatin\n"
@@ -20,6 +20,12 @@
 "X-Environment: kde\n"
 "X-Qt-Contexts: true\n"
 
+#: solid/devices/backends/fstab/fstabdevice.cpp:60
+#, qt-format
+msgctxt "%1 is sharename, %2 is servername"
+msgid "%1 on %2"
+msgstr "%1 na %2"
+
 #: solid/devices/backends/fstab/fstabmanager.cpp:88
 msgctxt "Solid::Backends::Fstab::FstabManager|"
 msgid "Network Shares"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/solid-5.38.0/po/sr@latin/solid5_qt.po 
new/solid-5.39.0/po/sr@latin/solid5_qt.po
--- old/solid-5.38.0/po/sr@latin/solid5_qt.po   2017-09-03 10:18:35.000000000 
+0200
+++ new/solid-5.39.0/po/sr@latin/solid5_qt.po   2017-10-07 21:28:57.000000000 
+0200
@@ -6,7 +6,7 @@
 "Project-Id-Version: solid5_qt\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-01-24 18:50+0000\n"
-"PO-Revision-Date: 2017-02-19 13:25+0100\n"
+"PO-Revision-Date: 2017-09-29 18:09+0200\n"
 "Last-Translator: Chusslove Illich <caslav.i...@gmx.net>\n"
 "Language-Team: Serbian <kde-i18n...@kde.org>\n"
 "Language: sr@latin\n"
@@ -20,6 +20,12 @@
 "X-Environment: kde\n"
 "X-Qt-Contexts: true\n"
 
+#: solid/devices/backends/fstab/fstabdevice.cpp:60
+#, qt-format
+msgctxt "%1 is sharename, %2 is servername"
+msgid "%1 on %2"
+msgstr "%1 na %2"
+
 #: solid/devices/backends/fstab/fstabmanager.cpp:88
 msgctxt "Solid::Backends::Fstab::FstabManager|"
 msgid "Network Shares"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/solid-5.38.0/po/sv/solid5_qt.po 
new/solid-5.39.0/po/sv/solid5_qt.po
--- old/solid-5.38.0/po/sv/solid5_qt.po 2017-09-03 10:18:35.000000000 +0200
+++ new/solid-5.39.0/po/sv/solid5_qt.po 2017-10-07 21:28:57.000000000 +0200
@@ -2,7 +2,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"PO-Revision-Date: 2017-02-21 18:16+0100\n"
+"PO-Revision-Date: 2017-09-27 16:47+0100\n"
 "Last-Translator: Stefan Asserhäll <stefan.asserh...@bredband.net>\n"
 "Language-Team: Swedish <kde-i18n-...@kde.org>\n"
 "Language: sv\n"
@@ -13,6 +13,12 @@
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Lokalize 2.0\n"
 
+#: solid/devices/backends/fstab/fstabdevice.cpp:60
+#, qt-format
+msgctxt "%1 is sharename, %2 is servername"
+msgid "%1 on %2"
+msgstr "%1 på %2"
+
 #: solid/devices/backends/fstab/fstabmanager.cpp:88
 msgctxt "Solid::Backends::Fstab::FstabManager|"
 msgid "Network Shares"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/solid-5.38.0/po/ta/solid5_qt.po 
new/solid-5.39.0/po/ta/solid5_qt.po
--- old/solid-5.38.0/po/ta/solid5_qt.po 2017-09-03 10:18:35.000000000 +0200
+++ new/solid-5.39.0/po/ta/solid5_qt.po 2017-10-07 21:28:57.000000000 +0200
@@ -18,6 +18,12 @@
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Qt-Contexts: true\n"
 
+#: solid/devices/backends/fstab/fstabdevice.cpp:60
+#, qt-format
+msgctxt "%1 is sharename, %2 is servername"
+msgid "%1 on %2"
+msgstr ""
+
 #: solid/devices/backends/fstab/fstabmanager.cpp:88
 msgctxt "Solid::Backends::Fstab::FstabManager|"
 msgid "Network Shares"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/solid-5.38.0/po/th/solid5_qt.po 
new/solid-5.39.0/po/th/solid5_qt.po
--- old/solid-5.38.0/po/th/solid5_qt.po 2017-09-03 10:18:35.000000000 +0200
+++ new/solid-5.39.0/po/th/solid5_qt.po 2017-10-07 21:28:57.000000000 +0200
@@ -18,6 +18,12 @@
 "X-Generator: Lokalize 1.1\n"
 "X-Qt-Contexts: true\n"
 
+#: solid/devices/backends/fstab/fstabdevice.cpp:60
+#, qt-format
+msgctxt "%1 is sharename, %2 is servername"
+msgid "%1 on %2"
+msgstr ""
+
 #: solid/devices/backends/fstab/fstabmanager.cpp:88
 #, fuzzy
 #| msgid "Network Shares"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/solid-5.38.0/po/tr/solid5_qt.po 
new/solid-5.39.0/po/tr/solid5_qt.po
--- old/solid-5.38.0/po/tr/solid5_qt.po 2017-09-03 10:18:35.000000000 +0200
+++ new/solid-5.39.0/po/tr/solid5_qt.po 2017-10-07 21:28:57.000000000 +0200
@@ -24,6 +24,12 @@
 "X-Generator: Lokalize 1.4\n"
 "X-Qt-Contexts: true\n"
 
+#: solid/devices/backends/fstab/fstabdevice.cpp:60
+#, qt-format
+msgctxt "%1 is sharename, %2 is servername"
+msgid "%1 on %2"
+msgstr ""
+
 #: solid/devices/backends/fstab/fstabmanager.cpp:88
 msgctxt "Solid::Backends::Fstab::FstabManager|"
 msgid "Network Shares"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/solid-5.38.0/po/ug/solid5_qt.po 
new/solid-5.39.0/po/ug/solid5_qt.po
--- old/solid-5.38.0/po/ug/solid5_qt.po 2017-09-03 10:18:35.000000000 +0200
+++ new/solid-5.39.0/po/ug/solid5_qt.po 2017-10-07 21:28:57.000000000 +0200
@@ -19,6 +19,12 @@
 "X-Generator: Poedit 1.5.5\n"
 "X-Qt-Contexts: true\n"
 
+#: solid/devices/backends/fstab/fstabdevice.cpp:60
+#, qt-format
+msgctxt "%1 is sharename, %2 is servername"
+msgid "%1 on %2"
+msgstr ""
+
 #: solid/devices/backends/fstab/fstabmanager.cpp:88
 #, fuzzy
 #| msgid "Network Shares"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/solid-5.38.0/po/uk/solid5_qt.po 
new/solid-5.39.0/po/uk/solid5_qt.po
--- old/solid-5.38.0/po/uk/solid5_qt.po 2017-09-03 10:18:35.000000000 +0200
+++ new/solid-5.39.0/po/uk/solid5_qt.po 2017-10-07 21:28:57.000000000 +0200
@@ -9,18 +9,24 @@
 "Project-Id-Version: solid5_qt\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-04-01 01:49+0000\n"
-"PO-Revision-Date: 2017-02-12 14:04+0200\n"
+"PO-Revision-Date: 2017-09-27 16:39+0200\n"
 "Last-Translator: Yuri Chornoivan <yurc...@ukr.net>\n"
 "Language-Team: Ukrainian <kde-i18n...@kde.org>\n"
 "Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Lokalize 2.0\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : n"
 "%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Qt-Contexts: true\n"
 
+#: solid/devices/backends/fstab/fstabdevice.cpp:60
+#, qt-format
+msgctxt "%1 is sharename, %2 is servername"
+msgid "%1 on %2"
+msgstr "%1 на %2"
+
 #: solid/devices/backends/fstab/fstabmanager.cpp:88
 msgctxt "Solid::Backends::Fstab::FstabManager|"
 msgid "Network Shares"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/solid-5.38.0/po/zh_CN/solid5_qt.po 
new/solid-5.39.0/po/zh_CN/solid5_qt.po
--- old/solid-5.38.0/po/zh_CN/solid5_qt.po      2017-09-03 10:18:35.000000000 
+0200
+++ new/solid-5.39.0/po/zh_CN/solid5_qt.po      2017-10-07 21:28:57.000000000 
+0200
@@ -1,3 +1,11 @@
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Ni Hui <shuizhuyuan...@126.com>, 2009, 2010, 2011.
+# Lie Ex <lilith...@gmail.com>, 2010.
+# Weng Xuetian <wen...@gmail.com>, 2012, 2013, 2014, 2015, 2017.
+# FengChao <rainofch...@gmail.com>, 2012.
+# Feng Chao <chaofeng...@gmail.com>, 2014.
 msgid ""
 msgstr ""
 "Project-Id-Version: kdeorg\n"
@@ -12,9 +20,13 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: crowdin.com\n"
-"X-Crowdin-Project: kdeorg\n"
-"X-Crowdin-Language: zh-CN\n"
-"X-Crowdin-File: /kf5-trunk/messages/frameworks/baloo_file5.pot\n"
+"X-Qt-Contexts: true\n"
+
+#: solid/devices/backends/fstab/fstabdevice.cpp:60
+#, qt-format
+msgctxt "%1 is sharename, %2 is servername"
+msgid "%1 on %2"
+msgstr "%2 上 的 %1"
 
 #: solid/devices/backends/fstab/fstabmanager.cpp:88
 msgctxt "Solid::Backends::Fstab::FstabManager|"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/solid-5.38.0/po/zh_TW/solid5_qt.po 
new/solid-5.39.0/po/zh_TW/solid5_qt.po
--- old/solid-5.38.0/po/zh_TW/solid5_qt.po      2017-09-03 10:18:35.000000000 
+0200
+++ new/solid-5.39.0/po/zh_TW/solid5_qt.po      2017-10-07 21:28:57.000000000 
+0200
@@ -21,6 +21,12 @@
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Qt-Contexts: true\n"
 
+#: solid/devices/backends/fstab/fstabdevice.cpp:60
+#, qt-format
+msgctxt "%1 is sharename, %2 is servername"
+msgid "%1 on %2"
+msgstr ""
+
 #: solid/devices/backends/fstab/fstabmanager.cpp:88
 msgctxt "Solid::Backends::Fstab::FstabManager|"
 msgid "Network Shares"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/solid-5.38.0/src/solid/devices/backends/fstab/fstabdevice.cpp 
new/solid-5.39.0/src/solid/devices/backends/fstab/fstabdevice.cpp
--- old/solid-5.38.0/src/solid/devices/backends/fstab/fstabdevice.cpp   
2017-09-03 10:18:35.000000000 +0200
+++ new/solid-5.39.0/src/solid/devices/backends/fstab/fstabdevice.cpp   
2017-10-07 21:28:57.000000000 +0200
@@ -23,7 +23,9 @@
 #include "fstabnetworkshare.h"
 #include "fstabstorageaccess.h"
 #include "fstabservice.h"
+#include <QtCore/QCoreApplication>
 #include <QtCore/QStringList>
+#include <QtCore/QUrl>
 
 using namespace Solid::Backends::Fstab;
 
@@ -35,14 +37,33 @@
     m_device.remove(parentUdi() + "/");
 
     if (m_device.startsWith("//")) {
-        m_product = m_device.mid(2, m_device.indexOf("/", 2) - 2);
-        m_vendor = m_device.mid(m_device.indexOf("/", 2) + 1);
+        m_vendor = m_device.mid(2, m_device.indexOf("/", 2) - 2);
+        m_product = m_device.mid(m_device.indexOf("/", 2) + 1);
     } else {
-        m_product = m_device.left(m_device.indexOf(":/"));
-        m_vendor = m_device.mid(m_device.indexOf(":/") + 1);
+        m_vendor = m_device.left(m_device.indexOf(":/"));
+        m_product = m_device.mid(m_device.indexOf(":/") + 2);
     }
 
-    m_description = m_vendor + " on " + m_product;
+    const QStringList& gvfsOptions = FstabHandling::options(m_device);
+
+    foreach (const QString& option, gvfsOptions) {
+        if (option.startsWith(QLatin1String("x-gvfs-name="))) {
+            QStringRef encoded = option.midRef(12);
+            m_description = QUrl::fromPercentEncoding(encoded.toLatin1());
+        } else if (option.startsWith(QLatin1String("x-gvfs-icon="))) {
+            QStringRef encoded = option.midRef(12);
+            m_iconName = QUrl::fromPercentEncoding(encoded.toLatin1());
+        }
+    }
+
+    if (m_description.isEmpty()) {
+        m_description = QCoreApplication::translate("", "%1 on %2",
+            "%1 is sharename, %2 is servername").arg(m_product).arg(m_vendor);
+    }
+
+    if (m_iconName.isEmpty()) {
+        m_iconName = QLatin1String("network-server");
+    }
 }
 
 FstabDevice::~FstabDevice()
@@ -71,7 +92,7 @@
 
 QString FstabDevice::icon() const
 {
-    return QString::fromLatin1("network-server");
+    return m_iconName;
 }
 
 QStringList FstabDevice::emblems() const
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/solid-5.38.0/src/solid/devices/backends/fstab/fstabdevice.h 
new/solid-5.39.0/src/solid/devices/backends/fstab/fstabdevice.h
--- old/solid-5.38.0/src/solid/devices/backends/fstab/fstabdevice.h     
2017-09-03 10:18:35.000000000 +0200
+++ new/solid-5.39.0/src/solid/devices/backends/fstab/fstabdevice.h     
2017-10-07 21:28:57.000000000 +0200
@@ -74,6 +74,7 @@
     QString m_product;
     QString m_vendor;
     QString m_description;
+    QString m_iconName;
     QPointer<FstabStorageAccess> m_storageAccess;
 };
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/solid-5.38.0/src/solid/devices/backends/fstab/fstabhandling.cpp 
new/solid-5.39.0/src/solid/devices/backends/fstab/fstabhandling.cpp
--- old/solid-5.38.0/src/solid/devices/backends/fstab/fstabhandling.cpp 
2017-09-03 10:18:35.000000000 +0200
+++ new/solid-5.39.0/src/solid/devices/backends/fstab/fstabhandling.cpp 
2017-10-07 21:28:57.000000000 +0200
@@ -129,6 +129,7 @@
     }
 
     globalFstabCache->m_fstabCache.clear();
+    globalFstabCache->m_fstabOptionsCache.clear();
 
 #if HAVE_SETMNTENT
 
@@ -142,8 +143,12 @@
         if (_k_isFstabNetworkFileSystem(fe->mnt_type, fe->mnt_fsname)) {
             const QString device = QFile::decodeName(fe->mnt_fsname);
             const QString mountpoint = QFile::decodeName(fe->mnt_dir);
+            QStringList options = 
QFile::decodeName(fe->mnt_opts).split(QLatin1Char(','));
 
             globalFstabCache->m_fstabCache.insert(device, mountpoint);
+            while (!options.isEmpty()) {
+                globalFstabCache->m_fstabOptionsCache.insert(device, 
options.takeFirst());
+            }
         }
     }
 
@@ -213,6 +218,14 @@
     return mountpoints;
 }
 
+QStringList Solid::Backends::Fstab::FstabHandling::options(const QString 
&device)
+{
+    _k_updateFstabMountPointsCache();
+
+    QStringList options = globalFstabCache->m_fstabOptionsCache.values(device);
+    return options;
+}
+
 QProcess *Solid::Backends::Fstab::FstabHandling::callSystemCommand(const 
QString &commandName,
         const QStringList &args,
         QObject *obj, const char *slot)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/solid-5.38.0/src/solid/devices/backends/fstab/fstabhandling.h 
new/solid-5.39.0/src/solid/devices/backends/fstab/fstabhandling.h
--- old/solid-5.38.0/src/solid/devices/backends/fstab/fstabhandling.h   
2017-09-03 10:18:35.000000000 +0200
+++ new/solid-5.39.0/src/solid/devices/backends/fstab/fstabhandling.h   
2017-10-07 21:28:57.000000000 +0200
@@ -43,6 +43,7 @@
     static QStringList deviceList();
     static QStringList currentMountPoints(const QString &device);
     static QStringList mountPoints(const QString &device);
+    static QStringList options(const QString &device);
     static QProcess *callSystemCommand(const QString &commandName,
                                        const QStringList &args,
                                        QObject *obj, const char *slot);
@@ -60,6 +61,7 @@
 
     QStringMultiHash m_mtabCache;
     QStringMultiHash m_fstabCache;
+    QStringMultiHash m_fstabOptionsCache;
     bool m_fstabCacheValid;
     bool m_mtabCacheValid;
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/solid-5.38.0/src/solid/devices/backends/fstab/fstabnetworkshare.cpp 
new/solid-5.39.0/src/solid/devices/backends/fstab/fstabnetworkshare.cpp
--- old/solid-5.38.0/src/solid/devices/backends/fstab/fstabnetworkshare.cpp     
2017-09-03 10:18:35.000000000 +0200
+++ new/solid-5.39.0/src/solid/devices/backends/fstab/fstabnetworkshare.cpp     
2017-10-07 21:28:57.000000000 +0200
@@ -35,8 +35,8 @@
     } else if (m_fstabDevice->device().contains(":/")) {
         m_type = Solid::NetworkShare::Nfs;
         url = "nfs://";
+        url += m_fstabDevice->vendor() + "/";
         url += m_fstabDevice->product();
-        url += m_fstabDevice->vendor();
     } else {
         m_type = Solid::NetworkShare::Unknown;
     }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/solid-5.38.0/src/solid/devices/backends/fstab/fstabstorageaccess.cpp 
new/solid-5.39.0/src/solid/devices/backends/fstab/fstabstorageaccess.cpp
--- old/solid-5.38.0/src/solid/devices/backends/fstab/fstabstorageaccess.cpp    
2017-09-03 10:18:35.000000000 +0200
+++ new/solid-5.39.0/src/solid/devices/backends/fstab/fstabstorageaccess.cpp    
2017-10-07 21:28:57.000000000 +0200
@@ -44,6 +44,7 @@
         m_filePath = currentMountPoints.first();
         m_isAccessible = true;
     }
+    m_isIgnored = 
FstabHandling::options(device->device()).contains(QLatin1String("x-gvfs-hide"));
 
     connect(device, SIGNAL(mtabChanged(QString)), this, 
SLOT(onMtabChanged(QString)));
     QTimer::singleShot(0, this, SLOT(connectDBusSignals()));
@@ -81,7 +82,7 @@
 
 bool FstabStorageAccess::isIgnored() const
 {
-    return false;
+    return m_isIgnored;
 }
 
 bool FstabStorageAccess::setup()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/solid-5.38.0/src/solid/devices/backends/fstab/fstabstorageaccess.h 
new/solid-5.39.0/src/solid/devices/backends/fstab/fstabstorageaccess.h
--- old/solid-5.38.0/src/solid/devices/backends/fstab/fstabstorageaccess.h      
2017-09-03 10:18:35.000000000 +0200
+++ new/solid-5.39.0/src/solid/devices/backends/fstab/fstabstorageaccess.h      
2017-10-07 21:28:57.000000000 +0200
@@ -83,6 +83,7 @@
     QProcess *m_process;
     QString m_filePath;
     bool m_isAccessible;
+    bool m_isIgnored;
 };
 
 }


Reply via email to