1
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-22 11:46:34 +01:00
Commit Graph

59 Commits

Author SHA1 Message Date
l10n daemon script
91059a3fb3 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"
2018-03-22 05:17:51 +01:00
l10n daemon script
34550e08f1 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"
2018-03-21 05:30:17 +01:00
l10n daemon script
f838f02db1 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"
2018-03-06 05:24:12 +01:00
l10n daemon script
b4eaa10c10 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"
2018-02-19 05:02:21 +01:00
l10n daemon script
00f337b82c 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"
2018-02-18 04:59:49 +01:00
l10n daemon script
dd3c570c41 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"
2018-02-17 05:04:26 +01:00
l10n daemon script
adf24d7f94 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"
2018-02-14 04:57:58 +01:00
l10n daemon script
3de958a3ed 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"
2018-02-13 05:17:37 +01:00
David Rosca
9db6745ee5
Port theme metadata to standard desktop file
This makes it possible to translate it.
2018-02-11 11:42:37 +01:00