Compare commits

...

2 Commits

Author SHA1 Message Date
Andrius Štikonas 47cdc9e405 Update smartmontool (runtime) dependency. 2019-01-01 21:30:07 +00:00
l10n daemon script 66ded3229d 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"
2019-01-01 05:26:53 +01:00
3 changed files with 3 additions and 1 deletions

View File

@ -28,7 +28,7 @@ set(BLKID_MIN_VERSION "2.32")
# Qca-qt5 (tested with botan and ossl backends) # Qca-qt5 (tested with botan and ossl backends)
# Runtime # Runtime
# smartmontools 6.7 # smartmontools 7.0
# Qca plugin (botan or ossl) # Qca plugin (botan or ossl)
set(VERSION_MAJOR "3") set(VERSION_MAJOR "3")

View File

@ -4,6 +4,7 @@
{ {
"Email": "vl@fidra.de", "Email": "vl@fidra.de",
"Name": "Volker Lanz", "Name": "Volker Lanz",
"Name[ast]": "Volker Lanz",
"Name[ca@valencia]": "Volker Lanz", "Name[ca@valencia]": "Volker Lanz",
"Name[ca]": "Volker Lanz", "Name[ca]": "Volker Lanz",
"Name[cs]": "Volker Lanz", "Name[cs]": "Volker Lanz",

View File

@ -4,6 +4,7 @@
{ {
"Email": "andrius@stikonas.eu", "Email": "andrius@stikonas.eu",
"Name": "Andrius Štikonas", "Name": "Andrius Štikonas",
"Name[ast]": "Andrius Štikonas",
"Name[ca@valencia]": "Andrius Štikonas", "Name[ca@valencia]": "Andrius Štikonas",
"Name[ca]": "Andrius Štikonas", "Name[ca]": "Andrius Štikonas",
"Name[cs]": "Andrius Štikonas", "Name[cs]": "Andrius Štikonas",