Commit Graph

6089 Commits (237ec8c4bf4c1e54a24c654c06f2a54cb9459f2d)
 

Author SHA1 Message Date
l10n daemon script 237ec8c4bf 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"
1 year ago
l10n daemon script 05e4885ef3 GIT_SILENT Sync po/docbooks with svn 1 year ago
l10n daemon script 6aae3646e8 GIT_SILENT Sync po/docbooks with svn 1 year ago
l10n daemon script 32ce630b51 GIT_SILENT Sync po/docbooks with svn 1 year ago
l10n daemon script b6884636b1 GIT_SILENT Sync po/docbooks with svn 1 year ago
l10n daemon script 054c9e5c94 GIT_SILENT Sync po/docbooks with svn 1 year ago
Lana Black f9727cdac5 Add default.nix for fun and profit. 1 year ago
Lana Black 66e52716b4 Allow maximising panel conditionally.
Add code that maximises panel length when maximised windows are present on the same screen.
1 year ago
l10n daemon script 7b210a9970 GIT_SILENT Sync po/docbooks with svn 1 year ago
Carl Schwan 8ea7f3e066
Fix ci
Use stable version from plasma workspace
1 year ago
l10n daemon script 620c7fa986 GIT_SILENT Sync po/docbooks with svn 1 year ago
l10n daemon script bf320e2d15 GIT_SILENT Sync po/docbooks with svn 1 year ago
l10n daemon script 98d25c1427 GIT_SILENT Sync po/docbooks with svn 1 year ago
l10n daemon script 7524c210b9 GIT_SILENT Sync po/docbooks with svn 1 year ago
l10n daemon script cb44b6f84d 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"
1 year ago
l10n daemon script 71e0243709 GIT_SILENT Sync po/docbooks with svn 1 year ago
l10n daemon script 65b6761237 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"
1 year ago
l10n daemon script 902092f2a8 GIT_SILENT Sync po/docbooks with svn 1 year ago
l10n daemon script 5dc506b49f GIT_SILENT Sync po/docbooks with svn 1 year ago
l10n daemon script 0423fd4259 GIT_SILENT Sync po/docbooks with svn 1 year ago
l10n daemon script 427b6ba690 GIT_SILENT Sync po/docbooks with svn 1 year ago
l10n daemon script 853a7735a4 GIT_SILENT Sync po/docbooks with svn 1 year ago
l10n daemon script 4f7f4c2395 GIT_SILENT Sync po/docbooks with svn 1 year ago
l10n daemon script 3b67d2112d GIT_SILENT Sync po/docbooks with svn 2 years ago
l10n daemon script 1aa9d9f825 GIT_SILENT Sync po/docbooks with svn 2 years ago
l10n daemon script 81ea60df72 GIT_SILENT made messages (after extraction) 2 years ago
l10n daemon script 61fa1b0e23 GIT_SILENT Sync po/docbooks with svn 2 years ago
l10n daemon script 720fc92d14 GIT_SILENT made messages (after extraction) 2 years ago
l10n daemon script 2d7c1642fc GIT_SILENT Sync po/docbooks with svn 2 years ago
l10n daemon script 5956db83ec GIT_SILENT Sync po/docbooks with svn 2 years ago
l10n daemon script a0ff6e7817 GIT_SILENT Sync po/docbooks with svn 2 years ago
l10n daemon script edb8a258a2 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"
2 years ago
l10n daemon script ea8c4b9714 GIT_SILENT Sync po/docbooks with svn 2 years ago
l10n daemon script 459f0d54ff GIT_SILENT Sync po/docbooks with svn 2 years ago
l10n daemon script a0e6eae9c8 GIT_SILENT Sync po/docbooks with svn 2 years ago
l10n daemon script 892ac7868b GIT_SILENT made messages (after extraction) 2 years ago
l10n daemon script 67591cf616 GIT_SILENT Sync po/docbooks with svn 2 years ago
l10n daemon script a91a1ef227 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"
2 years ago
l10n daemon script 6532af166f GIT_SILENT Sync po/docbooks with svn 2 years ago
l10n daemon script 5c2158b969 GIT_SILENT Sync po/docbooks with svn 2 years ago
l10n daemon script b58cdd7882 GIT_SILENT Sync po/docbooks with svn 2 years ago
l10n daemon script 4cc612284d GIT_SILENT Sync po/docbooks with svn 2 years ago
l10n daemon script 1193856d40 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"
2 years ago
l10n daemon script 5e5c352421 GIT_SILENT Sync po/docbooks with svn 2 years ago
l10n daemon script 515238b4b9 GIT_SILENT Sync po/docbooks with svn 2 years ago
l10n daemon script 6263a65606 GIT_SILENT Sync po/docbooks with svn 2 years ago
l10n daemon script e295e8a782 GIT_SILENT Sync po/docbooks with svn 2 years ago
l10n daemon script 819720a9e6 GIT_SILENT Sync po/docbooks with svn 2 years ago
l10n daemon script 93fcab6217 GIT_SILENT Sync po/docbooks with svn 2 years ago
l10n daemon script 657e243951 GIT_SILENT Sync po/docbooks with svn 2 years ago