1
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-21 11:16:35 +01:00
Commit Graph

58 Commits

Author SHA1 Message Date
l10n daemon script
1acade4133 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-04 05:19:42 +01:00
l10n daemon script
5da8d90528 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-03 05:29:43 +01:00
l10n daemon script
e88f022bb7 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-02 05:23:51 +01:00
l10n daemon script
d61b117959 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-01 05:29:40 +01:00
l10n daemon script
1f0443532f 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-28 05:21:18 +01:00
David Rosca
332b7a8e0a
Support loading translations for Python extensions 2018-02-27 12:18:26 +01:00
David Rosca
abd30880a5
SideBarManager: Remove interfaces by pointer not id 2018-02-26 20:28:34 +01:00
David Rosca
43e886a1b0
Add example hellopython Python extension 2018-02-26 18:18:56 +01:00