l10n daemon script
5834c7fa6c
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
b226bcde7a
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
b02217a309
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
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
c1da8f1f86
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
9a04a838e5
SVN_SILENT made messages (.desktop file)
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
0e35c812b0
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
Marco Martin
d89be8e25b
scripted default config for applets
...
execute a script from the look and feel package when
an applet is added, adding to the script environment
"applet" that wraps the currently added applet and
"containment" that wraps its containment.
from there the javascript part can do anything it can do
in the startup script as well.
In case of containments, "applet" and "containment" will
be the same thing
REVIEW:125562
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
l10n daemon script
55743b3c68
SVN_SILENT made messages (.desktop file)
11 years ago
l10n daemon script
ef2225271d
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
l10n daemon script
765e6a3c0a
SVN_SILENT made messages (.desktop file)
11 years ago
l10n daemon script
abb6dd177d
SVN_SILENT made messages (.desktop file)
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
Marco Martin
873d3e7b95
add possibility for l&f package to have layouts
...
if the l&f package has a default layout script, make it win over the one of the shell.
this should be used for distributions to customize.
since there can be one l&f package with multiple shells, a layout is specific for a particular shell package, so search the files as layouts/shellName-layout.js, like layouts/org.kde.plasma.shell-layout.js
REVIEW:121119
Reviewed by: Rohan Garg <rohangarg@kubuntu.org>
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