l10n daemon script
abc2d564a7
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"
7 years ago
l10n daemon script
9428884630
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"
7 years ago
l10n daemon script
bfa510d23b
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"
7 years ago
l10n daemon script
dc58b8df41
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"
7 years ago
l10n daemon script
3be8fca492
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"
7 years ago
l10n daemon script
bbc1b685ae
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"
7 years ago
l10n daemon script
2caae5d795
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"
7 years ago
l10n daemon script
a0cd6964ee
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"
7 years ago
l10n daemon script
4aa3fb6bcd
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"
7 years ago
l10n daemon script
7fbd4b65ee
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"
7 years ago
l10n daemon script
70b3b880b9
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"
7 years ago
l10n daemon script
9d9336f56f
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"
7 years ago
l10n daemon script
79196d7096
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"
7 years ago
l10n daemon script
9a403be178
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"
7 years ago
l10n daemon script
ef28044d6b
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"
7 years ago
l10n daemon script
5d6410de38
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"
7 years ago
l10n daemon script
e1293e4c37
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"
7 years ago
l10n daemon script
41e1294442
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"
7 years ago
l10n daemon script
f90bce6734
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"
7 years ago
Albert Astals Cid
48c72c349f
Use the nicer K_PLUGIN_CLASS_WITH_JSON
...
Reviewers: apol
Reviewed By: apol
Subscribers: apol, plasma-devel
Tags: #plasma
Differential Revision: https://phabricator.kde.org/D18027
7 years ago
l10n daemon script
d20799548a
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"
7 years ago
Bhushan Shah
46148f7083
Add copy of writeexports.h
...
todo: we should probably move this to some framework? so that both
formats kcm or translations kcm can use this.
Alternatively move formats kcm to the plasma-workspace.
CCMAIL: plasma-devel@kde.org
7 years ago
Bhushan Shah
456566fe66
build translations kcm
7 years ago
Bhushan Shah
500c847aa2
make translations kcm ready for moving to plasma-workspace
7 years ago
Albert Astals Cid
a19b8fc0f8
Fix qml warnings in splash kcm
...
Acked by David Edmundson
REVIEW: 121133
11 years ago
l10n daemon script
ebf667443b
SVN_SILENT made messages (.desktop file)
11 years ago
l10n daemon script
e0555d9ef1
SVN_SILENT made messages (.desktop file)
12 years ago
l10n daemon script
352e87eec9
SVN_SILENT made messages (.desktop file)
12 years ago
David Edmundson
8ad7d94c28
Move ksplash kcm to plasma-desktop with all the other KCMs
12 years ago
l10n daemon script
683c131e75
SVN_SILENT made messages (.desktop file)
12 years ago
Montel Laurent
cfb062eec6
Port to new connect api. Fix forward declaration. Fix includes
12 years ago
l10n daemon script
758fa766b2
SVN_SILENT made messages (.desktop file)
12 years ago
l10n daemon script
2f911ca9a3
SVN_SILENT made messages (.desktop file)
12 years ago
l10n daemon script
92f9c24988
SVN_SILENT made messages (.desktop file)
12 years ago
l10n daemon script
99a52fbe24
SVN_SILENT made messages (.desktop file)
12 years ago
Marco Martin
c677ce18f6
port to QWidget::createWindowContainer
...
QQuickWidget is not reliable enough for 5.1
12 years ago
l10n daemon script
53bc36bd3c
SVN_SILENT made messages (.desktop file)
12 years ago
l10n daemon script
ebd5d8f98e
SVN_SILENT made messages (.desktop file)
12 years ago
l10n daemon script
68f45dcc1c
SVN_SILENT made messages (.desktop file)
12 years ago
l10n daemon script
5d01f955db
SVN_SILENT made messages (.desktop file)
12 years ago
l10n daemon script
926d6fb61a
SVN_SILENT made messages (.desktop file)
12 years ago
l10n daemon script
620f924770
SVN_SILENT made messages (.desktop file)
12 years ago
l10n daemon script
344a005f12
SVN_SILENT made messages (.desktop file)
12 years ago
l10n daemon script
b4d7c387c7
SVN_SILENT made messages (.desktop file)
12 years ago
l10n daemon script
0bd88bd91a
SVN_SILENT made messages (.desktop file)
12 years ago
l10n daemon script
247cedd633
SVN_SILENT made messages (.desktop file)
12 years ago
l10n daemon script
edfceadfc6
SVN_SILENT made messages (.desktop file)
12 years ago
l10n daemon script
6b37f7f75f
SVN_SILENT made messages (.desktop file)
12 years ago
Marco Martin
a2d5f5b1cb
remove lookandfeelacces from lockscreen
12 years ago
Marco Martin
835875e15d
remove dependency from LookAndFeelAccess
12 years ago