SVN_SILENT made messages (.desktop file) - always resolve ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

src/core/partitionalignment.cpp

@@ -75,7 +75,7 @@ bool PartitionAlignment::isLengthAligned(const Device& d, const Partition& p)
     @param d device the partition is on
     @param p the partition to check
     @param quiet if true, will not print warning
-    @return true if propertly aligned
+    @return true if properly aligned
 */
 bool PartitionAlignment::isAligned(const Device& d, const Partition& p, bool quiet)
 {

src/core/smartparser.cpp

@@ -31,7 +31,7 @@
 #include <QString>
 
 /** Creates a new SmartParser object
-    @param device_path device path that indicates the device that SMART must analyse
+    @param device_path device path that indicates the device that SMART must analyze
 */
 SmartParser::SmartParser(const QString &device_path) :
     m_DevicePath(device_path),

src/core/smartparser.h

@@ -41,7 +41,7 @@ public:
 public:
     const QString &devicePath() const
     {
-        return m_DevicePath; /**< @return the device path that SMART must analyse */
+        return m_DevicePath; /**< @return the device path that SMART must analyze */
     }
 
     SmartDiskInformation *diskInformation() const

src/fs/btrfs.cpp

@@ -86,7 +86,7 @@ bool btrfs::supportToolFound() const
 
 FileSystem::SupportTool btrfs::supportToolName() const
 {
-    return SupportTool(QStringLiteral("btrfs-tools"), QUrl(QStringLiteral("http://btrfs.wiki.kernel.org/")));
+    return SupportTool(QStringLiteral("btrfs-tools"), QUrl(QStringLiteral("https://btrfs.wiki.kernel.org/")));
 }
 
 qint64 btrfs::minCapacity() const

src/fs/exfat.cpp

@@ -79,7 +79,7 @@ bool exfat::supportToolFound() const
 
 FileSystem::SupportTool exfat::supportToolName() const
 {
-    return SupportTool(QStringLiteral("exfat-utils"), QUrl(QStringLiteral("http://code.google.com/p/exfat/")));
+    return SupportTool(QStringLiteral("exfat-utils"), QUrl(QStringLiteral("https://github.com/relan/exfat")));
 }
 
 qint64 exfat::maxCapacity() const

src/fs/hfs.cpp

@@ -67,7 +67,7 @@ bool hfs::supportToolFound() const
 
 FileSystem::SupportTool hfs::supportToolName() const
 {
-    return SupportTool(QStringLiteral("hfsutils"), QUrl(QStringLiteral("http://www.mars.org/home/rob/proj/hfs/")));
+    return SupportTool(QStringLiteral("hfsutils"), QUrl(QStringLiteral("https://www.mars.org/home/rob/proj/hfs/")));
 }
 
 

src/fs/hfsplus.cpp

@@ -68,7 +68,7 @@ bool hfsplus::supportToolFound() const
 
 FileSystem::SupportTool hfsplus::supportToolName() const
 {
-    return SupportTool(QStringLiteral("diskdev_cmds"), QUrl(QStringLiteral("http://opendarwin.org")));
+    return SupportTool(QStringLiteral("diskdev_cmds"), QUrl(QStringLiteral("https://opensource.apple.com/tarballs/diskdev_cmds/")));
 }
 
 qint64 hfsplus::maxCapacity() const

src/fs/linuxswap.cpp

@@ -73,7 +73,7 @@ bool linuxswap::supportToolFound() const
 
 FileSystem::SupportTool linuxswap::supportToolName() const
 {
-    return SupportTool(QStringLiteral("util-linux"), QUrl(QStringLiteral("http://www.kernel.org/pub/linux/utils/util-linux-ng/")));
+    return SupportTool(QStringLiteral("util-linux"), QUrl(QStringLiteral("https://github.com/karelzak/util-linux")));
 }
 
 int linuxswap::maxLabelLength() const

src/fs/lvm2_pv.cpp

@@ -94,7 +94,7 @@ bool lvm2_pv::supportToolFound() const
 
 FileSystem::SupportTool lvm2_pv::supportToolName() const
 {
-    return SupportTool(QStringLiteral("lvm2"), QUrl(QStringLiteral("http://sourceware.org/lvm2/")));
+    return SupportTool(QStringLiteral("lvm2"), QUrl(QStringLiteral("https://sourceware.org/lvm2/")));
 }
 
 qint64 lvm2_pv::maxCapacity() const

src/fs/nilfs2.cpp

@@ -91,7 +91,7 @@ bool nilfs2::supportToolFound() const
 
 FileSystem::SupportTool nilfs2::supportToolName() const
 {
-    return SupportTool(QStringLiteral("nilfs2-utils"), QUrl(QStringLiteral("http://code.google.com/p/nilfs2/")));
+    return SupportTool(QStringLiteral("nilfs2-utils"), QUrl(QStringLiteral("https://github.com/nilfs-dev/nilfs-utils")));
 }
 
 qint64 nilfs2::minCapacity() const

src/fs/ntfs.cpp

@@ -85,7 +85,7 @@ bool ntfs::supportToolFound() const
 
 FileSystem::SupportTool ntfs::supportToolName() const
 {
-    return SupportTool(QStringLiteral("ntfs-3g"), QUrl(QStringLiteral("http://www.tuxera.com/community/ntfs-3g-download/")));
+    return SupportTool(QStringLiteral("ntfs-3g"), QUrl(QStringLiteral("https://www.tuxera.com/community/open-source-ntfs-3g/")));
 }
 
 qint64 ntfs::minCapacity() const

src/fs/ocfs2.cpp

@@ -84,7 +84,7 @@ bool ocfs2::supportToolFound() const
 
 FileSystem::SupportTool ocfs2::supportToolName() const
 {
-    return SupportTool(QStringLiteral("ocfs2-tools"), QUrl(QStringLiteral("http://oss.oracle.com/projects/ocfs2-tools/")));
+    return SupportTool(QStringLiteral("ocfs2-tools"), QUrl(QStringLiteral("https://oss.oracle.com/projects/ocfs2-tools/")));
 }
 
 qint64 ocfs2::minCapacity() const

src/fs/reiser4.cpp

@@ -68,13 +68,13 @@ bool reiser4::supportToolFound() const
 
 FileSystem::SupportTool reiser4::supportToolName() const
 {
-    return SupportTool(QStringLiteral("reiser4progs"), QUrl(QStringLiteral("http://www.kernel.org/pub/linux/utils/fs/reiser4/reiser4progs/")));
+    return SupportTool(QStringLiteral("reiser4progs"), QUrl(QStringLiteral("https://github.com/edward6/reiser4progs")));
 }
 
 qint64 reiser4::maxCapacity() const
 {
     // looks like it's actually unknown. see
-    // http://en.wikipedia.org/wiki/Comparison_of_file_systems
+    // https://en.wikipedia.org/wiki/Comparison_of_file_systems
     return Capacity::unitFactor(Capacity::Unit::Byte, Capacity::Unit::EiB);
 }
 

src/fs/reiserfs.cpp

@@ -80,7 +80,7 @@ bool reiserfs::supportToolFound() const
 
 FileSystem::SupportTool reiserfs::supportToolName() const
 {
-    return SupportTool(QStringLiteral("reiserfsprogs"), QUrl(QStringLiteral("http://www.kernel.org/pub/linux/utils/fs/reiserfs/")));
+    return SupportTool(QStringLiteral("reiserfsprogs"), QUrl(QStringLiteral("https://reiser4.wiki.kernel.org/index.php/Reiserfsprogs")));
 }
 
 qint64 reiserfs::minCapacity() const

src/fs/xfs.cpp

@@ -78,7 +78,7 @@ bool xfs::supportToolFound() const
 
 FileSystem::SupportTool xfs::supportToolName() const
 {
-    return SupportTool(QStringLiteral("xfsprogs"), QUrl(QStringLiteral("http://oss.sgi.com/projects/xfs/")));
+    return SupportTool(QStringLiteral("xfsprogs"), QUrl(QStringLiteral("https://xfs.org/index.php/Getting_the_latest_source_code")));
 }
 
 qint64 xfs::minCapacity() const
@@ -153,7 +153,7 @@ bool xfs::copy(Report& report, const QString& targetDeviceNode, const QString& s
 
     // xfs_copy behaves a little strangely. It apparently kills itself at the end of main, causing QProcess
     // to report that it crashed.
-    // See http://oss.sgi.com/archives/xfs/2004-11/msg00169.html
+    // See https://marc.info/?l=linux-xfs&m=110178337825926&w=2
     // So we cannot rely on QProcess::exitStatus() and thus not on ExternalCommand::run() returning true.
 
     cmd.run(-1);

src/fs/zfs.cpp

@@ -72,7 +72,7 @@ bool zfs::supportToolFound() const
 
 FileSystem::SupportTool zfs::supportToolName() const
 {
-    return SupportTool(QStringLiteral("zfs"), QUrl(QStringLiteral("http://zfsonlinux.org/")));
+    return SupportTool(QStringLiteral("zfs"), QUrl(QStringLiteral("https://zfsonlinux.org/")));
 }
 
 qint64 zfs::minCapacity() const

src/plugins/dummy/pmdummybackendplugin.json

@@ -13,6 +13,7 @@
                 "Name[el]": "Volker Lanz",
                 "Name[en_GB]": "Volker Lanz",
                 "Name[es]": "Volker Lanz",
+                "Name[et]": "Volker Lanz",
                 "Name[fi]": "Volker Lanz",
                 "Name[fr]": "Volker Lanz",
                 "Name[gl]": "Volker Lanz",
@@ -44,6 +45,7 @@
         "Description[el]": "Ένα εικονικό σύστημα υποστήριξης διαχειριστή κατατμήσεων του KDE για δοκιμές.",
         "Description[en_GB]": "A KDE Partition Manager dummy backend for testing purposes.",
         "Description[es]": "Un motor de simulación para el gestor de particiones de KDE para hacer pruebas.",
+        "Description[et]": "KDE partitsioonihalduri fiktiivne taustaprogramm testimiseks.",
         "Description[fi]": "KDE:n osionhallinnan valetaustaosa testaustarkoituksiin.",
         "Description[fr]": "Un moteur de test pour le gestionnaire de partitions de KDE pour faire des essais.",
         "Description[gl]": "Unha infraestrutura de probas para o xestor de particións de KDE.",
@@ -75,6 +77,7 @@
         "Name[el]": "KDE Εικονικό σύστημα υποστήριξης διαχειριστή κατατμήσεων",
         "Name[en_GB]": "KDE Partition Manager Dummy Backend",
         "Name[es]": "Motor de simulación para el gestor de particiones de KDE",
+        "Name[et]": "KDE partitsioonihalduri fiktiivne taustaprogramm",
         "Name[fi]": "KDE:n osionhallinnan valetaustaosa",
         "Name[fr]": "Moteur de test pour le gestionnaire de partitions de KDE",
         "Name[gl]": "Infraestrutura de probas para o xestor de particións de KDE",

src/plugins/sfdisk/pmsfdiskbackendplugin.json

@@ -13,6 +13,7 @@
                 "Name[el]": "Andrius Štikonas",
                 "Name[en_GB]": "Andrius Štikonas",
                 "Name[es]": "Andrius Štikonas",
+                "Name[et]": "Andrius Štikonas",
                 "Name[fi]": "Andrius Štikonas",
                 "Name[fr]": "Andrius Štikonas",
                 "Name[gl]": "Andrius Štikonas",
@@ -44,6 +45,7 @@
         "Description[el]": "Σύστημα υποστήριξης sfdisk διαχειριστή κατατμήσεων του KDE.",
         "Description[en_GB]": "A KDE Partition Manager sfdisk backend.",
         "Description[es]": "Motor sfdisk para el gestor de particiones de KDE.",
+        "Description[et]": "KDE partitsioonihalduri sfdisk'i taustaprogramm.",
         "Description[fi]": "KDE:n osionhallinnan sfdisk-taustaosa",
         "Description[fr]": "Moteur sfdisk pour le gestionnaire de partitions de KDE.",
         "Description[gl]": "Unha infraestrutura de sfdisk para o xestor de particións de KDE.",
@@ -74,6 +76,7 @@
         "Name[el]": "KDE Σύστημα υποστήριξης sfdisk διαχειριστή κατατμήσεων",
         "Name[en_GB]": "KDE Partition Manager sfdisk Backend",
         "Name[es]": "Motor sfdisk para el gestor de particiones de KDE",
+        "Name[et]": "KDE partitsioonihalduri sfdisk'i taustaprogramm",
         "Name[fi]": "KDE:n osionhallinnan sfdisk-taustaosa",
         "Name[fr]": "Moteur sfdisk pour le gestionnaire de partitions de KDE",
         "Name[gl]": "Infraestrutura de sfdisk para o xestor de particións de KDE",

src/plugins/sfdisk/sfdiskpartitiontable.cpp

@@ -58,7 +58,7 @@ bool SfdiskPartitionTable::commit(quint32 timeout)
 
     ExternalCommand(QStringLiteral("udevadm"), { QStringLiteral("settle"), QStringLiteral("--timeout=") + QString::number(timeout) }).run();
     ExternalCommand(QStringLiteral("partx"), { QStringLiteral("--update"), m_device->deviceNode() }).run();
-    ExternalCommand(QStringLiteral("udevadm"), { QStringLiteral("trigger") }).run();
+    ExternalCommand(QStringLiteral("udevadm"), { QStringLiteral("trigger"), QStringLiteral("--subsystem-match=block") }).run();
 
     if (m_device->type() == Device::Type::SoftwareRAID_Device)
         ExternalCommand(QStringLiteral("udevadm"), { QStringLiteral("control"), QStringLiteral("--start-exec-queue") }).run();

src/util/org.kde.kpmcore.externalcommand.actions

@@ -12,6 +12,7 @@ Name[de]=Externen Befehlsdienst starten
 Name[el]=Εκκίνηση διεργασίας με εξωτερική εντολή
 Name[en_GB]=Start external command daemon
 Name[es]=Iniciar el demonio de órdenes externas
+Name[et]=Välise käsu deemoni käivitamine
 Name[fi]=Käynnistä ulkoinen komentopalvelu
 Name[fr]=Lancer le démon de la commande externe
 Name[gl]=Iniciar o servizo de orde externa
@@ -37,6 +38,7 @@ Description[de]=Systemverwalterrechte sind zur Verwaltung von Festplatten erford
 Description[el]=Απαιτούνται δικαιώματα διαχειριστή για τη διαχείριση δίσκων
 Description[en_GB]=Administrative privileges are required to manage disks
 Description[es]=Se necesitan permisos de administrador para gestionar discos
+Description[et]=Ketaste haldamiseks on tarvis administraatori õigusi
 Description[fi]=Levyjen hallinta vaatii pääkäyttäjäoikeuksia
 Description[fr]=Vous devez disposer des privilèges d'administrateur pour gérer les disques
 Description[gl]=Requírense privilexios de administración para xestionar discos.

test/CMakeLists.txt

@@ -57,4 +57,4 @@ add_test(NAME testexternalcommand COMMAND testexternalcommand ${BACKEND})
 
 # Test Device
 kpm_test(testdevice testdevice.cpp)
-add_test(NAME testdevice COMMAND testdevice ${BACKEND})
+add_test(NAME testdevice COMMAND testdevice ${BACKEND})