Commit Graph

1370 Commits

Author SHA1 Message Date
l10n daemon script 0b1780397e 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"
2017-10-24 05:07:07 +02:00
Andrius Štikonas 7acc8b226e Make DocTools optional. 2017-10-20 14:29:43 +01:00
Andrius Štikonas b7fdd6e4c4 Don't repeat work of KAboutData::setupCommandLine(). 2017-10-11 00:20:03 +01:00
Andrius Štikonas f105f448b3 Add a validator for LVM LV names. 2017-10-09 23:56:15 +01:00
Andrius Štikonas f30a3c999f Add what's it entry to Recreate Existing File System checkbox.
BUG: 385524
2017-10-09 18:42:39 +01:00
Andrius Štikonas ca42730d39 Fix a typo in a comment. 2017-10-09 17:08:27 +01:00
Andrius Štikonas e512ed337a Use qOverload in Qt signal/slots. 2017-10-09 13:54:31 +01:00
Andrius Štikonas d38b889a22 Merge branch '3.2' 2017-10-06 18:54:25 -04:00
Andrius Štikonas f34733e824 Fix regexp++. 2017-10-06 23:48:52 +01:00
Andrius Štikonas e77567f768 Bump version. 2017-10-06 23:18:10 +01:00
Andrius Štikonas eb6478aa49 Fix a broken QRegularExpression in LVM VG name validator. 2017-10-06 23:16:30 +01:00
l10n daemon script 8baad25d47 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"
2017-10-02 05:00:54 +02:00
Andrius Štikonas 7ca06a74ae Update credits. 2017-10-02 01:40:14 +01:00
Andrius Štikonas cd9c4ab36b Port away from KService. 2017-10-01 22:07:21 +01:00
l10n daemon script 38d9c72466 GIT_SILENT made messages (after extraction) 2017-10-01 03:28:58 +02:00
Andrius Štikonas 38bdde8a6e Bump version to 3.2.0 2017-09-30 12:35:57 +01:00
l10n daemon script c9e9d31236 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"
2017-09-30 05:08:31 +02:00
l10n daemon script 485632e6e5 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"
2017-09-26 04:54:03 +02:00
l10n daemon script 9872a44597 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"
2017-09-23 04:55:31 +02:00
l10n daemon script a8189399af 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"
2017-09-22 04:55:58 +02:00
Andrius Štikonas cf14bdcac8 Use canonical device paths when comparing them. 2017-09-20 21:22:32 +01:00
Andrius Štikonas 9407c1ede4 Fix KUIT markup. 2017-09-20 20:39:59 +01:00
Andrius Štikonas 1c176ad5f4 Workaround for different swap naming conventions. 2017-09-18 15:21:47 +01:00
Andrius Štikonas 454845e14e Port from MountEntry to FstabEntry.
This helps to preserve comments in fstab file

BUG: 305469
2017-09-16 20:41:45 +01:00
Andrius Štikonas 24237a6120 Change a way untranslated file system name is accessed. 2017-09-15 12:47:28 +01:00
Andrius Štikonas f29656ca45 Move showColumnsContextMenu function from kpmcore to partitionmanager. 2017-09-14 20:42:43 +01:00
Andrius Štikonas 4b4198c34a Use untranslated file system name when importing partition table.
BUG: 364648
2017-09-14 14:47:39 +01:00
Jonathan Riddell f8f74d1698 revert duplicate commit 2017-09-13 15:30:00 +01:00
Jonathan Riddell a4d7832f86 Add freedesktop.org keywords to .desktop file, Author: Jonathan Carter <jcarter@linux.com> 2017-09-13 15:17:41 +01:00
l10n daemon script 931b1e90e0 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"
2017-09-13 08:45:37 +02:00
l10n daemon script 385507c3cb 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"
2017-09-12 04:49:41 +02:00
Andrius Štikonas aa762266ae Fix some minor clang warnings. 2017-09-11 18:46:48 +01:00
Andrius Štikonas 78eca538d6 Remove double underscore from include guards. 2017-09-11 16:28:04 +01:00
l10n daemon script 688b21f9f7 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"
2017-09-11 04:50:44 +02:00
Andrius Štikonas 9348e14b01 Update credits: Pali Rohár 2017-09-10 18:04:04 +01:00
l10n daemon script d70c1ab373 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"
2017-09-10 04:50:43 +02:00
Andrius Štikonas 112b6c9f07 Move IconThemes dependency from kpmcore to partitionmanager. 2017-09-08 15:06:08 +01:00
Andrius Štikonas d076291973 Add support for detecting ISO9660 file systems. 2017-09-08 11:43:31 +01:00
l10n daemon script 1dd8e32d40 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"
2017-09-08 04:30:49 +02:00
Andrius Štikonas eb80d94586 Merge branch 'next2' 2017-09-08 01:05:50 +01:00
Andrius Štikonas c2c68384a1 Remove conditional installation of translated docs. 2017-09-06 21:27:46 +01:00
Andrius Štikonas 421515dcaa Add partition;disk keywords to the desktop file. 2017-09-06 14:12:15 +01:00
Andrius Štikonas cfe3058c0c Bump version for tarball respin. 2017-09-06 11:40:21 +01:00
Andrius Štikonas ed1634c9b5 Bump version to 3.1.1 2017-09-06 00:14:34 +01:00
Andrius Štikonas a9047ca6e2 Merge branch 'master' into next2 2017-09-06 00:10:29 +01:00
Andrius Štikonas feb2e374e4 Fix a crash when clicking cancel in ApplyProgressDialog.
BUG: 384348
2017-09-06 00:07:11 +01:00
Andrius Štikonas 20da0d64cf Port away from QRegExp. 2017-09-05 12:55:44 +01:00
Andrius Štikonas da621fbfbe Use QValidator to validate label input. 2017-09-05 12:52:47 +01:00
Andrius Štikonas 0f64ac2dc3 Port to validateLabel function. 2017-09-04 17:39:39 +01:00
Andrius Štikonas ff45763427 Record sector size in FileSystem class. 2017-09-03 16:01:48 +01:00