l10n daemon script
f5546cb5e6
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"
10 years ago
l10n daemon script
f9893549ba
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"
10 years ago
Aleix Pol
96ff1c868e
Properly define overrides as suggested by the c++ standard
10 years ago
l10n daemon script
5435e568df
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"
10 years ago
l10n daemon script
278ba70509
SVN_SILENT made messages (.desktop file)
10 years ago
l10n daemon script
b2173723ce
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"
10 years ago
l10n daemon script
29e7eaf0be
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"
10 years ago
l10n daemon script
ed0ce07ac5
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"
11 years ago
Montel Laurent
a007f294b4
Use new connect api + QStringLiteral
11 years ago
l10n daemon script
80c1c7eada
SVN_SILENT made messages (.desktop file)
11 years ago
l10n daemon script
d3277e8269
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"
11 years ago
l10n daemon script
ef8e9abb33
SVN_SILENT made messages (.desktop file)
11 years ago
l10n daemon script
6635cdc956
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"
11 years ago
l10n daemon script
59292eea40
SVN_SILENT made messages (.desktop file)
11 years ago
l10n daemon script
1f37ac1fa2
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"
11 years ago
l10n daemon script
f8e40f16c2
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"
11 years ago
Montel Laurent
5f9ae5e13c
We depend against kf5-5.8 => ecm > 1.6 => we can use new KDE_ variable
11 years ago
l10n daemon script
640f47fdd2
SVN_SILENT made messages (.desktop file)
11 years ago
l10n daemon script
2569d35ff4
SVN_SILENT made messages (.desktop file)
11 years ago
l10n daemon script
5e058803f7
SVN_SILENT made messages (.desktop file)
11 years ago
l10n daemon script
e8dd62f1c1
SVN_SILENT made messages (.desktop file)
11 years ago
l10n daemon script
8e3c188f58
SVN_SILENT made messages (.desktop file)
11 years ago
l10n daemon script
99bd87a5ad
SVN_SILENT made messages (.desktop file)
11 years ago
l10n daemon script
5629da4cb1
SVN_SILENT made messages (.desktop file)
11 years ago
l10n daemon script
6b458cad48
SVN_SILENT made messages (.desktop file)
11 years ago
l10n daemon script
96a84be147
SVN_SILENT made messages (.desktop file)
11 years ago
Marco Martin
fb1dac65fb
port package structures to KPackage
11 years ago
David Edmundson
d03b205276
kservice_desktop_to_json -> kcoreaddons_desktop_to_json
11 years ago
l10n daemon script
16778ed168
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
51f2849197
SVN_SILENT made messages (.desktop file)
12 years ago
l10n daemon script
352e87eec9
SVN_SILENT made messages (.desktop file)
12 years ago
l10n daemon script
651c6e5841
SVN_SILENT made messages (.desktop file)
12 years ago
l10n daemon script
683c131e75
SVN_SILENT made messages (.desktop file)
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
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
1e94ebe714
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
Aaron Seigo
c0b805ff86
move WallpaperPackage into a pluging called Wallpaper/Images
...
this will allow it to be shared by other plugins out there. it does mean
sacrificing the generic "find best paper size" functionality which was
tightly bound to the image wallpaper (in plasma4, this was Plasma::Wallpaper,
so acceptable). Finding the best image is now left up to the plugin,
though I imagine that other plugins will want this eventually as well
and it will find its way into a library somewhere or else just be
copy-and-pasted a lot.
12 years ago