Commit Graph

15 Commits (41d94024c20662ada4735256c579cc02f1ac51bc)

Author SHA1 Message Date
l10n daemon script bf5dba5b58 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"
2020-02-04 06:03:03 +01:00
Carl Schwan cad3d9bd5c Adding utility category to desktop file 2020-01-29 17:45:34 +00:00
l10n daemon script c46f8e2e75 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"
2020-01-28 05:37:05 +01:00
l10n daemon script b7d2c92683 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"
2020-01-10 05:51:23 +01:00
l10n daemon script f2da5f98f3 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"
2020-01-09 05:47:13 +01:00
Bhushan Shah 78240a9efb
Rename binary to keysmith
org.kde prefix is definitely unusual so get rid of it.
2019-12-31 20:04:35 +05:30
l10n daemon script 5b430ddc95 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-12-30 05:39:49 +01:00
l10n daemon script 32693b7092 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-12-28 05:19:26 +01:00
l10n daemon script 534d973658 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-12-16 05:37:13 +01:00
l10n daemon script ffb3dd67c1 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-11-28 05:58:25 +01:00
l10n daemon script a66537dd1c 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-11-17 05:16:42 +01:00
l10n daemon script 5c1a7f3878 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-11-16 05:08:09 +01:00
Johan Ouwerkerk d46680e3f2 Fixup desktop file: remove duplicate Icon entry 2019-11-03 16:52:18 +01:00
Bhushan Shah 3da22c1de6 install new icon file and edit metadata 2019-11-03 11:57:25 +05:30
Johan Ouwerkerk e6a53b6f3b Rebrand otpclient as Keysmith 2019-10-21 19:16:51 +02:00